The third part switches multimedia/mediainfo over to the external
libzen and libmediainfo dependencies. It also updates the port to
version 21.03.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mediainfo/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 30 Oct 2020 20:55:01 -0000 1.24
+++ Makefile 27 Apr 2021 14:02:59 -0000
@@ -1,54 +1,37 @@
# $OpenBSD: Makefile,v 1.24 2020/10/30 20:55:01 naddy Exp $
-COMMENT= display technical and tag data for video and audio files
+COMMENT= utility for reading information from audio/video files
-VERSION= 20.09
+VERSION= 21.03
PKGNAME= mediainfo-${VERSION}
CATEGORIES= multimedia
+
HOMEPAGE= https://mediaarea.net/en/MediaInfo
MAINTAINER= Christian Weisgerber <[email protected]>
-# BSD-style
+# BSD
PERMIT_PACKAGE= Yes
-WANTLIB= c m pthread ${COMPILER_LIBCXX} z
-
-COMPILER = base-clang ports-gcc
-
-MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${VERSION}/
-DISTFILES= MediaInfo_CLI_${VERSION}_GNU_FromSource.tar.xz
+WANTLIB= ${COMPILER_LIBCXX} c m mediainfo pthread z zen
-WRKDIST= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource
+MASTER_SITES= https://mediaarea.net/download/source/mediainfo/${VERSION}/
+DISTFILES= mediainfo_${VERSION}.tar.xz
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= SUBDIRS="${SUBDIRS}"
-MAKE_ENV= SUBDIRS="${SUBDIRS}"
-LIBTOOL_FLAGS= --tag=disable-shared
-MODGNU_CONFIG_GUESS_DIRS=${SUBDIRS}
+COMPILER= base-clang ports-gcc
-ZENLIBDIR= ${WRKSRC}/ZenLib/Project/GNU/Library
-MEDIAINFOLIBDIR=${WRKSRC}/MediaInfoLib/Project/GNU/Library
-MEDIAINFODIR= ${WRKSRC}/MediaInfo/Project/GNU/CLI
+LIB_DEPENDS= devel/libzen \
+ multimedia/libmediainfo
-SUBDIRS= ${ZENLIBDIR} ${MEDIAINFOLIBDIR} ${MEDIAINFODIR}
+CONFIGURE_STYLE=autoreconf
DEBUG_PACKAGES= ${BUILD_PACKAGES}
-# MediaInfoLib tests fetch files from the Internet
-NO_TEST= Yes
+AUTOCONF_VERSION=2.69
+AUTOMAKE_VERSION=1.13
+AUTOCONF_DIR= ${WRKBUILD}
-# fix line endings for files that are patched
-#pre-patch:
-# @sed -i "s/$$(printf \\r)\$$//" \
-# ${WRKSRC}/MediaInfoLib/Source/MediaInfo/MediaInfo_Internal.cpp
-
-pre-configure:
- @cp ${FILESDIR}/configure ${FILESDIR}/Makefile ${WRKSRC}
- @chmod a+x ${WRKSRC}/configure
-
-do-install:
- @cd ${MEDIAINFODIR} && ${LIBTOOL} ${LIBTOOL_FLAGS} --mode=install \
- ${INSTALL_PROGRAM} mediainfo ${PREFIX}/bin
+WRKDIST= ${WRKDIR}/MediaInfo
+WRKBUILD= ${WRKSRC}/Project/GNU/CLI
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mediainfo/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 30 Oct 2020 20:55:01 -0000 1.19
+++ distinfo 27 Apr 2021 14:02:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (MediaInfo_CLI_20.09_GNU_FromSource.tar.xz) =
C9oHLJGxZGtVWmeC2zLEaJHjQNAgT8BxbTXBnRv2oNo=
-SIZE (MediaInfo_CLI_20.09_GNU_FromSource.tar.xz) = 3215776
+SHA256 (mediainfo_21.03.tar.xz) = 3lDKCyxge4mZ08nlQtJ8lwMKWfMYWbYSM1MVvmhQAh4=
+SIZE (mediainfo_21.03.tar.xz) = 1987340
Index: files/Makefile
===================================================================
RCS file: files/Makefile
diff -N files/Makefile
--- files/Makefile 1 Jan 2019 21:12:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2019/01/01 21:12:24 naddy Exp $
-
-all install:
- @for d in ${SUBDIRS}; do \
- ${MAKE} -C $$d $@ || exit; \
- done
Index: files/configure
===================================================================
RCS file: files/configure
diff -N files/configure
--- files/configure 13 Jun 2014 20:48:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-# $OpenBSD: configure,v 1.1.1.1 2014/06/13 20:48:58 naddy Exp $
-
-for d in $SUBDIRS; do
- (cd $d && ./configure "$@") || exit
- PATH=$d:$PATH # for lib*-config
-done
Index: patches/patch-MediaInfoLib_Project_GNU_Library_configure
===================================================================
RCS file: patches/patch-MediaInfoLib_Project_GNU_Library_configure
diff -N patches/patch-MediaInfoLib_Project_GNU_Library_configure
--- patches/patch-MediaInfoLib_Project_GNU_Library_configure 2 Oct 2018
21:06:29 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-MediaInfoLib_Project_GNU_Library_configure,v 1.7 2018/10/02
21:06:29 naddy Exp $
-Index: MediaInfoLib/Project/GNU/Library/configure
---- MediaInfoLib/Project/GNU/Library/configure.orig
-+++ MediaInfoLib/Project/GNU/Library/configure
-@@ -18851,9 +18851,6 @@ if test "$GXX" = yes ; then
- if test "$enable_debug" = "yes"; then
- CFLAGS="$CFLAGS -O0 -g -Wall -Wundef"
- CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual
-Wno-ctor-dtor-privacy"
-- else
-- CFLAGS="$CFLAGS -O2"
-- CXXFLAGS="$CXXFLAGS -O2"
- fi
- if test "$enable_gprof" = "yes"; then
- CFLAGS="$CFLAGS -pg -g"
Index: patches/patch-MediaInfo_Project_GNU_CLI_configure
===================================================================
RCS file: patches/patch-MediaInfo_Project_GNU_CLI_configure
diff -N patches/patch-MediaInfo_Project_GNU_CLI_configure
--- patches/patch-MediaInfo_Project_GNU_CLI_configure 11 Jan 2016 16:22:12
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-MediaInfo_Project_GNU_CLI_configure,v 1.5 2016/01/11 16:22:12
naddy Exp $
---- MediaInfo/Project/GNU/CLI/configure.orig Wed Dec 30 17:07:57 2015
-+++ MediaInfo/Project/GNU/CLI/configure Mon Jan 11 16:55:32 2016
-@@ -15171,9 +15171,6 @@ if test "$GXX" = yes ; then
- if test "$enable_debug" = "yes"; then
- CFLAGS="$CFLAGS -O0 -g -Wall -Wundef"
- CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual
-Wno-ctor-dtor-privacy"
-- else
-- CFLAGS="$CFLAGS -O2"
-- CXXFLAGS="$CXXFLAGS -O2"
- fi
- if test "$enable_gprof" = "yes"; then
- CFLAGS="$CFLAGS -pg -g"
Index: patches/patch-Project_GNU_CLI_configure_ac
===================================================================
RCS file: patches/patch-Project_GNU_CLI_configure_ac
diff -N patches/patch-Project_GNU_CLI_configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Project_GNU_CLI_configure_ac 27 Apr 2021 14:02:59 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: Project/GNU/CLI/configure.ac
+--- Project/GNU/CLI/configure.ac.orig
++++ Project/GNU/CLI/configure.ac
+@@ -136,9 +136,6 @@ if test "$GXX" = yes ; then
+ if test "$enable_debug" = "yes"; then
+ CFLAGS="$CFLAGS -O0 -g -Wall -Wundef"
+ CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual
-Wno-ctor-dtor-privacy"
+- else
+- CFLAGS="$CFLAGS -O2"
+- CXXFLAGS="$CXXFLAGS -O2"
+ fi
+ if test "$enable_gprof" = "yes"; then
+ CFLAGS="$CFLAGS -pg -g"
Index: patches/patch-ZenLib_Project_GNU_Library_configure
===================================================================
RCS file: patches/patch-ZenLib_Project_GNU_Library_configure
diff -N patches/patch-ZenLib_Project_GNU_Library_configure
--- patches/patch-ZenLib_Project_GNU_Library_configure 2 Oct 2018 21:06:29
-0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-ZenLib_Project_GNU_Library_configure,v 1.8 2018/10/02 21:06:29
naddy Exp $
-Index: ZenLib/Project/GNU/Library/configure
---- ZenLib/Project/GNU/Library/configure.orig
-+++ 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 -lpthread $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 -lpthread $ZenLib_LIBS_Static"
- fi
-
-
-@@ -15646,9 +15646,6 @@ if test "$GXX" = yes ; then
- if test "$enable_debug" = "yes"; then
- CFLAGS="$CFLAGS -O0 -g -Wall -Wundef"
- CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual
-Wno-ctor-dtor-privacy"
-- else
-- CFLAGS="$CFLAGS -O2"
-- CXXFLAGS="$CXXFLAGS -O2"
- fi
- if test "$enable_gprof" = "yes"; then
- CFLAGS="$CFLAGS -pg -g"
-@@ -15656,7 +15653,7 @@ if test "$GXX" = yes ; then
- fi
- fi
-
--LDFLAGS="$LDFLAGS -lpthread -lstdc++"
-+LDFLAGS="$LDFLAGS -lpthread"
-
-
-
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/multimedia/mediainfo/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 13 Jun 2014 20:48:58 -0000 1.1.1.1
+++ pkg/DESCR 27 Apr 2021 14:02:59 -0000
@@ -1,2 +1,10 @@
-MediaInfo is a convenient unified display of the most relevant technical
-and tag data for video and audio files.
+MediaInfo is a utility used for retrieving technical information and other
+metadata about audio or video files.
+
+A non-exhaustive list of the information MediaInfo can retrieve from media
+files include:
+- General: title, author, director, album, track number, date, duration...
+- Video: codec, aspect, fps, bitrate...
+- Audio: codec, sample rate, channels, language, bitrate...
+- Text: language of subtitle
+- Chapters: number of chapters, list of chapters
--
Christian "naddy" Weisgerber [email protected]
