configure.ac | 6 + debian/changelog | 5 - debian/control | 3 debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch | 44 ------------ debian/patches/series | 1 wrapper/Makefile.am | 2 6 files changed, 12 insertions(+), 49 deletions(-)
New commits: commit e64234369912050e823e8519c9299dd52ae00973 Author: Julien Cristau <[email protected]> Date: Sat Jul 12 17:59:01 2014 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 63ef829..5eb8b99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libxvmc (2:1.0.8-2) UNRELEASED; urgency=low +libxvmc (2:1.0.8-2) unstable; urgency=low * Link libXvMCW.so against -ldl (closes: #610592) * Remove Cyril from Uploaders. - -- Julien Cristau <[email protected]> Mon, 12 Aug 2013 22:49:03 +0200 + -- Julien Cristau <[email protected]> Sat, 12 Jul 2014 17:58:58 +0200 libxvmc (2:1.0.8-1) unstable; urgency=low commit 082086574f254e71c32b206a8b4f00840b7d66ba Author: Julien Cristau <[email protected]> Date: Sat Jul 12 17:58:57 2014 +0200 Remove Cyril from Uploaders. diff --git a/debian/changelog b/debian/changelog index 885fc2a..63ef829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxvmc (2:1.0.8-2) UNRELEASED; urgency=low * Link libXvMCW.so against -ldl (closes: #610592) + * Remove Cyril from Uploaders. -- Julien Cristau <[email protected]> Mon, 12 Aug 2013 22:49:03 +0200 diff --git a/debian/control b/debian/control index cf3c83f..6061bc8 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: libxvmc Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: + Drew Parsons <[email protected]>, Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 8.1.3), commit db4cc6423e1f998d69e9a24c67828bc14e20b890 Author: Julien Cristau <[email protected]> Date: Sat Jul 12 17:55:09 2014 +0200 Use upstream patch diff --git a/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch b/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch deleted file mode 100644 index 85b0593..0000000 --- a/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 772dbd452096efe456f5ceee67a2060fdcd3899f Mon Sep 17 00:00:00 2001 -From: Julien Cristau <[email protected]> -Date: Mon, 12 Aug 2013 23:02:53 +0200 -Subject: [PATCH] Link libXvMCW.so against -ldl if needed - ---- - configure.ac | 7 +++++++ - wrapper/Makefile.am | 2 +- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7c2a7e0..4baf1a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,6 +39,13 @@ XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - XORG_CHECK_MALLOC_ZERO - -+ORIG_LIBS="$LIBS" -+LIBS= -+AC_SEARCH_LIBS([dlopen], [dl]) -+LIBADD_DLOPEN="$LIBS" -+LIBS="$ORIG_LIBS" -+AC_SUBST([LIBADD_DLOPEN]) -+ - # Obtain compiler/linker options for depedencies - PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto) - -diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am -index b3a1c21..67a7760 100644 ---- a/wrapper/Makefile.am -+++ b/wrapper/Makefile.am -@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS) - - libXvMCW_la_SOURCES = XvMCWrapper.c --libXvMCW_la_LIBADD = $(XVMC_LIBS) -+libXvMCW_la_LIBADD = $(XVMC_LIBS) $(LIBADD_DLOPEN) - libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined - - if LINT --- -1.7.10.4 - diff --git a/debian/patches/series b/debian/patches/series index 55fde08..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -Link-libXvMCW.so-against-ldl-if-needed.patch commit 4d1e87d4d2a471d0a35a237f3c0b46c5d5f37338 Author: Yaakov Selkowitz <[email protected]> Date: Wed Oct 24 02:07:56 2012 -0500 Fix linking with -Wl,--no-undefined on Linux libXvMCW uses dlopen and friends, therefore it must be linked against libdl on systems where it exists as a separate library. Signed-off-by: Yaakov Selkowitz <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> (cherry picked from commit 4dd267a98790f4404b7607d9362d4346f55f49fb) diff --git a/configure.ac b/configure.ac index 7c2a7e0..f0ac9c6 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,12 @@ LIBS="$SAVE_LIBS" # Checks for library functions. AC_CHECK_FUNCS([shmat]) +# Check to see if dlopen is in default libraries (like Solaris, which +# has it in libc), or if libdl is needed to get it. +AC_CHECK_FUNC([dlopen], [], + AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) +AC_SUBST(DLOPEN_LIBS) + # Allow checking code with lint, sparse, etc. XORG_WITH_LINT LINT_FLAGS="${LINT_FLAGS} ${XVMC_CFLAGS}" diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am index b3a1c21..fbe8cf7 100644 --- a/wrapper/Makefile.am +++ b/wrapper/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS) libXvMCW_la_SOURCES = XvMCWrapper.c -libXvMCW_la_LIBADD = $(XVMC_LIBS) +libXvMCW_la_LIBADD = $(XVMC_LIBS) $(DLOPEN_LIBS) libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined if LINT -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
