haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

mediainfo: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-06-28 20:08:15 +10:00
parent 01aff448f2
commit 178f98a83c
3 changed files with 43 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media-libs/mediainfo/mediainfo-19.04.recipe → media-libs/mediainfo/mediainfo-21.03.recipe
View File

@@ -13,24 +13,31 @@ H.264/AVC, Dirac...
- 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"
COPYRIGHT="2002-2021 MediaArea.net SARL"
LICENSE="GNU LGPL v2.1
BSD (2-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="http://mediaarea.net/download/binary/mediainfo/$portVersion/MediaInfo_CLI_${portVersion}_GNU_FromSource.tar.bz2"
CHECKSUM_SHA256="fdd3de83d09e85d6b9ecb8b74e86f2fed31d424621adcd5f01b020a214bc7931"
CHECKSUM_SHA256="75adafad4f1bd3259354a50ae491de6929649c14c71998cf5a2ed176d298b011"
SOURCE_DIR="MediaInfo_CLI_GNU_FromSource"
PATCHES="mediainfo-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libVersion="0.0.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
mediainfo$secondaryArchSuffix = $portVersion
cmd:mediainfo$secondaryArchSuffix = $portVersion
cmd:mediainfo$commandSuffix = $portVersion
lib:libmediainfo$secondaryArchSuffix = $libVersionCompat
lib:libzen$secondaryArchSuffix = $libVersionCompat
"
@@ -78,13 +85,11 @@ BUILD()
--prefix=$prefix \
--libdir=$libDir \
--includedir=$includeDir \
--bindir=$binDir
--bindir=$commandBinDir
}
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

91
media-libs/mediainfo/patches/mediainfo-0.7.61.patch
View File

@@ -1,91 +0,0 @@
diff -Naur MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in MediaInfo_CLI_GNU_FromSource-haiku/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
--- MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in 2012-10-21 21:32:39.055050240 +0000
+++ MediaInfo_CLI_GNU_FromSource-haiku/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in 2012-12-03 20:00:08.240123904 +0000
@@ -3,11 +3,11 @@
libdir=@libdir@
includedir=@includedir@
Unicode=@MediaInfoLib_Unicode@
-Libs_Static=@libdir@/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lpthread -lz
+Libs_Static=@libdir@/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lz
la_name=lib@MediaInfoLib_LibName@.la
Name: libmediainfo
Version: @PACKAGE_VERSION@
Description: MediaInfoLib
-Libs: -L@libdir@ -l@MediaInfoLib_LibName@ -lzen -lz -lpthread
+Libs: -L@libdir@ -l@MediaInfoLib_LibName@ -lzen -lz
Cflags: -I@includedir@ @MediaInfoLib_CXXFLAGS@
diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure
--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure 2012-10-21 21:32:46.003670016 +0000
+++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure 2012-12-03 20:00:08.639893504 +0000
@@ -19110,8 +19110,8 @@
fi
-ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS"
-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+ZenLib_LIBS="-L$(pwd) -lzen -lstdc++ $ZenLib_LIBS"
+ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static"
if test "$enable_wstring_missing" = "yes"; then
@@ -19288,7 +19288,7 @@
fi
fi
-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS -lstdc++"
diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure.ac MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure.ac
--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure.ac 2012-10-21 21:32:46.002359296 +0000
+++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure.ac 2012-12-03 20:00:08.646184960 +0000
@@ -122,8 +122,8 @@
dnl -------------------------------------------------------------------------
dnl Common
dnl
-ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS"
-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+ZenLib_LIBS="-L$(pwd) -lzen -lstdc++ $ZenLib_LIBS"
+ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static"
dnl #########################################################################
dnl ### C/C++ compiler options used to compile
@@ -221,7 +221,7 @@
dnl -------------------------------------------------------------------------
dnl External libs
dnl
-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS -lstdc++"
dnl #########################################################################
dnl ### Output
diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/libzen.pc.in MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/libzen.pc.in
--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/libzen.pc.in 2012-10-21 21:32:46.003932160 +0000
+++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/libzen.pc.in 2012-12-03 20:00:08.653262848 +0000
@@ -4,10 +4,10 @@
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 -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Source/ZenLib/Conf.h MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Source/ZenLib/Conf.h
--- MediaInfo_CLI_GNU_FromSource/ZenLib/Source/ZenLib/Conf.h 2012-10-21 21:32:46.000262144 +0000
+++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Source/ZenLib/Conf.h 2012-12-03 20:29:36.678428672 +0000
@@ -80,7 +80,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

