Sun Mar 20 13:19:44 2011 UTC ()
Changes 4.6.0:
* build system: Fixed building the Qt version of mkvinfo's GUI (again).
* mmg: bug fix: If the header editor finds 'language' elements with ISO-639-1
  codes (e.g. "fra" instead of "fre" for "French") then it will map the code to
  the corresponding ISO-639-2 code
* mmg: bug fix: Fixed one of the issues causing mmg to report that it is
  configured to use an unsupported version of mkvmerge when the reported
  version was actually empty.
* mkvmerge: enhancement: HD-DVD subtitles are recognized as being an
  unsupported file format. This makes the error message presented to the user
  a bit clearer.
* build: Boost 1.36.0 or newer is required (up from 1.34.0). Also fixed
  building with v3 of Boost's filesystem library, e.g. with Boost 1.46.0
  Beta 1 or newer.
* mkvpropedit: new feature: Added support for adding, replacing and removing
  tags.
* all: Added a translation for the programs into Turkish by ßouЯock.
* build system: Fixed compilation if configure choses the internal versions of
  libebml and libmatroska while older versions are still installed in a
  location named with "-I..." or "-L..." in CFLAGS/CXXFLAGS/LDFLAGS or with
  configure's "--with-extra-includes" and "--with-extra-libs" options.


(adam)
diff -r1.31 -r1.32 pkgsrc/multimedia/mkvtoolnix/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/mkvtoolnix/PLIST
diff -r1.28 -r1.29 pkgsrc/multimedia/mkvtoolnix/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix/options.mk
cvs diff -r1.31 -r1.32 pkgsrc/multimedia/mkvtoolnix/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mkvtoolnix/Makefile 2011/02/14 19:12:01 1.31
+++ pkgsrc/multimedia/mkvtoolnix/Makefile 2011/03/20 13:19:44 1.32
@@ -1,71 +1,54 @@ @@ -1,71 +1,54 @@
1# $NetBSD: Makefile,v 1.31 2011/02/14 19:12:01 drochner Exp $ 1# $NetBSD: Makefile,v 1.32 2011/03/20 13:19:44 adam Exp $
2 2
3DISTNAME= mkvtoolnix-4.5.0 3DISTNAME= mkvtoolnix-4.6.0
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ 5MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/ 9HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/
10COMMENT= Set of tools to create, alter and inspect Matroska files 10COMMENT= Set of tools to create, alter and inspect Matroska files
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake msgfmt 
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18USE_LANGUAGES= c c++ 17USE_TOOLS+= gmake msgfmt
19 18GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs} 19CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
21CONFIGURE_ARGS+= --with-boost_regex=boost_regex 20CONFIGURE_ARGS+= --with-boost_regex=boost_regex
22CONFIGURE_ARGS+= --with-boost-filesystem=boost_filesystem 21CONFIGURE_ARGS+= --with-boost-filesystem=boost_filesystem
23 22
24PKG_OPTIONS_VAR= PKG_OPTIONS.mkvtoolnix 23INSTALL_ENV+= SHELL=${SH:Q}
25PKG_SUPPORTED_OPTIONS= mkvtoolnix-gui 
26PKG_SUGGESTED_OPTIONS= 
27 
28.include "../../mk/bsd.options.mk" 
29 
30PLIST_VARS+= gui 
31 
32.if !empty(PKG_OPTIONS:Mmkvtoolnix-gui) 
33PLIST.gui= yes 
34CONFIGURE_ARGS+= --enable-gui 
35CONFIGURE_ARGS+= --enable-wxwidgets 
36. include "../../x11/wxGTK28/buildlink3.mk" 
37.include "../../sysutils/desktop-file-utils/desktopdb.mk" 
38.include "../../databases/shared-mime-info/mimedb.mk" 
39.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 
40.else 
41CONFIGURE_ARGS+= --disable-gui 
42CONFIGURE_ARGS+= --disable-wxwidgets 
43.endif 
44 
45INSTALL_ENV+= SHELL=${SH} 
46 24
47do-build: 25do-build:
48 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake 26 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake
49 27
50do-install: 28do-install:
51 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install 29 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install
52 30
 31.include "options.mk"
 32
 33.include "../../mk/bsd.prefs.mk"
 34
 35.if ${OPSYS} != "Darwin"
