[SCM] libmediainfo/master: Refresh Drop-direct-linkage-of-libzen-in-.pc.patch

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Mon Mar 11 14:51:17 UTC 2013


The following commit has been merged in the master branch:
commit 360e5dad13a6ae6bdcef592785b1dfd24b334f17
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Oct 28 04:56:44 2012 +0800

    Refresh Drop-direct-linkage-of-libzen-in-.pc.patch

diff --git a/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch b/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch
index 7417f22..7598f45 100644
--- a/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch
+++ b/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch
@@ -10,10 +10,10 @@ link against it directly in client code.
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index cef5761..5b9c408 100755
+index 88d4ed2..ecee8f0 100755
 --- a/Project/GNU/Library/configure.ac
 +++ b/Project/GNU/Library/configure.ac
-@@ -390,7 +390,6 @@ else
+@@ -397,7 +397,6 @@ else
  		else
  			with_zenlib="system"
  			LIBS="$LIBS $(pkg-config --libs libzen)"
@@ -22,14 +22,13 @@ index cef5761..5b9c408 100755
  		fi
  	else
 diff --git a/Project/GNU/Library/libmediainfo.pc.in b/Project/GNU/Library/libmediainfo.pc.in
-index c2c589e..691c5e6 100755
+index 1ee9309..f9dfd8f 100755
 --- a/Project/GNU/Library/libmediainfo.pc.in
 +++ b/Project/GNU/Library/libmediainfo.pc.in
-@@ -8,5 +8,5 @@ Libs_Static=@libdir@/libmediainfo.a ${libdir}/libzen.a -lpthread -lz
+@@ -9,5 +9,5 @@ la_name=lib at MediaInfoLib_LibName@.la
  Name: libmediainfo
  Version: @PACKAGE_VERSION@
  Description: MediaInfoLib
--Libs: -L at libdir@ -lmediainfo -lzen -lz -lpthread
-+Libs: -L at libdir@ -lmediainfo -lz -lpthread
+-Libs: -L at libdir@ -l at MediaInfoLib_LibName@ -lzen -lz -lpthread
++Libs: -L at libdir@ -l at MediaInfoLib_LibName@ -lz -lpthread
  Cflags: -I at includedir@ @MediaInfoLib_CXXFLAGS@
--- 

-- 
libmediainfo packaging



More information about the pkg-multimedia-commits mailing list