From dca22c7d7759e53ecf79e9bf8f76779de859a2b3 Mon Sep 17 00:00:00 2001
From: Marcel Saegebarth <marc@mos6581.de>
Date: Thu, 10 Sep 2015 18:51:00 +0200
Subject: [PATCH] libraries/libva: Updated for version 1.6.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libva/libva.SlackBuild        | 10 +---------
 libraries/libva/libva.info              |  6 +++---
 libraries/libva/wayland-automagic.patch | 19 -------------------
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 libraries/libva/wayland-automagic.patch

diff --git a/libraries/libva/libva.SlackBuild b/libraries/libva/libva.SlackBuild
index d13154b9b0..9c9fa66a31 100644
--- a/libraries/libva/libva.SlackBuild
+++ b/libraries/libva/libva.SlackBuild
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libva
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,11 +72,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# --enable-wayland=no isn't working without this patch
-patch -p1 < $CWD/wayland-automagic.patch
-mkdir m4
-
-autoreconf -if
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -89,9 +84,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-wayland=no \
   --build=$ARCH-slackware-linux
 
-# configure creates its own libtool, but that libtool seems broken:
-cp -a $(which libtool) .
-
 make
 make install-strip DESTDIR=$PKG
 
diff --git a/libraries/libva/libva.info b/libraries/libva/libva.info
index fa89432528..33aecf546d 100644
--- a/libraries/libva/libva.info
+++ b/libraries/libva/libva.info
@@ -1,8 +1,8 @@
 PRGNAM="libva"
-VERSION="1.6.0"
+VERSION="1.6.1"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi/"
-DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.6.0.tar.bz2"
-MD5SUM="3f1241b4080db53c120325932f393f33"
+DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.6.1.tar.bz2"
+MD5SUM="7a5eb1fdf531f987211b7228a6a46428"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libva/wayland-automagic.patch b/libraries/libva/wayland-automagic.patch
deleted file mode 100644
index d55c3f5da8..0000000000
--- a/libraries/libva/wayland-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac	2015-06-14 18:17:48.776175722 +0200
-+++ b/configure.ac	2015-06-14 18:26:45.710159385 +0200
-@@ -275,14 +275,13 @@
-     if test "$USE_WAYLAND" = "yes"; then
-         AC_DEFINE([HAVE_VA_WAYLAND], [1],
-                   [Defined to 1 if VA/Wayland API is built])
-+        m4_ifdef([WAYLAND_SCANNER_RULES],
-+	  [WAYLAND_SCANNER_RULES(['$(top_buildir)/va/wayland/protocol'])],
-+	  [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])        
-     fi
- fi
- AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
- 
--m4_ifdef([WAYLAND_SCANNER_RULES],
--    [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
--    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)