multimedia/mediainfo: Version bump, update patch, and copyright update

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

3 files changed, 26 insertions, 20 deletions

diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild
index 35fd7f7873..cee62213ca 100644
--- a/multimedia/mediainfo/mediainfo.SlackBuild
+++ b/multimedia/mediainfo/mediainfo.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2012-2017 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2022  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mediainfo
-VERSION=${VERSION:-20.09}
+VERSION=${VERSION:-21.09}
 SRCNAM=MediaInfo
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/multimedia/mediainfo/mediainfo.info b/multimedia/mediainfo/mediainfo.info
index a7713afba0..14990ac124 100644
--- a/multimedia/mediainfo/mediainfo.info
+++ b/multimedia/mediainfo/mediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="mediainfo"
-VERSION="20.09"
+VERSION="21.09"
 HOMEPAGE="https://mediaarea.net/MediaInfo/"
-DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v20.09/MediaInfo-20.09.tar.gz"
-MD5SUM="5814d9ed34be0719cc71a7d90967bc16"
+DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v21.09/MediaInfo-21.09.tar.gz"
+MD5SUM="6c4c31875752e4c96d0c7ed20cf3eacf"
 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 e4e827f4b2..37c2afc0f1 100644
--- a/multimedia/mediainfo/remove-internal-libzen-support.patch
+++ b/multimedia/mediainfo/remove-internal-libzen-support.patch
@@ -1,8 +1,8 @@
 diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac
-index 275c349..1ddeec0 100644
+index 062688e..6b0d3dd 100644
 --- a/Project/GNU/CLI/configure.ac
 +++ b/Project/GNU/CLI/configure.ac
-@@ -65,16 +65,10 @@ dnl #########################################################################
+@@ -66,16 +66,10 @@ dnl #########################################################################
  dnl -------------------------------------------------------------------------
  dnl Unicode
  dnl
@@ -13,8 +13,8 @@ index 275c349..1ddeec0 100644
 +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)"
+-	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
@@ -22,7 +22,7 @@ index 275c349..1ddeec0 100644
  fi
  
  dnl #########################################################################
-@@ -198,41 +192,19 @@ fi
+@@ -199,41 +193,18 @@ fi
  dnl -------------------------------------------------------------------------
  dnl ZenLib
  dnl
@@ -39,7 +39,6 @@ index 275c349..1ddeec0 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)"
@@ -53,16 +52,16 @@ index 275c349..1ddeec0 100644
 +		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 ${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 --variable=Libs_Static libzen)"
--			LIBS="$LIBS $(pkg-config --static --libs libzen)"
+-			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 --libs libzen)"
+-			LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --libs libzen)"
 -		fi
 -	else
 -		AC_MSG_ERROR([libzen configuration is not found])
@@ -71,11 +70,18 @@ index 275c349..1ddeec0 100644
  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 78bdeff..ea9203d 100644
+index eaf7ebb..62833ca 100644
 --- a/Project/GNU/GUI/configure.ac
 +++ b/Project/GNU/GUI/configure.ac
-@@ -79,14 +79,10 @@ dnl #########################################################################
+@@ -80,14 +80,10 @@ dnl #########################################################################
  dnl -------------------------------------------------------------------------
  dnl Unicode
  dnl
@@ -93,7 +99,7 @@ index 78bdeff..ea9203d 100644
  fi
  
  dnl #########################################################################
-@@ -313,31 +309,19 @@ fi
+@@ -314,31 +310,19 @@ fi
  dnl -------------------------------------------------------------------------
  dnl ZenLib
  dnl