summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2005-10-29 01:43:18 +0000
committergrant <grant@pkgsrc.org>2005-10-29 01:43:18 +0000
commit2a1935046b4ba283738c00321c9a34d91169e0cf (patch)
treeecb3deeaddec190ad62fff8fcb76b8d1cffc9bf4
parentb96956f8ca815450f07f18eadcdaab4485afefe7 (diff)
downloadpkgsrc-2a1935046b4ba283738c00321c9a34d91169e0cf.tar.gz
remove more breakage introduced by NetBSD fixes...
-rw-r--r--multimedia/libmpeg3/distinfo4
-rw-r--r--multimedia/libmpeg3/patches/patch-ab14
2 files changed, 11 insertions, 7 deletions
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index 44386b544c3..287310ebe81 100644
--- a/multimedia/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/10/29 01:36:42 grant Exp $
+$NetBSD: distinfo,v 1.7 2005/10/29 01:43:18 grant Exp $
SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd
Size (libmpeg3-1.3.tar.gz) = 154062 bytes
SHA1 (patch-aa) = 88e1c193bb00056f757830c98f6bbbc58c1b16da
-SHA1 (patch-ab) = 844cfcbd99269f1f0b4bef76e0a8567522070707
+SHA1 (patch-ab) = 3223b9f7d81dd73eec6767f9e1bb2cb26b4bcd80
SHA1 (patch-ac) = 68576efb30a0d6f4cfe23fd543a04c4f3ada8936
SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
SHA1 (patch-ae) = 411443571371b2f964ab6408ee5be217f8ca7896
diff --git a/multimedia/libmpeg3/patches/patch-ab b/multimedia/libmpeg3/patches/patch-ab
index 1a3e8b09b94..b04eb8c58b4 100644
--- a/multimedia/libmpeg3/patches/patch-ab
+++ b/multimedia/libmpeg3/patches/patch-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2004/06/26 18:00:21 grant Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/29 01:43:18 grant Exp $
---- mpeg3css.c.orig Tue Jul 31 17:16:17 2001
-+++ mpeg3css.c Tue Jul 31 17:16:44 2001
-@@ -45,7 +45,7 @@
+--- mpeg3css.c.orig 2001-05-20 13:05:26.000000000 +1000
++++ mpeg3css.c
+@@ -45,7 +45,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <linux/cdrom.h>
-+#include <sys/dvdio.h>
++#ifdef __linux__
++# include <linux/cdrom.h>
++#else
++# include <sys/dvdio.h>
++#endif
#ifndef FIBMAP
#define FIBMAP _IO(0x00,1) /* bmap access */