diff options
| -rw-r--r-- | multimedia/mediainfo/mediainfo.SlackBuild | 2 | ||||
| -rw-r--r-- | multimedia/mediainfo/mediainfo.info | 6 | ||||
| -rw-r--r-- | multimedia/mediainfo/remove-internal-libzen-support.patch | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild index a70a139474..d1e2ab5727 100644 --- a/multimedia/mediainfo/mediainfo.SlackBuild +++ b/multimedia/mediainfo/mediainfo.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mediainfo -VERSION=${VERSION:-0.7.93} +VERSION=${VERSION:-0.7.98} SRCNAM=MediaInfo BUILD=${BUILD:-2} TAG=${TAG:-_SBo} diff --git a/multimedia/mediainfo/mediainfo.info b/multimedia/mediainfo/mediainfo.info index c386fe2c0e..2879c9f7bd 100644 --- a/multimedia/mediainfo/mediainfo.info +++ b/multimedia/mediainfo/mediainfo.info @@ -1,8 +1,8 @@ PRGNAM="mediainfo" -VERSION="0.7.93" +VERSION="0.7.98" HOMEPAGE="https://mediaarea.net/en/MediaInfo/" -DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v0.7.93/MediaInfo-0.7.93.tar.gz" -MD5SUM="bca1b7d217408327fdacc89e9a2b99da" +DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v0.7.98/MediaInfo-0.7.98.tar.gz" +MD5SUM="9c71fc0ac0aab02d7e173f8ed6a2f645" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmediainfo" diff --git a/multimedia/mediainfo/remove-internal-libzen-support.patch b/multimedia/mediainfo/remove-internal-libzen-support.patch index 535dfda039..e4e827f4b2 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)" |