53BUILDLINK_DEPMETHOD.${RUBY_BASE}= build 36BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
54.include "../../lang/ruby/buildlink3.mk" 37.include "../../lang/ruby/buildlink3.mk"
 38.endif
55 39
56.include "../../archivers/bzip2/buildlink3.mk" 40.include "../../archivers/bzip2/buildlink3.mk"
57.include "../../archivers/liblzo/buildlink3.mk" 41.include "../../archivers/lzo/buildlink3.mk"
58.include "../../audio/flac/buildlink3.mk" 42.include "../../audio/flac/buildlink3.mk"
59.include "../../audio/libvorbis/buildlink3.mk" 43.include "../../audio/libvorbis/buildlink3.mk"
60.include "../../converters/libiconv/buildlink3.mk" 44.include "../../converters/libiconv/buildlink3.mk"
61.include "../../devel/gettext-lib/buildlink3.mk" 45.include "../../devel/gettext-lib/buildlink3.mk"
62.include "../../devel/libebml/buildlink3.mk" 46.include "../../devel/libebml/buildlink3.mk"
63.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
64.include "../../devel/boost-headers/buildlink3.mk" 48.include "../../devel/boost-headers/buildlink3.mk"
65.include "../../devel/boost-libs/buildlink3.mk" 49.include "../../devel/boost-libs/buildlink3.mk"
66.include "../../multimedia/libmatroska/buildlink3.mk" 50.include "../../multimedia/libmatroska/buildlink3.mk"
67.include "../../multimedia/libogg/buildlink3.mk" 51.include "../../multimedia/libogg/buildlink3.mk"
68.include "../../sysutils/file/buildlink3.mk" 52.include "../../sysutils/file/buildlink3.mk"
69.include "../../textproc/expat/buildlink3.mk" 53.include "../../textproc/expat/buildlink3.mk"
70 
71.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/mkvtoolnix/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/mkvtoolnix/PLIST 2011/02/14 19:12:01 1.4
+++ pkgsrc/multimedia/mkvtoolnix/PLIST 2011/03/20 13:19:44 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2011/02/14 19:12:01 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.5 2011/03/20 13:19:44 adam Exp $
2bin/mkvextract 2bin/mkvextract
3bin/mkvinfo 3bin/mkvinfo
4bin/mkvmerge 4bin/mkvmerge
5bin/mkvpropedit 5bin/mkvpropedit
6${PLIST.gui}bin/mmg 6${PLIST.gui}bin/mmg
7man/ja/man1/mkvextract.1 7man/ja/man1/mkvextract.1
8man/ja/man1/mkvinfo.1 8man/ja/man1/mkvinfo.1
9man/ja/man1/mkvmerge.1 9man/ja/man1/mkvmerge.1
10man/ja/man1/mkvpropedit.1 10man/ja/man1/mkvpropedit.1
11${PLIST.gui}man/ja/man1/mmg.1 11${PLIST.gui}man/ja/man1/mmg.1
12man/man1/mkvextract.1 12man/man1/mkvextract.1
13man/man1/mkvinfo.1 13man/man1/mkvinfo.1
14man/man1/mkvmerge.1 14man/man1/mkvmerge.1
@@ -62,17 +62,18 @@ share/doc/mkvtoolnix/guide/zh_CN/mkvmerg @@ -62,17 +62,18 @@ share/doc/mkvtoolnix/guide/zh_CN/mkvmerg
62share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhk 62share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhk
63share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhp 63share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhp
64share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.html 64share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.html
65${PLIST.gui}share/icons/hicolor/32x32/apps/mkvinfo.png 65${PLIST.gui}share/icons/hicolor/32x32/apps/mkvinfo.png
66${PLIST.gui}share/icons/hicolor/32x32/apps/mkvmergeGUI.png 66${PLIST.gui}share/icons/hicolor/32x32/apps/mkvmergeGUI.png
67${PLIST.gui}share/icons/hicolor/64x64/apps/mkvinfo.png 67${PLIST.gui}share/icons/hicolor/64x64/apps/mkvinfo.png
68${PLIST.gui}share/icons/hicolor/64x64/apps/mkvmergeGUI.png 68${PLIST.gui}share/icons/hicolor/64x64/apps/mkvmergeGUI.png
69share/locale/de/LC_MESSAGES/mkvtoolnix.mo 69share/locale/de/LC_MESSAGES/mkvtoolnix.mo
70share/locale/es/LC_MESSAGES/mkvtoolnix.mo 70share/locale/es/LC_MESSAGES/mkvtoolnix.mo
71share/locale/fr/LC_MESSAGES/mkvtoolnix.mo 71share/locale/fr/LC_MESSAGES/mkvtoolnix.mo
72share/locale/ja/LC_MESSAGES/mkvtoolnix.mo 72share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
73share/locale/nl/LC_MESSAGES/mkvtoolnix.mo 73share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
74share/locale/ru/LC_MESSAGES/mkvtoolnix.mo 74share/locale/ru/LC_MESSAGES/mkvtoolnix.mo
 75share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
