[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxvmc: Changes to 'debian-unstable'



 debian/changelog                                            |    6 +
 debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch |   44 ++++++++++++
 debian/patches/series                                       |    1 
 3 files changed, 51 insertions(+)

New commits:
commit 4faf3bfe4c98f4820de130c068a0705dce8db8b7
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Aug 12 23:05:07 2013 +0200

    Link libXvMCW.so against -ldl (closes: #610592)

diff --git a/debian/changelog b/debian/changelog
index b13a9ea..885fc2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxvmc (2:1.0.8-2) UNRELEASED; urgency=low
+
+  * Link libXvMCW.so against -ldl (closes: #610592)
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 12 Aug 2013 22:49:03 +0200
+
 libxvmc (2:1.0.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch b/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch
new file mode 100644
index 0000000..85b0593
--- /dev/null
+++ b/debian/patches/Link-libXvMCW.so-against-ldl-if-needed.patch
@@ -0,0 +1,44 @@
+From 772dbd452096efe456f5ceee67a2060fdcd3899f Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+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 e69de29..55fde08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Link-libXvMCW.so-against-ldl-if-needed.patch


Reply to: