3 files changed, 85 insertions, 15 deletions
diff --git a/libraries/libmediainfo/libmediainfo.SlackBuild b/libraries/libmediainfo/libmediainfo.SlackBuild
index e440e3135b..13757f1ce6 100644
--- a/libraries/libmediainfo/libmediainfo.SlackBuild
+++ b/libraries/libmediainfo/libmediainfo.SlackBuild
@@ -2,9 +2,9 @@
 
 # Slackware build script for libmediainfo
 
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2012-2017  Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Copyright 2017  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=libmediainfo
 VERSION=${VERSION:-0.7.93}
-SRCNAM=MediaInfo_DLL_${VERSION}_GNU_FromSource
+SRCNAM=MediaInfoLib
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +62,9 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf MediaInfo_DLL_GNU_FromSource
-tar xvf $CWD/${SRCNAM}.tar.xz
-cd MediaInfo_DLL_GNU_FromSource
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,12 +72,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# We do not want builtin libzen
-if [ -d $TMP/ZenLib ]; then
-  rm -rf $TMP/ZenLib
-fi
+# We do not want to use the builtin libzen
+patch -p1 < $CWD/remove-internal-libzen-support.patch
 
-cd MediaInfoLib/Project/GNU/Library
+cd Project/GNU/Library
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -104,8 +103,6 @@ cd -
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cd MediaInfoLib
-
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 cp -a Project/GNU/Library/libmediainfo.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 sed -i "s/^Version: .*$/Version: $VERSION/" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libmediainfo.pc
diff --git a/libraries/libmediainfo/libmediainfo.info b/libraries/libmediainfo/libmediainfo.info
index c018bc2f23..22dc1b01b3 100644
--- a/libraries/libmediainfo/libmediainfo.info
+++ b/libraries/libmediainfo/libmediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="libmediainfo"
 VERSION="0.7.93"
 HOMEPAGE="https://mediaarea.net/MediaInfo"
-DOWNLOAD="https://mediaarea.net/download/binary/libmediainfo0/0.7.93/MediaInfo_DLL_0.7.93_GNU_FromSource.tar.xz"
-MD5SUM="d156eedcd3e00e6180b50b62e207f347"
+DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v0.7.93/MediaInfoLib-0.7.93.tar.gz"
+MD5SUM="cbb0efce9a63e01baa132cb2c9bc9b9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libzen"
diff --git a/libraries/libmediainfo/remove-internal-libzen-support.patch b/libraries/libmediainfo/remove-internal-libzen-support.patch
new file mode 100644
index 0000000000..141fe45476
--- /dev/null
+++ b/libraries/libmediainfo/remove-internal-libzen-support.patch
@@ -0,0 +1,73 @@
+diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
+index 12103a9..3479bed 100644
+--- a/Project/GNU/Library/configure.ac
++++ b/Project/GNU/Library/configure.ac
+@@ -354,16 +354,10 @@ dnl #########################################################################
+ dnl -------------------------------------------------------------------------
+ dnl Unicode
+ dnl
+-if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
+-	enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
+-elif test "$(command -v libzen-config)" ; then
+-	enable_unicode="$(libzen-config Unicode)"
++if pkg-config --exists libzen; then
++	enable_unicode="$(pkg-config --variable=Unicode libzen)"
+ else
+-	if pkg-config --exists libzen; then
+-		enable_unicode="$(pkg-config --variable=Unicode libzen)"
+-	else
+-		AC_MSG_ERROR([libzen configuration is not found])
+-	fi
++	AC_MSG_ERROR([libzen package is not found])
+ fi
+ 
+ dnl #########################################################################
+@@ -417,42 +411,18 @@ fi
+ dnl -------------------------------------------------------------------------
+ dnl ZenLib
+ dnl
+-if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
+-	CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
+-	if test "$enable_staticlibs" = "yes"; then
+-		with_zenlib="builtin (static)"
+-		LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
+-	else
+-		with_zenlib="builtin"
+-		LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
+-		MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
+-		MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
+-	fi
+-elif test "$(command -v libzen-config)" ; then
+-	CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)"
++if pkg-config --exists libzen; then
++	CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
+ 	if test "$enable_staticlibs" = "yes"; then
+ 		with_zenlib="system (static)"
+-		LIBS="$LIBS $(libzen-config LIBS_Static)"
++		LIBS="$LIBS $(pkg-config --variable=LIBS_Static libzen)"
+ 	else
+ 		with_zenlib="system"
+-		LIBS="$LIBS $(libzen-config LIBS)"
+-		MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(libzen-config LIBS)"
+-		MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(libzen-config LIBS)"
++		LIBS="$LIBS $(pkg-config --libs libzen)"
++		MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --variable=LIBS libzen)"
+ 	fi
+ else
+-	if pkg-config --exists libzen; then
+-		CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
+-		if test "$enable_staticlibs" = "yes"; then
+-			with_zenlib="system (static)"
+-			LIBS="$LIBS $(pkg-config --variable=LIBS_Static libzen)"
+-		else
+-			with_zenlib="system"
+-			LIBS="$LIBS $(pkg-config --libs libzen)"
+-			MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --variable=LIBS libzen)"
+-		fi
+-	else
+-		AC_MSG_ERROR([libzen configuration is not found])
+-	fi
++	AC_MSG_ERROR([libzen package is not found])
+ fi
+ 
+ dnl -------------------------------------------------------------------------