Mediainfo: bump, shared, use system libs (#3799)

2026-04-23 04:00:05 +02:00 · 2019-04-27 11:49:46 +02:00
parent 0ce8f68598
commit 45adbe7e65
3 changed files with 259 additions and 60 deletions
--- a/media-libs/mediainfo/mediainfo-0.7.61.recipe
+++ b/media-libs/mediainfo/mediainfo-0.7.61.recipe
@@ -1,60 +0,0 @@
-SUMMARY="A tool to display technical information of audio and video files"
-DESCRIPTION="MediaInfo is a convenient unified display of the most relevant \
-technical and tag data for video and audio files.
-
-MediaInfo analyticals include:
-
- Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including unprotected \
-DVD), MPEG-TS (including unprotected Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
- Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
- Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD), \
-H.264/AVC, Dirac...
- Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
- Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, DVB \
-Subtitle, Teletext, SRT, SSA, ASS, SAMI..."
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-COPYRIGHT="2002-2012 MediaArea.net SARL"
-LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="http://mediaarea.net/download/binary/mediainfo/0.7.61/MediaInfo_CLI_0.7.61_GNU_FromSource.tar.bz2"
-CHECKSUM_SHA256="8c5f9ef351a199548665125f3af1863ec0d9e825d5481b5a41a45c6c06b0e31f"
-SOURCE_DIR="MediaInfo_CLI_GNU_FromSource"
-PATCHES="mediainfo-0.7.61.patch"
-
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	mediainfo$secondaryArchSuffix = $portVersion
-	cmd:mediainfo$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	cp `finddir B_SYSTEM_DATA_DIRECTORY`/libtool/config/config.* ZenLib/Project/GNU/Library
-	cp `finddir B_SYSTEM_DATA_DIRECTORY`/libtool/config/config.* MediaInfoLib/Project/GNU/Library
-	cp `finddir B_SYSTEM_DATA_DIRECTORY`/libtool/config/config.* MediaInfo/Project/GNU/CLI
-
-	./CLI_Compile.sh
-}
-
-INSTALL()
-{
-	mkdir -p $binDir
-	cp -a MediaInfo/Project/GNU/CLI/mediainfo $binDir
-}
--- a/media-libs/mediainfo/mediainfo-19.04.recipe
+++ b/media-libs/mediainfo/mediainfo-19.04.recipe
@@ -0,0 +1,103 @@
+SUMMARY="A tool to display technical information of audio and video files"
+DESCRIPTION="MediaInfo is a convenient unified display of the most relevant \
+technical and tag data for video and audio files.
+
+MediaInfo analyticals include:
+
+- Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including unprotected \
+DVD), MPEG-TS (including unprotected Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+- Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+- Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD), \
+H.264/AVC, Dirac...
+- Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+- Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, DVB \
+Subtitle, Teletext, SRT, SSA, ASS, SAMI..."
+HOMEPAGE="http://mediainfo.sourceforge.net/"
+COPYRIGHT="2002-2019 MediaArea.net SARL"
+LICENSE="GNU LGPL v2.1
+	BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="http://mediaarea.net/download/binary/mediainfo/$portVersion/MediaInfo_CLI_${portVersion}_GNU_FromSource.tar.bz2"
+CHECKSUM_SHA256="fdd3de83d09e85d6b9ecb8b74e86f2fed31d424621adcd5f01b020a214bc7931"
+SOURCE_DIR="MediaInfo_CLI_GNU_FromSource"
+PATCHES="mediainfo-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	mediainfo$secondaryArchSuffix = $portVersion
+	cmd:mediainfo$secondaryArchSuffix = $portVersion
+	lib:libmediainfo$secondaryArchSuffix = $libVersionCompat
+	lib:libzen$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libtinyxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	mediainfo${secondaryArchSuffix}_devel = $portVersion
+	devel:libmediainfo$secondaryArchSuffix = $libVersionCompat
+	devel:libzen$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	mediainfo$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcurl$secondaryArchSuffix
+	devel:libtinyxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cd ZenLib/Project/GNU/Library
+	autoreconf -vfi
+	cd $sourceDir
+	CFLAGS="-D_BSD_SOURCE" CXXFLAGS="-D_BSD_SOURCE" \
+	LDFLAGS="-ltinyxml2" ./CLI_Compile.sh \
+		--with-libcurl \
+		--with-libtinyxml2 \
+		--enable-shared \
+		--prefix=$prefix \
+		--libdir=$libDir \
+		--includedir=$includeDir \
+		--bindir=$binDir
+}
+
+INSTALL()
+{
+#	mkdir -p $binDir
+#	cp -a MediaInfo/Project/GNU/CLI/mediainfo $binDir
+	cd $sourceDir/MediaInfoLib/Project/GNU/Library
+	make install
+	cd $sourceDir/MediaInfo/Project/GNU/CLI
+	make install
+	cd $sourceDir/ZenLib/Project/GNU/Library
+	make install
+
+	rm -rf $libDir/*.la
+
+	prepareInstalledDevelLibs libmediainfo libzen
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
--- a/media-libs/mediainfo/patches/mediainfo-19.04.patchset
+++ b/media-libs/mediainfo/patches/mediainfo-19.04.patchset
@@ -0,0 +1,156 @@
+From c020c4099f19cb6b434bbbafe9651ce175b6d326 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 27 Apr 2019 05:16:23 +0200
+Subject: Applying old patches
+
+
+diff --git a/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in b/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
+index e9c36e1..7eaa69a 100644
+--- a/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
+++ b/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
+@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ Unicode=@MediaInfoLib_Unicode@
+-Libs_Static=${libdir}/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lpthread -lz@Curl_Lib@
+Libs_Static=${libdir}/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lz@Curl_Lib@
+ la_name=lib@MediaInfoLib_LibName@.la
+ 
+ Name: libmediainfo
+diff --git a/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h b/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
+index 87c91ce..93f56c5 100644
+--- a/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
+++ b/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
+@@ -67,7 +67,7 @@
+     || defined(__unix) || defined(__unix__) \
+     || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) \
+     || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \
+-    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__)
+     #ifndef UNIX
+         #define UNIX
+     #endif
+diff --git a/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h b/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h
+index ec26345..230a4c3 100644
+--- a/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h
+++ b/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h
+@@ -67,7 +67,7 @@
+     || defined(__unix) || defined(__unix__)                                 \
+     || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi)        \
+     || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \
+-    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__)
+     #ifndef UNIX
+         #define UNIX
+     #endif
+diff --git a/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL_Static.h b/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL_Static.h
+index 3c41e2d..a2a051f 100644
+--- a/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL_Static.h
+++ b/MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL_Static.h
+@@ -67,7 +67,7 @@
+     || defined(__unix) || defined(__unix__)                                 \
+     || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi)        \
+     || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \
+-    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__)
+     #ifndef UNIX
+         #define UNIX
+     #endif
+diff --git a/MediaInfoLib/Source/ThirdParty/aes-gladman/brg_endian.h b/MediaInfoLib/Source/ThirdParty/aes-gladman/brg_endian.h
+index 4c34f2b..3b878c9 100644
+--- a/MediaInfoLib/Source/ThirdParty/aes-gladman/brg_endian.h
+++ b/MediaInfoLib/Source/ThirdParty/aes-gladman/brg_endian.h
+@@ -35,7 +35,7 @@ Issue Date: 20/12/2007
+ #elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
+ #  if !defined( __MINGW32__ ) && !defined( _AIX )
+ #    include <endian.h>
+-#    if !defined( __BEOS__ )
+#    if !defined( __BEOS__ ) && !defined(__HAIKU__)
+ #      include <byteswap.h>
+ #    endif
+ #  endif
+diff --git a/ZenLib/Project/GNU/Library/configure b/ZenLib/Project/GNU/Library/configure
+index 7a8ca10..08f7260 100755
+--- a/ZenLib/Project/GNU/Library/configure
+++ b/ZenLib/Project/GNU/Library/configure
+@@ -15538,10 +15538,10 @@ fi
+ 
+ 
+ if test "$enable_shared" = "yes"; then
+-    ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread -lstdc++ $ZenLib_LIBS"
+    ZenLib_LIBS="-L$(pwd)/.libs -lzen -lstdc++ $ZenLib_LIBS"
+ fi
+ if test "$enable_static" = "yes"; then
+-    ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+    ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static"
+ fi
+ 
+ 
+@@ -15656,7 +15656,7 @@ if test "$GXX" = yes ; then
+ 	fi
+ fi
+ 
+-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS  -lstdc++"
+ 
+ 
+ 
+diff --git a/ZenLib/Project/GNU/Library/configure.ac b/ZenLib/Project/GNU/Library/configure.ac
+index 2faa8cb..f7843d4 100644
+--- a/ZenLib/Project/GNU/Library/configure.ac
+++ b/ZenLib/Project/GNU/Library/configure.ac
+@@ -158,10 +158,10 @@ dnl -------------------------------------------------------------------------
+ dnl Common
+ dnl
+ if test "$enable_shared" = "yes"; then
+-    ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread -lstdc++ $ZenLib_LIBS"
+    ZenLib_LIBS="-L$(pwd)/.libs -lzen -lstdc++ $ZenLib_LIBS"
+ fi
+ if test "$enable_static" = "yes"; then
+-    ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+    ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static"
+ fi
+ 
+ dnl #########################################################################
+@@ -266,7 +266,7 @@ fi
+ dnl -------------------------------------------------------------------------
+ dnl External libs
+ dnl
+-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS -lstdc++"
+ 
+ dnl #########################################################################
+ dnl ### Output
+diff --git a/ZenLib/Project/GNU/Library/libzen.pc.in b/ZenLib/Project/GNU/Library/libzen.pc.in
+index c3e6778..a3a34ac 100644
+--- a/ZenLib/Project/GNU/Library/libzen.pc.in
+++ b/ZenLib/Project/GNU/Library/libzen.pc.in
+@@ -4,10 +4,10 @@ libdir=@libdir@
+ includedir=@includedir@
+ Unicode=@ZenLib_Unicode@
+ WstringMissing=@ZenLib_wstring_missing@
+-Libs_Static=@libdir@/libzen.a -lpthread
+Libs_Static=@libdir@/libzen.a
+ 
+ Name: libzen
+ Version: @PACKAGE_VERSION@
+ Description: ZenLib
+-Libs: -L${libdir} -lzen -lpthread -lstdc++
+Libs: -L${libdir} -lzen -lstdc++
+ Cflags: -I${includedir} @ZenLib_CXXFLAGS@
+diff --git a/ZenLib/Source/ZenLib/Conf.h b/ZenLib/Source/ZenLib/Conf.h
+index 18264cf..0a7426b 100644
+--- a/ZenLib/Source/ZenLib/Conf.h
+++ b/ZenLib/Source/ZenLib/Conf.h
+@@ -71,7 +71,7 @@
+     || defined(__unix) || defined(__unix__) \
+     || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) \
+     || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \
+-    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+    || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__)
+     #ifndef UNIX
+         #define UNIX
+     #endif
+-- 
+2.21.0
+