From ad3b27f9a4915c32d2ff7423bc7b6114de97492d Mon Sep 17 00:00:00 2001 From: Jeremy Hansen Date: Mon, 28 Aug 2017 11:07:20 +0100 Subject: multimedia/mediainfo: Updated for version 0.7.98. Signed-off-by: David Spencer --- multimedia/mediainfo/remove-internal-libzen-support.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'multimedia/mediainfo/remove-internal-libzen-support.patch') diff --git a/multimedia/mediainfo/remove-internal-libzen-support.patch b/multimedia/mediainfo/remove-internal-libzen-support.patch index 535dfda03980..e4e827f4b277 100644 --- a/multimedia/mediainfo/remove-internal-libzen-support.patch +++ b/multimedia/mediainfo/remove-internal-libzen-support.patch @@ -1,5 +1,5 @@ diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac -index 959868f..517ebd5 100644 +index 275c349..1ddeec0 100644 --- a/Project/GNU/CLI/configure.ac +++ b/Project/GNU/CLI/configure.ac @@ -65,16 +65,10 @@ dnl ######################################################################### @@ -22,7 +22,7 @@ index 959868f..517ebd5 100644 fi dnl ######################################################################### -@@ -197,40 +191,18 @@ fi +@@ -198,41 +192,19 @@ fi dnl ------------------------------------------------------------------------- dnl ZenLib dnl @@ -39,6 +39,7 @@ index 959868f..517ebd5 100644 -elif test "$(libzen-config Exists)" = "yes" ; then - CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)" - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(libzen-config CXXFLAGS)" ++ +if pkg-config --exists libzen; then + CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)" + MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)" @@ -58,6 +59,7 @@ index 959868f..517ebd5 100644 - if test "$enable_staticlibs" = "yes"; then - with_zenlib="system (static)" - LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)" +- LIBS="$LIBS $(pkg-config --static --libs libzen)" - else - with_zenlib="system" - LIBS="$LIBS $(pkg-config --libs libzen)" @@ -70,7 +72,7 @@ index 959868f..517ebd5 100644 dnl ######################################################################### diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac -index 3402da7..67102d8 100644 +index 78bdeff..ea9203d 100644 --- a/Project/GNU/GUI/configure.ac +++ b/Project/GNU/GUI/configure.ac @@ -79,14 +79,10 @@ dnl ######################################################################### @@ -91,7 +93,7 @@ index 3402da7..67102d8 100644 fi dnl ######################################################################### -@@ -312,30 +308,18 @@ fi +@@ -313,31 +309,19 @@ fi dnl ------------------------------------------------------------------------- dnl ZenLib dnl @@ -106,6 +108,7 @@ index 3402da7..67102d8 100644 - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)" + with_zenlib="system (static)" + LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)" ++ LIBS="$LIBS $(pkg-config --static --libs libzen)" else - with_zenlib="builtin" - LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)" @@ -119,6 +122,7 @@ index 3402da7..67102d8 100644 - if test "$enable_staticlibs" = "yes"; then - with_zenlib="system (static)" - LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)" +- LIBS="$LIBS $(pkg-config --static --libs libzen)" - else - with_zenlib="system" - LIBS="$LIBS $(pkg-config --libs libzen)" -- cgit v1.2.3