Mon Sep 7 01:02:00 2015 UTC ()
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.


(dsainty)
diff -r1.4 -r1.5 pkgsrc/multimedia/libmediainfo/Makefile
diff -r1.1 -r1.2 pkgsrc/multimedia/libmediainfo/PLIST
diff -r1.2 -r1.3 pkgsrc/multimedia/libmediainfo/buildlink3.mk
diff -r1.13 -r1.14 pkgsrc/multimedia/mediainfo/Makefile
diff -r1.3 -r1.4 pkgsrc/multimedia/mediainfo/Makefile.common
diff -r1.9 -r1.10 pkgsrc/multimedia/mediainfo/distinfo
diff -r1.2 -r0 pkgsrc/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/libmediainfo/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libmediainfo/Makefile 2015/01/10 20:35:24 1.4
+++ pkgsrc/multimedia/libmediainfo/Makefile 2015/09/07 01:02:00 1.5
@@ -1,41 +1,40 @@ @@ -1,41 +1,40 @@
1# $NetBSD: Makefile,v 1.4 2015/01/10 20:35:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2015/09/07 01:02:00 dsainty Exp $
2 2
3.include "../../multimedia/mediainfo/Makefile.common" 3.include "../../multimedia/mediainfo/Makefile.common"
4 4
5PKGNAME= libmediainfo-${MIVER} 5PKGNAME= libmediainfo-${MIVER}
6 6
7COMMENT= MediaInfoLib, support library for MediaInfo program 7COMMENT= MediaInfoLib, support library for MediaInfo program
8LICENSE= zlib 8LICENSE= zlib
9 9
10USE_TOOLS+= autoconf automake bash:run gmake pkg-config 10USE_TOOLS+= autoconf automake autoreconf gmake pkg-config
11USE_LIBTOOL= yes 11USE_LIBTOOL= yes
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14 14
15CONFIG_SHELL= bash 
16CONFIGURE_DIRS+= MediaInfoLib/Project/GNU/Library 15CONFIGURE_DIRS+= MediaInfoLib/Project/GNU/Library
17 16
18REPLACE_SH= MediaInfoLib/Project/GNU/Library/libmediainfo-config.in 17REPLACE_SH= MediaInfoLib/Project/GNU/Library/libmediainfo-config.in
19 18
20PKGCONFIG_OVERRIDE+= MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in 19PKGCONFIG_OVERRIDE+= MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
21 20
22.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
23# Enable shared library 22# Enable shared library
24.if empty(_OPSYS_SHLIB_TYPE:Mnone) 23.if empty(_OPSYS_SHLIB_TYPE:Mnone)
25CONFIGURE_ARGS+= --enable-shared 24CONFIGURE_ARGS+= --enable-shared
26.endif 25.endif
27 26
28INSTALLATION_DIRS+= bin lib/pkgconfig 27INSTALLATION_DIRS+= bin lib/pkgconfig
29 28
30pre-configure: 29pre-configure:
31 cd ${WRKSRC}/${CONFIGURE_DIRS} && autoreconf -i 30 cd ${WRKSRC}/${CONFIGURE_DIRS:Q} && autoreconf -i
32 31
33post-install: 32post-install:
34 ${INSTALL_SCRIPT} ${WRKSRC}/${CONFIGURE_DIRS}/libmediainfo-config \ 33 ${INSTALL_SCRIPT} ${WRKSRC}/${CONFIGURE_DIRS:Q}/libmediainfo-config \
35 ${DESTDIR}${PREFIX}/bin 34 ${DESTDIR}${PREFIX}/bin
36 ${INSTALL_DATA} ${WRKSRC}/${CONFIGURE_DIRS}/libmediainfo.pc \ 35 ${INSTALL_DATA} ${WRKSRC}/${CONFIGURE_DIRS:Q}/libmediainfo.pc \
37 ${DESTDIR}${PREFIX}/lib/pkgconfig 36 ${DESTDIR}${PREFIX}/lib/pkgconfig
38 37
39.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
40.include "../../devel/libzen/buildlink3.mk" 39.include "../../devel/libzen/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/libmediainfo/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/libmediainfo/PLIST 2013/12/31 23:19:46 1.1
+++ pkgsrc/multimedia/libmediainfo/PLIST 2015/09/07 01:02:00 1.2
@@ -1,4 +1,10 @@ @@ -1,4 +1,10 @@
1@comment $NetBSD: PLIST,v 1.1 2013/12/31 23:19:46 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/09/07 01:02:00 dsainty Exp $
2bin/libmediainfo-config 2bin/libmediainfo-config
 3include/MediaInfo/MediaInfo.h
 4include/MediaInfo/MediaInfoList.h
 5include/MediaInfo/MediaInfo_Const.h
 6include/MediaInfo/MediaInfo_Events.h
 7include/MediaInfoDLL/MediaInfoDLL.h
 8include/MediaInfoDLL/MediaInfoDLL_Static.h
