libraries/vdpau-video: Updated for version 0.7.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 63 insertions, 17 deletions

diff --git a/libraries/vdpau-video/slack-desc b/libraries/vdpau-video/slack-desc
index c70721e97c..fca96beee0 100644
--- a/libraries/vdpau-video/slack-desc
+++ b/libraries/vdpau-video/slack-desc
@@ -5,12 +5,12 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-       |-----handy-ruler------------------------------------------------------|
+           |-----handy-ruler------------------------------------------------------|
 vdpau-video: vdpau-video (A VDPAU-based backend for VA API)
 vdpau-video:
 vdpau-video: vdpau-video is a VDPAU-based backend for VA API.
 vdpau-video:
-vdpau-video: Website: http://www.splitted-desktop.com/~gbeauchesne/
+vdpau-video: Website: https://launchpad.net/ubuntu/+source/vdpau-video
 vdpau-video:
 vdpau-video:
 vdpau-video:
diff --git a/libraries/vdpau-video/vdpau-video.SlackBuild b/libraries/vdpau-video/vdpau-video.SlackBuild
index d1954017cb..2bc29837ae 100644
--- a/libraries/vdpau-video/vdpau-video.SlackBuild
+++ b/libraries/vdpau-video/vdpau-video.SlackBuild
@@ -22,7 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vdpau-video
-VERSION=${VERSION:-0.6.10}
+SRCNAM=vdpau-driver
+VERSION=${VERSION:-0.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,16 +59,18 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/vdpau-video.patch
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -77,18 +80,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-glx \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/vdpau-video/vdpau-video.info b/libraries/vdpau-video/vdpau-video.info
index 8d6e811742..ba460819b8 100644
--- a/libraries/vdpau-video/vdpau-video.info
+++ b/libraries/vdpau-video/vdpau-video.info
@@ -1,8 +1,8 @@
 PRGNAM="vdpau-video"
 VERSION="0.6.10"
-HOMEPAGE="http://www.splitted-desktop.com/~gbeauchesne/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vdpau-video-0.6.10.tar.gz"
-MD5SUM="8b638a84be5f20aed9b4f0edf7f264db"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/vdpau-video"
+DOWNLOAD="https://launchpad.net/ubuntu/+archive/primary/+files/vdpau-video_0.7.4.orig.tar.gz"
+MD5SUM="789fdf1f4d3042c90e658ce08f6149f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/vdpau-video/vdpau-video.patch b/libraries/vdpau-video/vdpau-video.patch
new file mode 100644
index 0000000000..d413e23956
--- /dev/null
+++ b/libraries/vdpau-video/vdpau-video.patch
@@ -0,0 +1,43 @@
+diff -ur a/src/vdpau_decode.c b/src/vdpau_decode.c
+--- a/src/vdpau_decode.c	2012-10-05 10:02:58.000000000 -0500
++++ b/src/vdpau_decode.c	2014-07-18 07:42:37.240166340 -0500
+@@ -1289,7 +1289,7 @@
+             driver_data,
+             obj_context->vdp_decoder,
+             obj_surface->vdp_surface,
+-            (VdpPictureInfo)&obj_context->vdp_picture_info,
++            (VdpPictureInfo*)&obj_context->vdp_picture_info,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );
+
+--- a/src/utils_glx.h	2012-10-05 16:02:58.000000000 +0100
++++ b/src/utils_glx.h	2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@ 
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++                    
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
+
+--- vdpau-driver-0.7.4/src/vdpau_dump.c.orig	2016-02-16 02:18:26.497963851 +0700
++++ vdpau-driver-0.7.4/src/vdpau_dump.c	2016-02-16 02:18:48.286710863 +0700
+@@ -59,8 +59,8 @@
+         _(VAEncSequenceParameterBufferType);
+         _(VAEncPictureParameterBufferType);
+         _(VAEncSliceParameterBufferType);
+-        _(VAEncH264VUIBufferType);
+-        _(VAEncH264SEIBufferType);
++        //_(VAEncH264VUIBufferType);
++        //_(VAEncH264SEIBufferType);
+ #endif
+ #if VA_CHECK_VERSION(0,31,1)
+         _(VAQMatrixBufferType);