summaryrefslogtreecommitdiff
path: root/graphics/mplayer-share
diff options
context:
space:
mode:
authorveego <veego@pkgsrc.org>2002-08-07 12:53:04 +0000
committerveego <veego@pkgsrc.org>2002-08-07 12:53:04 +0000
commit62926a3a32933a6fabf95968fc8877a2f4e8b4d8 (patch)
tree99be794d7e8c9ad24a816e4570c59cc9b05078a8 /graphics/mplayer-share
parent9cabd583413b42004c5baff5090192a10db172b5 (diff)
downloadpkgsrc-62926a3a32933a6fabf95968fc8877a2f4e8b4d8.tar.gz
Update from 0.90pre5 (rc5) to 0.90pre6 (rc6).
Local changes: - Restore the dependency to win32codecs which was lost 4 month ago (Hi Rene) - Depends on audio/realplayer if MPLAYER_USE_REALMEDIA is set to YES - Add a patch which was commited after the release to fix crashes while muting the sound. Changelog: - WMV1, Sorenson v1 (SVQ1) and RealPlayer 8.0 (RV20/30, Cook) codecs support - libavcodec M1 direct rendering, IPB support with Xv - libavcodec improvements, bugfixes - both encoder & decoder side - Raw DV demuxer, libdv-based DV audio/video decoder - Various MOV/MP4, RM and ASF/WMV demuxer bugfixes, improvements - Detection of AVI files which needs -ni, workaround for some Nandub bugs - Support for live.com RTP/RTSP streaming libraries - Support to rip DVD subs in VobSub format, bugfixes of mpsub/srt converter - Closed Captioning (ascii subs on RC1 DVDs) support - Massive directfb updates - Vidix fixes/updates, including fixes of all known radeon bugs - dithered 1/4/8 bpp support with -vo svga (EGA rulez:)) - AO: alsa9 fixes/improvements, native ARTS driver - various endianess and 64-bit fixes, including mencoder and -ao pcm - tons of small compatibility/portability fixes, better cygwin, darwin support - GUI fixes, new features - playlist, audio/video equalizer, preferences - Skins: fixed many small glitches, few new skins - 'mencvcd' script - helps creating VCD/SVCD with mencoder - html DOCS updates, manpage & README restructured (again :))
Diffstat (limited to 'graphics/mplayer-share')
-rw-r--r--graphics/mplayer-share/Makefile3
-rw-r--r--graphics/mplayer-share/Makefile.common7
-rw-r--r--graphics/mplayer-share/Makefile.depends9
-rw-r--r--graphics/mplayer-share/PLIST20
-rw-r--r--graphics/mplayer-share/distinfo8
-rw-r--r--graphics/mplayer-share/patches/patch-ab42
6 files changed, 43 insertions, 46 deletions
diff --git a/graphics/mplayer-share/Makefile b/graphics/mplayer-share/Makefile
index 0d07515b916..7ddae080c15 100644
--- a/graphics/mplayer-share/Makefile
+++ b/graphics/mplayer-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/25 07:51:22 veego Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/07 12:53:06 veego Exp $
.include "Makefile.common"
@@ -29,6 +29,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/font
${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
+ ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${PREFIX}/share/mplayer
${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/mplayer
@${ECHO_MSG} "Installing font ${MPLAYER_FONT}..."
(cd ${WRKDIR}/${MPLAYER_FONT}; ${PAX} -rwpp . ${PREFIX}/share/mplayer/font)
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 2b16f45f237..513915142a1 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.6 2002/08/04 08:44:47 veego Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/08/07 12:53:06 veego Exp $
-MPLAYER_DIST_VERSION= 0.90pre5
+MPLAYER_DIST_VERSION= 0.90pre6
# There is no need to change anything below here.
@@ -54,4 +54,7 @@ CONFIGURE_ENV+= TMPDIR=${WRKDIR}
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32"
+.if ${MPLAYER_USE_REALMEDIA} == "YES"
+CONFIGURE_ARGS+= --with-reallibdir="${LOCALBASE}/lib/RealPlayer8/Codecs"
+.endif
.endif
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 38c6e6d26c4..614cd721009 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.2 2002/08/04 08:43:57 veego Exp $
+# $NetBSD: Makefile.depends,v 1.3 2002/08/07 12:53:06 veego Exp $
DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share
@@ -6,6 +6,13 @@ DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:.
.include "../../devel/binutils/buildlink.mk"
.endif
+.if ${MACHINE_ARCH} == "i386"
+DEPENDS+= win32-codecs>=011227:../../graphics/win32-codecs
+.if ${MPLAYER_USE_REALMEDIA} == "YES"
+DEPENDS+= realplayer>=8:../../audio/realplayer
+.endif
+.endif
+
.include "../../audio/mad/buildlink.mk"
.include "../../devel/SDL/buildlink.mk"
.include "../../graphics/jpeg/buildlink.mk"
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index 42ca303ccff..b1a6003a8db 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/08 23:41:56 veego Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/07 12:53:06 veego Exp $
man/man1/mplayer.1
-share/mplayer/DOCS/DVB
-share/mplayer/DOCS/DXR3
share/mplayer/DOCS/French/bugreports.html
share/mplayer/DOCS/French/cd-dvd.html
share/mplayer/DOCS/French/codecs.html
@@ -14,11 +12,11 @@ share/mplayer/DOCS/French/video.html
share/mplayer/DOCS/German/bugreports.html
share/mplayer/DOCS/German/cd-dvd.html
share/mplayer/DOCS/German/codecs.html
+share/mplayer/DOCS/German/default.css
share/mplayer/DOCS/German/documentation.html
share/mplayer/DOCS/German/encoding.html
share/mplayer/DOCS/German/faq.html
share/mplayer/DOCS/German/formats.html
-share/mplayer/DOCS/German/mencoder.1
share/mplayer/DOCS/German/mplayer.1
share/mplayer/DOCS/German/sound.html
share/mplayer/DOCS/German/video.html
@@ -37,6 +35,7 @@ share/mplayer/DOCS/Hungarian/video.html
share/mplayer/DOCS/Italian/bugreports.html
share/mplayer/DOCS/Italian/cd-dvd.html
share/mplayer/DOCS/Italian/codecs.html
+share/mplayer/DOCS/Italian/default.css
share/mplayer/DOCS/Italian/documentation.html
share/mplayer/DOCS/Italian/encoding.html
share/mplayer/DOCS/Italian/faq.html
@@ -65,6 +64,7 @@ share/mplayer/DOCS/bugreports.html
share/mplayer/DOCS/cd-dvd.html
share/mplayer/DOCS/codecs-in.html
share/mplayer/DOCS/codecs.html
+share/mplayer/DOCS/default.css
share/mplayer/DOCS/documentation.html
share/mplayer/DOCS/encoding.html
share/mplayer/DOCS/faq.html
@@ -80,8 +80,10 @@ share/mplayer/DOCS/tech/cvs-howto.txt
share/mplayer/DOCS/tech/dr-methods.txt
share/mplayer/DOCS/tech/formats-hun.txt
share/mplayer/DOCS/tech/formats.txt
+share/mplayer/DOCS/tech/general.txt
share/mplayer/DOCS/tech/hwac3.txt
-share/mplayer/DOCS/tech/libavc-rate-control.txt
+share/mplayer/DOCS/tech/libao2.txt
+share/mplayer/DOCS/tech/libavc-options.txt
share/mplayer/DOCS/tech/libvo.txt
share/mplayer/DOCS/tech/libvo2.txt
share/mplayer/DOCS/tech/mpsub.sub
@@ -90,10 +92,16 @@ share/mplayer/DOCS/tech/patches.txt
share/mplayer/DOCS/tech/playtree
share/mplayer/DOCS/tech/playtree-hun
share/mplayer/DOCS/tech/porting-status.txt
+share/mplayer/DOCS/tech/realcodecs/TODO
+share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
+share/mplayer/DOCS/tech/realcodecs/streaming.txt
+share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
share/mplayer/DOCS/tech/subcp.txt
-share/mplayer/DOCS/tech/tech-eng.txt
+share/mplayer/DOCS/tech/swscaler_filters.txt
+share/mplayer/DOCS/tech/swscaler_methods.txt
share/mplayer/DOCS/tech/vidix.txt
share/mplayer/DOCS/tech/vop.txt
share/mplayer/DOCS/users_against_developers.html
share/mplayer/DOCS/video.html
share/mplayer/codecs.conf
+share/mplayer/input.conf
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index cb70bc0aa65..ecc692eba91 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/06/11 23:22:43 fredb Exp $
+$NetBSD: distinfo,v 1.4 2002/08/07 12:53:06 veego Exp $
-SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
-Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
+SHA1 (mplayer/MPlayer-0.90pre6.tar.bz2) = 487cea09f024191ec7f632292ede1eb33bc931c4
+Size (mplayer/MPlayer-0.90pre6.tar.bz2) = 2599258 bytes
SHA1 (mplayer/mp-arial-iso-8859-1.zip) = 535809c2745d5dfa79d1243cbe225ee030e626ac
Size (mplayer/mp-arial-iso-8859-1.zip) = 272659 bytes
SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d3
@@ -9,4 +9,4 @@ 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) = 2c1c6f35caf047f188871ac223d672ce453c26ec
-SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e
+SHA1 (patch-ab) = c33fad66529a98cc7eaf9c34fe1c563b9c94ae3c
diff --git a/graphics/mplayer-share/patches/patch-ab b/graphics/mplayer-share/patches/patch-ab
index 9b26eec9fe0..4957429ed73 100644
--- a/graphics/mplayer-share/patches/patch-ab
+++ b/graphics/mplayer-share/patches/patch-ab
@@ -1,34 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2002/06/11 23:22:43 fredb Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/07 12:53:07 veego Exp $
---- libao2/ao_sun.c.orig Mon Apr 29 03:47:30 2002
-+++ libao2/ao_sun.c
-@@ -445,13 +445,19 @@
+--- mplayer.c.orig Mon Aug 5 20:37:14 2002
++++ mplayer.c Wed Aug 7 13:51:30 2002
+@@ -2392,6 +2392,7 @@
+ } break;
+ case MP_CMD_MUTE: {
+ mixer_mute();
++ break;
}
- #endif
-
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
- ioctl(audio_fd, AUDIO_GETINFO, &info);
- if (queued_bursts - info.play.eof > 2)
- return 0;
- #endif
-
-+#if defined(__NetBSD__)
-+ ioctl(audio_fd, AUDIO_GETINFO, &info);
-+ return info.hiwat * info.blocksize - info.play.seek;
-+#else
- return ao_data.outburst;
-+#endif
-+
- }
-
- // plays 'len' bytes of 'data'
-@@ -507,7 +513,7 @@
- static float get_delay(){
- audio_info_t info;
- ioctl(audio_fd, AUDIO_GETINFO, &info);
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- return (float) info.play.seek/ (float)byte_per_sec ;
- #else
- if (info.play.samples && enable_sample_timing == RTSC_ENABLED)
+ case MP_CMD_LOADFILE : {
+ play_tree_t* e = play_tree_new();