3lib/libmediainfo.la 9lib/libmediainfo.la
4lib/pkgconfig/libmediainfo.pc 10lib/pkgconfig/libmediainfo.pc
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/libmediainfo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/libmediainfo/buildlink3.mk 2013/12/31 23:21:08 1.2
+++ pkgsrc/multimedia/libmediainfo/buildlink3.mk 2015/09/07 01:02:00 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.2 2013/12/31 23:21:08 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2015/09/07 01:02:00 dsainty Exp $
2 2
3BUILDLINK_TREE+= libmediainfo 3BUILDLINK_TREE+= libmediainfo
4 4
5.if !defined(LIBMEDIAINFO_BUILDLINK3_MK) 5.if !defined(LIBMEDIAINFO_BUILDLINK3_MK)
6LIBMEDIAINFO_BUILDLINK3_MK:= 6LIBMEDIAINFO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libmediainfo+= libmediainfo>=0.7.65 8BUILDLINK_API_DEPENDS.libmediainfo+= libmediainfo>=0.7.77
9BUILDLINK_PKGSRCDIR.libmediainfo?= ../../multimedia/libmediainfo 9BUILDLINK_PKGSRCDIR.libmediainfo?= ../../multimedia/libmediainfo
10 10
11.include "../../devel/zlib/buildlink3.mk" 11.include "../../devel/zlib/buildlink3.mk"
12.include "../../devel/libzen/buildlink3.mk" 12.include "../../devel/libzen/buildlink3.mk"
13.endif # LIBMEDIAINFO_BUILDLINK3_MK 13.endif # LIBMEDIAINFO_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -libmediainfo 15BUILDLINK_TREE+= -libmediainfo
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/mediainfo/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mediainfo/Makefile 2015/01/10 20:35:24 1.13
+++ pkgsrc/multimedia/mediainfo/Makefile 2015/09/07 01:02:00 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.13 2015/01/10 20:35:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2015/09/07 01:02:00 dsainty Exp $
2 2
3.include "../../multimedia/mediainfo/Makefile.common" 3.include "../../multimedia/mediainfo/Makefile.common"
4 4
5PKGNAME= mediainfo-${MIVER} 5PKGNAME= mediainfo-${MIVER}
6LICENSE= gnu-lgpl-v3 6LICENSE= gnu-lgpl-v3
7 7
8USE_TOOLS+= autoconf automake gmake pkg-config 8USE_TOOLS+= autoconf automake autoreconf gmake pkg-config
9USE_LIBTOOL= yes 9USE_LIBTOOL= yes
10USE_LANGUAGES= c c++ 10USE_LANGUAGES= c c++
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12 12
13CONFIGURE_DIRS+= MediaInfo/Project/GNU/CLI 13CONFIGURE_DIRS+= MediaInfo/Project/GNU/CLI
14 14
15pre-configure: 15pre-configure:
16 cd ${WRKSRC}/${CONFIGURE_DIRS} && autoreconf -i 16 cd ${WRKSRC}/${CONFIGURE_DIRS:Q} && autoreconf -i
17 17
18.include "../../multimedia/libmediainfo/buildlink3.mk" 18.include "../../multimedia/libmediainfo/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/mediainfo/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/mediainfo/Makefile.common 2014/10/13 09:34:49 1.3
+++ pkgsrc/multimedia/mediainfo/Makefile.common 2015/09/07 01:02:00 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.3 2014/10/13 09:34:49 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.4 2015/09/07 01:02:00 dsainty Exp $
2# 2#
3# used by multimedia/mediainfo/Makefile 3# used by multimedia/mediainfo/Makefile
4# used by multimedia/libmediainfo/Makefile 4# used by multimedia/libmediainfo/Makefile
5 5
6MIVER= 0.7.65 6MIVER= 0.7.77
7 7
8DISTNAME= mediainfo_${MIVER}_AllInclusive 8DISTNAME= mediainfo_${MIVER}_AllInclusive
9CATEGORIES= multimedia 9CATEGORIES= multimedia
10MASTER_SITES= http://mediaarea.net/download/source/mediainfo/${MIVER}/ 10MASTER_SITES= http://mediaarea.net/download/source/mediainfo/${MIVER}/
11EXTRACT_SUFX= .7z 11EXTRACT_SUFX= .7z
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://mediaarea.net/en/MediaInfo 14HOMEPAGE= http://mediaarea.net/en/MediaInfo
15COMMENT= Utility to supply technical info about audio and video 15COMMENT= Utility to supply technical info about audio and video
16 16
17DISTINFO_FILE= ${.CURDIR}/../../multimedia/mediainfo/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../multimedia/mediainfo/distinfo
18PATCHDIR= ${.CURDIR}/../../multimedia/mediainfo/patches 18PATCHDIR= ${.CURDIR}/../../multimedia/mediainfo/patches
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}/mediainfo_AllInclusive
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/mediainfo/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mediainfo/distinfo 2015/05/14 13:20:06 1.9
+++ pkgsrc/multimedia/mediainfo/distinfo 2015/09/07 01:02:00 1.10
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.9 2015/05/14 13:20:06 jperkin Exp $ 1$NetBSD: distinfo,v 1.10 2015/09/07 01:02:00 dsainty Exp $
2 2
3SHA1 (mediainfo_0.7.65_AllInclusive.7z) = 80d8b289e6ef9e11a68b960ccd709032452d9e1c 3SHA1 (mediainfo_0.7.77_AllInclusive.7z) = 3cdf292f8aa72c1c590618b44ec9c0700f66b818
4RMD160 (mediainfo_0.7.65_AllInclusive.7z) = 35a6ad9ed28e15688597465640a427be4ea70651 4RMD160 (mediainfo_0.7.77_AllInclusive.7z) = bd752aaa933c9fac9bff6ddb5a26ef7e6fa61b04
5Size (mediainfo_0.7.65_AllInclusive.7z) = 2286326 bytes 5Size (mediainfo_0.7.77_AllInclusive.7z) = 2645508 bytes
6SHA1 (patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h) = c55f25c0781c1902dd2459d138a88117e3f43de5 6SHA1 (patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h) = c55f25c0781c1902dd2459d138a88117e3f43de5
7SHA1 (patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h) = 9e2e86b46b5106c39be3e07f28c16a9b1a033435 
File Deleted: pkgsrc/multimedia/mediainfo/patches/Attic/patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h