60
media-libs/mediainfo/patches/mediainfo-19.04.patchset → media-libs/mediainfo/patches/mediainfo-21.03.patchset
View File

@@ -1,6 +1,6 @@
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
From 1281e33cffdf71de55ff430bbb88b7d773aa0e6f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 28 Jun 2021 19:41:02 +1000
Subject: Applying old patches
@@ -18,7 +18,7 @@ index e9c36e1..7eaa69a 100644
Name: libmediainfo
diff --git a/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h b/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
index 87c91ce..93f56c5 100644
index 933f76e..6564a75 100644
--- a/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
+++ b/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h
@@ -67,7 +67,7 @@
@@ -70,59 +70,59 @@ index 4c34f2b..3b878c9 100644
# endif
# endif
diff --git a/ZenLib/Project/GNU/Library/configure b/ZenLib/Project/GNU/Library/configure
index 7a8ca10..08f7260 100755
index d6e8bb8..cc3694c 100755
--- a/ZenLib/Project/GNU/Library/configure
+++ b/ZenLib/Project/GNU/Library/configure
@@ -15538,10 +15538,10 @@ fi
@@ -15591,10 +15591,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"
- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS"
+ ZenLib_LIBS="-L$(pwd)/.libs -lzen $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"
- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static"
+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static"
fi
@@ -15656,7 +15656,7 @@ if test "$GXX" = yes ; then
@@ -15709,7 +15709,7 @@ if test "$GXX" = yes ; then
fi
fi
-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS -lstdc++"
-LDFLAGS="$LDFLAGS -lpthread"
+LDFLAGS="$LDFLAGS"
for ac_func in gmtime_r localtime_r
do :
diff --git a/ZenLib/Project/GNU/Library/configure.ac b/ZenLib/Project/GNU/Library/configure.ac
index 2faa8cb..f7843d4 100644
index 500101b..a13f0b6 100644
--- a/ZenLib/Project/GNU/Library/configure.ac
+++ b/ZenLib/Project/GNU/Library/configure.ac
@@ -158,10 +158,10 @@ dnl -------------------------------------------------------------------------
@@ -144,10 +144,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"
- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS"
+ ZenLib_LIBS="-L$(pwd)/.libs -lzen $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"
- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static"
+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static"
fi
dnl #########################################################################
@@ -266,7 +266,7 @@ fi
@@ -252,7 +252,7 @@ fi
dnl -------------------------------------------------------------------------
dnl External libs
dnl
-LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+LDFLAGS="$LDFLAGS -lstdc++"
-LDFLAGS="$LDFLAGS -lpthread"
+LDFLAGS="$LDFLAGS"
dnl #########################################################################
dnl ### Output
dnl -------------------------------------------------------------------------
dnl Check if thread safe variants of time functions are available
diff --git a/ZenLib/Project/GNU/Library/libzen.pc.in b/ZenLib/Project/GNU/Library/libzen.pc.in
index c3e6778..a3a34ac 100644
index f7bb814..3e9dfa7 100644
--- a/ZenLib/Project/GNU/Library/libzen.pc.in
+++ b/ZenLib/Project/GNU/Library/libzen.pc.in
@@ -4,10 +4,10 @@ libdir=@libdir@
@@ -135,8 +135,8 @@ index c3e6778..a3a34ac 100644
Name: libzen
Version: @PACKAGE_VERSION@
Description: ZenLib
-Libs: -L${libdir} -lzen -lpthread -lstdc++
+Libs: -L${libdir} -lzen -lstdc++
-Libs: -L${libdir} -lzen -lpthread
+Libs: -L${libdir} -lzen
Cflags: -I${includedir} @ZenLib_CXXFLAGS@
diff --git a/ZenLib/Source/ZenLib/Conf.h b/ZenLib/Source/ZenLib/Conf.h
index 18264cf..0a7426b 100644
@@ -152,5 +152,5 @@ index 18264cf..0a7426b 100644
#define UNIX
#endif
--
2.21.0
2.30.2