summaryrefslogtreecommitdiff
path: root/multimedia/mkvtoolnix
diff options
context:
space:
mode:
authorkristerw <kristerw>2004-07-22 17:47:18 +0000
committerkristerw <kristerw>2004-07-22 17:47:18 +0000
commit1a18051319330c4b7440abf7874c2a59f9934fec (patch)
treea252dcded19fccf569f41ccdb6bf4b408b2a536c /multimedia/mkvtoolnix
parent41fbaa7ed989e5fd4dba91af61959a3323aabc03 (diff)
downloadpkgsrc-1a18051319330c4b7440abf7874c2a59f9934fec.tar.gz
Fix invalid use of preprocessing directive within macro arguments,
to make this compile when using gcc 2.95.
Diffstat (limited to 'multimedia/mkvtoolnix')
-rw-r--r--multimedia/mkvtoolnix/distinfo4
-rw-r--r--multimedia/mkvtoolnix/patches/patch-ab45
2 files changed, 41 insertions, 8 deletions
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 90e8af3246f..c76bc04af52 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/07/21 00:04:30 salo Exp $
+$NetBSD: distinfo,v 1.8 2004/07/22 17:47:18 kristerw Exp $
SHA1 (mkvtoolnix-0.9.3.tar.bz2) = e8bec87e212ee4e691077ba53507e0e11238bf18
Size (mkvtoolnix-0.9.3.tar.bz2) = 494512 bytes
SHA1 (patch-aa) = a7ffe453a5d6c1881b2c62e8e2a5c1f59d82c6c1
-SHA1 (patch-ab) = 0d02fbb4c53d140b3c9c7b16b063f2d3a63fe7d2
+SHA1 (patch-ab) = 453e82e85046f6f08cb49cf0e62597d276f80050
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
index c9165a2c1cb..ba44cb2f6b1 100644
--- a/multimedia/mkvtoolnix/patches/patch-ab
+++ b/multimedia/mkvtoolnix/patches/patch-ab
@@ -1,8 +1,41 @@
-$NetBSD: patch-ab,v 1.1 2004/07/21 00:04:30 salo Exp $
+$NetBSD: patch-ab,v 1.2 2004/07/22 17:47:18 kristerw Exp $
---- src/mkvinfo.cpp.orig 2004-07-18 18:08:45.000000000 +0200
-+++ src/mkvinfo.cpp 2004-07-21 01:08:15.000000000 +0200
-@@ -786,6 +786,10 @@
+--- src/mkvinfo.cpp.orig Sun Jul 18 18:08:45 2004
++++ src/mkvinfo.cpp Thu Jul 22 19:32:58 2004
+@@ -134,12 +134,11 @@
+
+ void
+ usage() {
++#ifdef HAVE_WXWINDOWS
+ mxinfo(_(
+ "Usage: mkvinfo [options] inname\n\n"
+ " options:\n"
+-#ifdef HAVE_WXWINDOWS
+ " -g, --gui Start the GUI (and open inname if it was given).\n"
+-#endif
+ " inname Use 'inname' as the source.\n"
+ " -v, --verbose Increase verbosity. See the man page for a detailed\n"
+ " description of what mkvinfo outputs.\n"
+@@ -147,6 +146,18 @@
+ " -s, --summary Only show summaries of the contents, not each element.\n"
+ " -h, --help Show this help.\n"
+ " -V, --version Show version information.\n"));
++#else
++ mxinfo(_(
++ "Usage: mkvinfo [options] inname\n\n"
++ " options:\n"
++ " inname Use 'inname' as the source.\n"
++ " -v, --verbose Increase verbosity. See the man page for a detailed\n"
++ " description of what mkvinfo outputs.\n"
++ " -c, --checksum Calculate and display checksums of frame contents.\n"
++ " -s, --summary Only show summaries of the contents, not each element.\n"
++ " -h, --help Show this help.\n"
++ " -V, --version Show version information.\n"));
++#endif
+ }
+
+ string
+@@ -786,6 +797,10 @@
vector<string> &summary) {
EbmlMaster *m3;
int i3;
@@ -13,7 +46,7 @@ $NetBSD: patch-ab,v 1.1 2004/07/21 00:04:30 salo Exp $
show_element(l3, 3, "Audio track");
-@@ -1393,6 +1397,10 @@
+@@ -1393,6 +1408,10 @@
def_handle(cues) {
EbmlMaster *m1, *m2, *m3;
int i1, i2, i3;
@@ -24,7 +57,7 @@ $NetBSD: patch-ab,v 1.1 2004/07/21 00:04:30 salo Exp $
if (verbose < 2) {
show_element(l1, 1, "Cues (subentries will be skipped)");
-@@ -1571,6 +1579,9 @@
+@@ -1571,6 +1590,9 @@
bool fref_found, bref_found;
uint32_t lf_tnum;
uint64_t lf_timecode;