multimedia/mediainfo: Version bump to 24.06

Patch does not seem to be required when source is downloaded from GitHub instead of their website. Also switch remaining references of wxPython to wxGTK3

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 6 insertions, 151 deletions

diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild
index e7331a36486d..3b8bb417bae6 100644
--- a/multimedia/mediainfo/mediainfo.SlackBuild
+++ b/multimedia/mediainfo/mediainfo.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mediainfo
-VERSION=${VERSION:-24.05}
+VERSION=${VERSION:-24.06}
 SRCNAM=MediaInfo
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -96,9 +96,6 @@ 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 {} \;
 
-# Patch to force using system libzen and error out if not present
-patch -p1 < $CWD/remove-internal-libzen-support.patch
-
 # Make compiling the CLI version optional
 if [ "$CLI" == "yes" ]; then
 
@@ -128,12 +125,12 @@ if [ "$CLI" == "yes" ]; then
   CLIDOC=History_CLI.txt
 fi
 
-# Make compiling the GUI optional -- requires wxWidgets/wxPython
+# Make compiling the GUI optional -- requires wxGTK3
 if [ "$GUI" == "yes" ]; then
 
   # Error out if missing WxWidgets/wxPython rather than try downloading and compiling it
   cd Project/GNU/GUI
-  sed -i 's|WxWidgets not yet compiled, try to compile|wxPython not found. Please install first.|' configure.ac
+  sed -i 's|WxWidgets not yet compiled, try to compile|wxGTK3 not found. Please install first.|' configure.ac
   sed -i 's|WxBuiltInCompile$|with_wxwidgets="no"|g' configure.ac
 
   ./autogen.sh
diff --git a/multimedia/mediainfo/mediainfo.info b/multimedia/mediainfo/mediainfo.info
index 2218ff854682..8fd3eb34451c 100644
--- a/multimedia/mediainfo/mediainfo.info
+++ b/multimedia/mediainfo/mediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="mediainfo"
-VERSION="24.05"
+VERSION="24.06"
 HOMEPAGE="https://mediaarea.net/MediaInfo/"
-DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v24.05/MediaInfo-24.05.tar.gz"
-MD5SUM="e1e8c6a3f41a6c13eb4c093ff6df08ab"
+DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v24.06/MediaInfo-24.06.tar.gz"
+MD5SUM="04029eb3759b9414e5fa59e92bd3b9c3"
 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
deleted file mode 100644
index 37c2afc0f141..000000000000
--- a/multimedia/mediainfo/remove-internal-libzen-support.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac
-index 062688e..6b0d3dd 100644
---- a/Project/GNU/CLI/configure.ac
-+++ b/Project/GNU/CLI/configure.ac
-@@ -66,16 +66,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 "$(libzen-config Exists)" = "yes" ; then
--	enable_unicode="$(libzen-config Unicode)"
-+if pkg-config --exists libzen; then
-+	enable_unicode="$(pkg-config --variable=Unicode libzen)"
- else
--	if ${PKG_CONFIG:-pkg-config} --exists libzen; then
--		enable_unicode="$(${PKG_CONFIG:-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 #########################################################################
-@@ -199,41 +193,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)"
--	MediaInfoLib_CXXFLAGS="$MediaInfoLib_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)"
--	fi
--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)"
- 	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)"
-+		LIBS="$LIBS $(pkg-config --libs libzen)"
- 	fi
- else
--	if ${PKG_CONFIG:-pkg-config} --exists libzen; then
--		CXXFLAGS="$CXXFLAGS $(${PKG_CONFIG:-pkg-config} --cflags libzen)"
--		MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(${PKG_CONFIG:-pkg-config} --cflags libzen)"
--		if test "$enable_staticlibs" = "yes"; then
--			with_zenlib="system (static)"
--			LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --variable=Libs_Static libzen)"
--			LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --static --libs libzen)"
--		else
--			with_zenlib="system"
--			LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --libs libzen)"
--		fi
--	else
--		AC_MSG_ERROR([libzen configuration is not found])
--	fi
-+	AC_MSG_ERROR([libzen package is not found])
- fi
- 
- dnl #########################################################################
-@@ -317,4 +288,4 @@ echo "  Using libzen?                                           $with_zenlib"
- echo "  Using libmediainfo?                                     $with_mediainfolib"
- echo ""
- echo "  CXXFLAGS: $CXXFLAGS"
--echo "  LIBS: $LIBS"
-\ No newline at end of file
-+echo "  LIBS: $LIBS"
-diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac
-index eaf7ebb..62833ca 100644
---- a/Project/GNU/GUI/configure.ac
-+++ b/Project/GNU/GUI/configure.ac
-@@ -80,14 +80,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)"
-+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 #########################################################################
-@@ -314,31 +310,19 @@ fi
- dnl -------------------------------------------------------------------------
- dnl ZenLib
- dnl
--if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
--    CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
--    MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
-+if pkg-config --exists libzen; then
-+    CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
-+    MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
-     if test "$enable_staticlibs" = "yes"; then
--        with_zenlib="builtin (static)"
--        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)"
-+        with_zenlib="system"
-+        LIBS="$LIBS $(pkg-config --libs libzen)"
-     fi
- else
--    if pkg-config --exists libzen; then
--        CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
--        MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
--        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)"
--        fi
--    else
--        AC_MSG_ERROR([libzen configuration is not found])
--    fi
-+    AC_MSG_ERROR([libzen package is not found])
- fi
- 
- dnl #########################################################################