[fix] Replace outdated FFMPEG enum and type

2 files changed, 8 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d55d10a8d60c..7020ec68ba7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
 	pkgver = 0.50
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/CorsixTH/CorsixTH
 	install = corsix-th.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 6963377fcd9f..3b5f2aaf3dbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=corsix-th
 pkgver=0.50
-pkgrel=2
+pkgrel=3
 pkgdesc='Reimplementation of the game engine of Theme Hospital'
 url='https://github.com/CorsixTH/CorsixTH'
 arch=('i686' 'x86_64' 'armv7h')
@@ -20,11 +20,14 @@ sha256sums=('822cb5b4a4ec863ba410b6a37e456b360516b2362337532689070e4555c037ee'
             '3614197a30498774fff4055ee54d82a812a8b88eba353b70c3288a09ff700158')
 
 prepare() {
+  cd CorsixTH-$pkgver
+
   # fix location in .desktop entry
-  cp -up CorsixTH-$pkgver/DebianPackage/usr/share/applications/CorsixTH.desktop $pkgname.desktop
-  sed 's/games/share/g' -i $pkgname.desktop
+  sed 's/games/share/g' DebianPackage/usr/share/applications/CorsixTH.desktop > ../$pkgname.desktop
   # fix crash in ffmpeg 2.8+
-  patch -d CorsixTH-$pkgver -Np1 < $pkgname-fix-parameters-to-sws_scale.patch
+  patch -Np1 < ../$pkgname-fix-parameters-to-sws_scale.patch
+  # fix compilation with recent ffmpeg
+  sed 's/PIX_FMT_RGB24/AV_&/g;s/PixelFormat/AV&/g' -ibak CorsixTH/Src/th_movie.{cpp,h}
 }
 
 build() {