xf86-video-intel: 2 commits - configure.ac NEWS src/xvmc/Makefile.am

[Chris Wilson]

 NEWS                 |    2 +-
 configure.ac         |    3 ++-
 src/xvmc/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b96ee47ad97943c3dccd40d9570e29002dc3d85f
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sun Feb 3 13:33:08 2013 +0100

    configure.ac: Split out XCB libraries from `XVMCLIB` into `XCB`
    
    Building the package under Debian Sid/unstable, `dh_shlibdeps` informs
    that `libI810XvMC.so.1.0.0` does not need to be linked against
    `libX11-xcb.so.1`, `libxcb-dri2.so.0`, `libxcb-util.so.0` or
    `libxcb.so.1` [1].
    
            $ debuild -b -us -uc
            […]
            make[1]: Entering directory `/src/xserver-xorg-video-intel'
            dh_shlibdeps -- --warnings=6
            dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/libI810XvMC.so.1.0.0 sollte nicht gegen libX11-xcb.so.1 gelinkt werden (es verwendet keines der Bibliotheks-Symbole)
            dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/libI810XvMC.so.1.0.0 sollte nicht gegen libxcb-dri2.so.0 gelinkt werden (es verwendet keines der Bibliotheks-Symbole)
            dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/libI810XvMC.so.1.0.0 sollte nicht gegen libxcb-util.so.0 gelinkt werden (es verwendet keines der Bibliotheks-Symbole)
            dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/libI810XvMC.so.1.0.0 sollte nicht gegen libxcb.so.1 gelinkt werden (es verwendet keines der Bibliotheks-Symbole)
            make[1]: Leaving directory `/src/xserver-xorg-video-intel'
            […]
    
    Moving `x11-xcb`, `xcb-dri2` and `xcb-aux` from `XVMCLIBS` into `XCB`
    and adding `XCB_LIBS` only to the `LIBADD` variables of `libIntelXvMC`
    makes the warnings go away and the libraries are still built without any
    issues.
    
            make[1]: Entering directory `/src/xserver-xorg-video-intel'
            dh_shlibdeps -- --warnings=6
            make[1]: Leaving directory `/src/xserver-xorg-video-intel'
               dh_installdeb -O--builddirectory=build/
               dh_xsf_substvars -O--builddirectory=build/
               dh_gencontrol -O--builddirectory=build/
            dpkg-gencontrol: Warnung: Feld Depends von Paket xserver-xorg-video-intel-dbg: unbekannte Substitutionsvariable ${shlibs:Depends}
               dh_md5sums -O--builddirectory=build/
               dh_builddeb -O--builddirectory=build/
            dpkg-deb: Paket »xserver-xorg-video-intel« wird in »../xserver-xorg-video-intel_2.19.0-6.1_i386.deb« gebaut.
            dpkg-deb: Paket »xserver-xorg-video-intel-dbg« wird in »../xserver-xorg-video-intel-dbg_2.19.0-6.1_i386.deb« gebaut.
             dpkg-genchanges -b >../xserver-xorg-video-intel_2.19.0-6.1_i386.changes
            dpkg-genchanges: rein binärer Upload - es ist kein Quellcode hinzugefügt
             dpkg-source --after-build xserver-xorg-video-intel
            dpkg-buildpackage: Binärpaket(e) hochzuladen (keine Quellen enthalten)
            Now running lintian...
            W: xserver-xorg-video-intel: hardening-no-relro usr/lib/libI810XvMC.so.1.0.0
            W: xserver-xorg-video-intel: hardening-no-fortify-functions usr/lib/libI810XvMC.so.1.0.0
            W: xserver-xorg-video-intel: hardening-no-relro usr/lib/libIntelXvMC.so.1.0.0
            W: xserver-xorg-video-intel: hardening-no-fortify-functions usr/lib/libIntelXvMC.so.1.0.0
            W: xserver-xorg-video-intel: hardening-no-relro usr/lib/xorg/modules/drivers/intel_drv.so
            W: xserver-xorg-video-intel: hardening-no-fortify-functions usr/lib/xorg/modules/drivers/intel_drv.so
            N: 1 tag overridden (1 warning)
            Finished running lintian.
    
    The modules were originally added with the following commit present
    since tag 2.10.0.
    
            commit 3e8f2eae3a586aa29be4858698e666e0ec778cea
            Author: Eric Anholt <eric at anholt.net>
            Date:   Thu Oct 15 13:48:56 2009 -0700
    
                XVMC: Use XCB DRI2 instead of cargo-culting our own copy of Xlib stuff. (v2)
    
    [1] https://buildd.debian.org/status/fetch.php?pkg=xserver-xorg-video-intel&arch=i386&ver=2%3A2.19.0-6&stamp=1347825458
    
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>

diff --git a/configure.ac b/configure.ac
index e6ab9d0..5ae4208 100644
--- a/configure.ac
+++ b/configure.ac
@@ -404,8 +404,9 @@ AC_MSG_RESULT([$DRI2])
 
 if test "$XVMC" = yes; then
 	PKG_CHECK_MODULES(XVMCLIB,
-			  [xvmc dri2proto x11-xcb xcb-dri2 xcb-aux],
+			  [xvmc dri2proto],
 			  [XVMC=yes], [XVMC=no])
+	PKG_CHECK_MODULES(XCB, [x11-xcb xcb-dri2 xcb-aux])
 fi
 AC_MSG_CHECKING([whether to include XvMC support])
 AC_MSG_RESULT([$XVMC])
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 36a939b..85e6a89 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -20,4 +20,4 @@ AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 
 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @DRMINTEL_LIBS@ -lpthread
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XCB_LIBS@ @DRMINTEL_LIBS@ -lpthread
commit 93770c709aa7d3719b7c717040b16c8f82d5c207
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Tue Jan 22 10:47:22 2013 +0100

    NEWS: Fix a typo: a*n* inadvertent

diff --git a/NEWS b/NEWS
index a1fcf66..bc384e7 100644
--- a/NEWS
+++ b/NEWS
@@ -47,7 +47,7 @@ As usual we have a large number of bug fixes since the last release:
 Release 2.20.19 (2013-01-20)
 ============================
 A quick release as the last broke USB DisplayLink slave outputs badly. The
-performance of those displays was unusable due to a inadvertent change that
+performance of those displays was unusable due to an inadvertent change that
 caused us to flush the entire scanout over the USB for every drawing
 operation.