diff options
author | dsainty <dsainty@pkgsrc.org> | 2015-09-07 01:02:00 +0000 |
---|---|---|
committer | dsainty <dsainty@pkgsrc.org> | 2015-09-07 01:02:00 +0000 |
commit | 41cb8277808f9a15b15f83c45b5ea01e4a73f3a8 (patch) | |
tree | 5dda512c6d90eeb029eb314d28d64ec1f5de2920 | |
parent | 60411519597aec77919cf0ded75e6381be9f96e7 (diff) | |
download | pkgsrc-41cb8277808f9a15b15f83c45b5ea01e4a73f3a8.tar.gz |
Update mediainfo and libmediainfo to 0.7.77
The change logs between 0.7.65 and 0.7.77 total several hundred lines, and
consists primarily of very detailed per-codec trivia. The complete change
logs can be found in the source distribution as MediaInfo/History_CLI.txt and
MediaInfoLib/History_DLL.txt.
Pkgsrc:
- patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h applied upstream.
- pkglint a bit.
- mediainfo appears to have done some work in avoiding bashisms, so remove
"bash" from the tools.
- CONFIG_SHELL doesn't need to be explicitly bash any longer. Possibly this
was only ever necessary because bash seems to be the only shell that was
willing to treat a garbage shell substitution (caused by a bug in the
configure.ac) as somehow legal.
- ... and libmediainfo now actually builds if you accidentally on purpose
override CONFIG_SHELL to be pdksh.
-rw-r--r-- | multimedia/libmediainfo/Makefile | 11 | ||||
-rw-r--r-- | multimedia/libmediainfo/PLIST | 8 | ||||
-rw-r--r-- | multimedia/libmediainfo/buildlink3.mk | 4 | ||||
-rw-r--r-- | multimedia/mediainfo/Makefile | 6 | ||||
-rw-r--r-- | multimedia/mediainfo/Makefile.common | 10 | ||||
-rw-r--r-- | multimedia/mediainfo/distinfo | 9 | ||||
-rw-r--r-- | multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h | 19 |
7 files changed, 26 insertions, 41 deletions
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index b1fef1217fe..8a2aa5eb3d1 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/01/10 20:35:24 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2015/09/07 01:02:00 dsainty Exp $ .include "../../multimedia/mediainfo/Makefile.common" @@ -7,12 +7,11 @@ PKGNAME= libmediainfo-${MIVER} COMMENT= MediaInfoLib, support library for MediaInfo program LICENSE= zlib -USE_TOOLS+= autoconf automake bash:run gmake pkg-config +USE_TOOLS+= autoconf automake autoreconf gmake pkg-config USE_LIBTOOL= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIG_SHELL= bash CONFIGURE_DIRS+= MediaInfoLib/Project/GNU/Library REPLACE_SH= MediaInfoLib/Project/GNU/Library/libmediainfo-config.in @@ -28,12 +27,12 @@ CONFIGURE_ARGS+= --enable-shared INSTALLATION_DIRS+= bin lib/pkgconfig pre-configure: - cd ${WRKSRC}/${CONFIGURE_DIRS} && autoreconf -i + cd ${WRKSRC}/${CONFIGURE_DIRS:Q} && autoreconf -i post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${CONFIGURE_DIRS}/libmediainfo-config \ + ${INSTALL_SCRIPT} ${WRKSRC}/${CONFIGURE_DIRS:Q}/libmediainfo-config \ ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/${CONFIGURE_DIRS}/libmediainfo.pc \ + ${INSTALL_DATA} ${WRKSRC}/${CONFIGURE_DIRS:Q}/libmediainfo.pc \ ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../devel/zlib/buildlink3.mk" diff --git a/multimedia/libmediainfo/PLIST b/multimedia/libmediainfo/PLIST index 0941caaec53..f5cb08b6d8b 100644 --- a/multimedia/libmediainfo/PLIST +++ b/multimedia/libmediainfo/PLIST @@ -1,4 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/31 23:19:46 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/09/07 01:02:00 dsainty Exp $ bin/libmediainfo-config +include/MediaInfo/MediaInfo.h +include/MediaInfo/MediaInfoList.h +include/MediaInfo/MediaInfo_Const.h +include/MediaInfo/MediaInfo_Events.h +include/MediaInfoDLL/MediaInfoDLL.h +include/MediaInfoDLL/MediaInfoDLL_Static.h lib/libmediainfo.la lib/pkgconfig/libmediainfo.pc diff --git a/multimedia/libmediainfo/buildlink3.mk b/multimedia/libmediainfo/buildlink3.mk index 0f8a3440799..89829a66eef 100644 --- a/multimedia/libmediainfo/buildlink3.mk +++ b/multimedia/libmediainfo/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/12/31 23:21:08 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2015/09/07 01:02:00 dsainty Exp $ BUILDLINK_TREE+= libmediainfo .if !defined(LIBMEDIAINFO_BUILDLINK3_MK) LIBMEDIAINFO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libmediainfo+= libmediainfo>=0.7.65 +BUILDLINK_API_DEPENDS.libmediainfo+= libmediainfo>=0.7.77 BUILDLINK_PKGSRCDIR.libmediainfo?= ../../multimedia/libmediainfo .include "../../devel/zlib/buildlink3.mk" diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index 81c8e816585..ad1c116cd51 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2015/01/10 20:35:24 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2015/09/07 01:02:00 dsainty Exp $ .include "../../multimedia/mediainfo/Makefile.common" PKGNAME= mediainfo-${MIVER} LICENSE= gnu-lgpl-v3 -USE_TOOLS+= autoconf automake gmake pkg-config +USE_TOOLS+= autoconf automake autoreconf gmake pkg-config USE_LIBTOOL= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes CONFIGURE_DIRS+= MediaInfo/Project/GNU/CLI pre-configure: - cd ${WRKSRC}/${CONFIGURE_DIRS} && autoreconf -i + cd ${WRKSRC}/${CONFIGURE_DIRS:Q} && autoreconf -i .include "../../multimedia/libmediainfo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mediainfo/Makefile.common b/multimedia/mediainfo/Makefile.common index 17f8e617431..c5811602caa 100644 --- a/multimedia/mediainfo/Makefile.common +++ b/multimedia/mediainfo/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.3 2014/10/13 09:34:49 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2015/09/07 01:02:00 dsainty Exp $ # # used by multimedia/mediainfo/Makefile # used by multimedia/libmediainfo/Makefile -MIVER= 0.7.65 +MIVER= 0.7.77 DISTNAME= mediainfo_${MIVER}_AllInclusive CATEGORIES= multimedia @@ -14,7 +14,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mediaarea.net/en/MediaInfo COMMENT= Utility to supply technical info about audio and video -DISTINFO_FILE= ${.CURDIR}/../../multimedia/mediainfo/distinfo -PATCHDIR= ${.CURDIR}/../../multimedia/mediainfo/patches +DISTINFO_FILE= ${.CURDIR}/../../multimedia/mediainfo/distinfo +PATCHDIR= ${.CURDIR}/../../multimedia/mediainfo/patches -WRKSRC= ${WRKDIR} +WRKSRC= ${WRKDIR}/mediainfo_AllInclusive diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo index 693e1793c29..47a56c60f53 100644 --- a/multimedia/mediainfo/distinfo +++ b/multimedia/mediainfo/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.9 2015/05/14 13:20:06 jperkin Exp $ +$NetBSD: distinfo,v 1.10 2015/09/07 01:02:00 dsainty Exp $ -SHA1 (mediainfo_0.7.65_AllInclusive.7z) = 80d8b289e6ef9e11a68b960ccd709032452d9e1c -RMD160 (mediainfo_0.7.65_AllInclusive.7z) = 35a6ad9ed28e15688597465640a427be4ea70651 -Size (mediainfo_0.7.65_AllInclusive.7z) = 2286326 bytes +SHA1 (mediainfo_0.7.77_AllInclusive.7z) = 3cdf292f8aa72c1c590618b44ec9c0700f66b818 +RMD160 (mediainfo_0.7.77_AllInclusive.7z) = bd752aaa933c9fac9bff6ddb5a26ef7e6fa61b04 +Size (mediainfo_0.7.77_AllInclusive.7z) = 2645508 bytes SHA1 (patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h) = c55f25c0781c1902dd2459d138a88117e3f43de5 -SHA1 (patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h) = 9e2e86b46b5106c39be3e07f28c16a9b1a033435 diff --git a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h b/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h deleted file mode 100644 index 915905d9dd8..00000000000 --- a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h,v 1.2 2014/10/13 09:36:29 wiz Exp $ - -Forward declarations may not be namespace qualified. - ---- MediaInfoLib/Source/MediaInfo/Text/File_Ttml.h.orig 2014-01-06 09:53:28.000000000 +0000 -+++ MediaInfoLib/Source/MediaInfo/Text/File_Ttml.h -@@ -19,8 +19,10 @@ - #include "MediaInfo/File__Analyze.h"
- //---------------------------------------------------------------------------
-
--class tinyxml2::XMLDocument;
--class tinyxml2::XMLElement;
-+namespace tinyxml2 {
-+class XMLDocument;
-+class XMLElement;
-+}
-
- namespace MediaInfoLib
- {
|