[pkgsrc/trunk]: pkgsrc/multimedia/libmpeg3 remove more breakage introduced by...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ff3126b41e6
branches:  trunk
changeset: 501782:0ff3126b41e6
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Oct 29 01:43:18 2005 +0000

description:
remove more breakage introduced by NetBSD fixes...

diffstat:

 multimedia/libmpeg3/distinfo         |   4 ++--
 multimedia/libmpeg3/patches/patch-ab |  14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r c3b40a63522a -r 0ff3126b41e6 multimedia/libmpeg3/distinfo
--- a/multimedia/libmpeg3/distinfo      Sat Oct 29 01:36:42 2005 +0000
+++ b/multimedia/libmpeg3/distinfo      Sat Oct 29 01:43:18 2005 +0000
@@ -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 -r c3b40a63522a -r 0ff3126b41e6 multimedia/libmpeg3/patches/patch-ab
--- a/multimedia/libmpeg3/patches/patch-ab      Sat Oct 29 01:36:42 2005 +0000
+++ b/multimedia/libmpeg3/patches/patch-ab      Sat Oct 29 01:43:18 2005 +0000
@@ -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 */