diff options
Diffstat (limited to 'multimedia/mplayer-share')
| -rw-r--r-- | multimedia/mplayer-share/Makefile.common | 22 | ||||
| -rw-r--r-- | multimedia/mplayer-share/Makefile.depends | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/PLIST | 26 | ||||
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 25 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 37 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ab | 18 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ac | 13 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ad | 12 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ae | 42 |
9 files changed, 67 insertions, 132 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index b499067811a..d3d00fc5abc 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.6 2004/04/10 12:23:55 salo Exp $ +# $NetBSD: Makefile.common,v 1.7 2004/04/28 15:54:46 wiz Exp $ # -MPLAYER_DIST_VERSION= 1.0pre3 +MPLAYER_DIST_VERSION= 1.0pre4 # This variable is used in all packages which depend on this package -MPLAYER_PKG_VERSION= 1.0rc3 +MPLAYER_PKG_VERSION= 1.0rc4 DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} CATEGORIES?= multimedia @@ -68,11 +68,11 @@ CONFIGURE_ARGS+= --disable-mlib # Keep this list in sync with the one in bsd.pkg.defaults.mk, where # MPLAYER_DISABLE_DRIVERS is explained. -MPLAYER_DRIVERS= arts audio/arts \ - esd audio/esound \ - matroska multimedia/libmatroska \ - nas audio/nas \ - sdl devel/SDL +MPLAYER_DRIVERS= arts audio/arts arts \ + esd audio/esound esd \ + matroska multimedia/libmatroska external-matroska \ + nas audio/nas nas \ + sdl devel/SDL sdl # arts is currently broken on Solaris. .if ${OPSYS} == "SunOS" @@ -84,10 +84,10 @@ MPLAYER_DISABLE_DRIVERS=arts esd matroska nas sdl .else BUILD_DEFS+= MPLAYER_DISABLE_DRIVERS .endif -.for drv pkg in ${MPLAYER_DRIVERS} +.for drv pkg val in ${MPLAYER_DRIVERS} . if empty(MPLAYER_DISABLE_DRIVERS:M${drv}) -CONFIGURE_ARGS+= --enable-${drv} +CONFIGURE_ARGS+= --enable-${val} . else -CONFIGURE_ARGS+= --disable-${drv} +CONFIGURE_ARGS+= --disable-${val} . endif .endfor diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends index d3df21b7673..160a8feca2c 100644 --- a/multimedia/mplayer-share/Makefile.depends +++ b/multimedia/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.7 2004/04/10 12:23:55 salo Exp $ +# $NetBSD: Makefile.depends,v 1.8 2004/04/28 15:54:46 wiz Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share @@ -23,7 +23,7 @@ DEPENDS+= realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs USE_X11= YES -.for drv pkg in ${MPLAYER_DRIVERS} +.for drv pkg val in ${MPLAYER_DRIVERS} . if empty(MPLAYER_DISABLE_DRIVERS:M${drv}) . include "../../${pkg}/buildlink3.mk" . endif diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST index febd75ac187..70cd6b16472 100644 --- a/multimedia/mplayer-share/PLIST +++ b/multimedia/mplayer-share/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:06:41 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/04/28 15:54:46 wiz Exp $ man/man1/mplayer.1 +share/mplayer/DOCS/HTML/en/amiga.html share/mplayer/DOCS/HTML/en/aspect.html share/mplayer/DOCS/HTML/en/bsd.html share/mplayer/DOCS/HTML/en/bugreports.html @@ -28,6 +29,7 @@ share/mplayer/DOCS/HTML/en/gcc-296.html share/mplayer/DOCS/HTML/en/gui.html share/mplayer/DOCS/HTML/en/history.html share/mplayer/DOCS/HTML/en/howtoread.html +share/mplayer/DOCS/HTML/en/hpux.html share/mplayer/DOCS/HTML/en/index.html share/mplayer/DOCS/HTML/en/install.html share/mplayer/DOCS/HTML/en/intro.html @@ -37,6 +39,7 @@ share/mplayer/DOCS/HTML/en/linux.html share/mplayer/DOCS/HTML/en/macos.html share/mplayer/DOCS/HTML/en/mailinglists.html share/mplayer/DOCS/HTML/en/menc-feat-divx4.html +share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html @@ -44,6 +47,7 @@ share/mplayer/DOCS/HTML/en/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html share/mplayer/DOCS/HTML/en/menc-feat-rescale.html share/mplayer/DOCS/HTML/en/menc-feat-streamcopy.html +share/mplayer/DOCS/HTML/en/menc-feat-telecine.html share/mplayer/DOCS/HTML/en/mencoder.html share/mplayer/DOCS/HTML/en/mplayer-binary.html share/mplayer/DOCS/HTML/en/mpst.html @@ -65,6 +69,7 @@ share/mplayer/DOCS/HTML/en/usage.html share/mplayer/DOCS/HTML/en/users-vs-dev.html share/mplayer/DOCS/HTML/en/vcd.html share/mplayer/DOCS/HTML/en/windows.html +share/mplayer/DOCS/HTML/es/amiga.html share/mplayer/DOCS/HTML/es/aspect.html share/mplayer/DOCS/HTML/es/bsd.html share/mplayer/DOCS/HTML/es/bugreports.html @@ -93,6 +98,7 @@ share/mplayer/DOCS/HTML/es/gcc-296.html share/mplayer/DOCS/HTML/es/gui.html share/mplayer/DOCS/HTML/es/history.html share/mplayer/DOCS/HTML/es/howtoread.html +share/mplayer/DOCS/HTML/es/hpux.html share/mplayer/DOCS/HTML/es/index.html share/mplayer/DOCS/HTML/es/install.html share/mplayer/DOCS/HTML/es/intro.html @@ -102,6 +108,7 @@ share/mplayer/DOCS/HTML/es/linux.html share/mplayer/DOCS/HTML/es/macos.html share/mplayer/DOCS/HTML/es/mailinglists.html share/mplayer/DOCS/HTML/es/menc-feat-divx4.html +share/mplayer/DOCS/HTML/es/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/es/menc-feat-enc-images.html share/mplayer/DOCS/HTML/es/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/es/menc-feat-extractsub.html @@ -109,6 +116,7 @@ share/mplayer/DOCS/HTML/es/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/es/menc-feat-mpeg.html share/mplayer/DOCS/HTML/es/menc-feat-rescale.html share/mplayer/DOCS/HTML/es/menc-feat-streamcopy.html +share/mplayer/DOCS/HTML/es/menc-feat-telecine.html share/mplayer/DOCS/HTML/es/mencoder.html share/mplayer/DOCS/HTML/es/mplayer-binary.html share/mplayer/DOCS/HTML/es/mpst.html @@ -130,6 +138,7 @@ share/mplayer/DOCS/HTML/es/usage.html share/mplayer/DOCS/HTML/es/users-vs-dev.html share/mplayer/DOCS/HTML/es/vcd.html share/mplayer/DOCS/HTML/es/windows.html +share/mplayer/DOCS/HTML/fr/amiga.html share/mplayer/DOCS/HTML/fr/aspect.html share/mplayer/DOCS/HTML/fr/bsd.html share/mplayer/DOCS/HTML/fr/bugreports.html @@ -158,6 +167,7 @@ share/mplayer/DOCS/HTML/fr/gcc-296.html share/mplayer/DOCS/HTML/fr/gui.html share/mplayer/DOCS/HTML/fr/history.html share/mplayer/DOCS/HTML/fr/howtoread.html +share/mplayer/DOCS/HTML/fr/hpux.html share/mplayer/DOCS/HTML/fr/index.html share/mplayer/DOCS/HTML/fr/install.html share/mplayer/DOCS/HTML/fr/intro.html @@ -167,6 +177,7 @@ share/mplayer/DOCS/HTML/fr/linux.html share/mplayer/DOCS/HTML/fr/macos.html share/mplayer/DOCS/HTML/fr/mailinglists.html share/mplayer/DOCS/HTML/fr/menc-feat-divx4.html +share/mplayer/DOCS/HTML/fr/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/fr/menc-feat-enc-images.html share/mplayer/DOCS/HTML/fr/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/fr/menc-feat-extractsub.html @@ -174,6 +185,7 @@ share/mplayer/DOCS/HTML/fr/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/fr/menc-feat-mpeg.html share/mplayer/DOCS/HTML/fr/menc-feat-rescale.html share/mplayer/DOCS/HTML/fr/menc-feat-streamcopy.html +share/mplayer/DOCS/HTML/fr/menc-feat-telecine.html share/mplayer/DOCS/HTML/fr/mencoder.html share/mplayer/DOCS/HTML/fr/mplayer-binary.html share/mplayer/DOCS/HTML/fr/mpst.html @@ -195,6 +207,7 @@ share/mplayer/DOCS/HTML/fr/usage.html share/mplayer/DOCS/HTML/fr/users-vs-dev.html share/mplayer/DOCS/HTML/fr/vcd.html share/mplayer/DOCS/HTML/fr/windows.html +share/mplayer/DOCS/HTML/pl/amiga.html share/mplayer/DOCS/HTML/pl/aspect.html share/mplayer/DOCS/HTML/pl/bsd.html share/mplayer/DOCS/HTML/pl/bugreports.html @@ -223,6 +236,7 @@ share/mplayer/DOCS/HTML/pl/gcc-296.html share/mplayer/DOCS/HTML/pl/gui.html share/mplayer/DOCS/HTML/pl/history.html share/mplayer/DOCS/HTML/pl/howtoread.html +share/mplayer/DOCS/HTML/pl/hpux.html share/mplayer/DOCS/HTML/pl/index.html share/mplayer/DOCS/HTML/pl/install.html share/mplayer/DOCS/HTML/pl/intro.html @@ -232,6 +246,7 @@ share/mplayer/DOCS/HTML/pl/linux.html share/mplayer/DOCS/HTML/pl/macos.html share/mplayer/DOCS/HTML/pl/mailinglists.html share/mplayer/DOCS/HTML/pl/menc-feat-divx4.html +share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html @@ -260,6 +275,7 @@ share/mplayer/DOCS/HTML/pl/usage.html share/mplayer/DOCS/HTML/pl/users-vs-dev.html share/mplayer/DOCS/HTML/pl/vcd.html share/mplayer/DOCS/HTML/pl/windows.html +share/mplayer/DOCS/HTML/ru/amiga.html share/mplayer/DOCS/HTML/ru/aspect.html share/mplayer/DOCS/HTML/ru/bsd.html share/mplayer/DOCS/HTML/ru/bugreports.html @@ -288,13 +304,16 @@ share/mplayer/DOCS/HTML/ru/gcc-296.html share/mplayer/DOCS/HTML/ru/gui.html share/mplayer/DOCS/HTML/ru/history.html share/mplayer/DOCS/HTML/ru/howtoread.html +share/mplayer/DOCS/HTML/ru/hpux.html share/mplayer/DOCS/HTML/ru/index.html share/mplayer/DOCS/HTML/ru/install.html share/mplayer/DOCS/HTML/ru/intro.html share/mplayer/DOCS/HTML/ru/joe-barr.html share/mplayer/DOCS/HTML/ru/linux.html +share/mplayer/DOCS/HTML/ru/macos.html share/mplayer/DOCS/HTML/ru/mailinglists.html share/mplayer/DOCS/HTML/ru/menc-feat-divx4.html +share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html @@ -302,6 +321,7 @@ share/mplayer/DOCS/HTML/ru/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html share/mplayer/DOCS/HTML/ru/menc-feat-streamcopy.html +share/mplayer/DOCS/HTML/ru/menc-feat-telecine.html share/mplayer/DOCS/HTML/ru/mencoder.html share/mplayer/DOCS/HTML/ru/mplayer-binary.html share/mplayer/DOCS/HTML/ru/mpst.html @@ -363,6 +383,7 @@ share/mplayer/DOCS/man/en/mplayer.1 share/mplayer/DOCS/man/es/mplayer.1 share/mplayer/DOCS/man/fr/mplayer.1 share/mplayer/DOCS/man/hu/mplayer.1 +share/mplayer/DOCS/man/it/mplayer.1 share/mplayer/DOCS/man/pl/mplayer.1 share/mplayer/DOCS/man/zh/mplayer.1 share/mplayer/DOCS/tech/MAINTAINERS @@ -372,7 +393,6 @@ share/mplayer/DOCS/tech/codecs-in.html share/mplayer/DOCS/tech/codecs.conf.txt share/mplayer/DOCS/tech/colorspaces.txt share/mplayer/DOCS/tech/cvs-howto.txt -share/mplayer/DOCS/tech/directfb.txt share/mplayer/DOCS/tech/dr-methods.txt share/mplayer/DOCS/tech/encoding-tips.txt share/mplayer/DOCS/tech/formats.txt @@ -399,6 +419,7 @@ share/mplayer/DOCS/tech/slave.txt share/mplayer/DOCS/tech/subcp.txt share/mplayer/DOCS/tech/swscaler_filters.txt share/mplayer/DOCS/tech/swscaler_methods.txt +share/mplayer/DOCS/tech/translations.txt share/mplayer/DOCS/tech/vidix.txt share/mplayer/DOCS/tech/wishlist share/mplayer/DOCS/zh/bugreports.html @@ -496,6 +517,7 @@ share/mplayer/input.conf @dirrm share/mplayer/DOCS/tech @dirrm share/mplayer/DOCS/man/zh @dirrm share/mplayer/DOCS/man/pl +@dirrm share/mplayer/DOCS/man/it @dirrm share/mplayer/DOCS/man/hu @dirrm share/mplayer/DOCS/man/fr @dirrm share/mplayer/DOCS/man/es diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index c60d1d83179..98fc436b408 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,15 +1,12 @@ -$NetBSD: distinfo,v 1.3 2004/04/07 12:57:58 salo Exp $ +$NetBSD: distinfo,v 1.4 2004/04/28 15:54:46 wiz Exp $ -SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432 -Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes -SHA1 (mplayer-1.0rc3/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212 -Size (mplayer-1.0rc3/font-arial-iso-8859-1.tar.bz2) = 234242 bytes -SHA1 (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 -Size (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 222208 bytes -SHA1 (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 -Size (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 5c1fef6453f2fde1bb2bc13fc0501935208a459c -SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b -SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed -SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b -SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7 +SHA1 (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702 +Size (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 4913390 bytes +SHA1 (mplayer-1.0rc4/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212 +Size (mplayer-1.0rc4/font-arial-iso-8859-1.tar.bz2) = 234242 bytes +SHA1 (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 +Size (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 222208 bytes +SHA1 (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 +Size (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = 249705 bytes +SHA1 (patch-aa) = 1b09896da6e37512abb1306df4b1674d96b11c4b +SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 53f4efb4ccb..f2c9f6072d4 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ +$NetBSD: patch-aa,v 1.4 2004/04/28 15:54:46 wiz Exp $ ---- configure.orig 2003-12-08 22:33:31.000000000 +0100 -+++ configure 2004-04-06 22:46:56.000000000 +0200 -@@ -367,8 +367,8 @@ +--- configure.orig Mon Apr 26 11:44:06 2004 ++++ configure +@@ -375,8 +375,8 @@ for ac_option do _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -13,16 +13,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -431,7 +431,7 @@ - case "`( uname -m ) 2>&1`" in - i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; - ia64) host_arch=ia64 ;; -- x86_64) host_arch=x86_64 ;; -+ x86_64|amd64) host_arch=x86_64 ;; - ppc) host_arch=ppc ;; - alpha) host_arch=alpha ;; - sparc*) host_arch=sparc ;; -@@ -499,7 +499,7 @@ +@@ -507,7 +507,7 @@ if test "$_skip_cc_check" != yes ; then for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do echocheck "$_cc version" cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` @@ -31,7 +22,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ if test "$?" -gt 0; then cc_version="not found" fi -@@ -610,7 +610,7 @@ +@@ -618,7 +618,7 @@ case "$host_arch" in pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` @@ -40,7 +31,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` -@@ -819,7 +819,7 @@ +@@ -827,7 +827,7 @@ EOF _optimizing='' ;; @@ -49,17 +40,17 @@ $NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ _def_arch='#define ARCH_X86_64 1' _target_arch='TARGET_ARCH_X86_64 = yes' iproc='x86_64' -@@ -4491,11 +4491,11 @@ +@@ -4653,11 +4653,11 @@ if test "$_matroska_external" != no ; th int main(void) { return 0; } EOF -- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes -+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes - if test "$_matroska" = no ; then +- cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes ++ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska_external=yes + if test "$_matroska_external" = no ; then _saved_inc_extra=$_inc_extra _inc_extra="$_inc_extra -I/usr/local/include" -- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes -+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes - if test "$_matroska" = no ; then +- cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes ++ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska_external=yes + if test "$_matroska_external" = no ; then _inc_extra=$_saved_inc_extra fi diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab deleted file mode 100644 index 356de5452e1..00000000000 --- a/multimedia/mplayer-share/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ - ---- loader/win32.c.orig 2003-09-06 00:08:23.000000000 +0200 -+++ loader/win32.c 2004-01-24 15:39:14.000000000 +0100 -@@ -1374,8 +1374,11 @@ - printf("Win32 Warning: Leaving uninitialized Critical Section %p!!\n", c); - return; - } -- cs->locked=0; -- pthread_mutex_unlock(&(cs->mutex)); -+ if (cs->locked) -+ { -+ cs->locked=0; -+ pthread_mutex_unlock(&(cs->mutex)); -+ } - return; - } - diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac deleted file mode 100644 index 89e72d36712..00000000000 --- a/multimedia/mplayer-share/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/03/31 13:23:27 wiz Exp $ - ---- libmpdemux/http.c.orig Wed Nov 13 10:02:55 2002 -+++ libmpdemux/http.c -@@ -175,7 +175,7 @@ http_build_request( HTTP_header_t *http_ - if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET"); - if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/"); - else { -- uri = (char*)malloc(strlen(http_hdr->uri)*2); -+ uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1); - if( uri==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n"); - return NULL; diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad index 9ffcf07c320..d5acc54f3a8 100644 --- a/multimedia/mplayer-share/patches/patch-ad +++ b/multimedia/mplayer-share/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ +$NetBSD: patch-ad,v 1.2 2004/04/28 15:54:46 wiz Exp $ ---- mp_msg.c.orig 2003-09-12 17:46:16.000000000 +0200 +--- mp_msg.c.orig Fri Sep 12 17:46:16 2003 +++ mp_msg.c @@ -34,6 +34,7 @@ void mp_msg_init(){ #ifdef MP_DEBUG @@ -10,16 +10,14 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL)); #endif setlocale(LC_ALL, ""); /* set from the environment variables */ -@@ -41,9 +42,12 @@ void mp_msg_init(){ +@@ -41,7 +42,10 @@ void mp_msg_init(){ textdomain("mplayer"); #ifdef MP_DEBUG fprintf(stdout, "Current domain: %s\n", textdomain(NULL)); +#if 0 fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL)); - #endif - #endif +#endif +#endif + #endif + #endif mp_msg_set_level(MSGL_STATUS); - } - diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae deleted file mode 100644 index c7f2352ea2a..00000000000 --- a/multimedia/mplayer-share/patches/patch-ae +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ - ---- libmpdemux/tvi_bsdbt848.c.orig Sat Oct 4 19:29:01 2003 -+++ libmpdemux/tvi_bsdbt848.c -@@ -41,6 +41,7 @@ - - #ifdef __NetBSD__ - #include <dev/ic/bt8xx.h> -+#include <sys/audioio.h> - #else - #include <machine/ioctl_meteor.h> - #include <machine/ioctl_bt848.h> -@@ -785,14 +786,29 @@ return(priv->dspbytesread * 1.0 / priv-> - static int get_audio_framesize(priv_t *priv) - { - int bytesavail; -+#ifdef __NetBSD__ -+struct audio_info auinf; -+#endif - - if(priv->dspready == FALSE) return 0; - -+#ifdef __NetBSD__ -+if(ioctl(priv->dspfd, AUDIO_GETINFO, &auinf) < 0) -+ { -+ perror("AUDIO_GETINFO"); -+ return(TVI_CONTROL_FALSE); -+ } -+else -+ { -+ bytesavail = auinf.record.seek; /* * priv->dspsamplesize; */ -+ } -+#else - if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0) - { - perror("FIONREAD"); - return(TVI_CONTROL_FALSE); - } -+#endif - - /* When mencoder wants audio data, it wants data.. - it won't go do anything else until it gets it :( */ |