From 1be4901cc9da72c1758094baab2f78712536e06a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 23 Dec 2019 21:34:29 +0000
Subject: ffmpeg: fix compilation of SDL2 on 32bit. Revert libvdpau to 1.2
 because 1.3 switched to meson build system and no longer allows creating
 static libraries. We will now use the system libvdpau instead, seems the
 wiser choice.

---
 ffmpeg/build/ffmpeg.SlackBuild | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'ffmpeg')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 33c4137f..698ca55a 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -288,7 +288,7 @@ SCHROEDINGER=1.0.11
 SDL2=2.0.10
 SPEEX=1.2.0
 V4L=1.18.0
-VDPAU=1.3
+VDPAU=1.2
 VPX=1.8.2
 X264=20191217-2245
 X265=3.1.2
@@ -343,7 +343,7 @@ SRCPAT[0]="NO"
 
 # VDPAU for video hardware acceleration:
 SOURCE[1]="$SRCDIR/sources/libvdpau-${VDPAU}.tar.bz2"
-SRCURL[1]="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${VDPAU}/libvdpau-${VDPAU}.tar.bz2"
+SRCURL[1]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.bz2"
 SRCPAT[1]="NO"
 
 # SDL2 is required by ffplay:
@@ -995,7 +995,15 @@ cd $OLDDIR
 make_sdl2()
 {
 echo -e "**\n**  sdl2  ...\n**"
+
 cd $TMP/tmp-$PRGNAM/SDL2-$SDL2
+
+if [ "$ARCH" != "x86_64" ]; then
+  # Patch needed to compile on 32bit:
+  cat $SRCDIR/patches/SDL2_32bit_gles.patch | patch -p1 --verbose
+    2>&1 | tee $OUTPUT/patch-${PRGNAM}_sdl2.log
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -1191,6 +1199,12 @@ find . -name "*.a" | xargs strip --strip-unneeded
 echo -e "\n**\n**\n"
 make install DESTDIR=$FFMPEGDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vdpau.log
+# Strip the static lib to prevent linking errors in 64-bit,
+find . -name "*.a" | xargs strip --strip-unneeded
+# Install vdpau into a temp location so ffmpeg can pickup the library
+echo -e "\n**\n**\n"
+DESTDIR=$FFMPEGDEPSDIR $NINJA install \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vdpau.log
 # Remove the .so and .la files; we want static linking:
 rm -f $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.so*
 rm -f $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.la
@@ -1684,7 +1698,8 @@ make_x264
 make_x265
 make_vpx
 make_libva
-make_vdpau
+# Use system libvdpau now that meson won't build static libs:
+#make_vdpau
 make_mfx
 make_fribidi
 make_ass
-- 
cgit v1.2.3