From 8cccb13866ddd4a7407f104f85c2ee1fcd7e33a4 Mon Sep 17 00:00:00 2001 From: salo Date: Wed, 23 Mar 2005 16:58:39 +0000 Subject: Updated to version 1.4.1 Changes: - added help file 1.4.1: ====== - bugfixes 1.4.0: ====== - support for MPEG-1 and MPEG-2 video read from PS and ES streams, - support for AVC (aka h.264) video from MP4 files, - support for concatenating files, - support for the new elements needed for menus, - support for WAVPACK4 lossless and lossy audio, - support for extracting VobSubs and - added an online help to mmg accessible by pressing F1 --- multimedia/mkvtoolnix/Makefile.dist | 2 +- multimedia/mkvtoolnix/distinfo | 11 ++++------- multimedia/mkvtoolnix/patches/patch-aa | 13 ------------- multimedia/mkvtoolnix/patches/patch-ab | 17 ----------------- multimedia/mkvtoolnix/patches/patch-ac | 13 ------------- multimedia/mmg/Makefile | 24 ++++++++++++++++-------- multimedia/mmg/PLIST | 32 +++++++++++++++++--------------- multimedia/mmg/distinfo | 13 +++++-------- multimedia/mmg/patches/patch-ab | 23 +++++++++++------------ multimedia/mmg/patches/patch-ac | 13 ------------- multimedia/mmg/patches/patch-ad | 17 ----------------- multimedia/mmg/patches/patch-ae | 13 ------------- 12 files changed, 54 insertions(+), 137 deletions(-) delete mode 100644 multimedia/mkvtoolnix/patches/patch-aa delete mode 100644 multimedia/mkvtoolnix/patches/patch-ab delete mode 100644 multimedia/mkvtoolnix/patches/patch-ac delete mode 100644 multimedia/mmg/patches/patch-ac delete mode 100644 multimedia/mmg/patches/patch-ad delete mode 100644 multimedia/mmg/patches/patch-ae (limited to 'multimedia') diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist index ca0389cf963..db7f1010db1 100644 --- a/multimedia/mkvtoolnix/Makefile.dist +++ b/multimedia/mkvtoolnix/Makefile.dist @@ -1,4 +1,4 @@ -DISTNAME= mkvtoolnix-1.0.2 +DISTNAME= mkvtoolnix-1.4.1 CATEGORIES= multimedia MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo index b426ad7e71c..3e40d9936b2 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.17 2005/02/24 11:24:03 agc Exp $ +$NetBSD: distinfo,v 1.18 2005/03/23 16:58:39 salo Exp $ -SHA1 (mkvtoolnix-1.0.2.tar.bz2) = a590d575ade3b6952b3f3864ce99045ad1c0bd56 -RMD160 (mkvtoolnix-1.0.2.tar.bz2) = a37d6c04be77b6f848aa129276c2dbb8faa339a1 -Size (mkvtoolnix-1.0.2.tar.bz2) = 529778 bytes -SHA1 (patch-aa) = 104355ded3f3e1050070135d8c25db0d772b27f7 -SHA1 (patch-ab) = 74bbf8f9a092446af43253b9f7658890adf507d0 -SHA1 (patch-ac) = 0bef3efaed92455b784585b8c7195325043509de +SHA1 (mkvtoolnix-1.4.1.tar.bz2) = 1a48bb993aeb54449ae136a4d7a8bf1d35fefb8e +RMD160 (mkvtoolnix-1.4.1.tar.bz2) = 85a4ba138b17c8c43a9a5e6677b67d11decdf4ea +Size (mkvtoolnix-1.4.1.tar.bz2) = 633834 bytes diff --git a/multimedia/mkvtoolnix/patches/patch-aa b/multimedia/mkvtoolnix/patches/patch-aa deleted file mode 100644 index 23c54f32466..00000000000 --- a/multimedia/mkvtoolnix/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/01/29 23:25:11 kristerw Exp $ - ---- src/common/aac_common.h.orig Sat Jan 29 23:33:01 2005 -+++ src/common/aac_common.h Sat Jan 29 23:33:23 2005 -@@ -57,7 +57,7 @@ - int MTX_DLL_API create_aac_data(unsigned char *data, int profile, - int channels, int sample_rate, - int output_sample_rate, bool sbr); --bool MTX_DLL_API parse_aac_codec_id(const string &codec_id, int &id, -+bool MTX_DLL_API parse_aac_codec_id(const char *codec_id, int &id, - int &profile); - - #endif // __AACCOMMON_H diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab deleted file mode 100644 index 2daa21a1fbe..00000000000 --- a/multimedia/mkvtoolnix/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2005/01/29 23:25:11 kristerw Exp $ - ---- src/common/aac_common.cpp.orig Sat Jan 29 23:27:27 2005 -+++ src/common/aac_common.cpp Sat Jan 29 23:32:45 2005 -@@ -232,10 +232,10 @@ - } - - bool --parse_aac_codec_id(const string &codec_id, -+parse_aac_codec_id(const char *codec_id, - int &id, - int &profile) { -- if (codec_id.size() < strlen(MKV_A_AAC_2LC)) -+ if (strlen(codec_id) < strlen(MKV_A_AAC_2LC)) - return false; - - if (codec_id[10] == '2') diff --git a/multimedia/mkvtoolnix/patches/patch-ac b/multimedia/mkvtoolnix/patches/patch-ac deleted file mode 100644 index de189bb777f..00000000000 --- a/multimedia/mkvtoolnix/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/01/29 23:25:11 kristerw Exp $ - ---- src/input/r_matroska.cpp.orig Sat Jan 29 23:33:37 2005 -+++ src/input/r_matroska.cpp Sat Jan 29 23:34:16 2005 -@@ -1668,7 +1668,7 @@ - id = 0; - profile = 0; - if (t->a_formattag == FOURCC('M', 'P', '4', 'A')) { -- if (!parse_aac_codec_id(string(t->codec_id), id, profile)) -+ if (!parse_aac_codec_id(t->codec_id, id, profile)) - mxerror(FMT_TID "Malformed codec id '%s'.\n", ti->fname, - (int64_t)t->tnum, t->codec_id); - } else { diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile index e34da0777af..7ce8836605e 100644 --- a/multimedia/mmg/Makefile +++ b/multimedia/mmg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/02/17 11:04:09 salo Exp $ +# $NetBSD: Makefile,v 1.9 2005/03/23 16:58:39 salo Exp $ # .include "../../multimedia/mkvtoolnix/Makefile.dist" @@ -18,18 +18,26 @@ USE_X11= yes BUILD_TARGET= src/mmg/mmg -post-patch: - @${SED} 's,@PREFIX@,${PREFIX},' ${WRKSRC}/doc/mmg.1 > \ - ${WRKDIR}/mmg.1 +SUBST_CLASSES= man help + +SUBST_STAGE.man= pre-configure +SUBST_FILES.man= doc/mmg.1 +SUBST_SED.man= 's,(doc/,(${PREFIX}/share/doc/html/mmg/,g' +SUBST_MESSAGE.man= "Fixing paths in manual page." + +SUBST_STAGE.help= pre-configure +SUBST_FILES.help= src/mmg/mmg.cpp +SUBST_SED.help= 's,@HELPDIR@,${PREFIX}/share/doc/html/mmg,' +SUBST_MESSAGE.help= "Fixing path to help data." do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKDIR}/mmg.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/mmg/images/ - ${INSTALL_DATA} ${WRKSRC}/doc/images/*.png \ + ${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \ ${PREFIX}/share/doc/html/mmg/images/ - ${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.html \ - ${PREFIX}/share/doc/html/mmg/guide.html + ${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.* \ + ${PREFIX}/share/doc/html/mmg/ .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libebml/buildlink3.mk" diff --git a/multimedia/mmg/PLIST b/multimedia/mmg/PLIST index c821f9f6824..ae11fadce09 100644 --- a/multimedia/mmg/PLIST +++ b/multimedia/mmg/PLIST @@ -1,19 +1,21 @@ -@comment $NetBSD: PLIST,v 1.2 2004/07/21 00:04:30 salo Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/03/23 16:58:39 salo Exp $ bin/mmg man/man1/mmg.1 -share/doc/html/mmg/guide.html -share/doc/html/mmg/images/addingremovingattachments.png -share/doc/html/mmg/images/addremovefiles.png -share/doc/html/mmg/images/attachmentoptions.png -share/doc/html/mmg/images/audiotrackoptions.png -share/doc/html/mmg/images/chaptereditor.png -share/doc/html/mmg/images/jobmanager.png -share/doc/html/mmg/images/movietitle.png -share/doc/html/mmg/images/muxingwindow.png -share/doc/html/mmg/images/selectmkvmergeexecutable.png -share/doc/html/mmg/images/splitting.png -share/doc/html/mmg/images/textsubtitlestrackoptions.png -share/doc/html/mmg/images/trackselection.png -share/doc/html/mmg/images/videotrackoptions.png +share/doc/html/mmg/images/addingremovingattachments.gif +share/doc/html/mmg/images/addremovefiles.gif +share/doc/html/mmg/images/attachmentoptions.gif +share/doc/html/mmg/images/audiotrackoptions.gif +share/doc/html/mmg/images/chaptereditor.gif +share/doc/html/mmg/images/jobmanager.gif +share/doc/html/mmg/images/movietitle.gif +share/doc/html/mmg/images/muxingwindow.gif +share/doc/html/mmg/images/selectmkvmergeexecutable.gif +share/doc/html/mmg/images/splitting.gif +share/doc/html/mmg/images/textsubtitlestrackoptions.gif +share/doc/html/mmg/images/trackselection.gif +share/doc/html/mmg/images/videotrackoptions.gif +share/doc/html/mmg/mkvmerge-gui.hhc +share/doc/html/mmg/mkvmerge-gui.hhp +share/doc/html/mmg/mkvmerge-gui.html @dirrm share/doc/html/mmg/images @dirrm share/doc/html/mmg diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo index 04cc57122e8..0e2511fdde8 100644 --- a/multimedia/mmg/distinfo +++ b/multimedia/mmg/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.14 2005/02/24 11:24:03 agc Exp $ +$NetBSD: distinfo,v 1.15 2005/03/23 16:58:39 salo Exp $ -SHA1 (mkvtoolnix-1.0.2.tar.bz2) = a590d575ade3b6952b3f3864ce99045ad1c0bd56 -RMD160 (mkvtoolnix-1.0.2.tar.bz2) = a37d6c04be77b6f848aa129276c2dbb8faa339a1 -Size (mkvtoolnix-1.0.2.tar.bz2) = 529778 bytes +SHA1 (mkvtoolnix-1.4.1.tar.bz2) = 1a48bb993aeb54449ae136a4d7a8bf1d35fefb8e +RMD160 (mkvtoolnix-1.4.1.tar.bz2) = 85a4ba138b17c8c43a9a5e6677b67d11decdf4ea +Size (mkvtoolnix-1.4.1.tar.bz2) = 633834 bytes SHA1 (patch-aa) = 19177b4a75ed8a27b746e2d1825c23fe59f95a77 -SHA1 (patch-ab) = 43b0aaccc6c18da2a2fca6384ea118239c912795 -SHA1 (patch-ac) = 104355ded3f3e1050070135d8c25db0d772b27f7 -SHA1 (patch-ad) = 74bbf8f9a092446af43253b9f7658890adf507d0 -SHA1 (patch-ae) = 0bef3efaed92455b784585b8c7195325043509de +SHA1 (patch-ab) = 0d25c873351f183059ac2434ddf1d7129844c27d diff --git a/multimedia/mmg/patches/patch-ab b/multimedia/mmg/patches/patch-ab index b22b0b8d348..71951945d69 100644 --- a/multimedia/mmg/patches/patch-ab +++ b/multimedia/mmg/patches/patch-ab @@ -1,14 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/05/08 18:22:14 salo Exp $ +$NetBSD: patch-ab,v 1.2 2005/03/23 16:58:39 salo Exp $ ---- doc/mmg.1.orig 2004-05-06 19:47:45.000000000 +0200 -+++ doc/mmg.1 2004-05-08 18:44:49.000000000 +0200 -@@ -23,7 +23,8 @@ - be loaded directly after startup. This way \fBmmg\fR preferences files - can be associated with \fBmmg\fR itself. - .LP --The full documentation is available in HTML form (doc/mkvmerge-gui.html). -+The full documentation is available in HTML form -+(@PREFIX@/share/doc/html/mmg/guide.html). +--- src/mmg/mmg.cpp.orig 2005-03-02 22:34:35.000000000 +0100 ++++ src/mmg/mmg.cpp 2005-03-23 17:27:01.000000000 +0100 +@@ -1153,7 +1153,7 @@ + wxConfigBase *cfg; + bool first; - - .SH AUTHOR +- help_path = wxGetCwd(); ++ help_path = "@HELPDIR@"; + cfg = wxConfigBase::Get(); + cfg->SetPath(wxT("/GUI")); + if (!cfg->Read(wxT("help_path"), &help_path)) diff --git a/multimedia/mmg/patches/patch-ac b/multimedia/mmg/patches/patch-ac deleted file mode 100644 index 2d2fb05ff43..00000000000 --- a/multimedia/mmg/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/02/05 23:45:36 salo Exp $ - ---- src/common/aac_common.h.orig Sat Jan 29 23:33:01 2005 -+++ src/common/aac_common.h Sat Jan 29 23:33:23 2005 -@@ -57,7 +57,7 @@ - int MTX_DLL_API create_aac_data(unsigned char *data, int profile, - int channels, int sample_rate, - int output_sample_rate, bool sbr); --bool MTX_DLL_API parse_aac_codec_id(const string &codec_id, int &id, -+bool MTX_DLL_API parse_aac_codec_id(const char *codec_id, int &id, - int &profile); - - #endif // __AACCOMMON_H diff --git a/multimedia/mmg/patches/patch-ad b/multimedia/mmg/patches/patch-ad deleted file mode 100644 index b48d30e032e..00000000000 --- a/multimedia/mmg/patches/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/02/05 23:45:36 salo Exp $ - ---- src/common/aac_common.cpp.orig Sat Jan 29 23:27:27 2005 -+++ src/common/aac_common.cpp Sat Jan 29 23:32:45 2005 -@@ -232,10 +232,10 @@ - } - - bool --parse_aac_codec_id(const string &codec_id, -+parse_aac_codec_id(const char *codec_id, - int &id, - int &profile) { -- if (codec_id.size() < strlen(MKV_A_AAC_2LC)) -+ if (strlen(codec_id) < strlen(MKV_A_AAC_2LC)) - return false; - - if (codec_id[10] == '2') diff --git a/multimedia/mmg/patches/patch-ae b/multimedia/mmg/patches/patch-ae deleted file mode 100644 index cfba51fd86d..00000000000 --- a/multimedia/mmg/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/02/05 23:45:36 salo Exp $ - ---- src/input/r_matroska.cpp.orig Sat Jan 29 23:33:37 2005 -+++ src/input/r_matroska.cpp Sat Jan 29 23:34:16 2005 -@@ -1668,7 +1668,7 @@ - id = 0; - profile = 0; - if (t->a_formattag == FOURCC('M', 'P', '4', 'A')) { -- if (!parse_aac_codec_id(string(t->codec_id), id, profile)) -+ if (!parse_aac_codec_id(t->codec_id, id, profile)) - mxerror(FMT_TID "Malformed codec id '%s'.\n", ti->fname, - (int64_t)t->tnum, t->codec_id); - } else { -- cgit v1.2.3