[Libva] [ANNOUNCE] libva-intel-driver-1.6.0

[Gilles Chanteperdrix]

On Sun, Jul 12, 2015 at 01:14:36PM +0200, Gilles Chanteperdrix wrote:
> On Wed, Jul 01, 2015 at 04:52:17PM +0800, Xiang, Haihao wrote:
> > Hi all,
> > 
> > libva-intel-driver-1.6.0 is now available at 
> > http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver
> > 
> > libva 1.6.0 is required to build the new driver release.
> > 
> > This release brings the following new features and fix critical issues.
> > 
> > * Add support for VP8 encode (CQP, CBR) on BSW/SKL
> > * Add support for HEVC decode on BSW
> > * Add support for HEVC encode (CQP) on SKL
> > * Add support for low-power mode (VA_PROC_PIPELINE_FAST) in VPP
> > * Improve the JPEG encode quality on BSW/SKL
> > * Optimize MPEG-2 start code search on IVB
> > * Fix memory leak issue with JPEG decode on IVB/HSW
> > * Fix HEVC decode issue on SKL
> > * Fix GPU hang issue caused by VP8 decode on BDW/BSW
> > * Fix MADI/MCDI issues on SNB/IVB
> > 
> > git tag: 1.6.0
> > http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.6.0.tar.bz2
> > md5sum 8d9da76883429a155511ee0e71a737aea07ad217  libva-intel-driver-1.6.0.tar.bz2
> > 
> 
> Hi,
> 
> I am trying to compile this code on a machine without Wayland, and
> even though I pass --disable-wayland on the configure script command
> line, I get the following error:
> 
> checking for WAYLAND_SCANNER... no
> configure: error: Package requirements (wayland-scanner) were not met:
> 
> No package 'wayland-scanner' found
> 
> Consider adjusting the PKG_CONFIG_PATH environment variable if you
> installed software in a non-standard prefix.
> 
> Alternatively, you may set the environment variables WAYLAND_SCANNER_CFLAGS
> and WAYLAND_SCANNER_LIBS to avoid the need to call pkg-config.
> See the pkg-config man page for more details.
> 
> From what I can tell, the problem comes from the fact that the
> aclocal.m4 shipped with the package contains the definition for the
> WAYLAND_SCANNER_RULES macro, so the macro gets called
> unconditionally. I believe the fix is to move the
> m4_ifdef([WAYLAND_SCANNER_RULES] block in the 
> if test "$enable_wayland" = "yes"
> block above, but I can not really test this, because when I run
> autoreconf on my system, the WAYLAND_SCANNER_RULES macro does not
> get defined in aclocal.m4 , and so the problem disappears.

Sorry, I can run autoconf so that aclocal.m4 does not get touched.

So, the following patch fixes it for me:
diff --git a/libva-intel-driver-1.6.0/configure.ac~ b/libva-intel-driver-1.6.0/configure.ac
index c4437f8..eb9b2e1 100644
--- a/libva-intel-driver-1.6.0/configure.ac~
+++ b/libva-intel-driver-1.6.0/configure.ac
@@ -165,13 +165,14 @@ if test "$enable_wayland" = "yes"; then
     PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
         [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
         [USE_WAYLAND="no"])
+    m4_ifdef([WAYLAND_SCANNER_RULES],
+        [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+        [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+else
+        wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)
 fi
 AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
-m4_ifdef([WAYLAND_SCANNER_RULES],
-    [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
-
 AC_OUTPUT([
     Makefile
     debian.upstream/Makefile 

Obviously, I have not tested that it does not break the build with
Wayland.

Regards.

-- 
					    Gilles.
https://click-hack.org