75share/locale/uk/LC_MESSAGES/mkvtoolnix.mo 76share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
76share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo 77share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
77share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo 78share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
78${PLIST.gui}share/mime/packages/mkvtoolnix.xml 79${PLIST.gui}share/mime/packages/mkvtoolnix.xml
cvs diff -r1.28 -r1.29 pkgsrc/multimedia/mkvtoolnix/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mkvtoolnix/distinfo 2011/02/14 19:12:01 1.28
+++ pkgsrc/multimedia/mkvtoolnix/distinfo 2011/03/20 13:19:44 1.29
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.28 2011/02/14 19:12:01 drochner Exp $ 1$NetBSD: distinfo,v 1.29 2011/03/20 13:19:44 adam Exp $
2 2
3SHA1 (mkvtoolnix-4.5.0.tar.bz2) = 7e9c14c29f5aaf7043ac2c2db56326970c63242d 3SHA1 (mkvtoolnix-4.6.0.tar.bz2) = 1e46f94a0b50bf3e12c0feab710655e7cf2a9489
4RMD160 (mkvtoolnix-4.5.0.tar.bz2) = 1ac00b89345e3c8cd747e0921d4ae1f715a264c5 4RMD160 (mkvtoolnix-4.6.0.tar.bz2) = d1ebbf181525c832a3ceafd46bea9462df1eebb6
5Size (mkvtoolnix-4.5.0.tar.bz2) = 2016980 bytes 5Size (mkvtoolnix-4.6.0.tar.bz2) = 2032839 bytes
6SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91 6SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
File Added: pkgsrc/multimedia/mkvtoolnix/options.mk
# $NetBSD: options.mk,v 1.1 2011/03/20 13:19:44 adam Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
PKG_SUPPORTED_OPTIONS=	# empty
PKG_OPTIONS_OPTIONAL_GROUPS=	gui
PKG_OPTIONS_GROUP.gui=	wxwidgets
PKG_SUGGESTED_OPTIONS=	# empty

.include "../../mk/bsd.options.mk"

PLIST_VARS+=		gui

.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mwxwidgets)
PLIST.gui=		yes
CONFIGURE_ARGS+=	--enable-gui
.else
CONFIGURE_ARGS+=	--disable-gui
.endif

#.if !empty(PKG_OPTIONS:Mqt)
#CONFIGURE_ARGS+=	--enable-qt
#.  include "../../x11/qt4-libs/buildlink3.mk"
#.  include "../../x11/qt4-tools/buildlink3.mk"
#.else
#CONFIGURE_ARGS+=	--disable-qt
#.endif

.if !empty(PKG_OPTIONS:Mwxwidgets)
CONFIGURE_ARGS+=	--enable-wxwidgets
.  include "../../databases/shared-mime-info/mimedb.mk"
.  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
.  include "../../x11/wxGTK28/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-wxwidgets
.endif