[pkgsrc/trunk]: pkgsrc/multimedia Add a patch for better VCD support from Ser...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08c44574073b
branches:  trunk
changeset: 548641:08c44574073b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Oct 20 07:40:00 2008 +0000

description:
Add a patch for better VCD support from Sergey Svishchev.
Fixes PR 20549.

diffstat:

 multimedia/gmplayer/Makefile              |   4 +-
 multimedia/gmplayer/distinfo              |   4 ++-
 multimedia/mencoder/Makefile              |   5 +--
 multimedia/mplayer-share/distinfo         |   3 +-
 multimedia/mplayer-share/patches/patch-an |  37 +++++++++++++++++++++++++++++++
 multimedia/mplayer/Makefile               |   4 +-
 6 files changed, 48 insertions(+), 9 deletions(-)

diffs (121 lines):

diff -r a069aea869f4 -r 08c44574073b multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Mon Oct 20 07:21:32 2008 +0000
+++ b/multimedia/gmplayer/Makefile      Mon Oct 20 07:40:00 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2008/10/02 12:32:41 tron Exp $
+# $NetBSD: Makefile,v 1.72 2008/10/20 07:40:00 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 
 BROKEN_IN=             pkgsrc-2006Q4
 
diff -r a069aea869f4 -r 08c44574073b multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Mon Oct 20 07:21:32 2008 +0000
+++ b/multimedia/gmplayer/distinfo      Mon Oct 20 07:40:00 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2008/09/12 19:41:57 abs Exp $
+$NetBSD: distinfo,v 1.58 2008/10/20 07:40:00 wiz Exp $
 
 SHA1 (gmplayer-1.0rc10-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (gmplayer-1.0rc10-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -75,6 +75,8 @@
 SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527
 SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58
 SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d
+SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e
+SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73
 SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e
 SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
 SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
diff -r a069aea869f4 -r 08c44574073b multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Mon Oct 20 07:21:32 2008 +0000
+++ b/multimedia/mencoder/Makefile      Mon Oct 20 07:40:00 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2008/10/02 12:32:42 tron Exp $
+# $NetBSD: Makefile,v 1.40 2008/10/20 07:40:00 wiz Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
-
-PKGREVISION=   3
+PKGREVISION=   4
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
diff -r a069aea869f4 -r 08c44574073b multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Mon Oct 20 07:21:32 2008 +0000
+++ b/multimedia/mplayer-share/distinfo Mon Oct 20 07:40:00 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2008/10/02 12:32:41 tron Exp $
+$NetBSD: distinfo,v 1.55 2008/10/20 07:40:00 wiz Exp $
 
 SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
 RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
@@ -16,6 +16,7 @@
 SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58
 SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d
 SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e
+SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73
 SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e
 SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
 SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
diff -r a069aea869f4 -r 08c44574073b multimedia/mplayer-share/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-an Mon Oct 20 07:40:00 2008 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $
+
+--- stream/vcd_read_fbsd.h.orig        2007-10-07 19:49:26.000000000 +0000
++++ stream/vcd_read_fbsd.h
+@@ -37,9 +37,8 @@ typedef struct mp_vcd_priv_st {
+   vcd_tocentry entry;
+ #ifdef VCD_NETBSD
+   struct cd_toc_entry entry_data;
+-#else
+-  cdsector_t buf;
+ #endif
++  cdsector_t buf;
+ } mp_vcd_priv_t;
+ 
+ static inline void
+@@ -208,8 +207,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
+   sc.cmd[9] = 1 << 4; // user data only
+   sc.cmd[10] = 0;     // no subchannel
+   sc.cmdlen = 12;
+-  sc.databuf = (caddr_t) mem;
+-  sc.datalen = 2328;
++  sc.databuf = (caddr_t) vcd->buf.data;
++  sc.datalen = VCD_SECTOR_DATA + 4;    // MMC-3 spec says there are 4 extra bytes
+   sc.senselen = sizeof(sc.sense);
+   sc.flags = SCCMD_READ;
+   sc.timeout = 10000;
+@@ -226,9 +225,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
+ #else
+   if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
+      != VCD_SECTOR_SIZE) return 0;  // EOF?
++#endif
+ 
+   memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
+-#endif
+   vcd_inc_msf(vcd);
+   return VCD_SECTOR_DATA;
+ }
diff -r a069aea869f4 -r 08c44574073b multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Mon Oct 20 07:21:32 2008 +0000
+++ b/multimedia/mplayer/Makefile       Mon Oct 20 07:40:00 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2008/10/02 12:32:41 tron Exp $
+# $NetBSD: Makefile,v 1.62 2008/10/20 07:40:00 wiz Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   8
+PKGREVISION=   9
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder