Merge pull request #7993 from orgads/scummvm

scummvm: update to 2.2.0

mingw-w64-scummvm/0001-mingw-w64-compilation-fix.patch

@@ -1,23 +0,0 @@
-# This patch is needed for ScummVM <= 2.0.0.
-# Future versions of ScummVM won't need this patch as this is now
-# fixed upstream.
-
---- ${srcdir}/${_realname}-${pkgver}/backends/platform/sdl/sdl-sys.h
-+++ ${srcdir}/${_realname}-${pkgver}/backends/platform/sdl/sdl-sys.h
-@@ -36,10 +36,12 @@
- #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE)
- #undef FILE
- // Solaris has typedef __FILE FILE in several places already
--#if !defined(__sun)
--typedef struct { int FAKE; } FAKE_FILE;
--#define FILE FAKE_FILE
--#endif   // (__sun)
-+// The following lines have to be commented out in ScummVM <= 2.0.0 in order to make
-+// compilation work in current MSYS2/Mingw-w64 build environments.
-+//#if !defined(__sun)
-+//typedef struct { int FAKE; } FAKE_FILE;
-+//#define FILE FAKE_FILE
-+//#endif   // (__sun)
- #endif
- 
- #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp)

mingw-w64-scummvm/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=scummvm
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A program which allows you to run certain classic graphical point-and-click adventure games (mingw-w64)"
 arch=('any')
 url='https://www.scummvm.org/'
@@ -28,14 +28,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-faad2"
          "${MINGW_PACKAGE_PREFIX}-readline"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-source=("https://www.scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz"
-         0001-mingw-w64-compilation-fix.patch)
-sha256sums=('9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60'
-            '163b95944e0dcdf358930a842fb2e56cd005bd53ee541fa9dca20b0777cfa327')
+source=("https://downloads.scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz")
+sha256sums=('1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 ${srcdir}/${_realname}-${pkgver}/backends/platform/sdl/sdl-sys.h < ${srcdir}/0001-mingw-w64-compilation-fix.patch
 }
 
 build() {
@@ -54,4 +51,4 @@ build() {
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   make DESTDIR="${pkgdir}" install
-}
+}