Merge lp:~ari-tczew/ubuntu/utopic/libxvmc/merge into lp:ubuntu/utopic/libxvmc

[Artur Rona]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

21. By Artur Rona on 2014-08-06

* Merge from Debian unstable. Remaining changes:
  - debian/patches/01_support_alternatives.patch,
    debian/libxvmc1.install, debian/rules:
    + Put XvMCConfig in usr/lib/xvmcconfig-standard.
    + Make the library look for /lib/XvMCConfig (which will be
      the link that alternatives will set).
* Link libXvMCW.so against -ldl (closes: #610592)
* Remove Cyril from Uploaders.

=== modified file 'configure.ac'
--- configure.ac	2013-11-03 01:40:21 +0000
+++ configure.ac	2014-08-06 22:34:07 +0000
@@ -51,6 +51,12 @@
 # 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}"
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-11-03 01:40:21 +0000
+++ debian/changelog	2014-08-06 22:34:07 +0000
@@ -1,3 +1,21 @@
+libxvmc (2:1.0.8-2ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/01_support_alternatives.patch,
+      debian/libxvmc1.install, debian/rules:
+      + Put XvMCConfig in usr/lib/xvmcconfig-standard.
+      + Make the library look for /lib/XvMCConfig (which will be
+        the link that alternatives will set).
+
+ -- Artur Rona <[e-mail]>  Thu, 07 Aug 2014 00:04:27 +0200
+
+libxvmc (2:1.0.8-2) unstable; urgency=low
+
+  * Link libXvMCW.so against -ldl (closes: #610592)
+  * Remove Cyril from Uploaders.
+
+ -- Julien Cristau <[e-mail]>  Sat, 12 Jul 2014 17:58:58 +0200
+
 libxvmc (2:1.0.8-1ubuntu1) trusty; urgency=low
 
   * Merge from Debian unstable. (LP: #1247502) Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2013-11-03 01:40:21 +0000
+++ debian/control	2014-08-06 22:34:07 +0000
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu X-SWAT <[e-mail]>
 XSBC-Original-Maintainer: Debian X Strike Force <[e-mail]>
-Uploaders: Drew Parsons <[e-mail]>, Cyril Brulebois <[e-mail]>
+Uploaders:
+ Drew Parsons <[e-mail]>,
 Build-Depends:
  dpkg-dev (>= 1.16.1),
  debhelper (>= 8.1.3),
 
=== modified file 'wrapper/Makefile.am'
--- wrapper/Makefile.am	2012-04-24 22:46:56 +0000
+++ wrapper/Makefile.am	2014-08-06 22:34:07 +0000
@@ -10,7 +10,7 @@
 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