summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/mpeg4ip/Makefile4
-rw-r--r--multimedia/mpeg4ip/PLIST4
-rw-r--r--multimedia/mpeg4ip/distinfo4
-rw-r--r--multimedia/mpeg4ip/patches/patch-ai24
-rw-r--r--multimedia/mpeg4ip/patches/patch-aj14
5 files changed, 44 insertions, 6 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index e46972a087a..bf7f03b4754 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/10/03 12:55:32 tron Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/05 19:35:46 rillig Exp $
DISTNAME= mpeg4ip-1.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/}
diff --git a/multimedia/mpeg4ip/PLIST b/multimedia/mpeg4ip/PLIST
index 893e4b1be40..cef5c7367b0 100644
--- a/multimedia/mpeg4ip/PLIST
+++ b/multimedia/mpeg4ip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/03 12:55:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/05 19:35:46 rillig Exp $
bin/avi2raw
bin/avidump
bin/h264_parse
@@ -196,6 +196,4 @@ man/man3/MP4SetVerbosity.3
man/man3/MP4SetVideoProfileLevel.3
man/man3/MP4WriteRtpHint.3
man/man3/MP4WriteSample.3
-man/manm/api.mpt
-@dirrm man/manm
@dirrm lib/mp4player_plugin
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index 95dda7bf4f3..986aced8656 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/10/25 23:18:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2007/01/05 19:35:46 rillig Exp $
SHA1 (mpeg4ip-1.5.tar.gz) = 32b5c1220fffa386da3efb50bde936990e0a472b
RMD160 (mpeg4ip-1.5.tar.gz) = 98823860a4c3f2d49299f920661f1bd2b08a0673
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111
SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85
SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1
SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d
+SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e
+SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7
diff --git a/multimedia/mpeg4ip/patches/patch-ai b/multimedia/mpeg4ip/patches/patch-ai
new file mode 100644
index 00000000000..811e2db7e29
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1 2007/01/05 19:35:46 rillig Exp $
+
+Tags: for-upstream
+
+--- doc/mp4v2/Makefile.am.orig 2003-02-06 20:15:04.000000000 +0100
++++ doc/mp4v2/Makefile.am 2007-01-05 18:20:54.000000000 +0100
+@@ -1,5 +1,4 @@
+-this_FILES = \
+- api.mpt \
++man_MANS = \
+ MP4.3 \
+ MP4AddAudioTrack.3 \
+ MP4AddHintTrack.3 \
+@@ -109,7 +108,6 @@ this_FILES = \
+ MP4WriteRtpHint.3 \
+ MP4WriteSample.3
+
+-
+-man_MANS = $(this_FILES)
+-
+-EXTRA_DIST = $(this_FILES)
++EXTRA_DIST = \
++ api.mpt \
++ $(this_FILES)
diff --git a/multimedia/mpeg4ip/patches/patch-aj b/multimedia/mpeg4ip/patches/patch-aj
new file mode 100644
index 00000000000..96262d41868
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2007/01/05 19:35:46 rillig Exp $
+
+Tags: not-for-upstream
+
+--- doc/mp4v2/Makefile.in.orig 2007-01-05 18:21:23.000000000 +0100
++++ doc/mp4v2/Makefile.in 2007-01-05 18:21:29.000000000 +0100
+@@ -231,7 +231,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ this_FILES = \
+- api.mpt \
+ MP4.3 \
+ MP4AddAudioTrack.3 \
+ MP4AddHintTrack.3 \