From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Menzel Subject: [PATCH v2 2/2] configure.ac: Split out XCB libraries from `XVMCLIB` into `XCB` Date: Wed, 06 Feb 2013 10:59:53 +0100 Message-ID: <1360144793.4790.35.camel@mattotaupa> References: <1359842415.5545.7.camel@mattotaupa> <20130203093213.GB9892@cantiga.alporthouse.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0204351873==" Return-path: Received: from mail.gw90.de (mail.gw90.de [188.40.100.199]) by gabe.freedesktop.org (Postfix) with ESMTP id C7716E673B for ; Wed, 6 Feb 2013 01:59:56 -0800 (PST) Received: from e178068135.adsl.alicedsl.de ([85.178.68.135] helo=[192.168.2.49]) by mail.gw90.de with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1U31nI-0006if-Dr for intel-gfx@lists.freedesktop.org; Wed, 06 Feb 2013 09:59:56 +0000 In-Reply-To: <20130203093213.GB9892@cantiga.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0204351873== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-g3YqWkBaKDRR70Ac1edE" --=-g3YqWkBaKDRR70Ac1edE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Date: Sun, 3 Feb 2013 13:33:08 +0100 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 [=E2=80=A6] make[1]: Entering directory `/src/xserver-xorg-video-intel' dh_shlibdeps -- --warnings=3D6 dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/li= bI810XvMC.so.1.0.0 sollte nicht gegen libX11-xcb.so.1 gelinkt werden (es ve= rwendet keines der Bibliotheks-Symbole) dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/li= bI810XvMC.so.1.0.0 sollte nicht gegen libxcb-dri2.so.0 gelinkt werden (es v= erwendet keines der Bibliotheks-Symbole) dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/li= bI810XvMC.so.1.0.0 sollte nicht gegen libxcb-util.so.0 gelinkt werden (es v= erwendet keines der Bibliotheks-Symbole) dpkg-shlibdeps: Warnung: debian/xserver-xorg-video-intel/usr/lib/li= bI810XvMC.so.1.0.0 sollte nicht gegen libxcb.so.1 gelinkt werden (es verwen= det keines der Bibliotheks-Symbole) make[1]: Leaving directory `/src/xserver-xorg-video-intel' [=E2=80=A6] 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=3D6 make[1]: Leaving directory `/src/xserver-xorg-video-intel' dh_installdeb -O--builddirectory=3Dbuild/ dh_xsf_substvars -O--builddirectory=3Dbuild/ dh_gencontrol -O--builddirectory=3Dbuild/ dpkg-gencontrol: Warnung: Feld Depends von Paket xserver-xorg-video= -intel-dbg: unbekannte Substitutionsvariable ${shlibs:Depends} dh_md5sums -O--builddirectory=3Dbuild/ dh_builddeb -O--builddirectory=3Dbuild/ dpkg-deb: Paket =C2=BBxserver-xorg-video-intel=C2=AB wird in =C2=BB= ../xserver-xorg-video-intel_2.19.0-6.1_i386.deb=C2=AB gebaut. dpkg-deb: Paket =C2=BBxserver-xorg-video-intel-dbg=C2=AB wird in = =C2=BB../xserver-xorg-video-intel-dbg_2.19.0-6.1_i386.deb=C2=AB gebaut. dpkg-genchanges -b >../xserver-xorg-video-intel_2.19.0-6.1_i386.ch= anges dpkg-genchanges: rein bin=C3=A4rer Upload - es ist kein Quellcode h= inzugef=C3=BCgt dpkg-source --after-build xserver-xorg-video-intel dpkg-buildpackage: Bin=C3=A4rpaket(e) hochzuladen (keine Quellen en= thalten) 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/libIntelXvM= C.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/module= s/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 Date: Thu Oct 15 13:48:56 2009 -0700 XVMC: Use XCB DRI2 instead of cargo-culting our own copy of Xli= b stuff. (v2) [1] https://buildd.debian.org/status/fetch.php?pkg=3Dxserver-xorg-video-int= el&arch=3Di386&ver=3D2%3A2.19.0-6&stamp=3D1347825458 Signed-off-by: Paul Menzel --- configure.ac | 3 ++- src/xvmc/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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]) =20 if test "$XVMC" =3D yes; then PKG_CHECK_MODULES(XVMCLIB, - [xvmc dri2proto x11-xcb xcb-dri2 xcb-aux], + [xvmc dri2proto], [XVMC=3Dyes], [XVMC=3Dno]) + 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 =3D @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=3D1 -DFALSE=3D0 =20 libIntelXvMC_la_LDFLAGS =3D -version-number 1:0:0 -libIntelXvMC_la_LIBADD =3D @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @DRMINTEL_= LIBS@ -lpthread +libIntelXvMC_la_LIBADD =3D @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XCB_LIBS@= @DRMINTEL_LIBS@ -lpthread --=20 1.7.10.4 --=-g3YqWkBaKDRR70Ac1edE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlESKZkACgkQPX1aK2wOHVizpACghboJPSHIesqOGszzl8EdXhW9 GcoAniTBUMrlWXnFSB08WzaVDiP3ukYP =h4hP -----END PGP SIGNATURE----- --=-g3YqWkBaKDRR70Ac1edE-- --===============0204351873== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0204351873==--