fix VCD playback

search for config files where we install them
bump PKGREVISION

9 files changed, 50 insertions, 9 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index c1e77de6224..63cfd383f51 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/28 07:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/01 12:51:48 dillo Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -43,6 +43,7 @@ DISTFILES+=	${SKINS}
 USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--enable-gui
 CONFIGURE_ARGS+=	--disable-mencoder
+CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin/gmplayer
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index d34da7f95af..744061ad334 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2002/10/01 07:31:51 abs Exp $
+$NetBSD: distinfo,v 1.16 2002/10/01 12:51:49 dillo Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre8.tar.bz2) = f61ec2af22f65a402bf8bfe93bd248298acca30f
 Size (mplayer/MPlayer-0.90pre8.tar.bz2) = 2692566 bytes
@@ -42,5 +42,6 @@ SHA1 (mplayer/CornerMP-aqua.tar.bz2) = f46260401e036f5529cdb6f2be4a555f0fa0ae74
 Size (mplayer/CornerMP-aqua.tar.bz2) = 247987 bytes
 SHA1 (mplayer/hwswskin.tar.bz2) = 2b5b59d2e91bfa5c01011773c71db0ab2b48edec
 Size (mplayer/hwswskin.tar.bz2) = 20275 bytes
-SHA1 (patch-aa) = abc450482c760e70d9998f33afb005d6749de2b2
+SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
+SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ac) = 2541883d43c4eb07eafb4f2f62b93a3bcbc4aa50
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index 12855948690..c7cf894f832 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/28 07:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/01 12:51:50 dillo Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -7,6 +7,7 @@ COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
 ALL_TARGET=	mencoder
 
diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo
index 3eb295c8c49..c7d77c19b61 100644
--- a/graphics/mencoder/distinfo
+++ b/graphics/mencoder/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/09/29 16:18:51 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/10/01 12:51:50 dillo Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre8.tar.bz2) = f61ec2af22f65a402bf8bfe93bd248298acca30f
 Size (mplayer/MPlayer-0.90pre8.tar.bz2) = 2692566 bytes
 SHA1 (patch-aa) = abc450482c760e70d9998f33afb005d6749de2b2
+SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ac) = 2541883d43c4eb07eafb4f2f62b93a3bcbc4aa50
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 6db63088f07..361ac4cb3fc 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2002/09/29 16:18:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2002/10/01 12:51:47 dillo Exp $
 
 MPLAYER_DIST_VERSION=	0.90pre8
+PKGREVISION=		1
 
 # There is no need to change anything below here.
 
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 69b22d7b8ca..4f620247684 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/09/29 16:18:50 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/10/01 12:51:47 dillo Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre8.tar.bz2) = f61ec2af22f65a402bf8bfe93bd248298acca30f
 Size (mplayer/MPlayer-0.90pre8.tar.bz2) = 2692566 bytes
@@ -9,4 +9,5 @@ Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes
 SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e
 Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes
 SHA1 (patch-aa) = abc450482c760e70d9998f33afb005d6749de2b2
+SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ac) = 2541883d43c4eb07eafb4f2f62b93a3bcbc4aa50
diff --git a/graphics/mplayer-share/patches/patch-ab b/graphics/mplayer-share/patches/patch-ab
new file mode 100644
index 00000000000..5ace9f38f41
--- /dev/null
+++ b/graphics/mplayer-share/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.5 2002/10/01 12:51:48 dillo Exp $
+
+--- libmpdemux/vcd_read_nbsd.h.orig	Tue Oct  1 13:24:26 2002
++++ libmpdemux/vcd_read_nbsd.h
+@@ -21,6 +21,20 @@ vcd_set_msf(unsigned int sect)
+   vcd_entry_data.addr.msf.minute = sect;
+ }
+ 
++static inline void
++vcd_inc_msf(void)
++{
++  vcd_entry_data.addr.msf.frame++;
++  if (vcd_entry_data.addr.msf.frame==75){
++    vcd_entry_data.addr.msf.frame=0;
++    vcd_entry_data.addr.msf.second++;
++    if (vcd_entry_data.addr.msf.second==60){
++      vcd_entry_data.addr.msf.second=0;
++      vcd_entry_data.addr.msf.minute++;
++    }
++  }
++}
++
+ static inline unsigned int 
+ vcd_get_msf()
+ {
+@@ -145,6 +159,7 @@ vcd_read(int fd, char *mem)
+ 	    sc.error);
+     return -1;
+   }
++  vcd_inc_msf();
+   return VCD_SECTOR_DATA;
+ }
+ 
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 05362c95b32..c139356f5b0 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/08/28 07:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/01 12:51:46 dillo Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -7,6 +7,7 @@ COMMENT=	Software only MPEG-1/2/4 video decoder
 
 USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--disable-mencoder
+CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index e1b0e9bfc6a..bf72a0468c8 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2002/09/29 16:18:49 wiz Exp $
+$NetBSD: distinfo,v 1.20 2002/10/01 12:51:46 dillo Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre8.tar.bz2) = f61ec2af22f65a402bf8bfe93bd248298acca30f
 Size (mplayer/MPlayer-0.90pre8.tar.bz2) = 2692566 bytes
 SHA1 (patch-aa) = abc450482c760e70d9998f33afb005d6749de2b2
+SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ac) = 2541883d43c4eb07eafb4f2f62b93a3bcbc4aa50