libva-vdpau-driver: rebuilt for current, patching in a header file that went missing in a recent libva commit.

1 files changed, 25 insertions, 21 deletions

diff --git a/libva-vdpau-driver/build/libva-vdpau-driver.SlackBuild b/libva-vdpau-driver/build/libva-vdpau-driver.SlackBuild
index 6cdde3d5..4b55965e 100755
--- a/libva-vdpau-driver/build/libva-vdpau-driver.SlackBuild
+++ b/libva-vdpau-driver/build/libva-vdpau-driver.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2013, 2015  Eric Hameleers, Netherlands, NL
+# Copyright 2010, 2011, 2013, 2015, 2019  Eric Hameleers, Netherlands, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -41,6 +41,9 @@
 #               accompanying the new libva-1.2.1 package.
 # 0.7.4-2:    03/jun/2015 by Eric Hameleers <alien@slackware.com>
 #             * Apply a patch to compile against vdpau 0.8.
+# 0.7.4-3:    28/dec/2019 by Eric Hameleers <alien@slackware.com>
+#             * Apply a patch to re-add a missing include caused by a libva
+#               commit.
 # 
 # Run 'sh vdpau-video.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -52,8 +55,8 @@
 
 PRGNAM=libva-vdpau-driver
 VERSION=${VERSION:-0.7.4}
-BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:" -j4 "}
+BUILD=${BUILD:-3}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING NEWS README"
@@ -74,33 +77,29 @@ SRCURL="http://www.freedesktop.org/software/vaapi/releases/${PRGNAM}/${PRGNAM}-$
 ##
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    armv6hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
-             LIBDIRSUFFIX="${LIBDIRSUFFIX:-64}"; SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
   armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  *)         SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+  *)         SLKCFLAGS=${SLKCFLAGS:-"-O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
              ;;
 esac
 
@@ -137,7 +136,7 @@ if ! [ -f ${SOURCE} ]; then
   if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    wget  --no-check-certificate  -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -166,11 +165,13 @@ tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 
 # Make it build here:
-cat $SRCDIR/libva-vdpau-driver_glext.patch \
+cat $SRCDIR/patches/libva-vdpau-driver_glext.patch \
   | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/libva-vdpau-driver_VAEncH264SEIBufferType.patch \
+cat $SRCDIR/patches/libva-vdpau-driver_VAEncH264SEIBufferType.patch \
   | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/libva-vdpau-driver-vdpau-0.8.patch \
+cat $SRCDIR/patches/libva-vdpau-driver-vdpau-0.8.patch \
+  | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+cat $SRCDIR/patches/libva-vdpau-driver_videodev2_h.patch \
   | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 chown -R root:root .
@@ -205,6 +206,9 @@ cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/dri/*.la
+
 # Strip binaries (if any):
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true