From d8bca2c4c7361820bd313f1c4054e6c5c09525f4 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Sat, 5 Feb 2005 23:45:36 +0000
Subject: Add kristerw@'s patches from multimedia/mkvtoolnix. Fixes build with
 gcc2.

---
 multimedia/mmg/distinfo         |  5 ++++-
 multimedia/mmg/patches/patch-ac | 13 +++++++++++++
 multimedia/mmg/patches/patch-ad | 17 +++++++++++++++++
 multimedia/mmg/patches/patch-ae | 13 +++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/mmg/patches/patch-ac
 create mode 100644 multimedia/mmg/patches/patch-ad
 create mode 100644 multimedia/mmg/patches/patch-ae

(limited to 'multimedia')

diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
index df35b949915..d220a2197ed 100644
--- a/multimedia/mmg/distinfo
+++ b/multimedia/mmg/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.11 2004/12/15 13:53:09 salo Exp $
+$NetBSD: distinfo,v 1.12 2005/02/05 23:45:36 salo Exp $
 
 SHA1 (mkvtoolnix-1.0.1.tar.bz2) = 67551f7d86314e55cb250ff44a58e1c3b39236d0
 Size (mkvtoolnix-1.0.1.tar.bz2) = 523644 bytes
 SHA1 (patch-aa) = 19177b4a75ed8a27b746e2d1825c23fe59f95a77
 SHA1 (patch-ab) = 43b0aaccc6c18da2a2fca6384ea118239c912795
+SHA1 (patch-ac) = 104355ded3f3e1050070135d8c25db0d772b27f7
+SHA1 (patch-ad) = 74bbf8f9a092446af43253b9f7658890adf507d0
+SHA1 (patch-ae) = 0bef3efaed92455b784585b8c7195325043509de
diff --git a/multimedia/mmg/patches/patch-ac b/multimedia/mmg/patches/patch-ac
new file mode 100644
index 00000000000..2d2fb05ff43
--- /dev/null
+++ b/multimedia/mmg/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..b48d30e032e
--- /dev/null
+++ b/multimedia/mmg/patches/patch-ad
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..cfba51fd86d
--- /dev/null
+++ b/multimedia/mmg/patches/patch-ae
@@ -0,0 +1,13 @@
+$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