diff options
| -rw-r--r-- | multimedia/gmplayer/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gmplayer/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mencoder/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-an | 37 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 4 |
6 files changed, 48 insertions, 9 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index ff2aa63620b..87f1046b3c0 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -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 --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index 5399237ddad..1d1ced4b5a4 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -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-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988 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 --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 05de85c55a3..e97f609e9b8 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -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 --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index be809912c37..b1b0b767ad0 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -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-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 --git a/multimedia/mplayer-share/patches/patch-an b/multimedia/mplayer-share/patches/patch-an new file mode 100644 index 00000000000..027895e4ead --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-an @@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 6fc89ed6bc8..40c5a971c43 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 |