diff options
author | fredb <fredb> | 2003-01-20 07:10:41 +0000 |
---|---|---|
committer | fredb <fredb> | 2003-01-20 07:10:41 +0000 |
commit | 46c9cc1147eab7d27c624a602d8a5a84fda0467d (patch) | |
tree | 6df7e194887b4875adc495b79e7ab79325cce3b7 /graphics | |
parent | 66c1a826c02ba80e0b84d0738546bece0ba35dd9 (diff) | |
download | pkgsrc-46c9cc1147eab7d27c624a602d8a5a84fda0467d.tar.gz |
Update mplayer package to 0.90rc3. Changes from rc2 include important bug fixes
and new features. From the ChangeLog: [Go to end for package changes.]
DOCS:
* english man page & HTML docs updates
* audio filter documentation
* help_diff.sh doesn't depend on BASH any more
* Hungarian, French, Italian, German, Polish(?) docs synced
Important fixes:
* X11 fullscreen switching (yes, again...) rewritten, some x11 code cleanup
* Voxware and Quicktime DLLs finally work (was broken in some contexts)
* VIDIX Radeon support cleanup, should really solve the pink screen bugs
* Cygwin: -vo directx crashes and garbled picture with some files fixed
* OGM/Ogg seeking (broken frames) fixed, subtitle fixes, XCD support
* libaf: big (audio filter layer) updates, floating point support, speedup
* ffwma2 fixed (better error resilience)
* SPU queueing - fixes missing or early disappearing DVD subtitles
* the mysterious DVD audio delay (150-300ms) fixed
* extension-based fileformat detection fixed the .mp3 vs. mpeg-ps conflict
* cache2 keeps buffer for non-seekable media, fixes quicktime streaming
Fixes:
* mp3lib CPU detection part cleanup, 'decwin' linker problem fixed
* various cddb:// fixes, support of netbsd-1.6
* libmpdvdkit2: Fix DVD authentication on Solaris 9
* libmpdvdkit2: libdvdcss upgraded to 1.2.4 (keeping the key cache patch)
* libmpdvdkit2: fixed decryption from multiple VOB files (hdd or darwin)
* -ao arts, -ao oss: Fix 8-bit sound support
* -vop expand + ffmpeg codecs conflicts solved, some other -vop bugs fixed
* -ac ffmp2 with MPEG files (sig11) fixed
* QT Qclp audio codec initialization fixed
* mplayer exit codes cleanup (0 for quit/eof, 1 for error)
* -ao win32 sync problems solved, -autosync 100 is still recommended
* -vo gif89a uninit sig11 fixed
* the usual compiler warning fixes :)
* use -pphelp instead of -vop pp=help
* various bigendian fixes
* 16bpp packed yuv fixes in crop, mirror, rotate filters
* some -fixed-vo and vo_preinit fixes, -vo sdl,xmga,mga should work...
* various Solaris compatibility fixes (should work out of the box)
* mms:// port fixes, tries 1755 if 80 failed
* libavcodec: various ME fixes, B frames fixes, WMV2 slice decoding fixes
* -ao alsa9 audio-file playback high cpu usage fixed
* libaf updates, 2-pass initialization to get better filter path
* better detection of playlists, support for [Reference]-style format
* handle quicktime reference media files as playlist
* cddb:// & cdda:// cdrom device name fixes on linux and *BSD
Features:
* -ao esd: new EsounD audio driver
* -vo dxr3: new NORM option
* Xanim & RealPlayer binary Codecs working on PPC
* Radeon 9000 support in VIDIX, colorkey restoring for all Radeons
* Initial PPC (Big-Endian) support in VIDIX Rage128 driver
* PNM:// streaming support (ported from xine)
* Muxer layer: mencoder can now write MPEG-PS format, too (EXPERIMENTAL!)
* libavcodec: wmv2 decoder (buggy/untested)
* DVB "HEAD" (aka. NEWSTRUCT) drivers support
* Subtitles background bounding-box support (optional grey-level & opacity)
* libaf: 3 new filters: panning, compressor/limiter and a noise gate
* per-mediafile config file support (for file-specific options)
* iconv (codepage conversion) support for OGM (Ogg) subtitles
* v4l: user friendly channel tuning
* Freetype & old-style RAW font support usable (compilable) at the same time
* vo_directfb2, vo_dfbmga: DirectFB 0.9.16 support
* libavcodec: motion estimation pre pass, qpel encoding, trellis quantization
* libavcodec, liba52, mp3lib: Altivec optimizations
* keep window's aspect ratio at resizing (x11, xv), requires WM support
* -geometry option, also accepts X11 syntax
* real .bin+.cue (S)VCD images support (-vcd 2 -cuefile xxx.cue)
* postprocess: YUV 411/422/444 support, stride fixes
* jumping of overlapping subs fixed, sorting is automatical, iconv fixes
* mpeg2 telecine detection and automatic inverse telecine (mplayer only)
Gui:
* correct GTK widget destroy event handler
* fullscreen switching fixed (sync with x11_common)
* fix gtk submenu
* new font render engine
* added persistant history patch
* SDL Audio configure window
* add overlapping to preferences
* add play bar for subwindow
* add vertical potmeter for skin
* fixed 'single pixel bug'
* fixed some possible crashes
NetBSD package changes:
-- Add cdparanoia support. You can play an Audio CD with
mplayer -cache 1024 cdda://
-- Remove commented out "--enable-dvdread" hook, as, in jurisdictions were
permitted, it would make more sense to comment out "--disable-mpdvdkit".
-- Add "Makefile.cflags" with some reasonable optimizations.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gmplayer/Makefile | 3 | ||||
-rw-r--r-- | graphics/gmplayer/distinfo | 88 | ||||
-rw-r--r-- | graphics/mencoder/Makefile | 4 | ||||
-rw-r--r-- | graphics/mencoder/distinfo | 8 | ||||
-rw-r--r-- | graphics/mplayer-share/Makefile.cflags | 19 | ||||
-rw-r--r-- | graphics/mplayer-share/Makefile.common | 13 | ||||
-rw-r--r-- | graphics/mplayer-share/Makefile.depends | 3 | ||||
-rw-r--r-- | graphics/mplayer-share/PLIST | 3 | ||||
-rw-r--r-- | graphics/mplayer-share/distinfo | 8 | ||||
-rw-r--r-- | graphics/mplayer-share/patches/patch-aa | 34 | ||||
-rw-r--r-- | graphics/mplayer/Makefile | 4 | ||||
-rw-r--r-- | graphics/mplayer/distinfo | 8 |
12 files changed, 94 insertions, 101 deletions
diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile index 63cfd383f51..5c73c699c80 100644 --- a/graphics/gmplayer/Makefile +++ b/graphics/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/10/01 12:51:48 dillo Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/20 07:10:42 fredb Exp $ .include "../../graphics/mplayer-share/Makefile.common" @@ -61,4 +61,5 @@ do-install: .include "../../audio/nas/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" +.include "../../graphics/mplayer-share/Makefile.cflags" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo index 32ddc5649bd..189ed743257 100644 --- a/graphics/gmplayer/distinfo +++ b/graphics/gmplayer/distinfo @@ -1,45 +1,45 @@ -$NetBSD: distinfo,v 1.24 2002/12/25 03:24:50 wiz Exp $ +$NetBSD: distinfo,v 1.25 2003/01/20 07:10:42 fredb Exp $ -SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee -Size (mplayer/MPlayer-0.90rc2.tar.bz2) = 3121703 bytes -SHA1 (mplayer/default.tar.bz2) = 804d181e96c81e3794260dc8976786f3a535a3cf -Size (mplayer/default.tar.bz2) = 167735 bytes -SHA1 (mplayer/MidnightLove.tar.bz2) = 449a9b82633b7e5dd7e801d701540c4811ac6e58 -Size (mplayer/MidnightLove.tar.bz2) = 539499 bytes -SHA1 (mplayer/avifile.tar.bz2) = ee4b18e790aa60c3ffa38349ee2cda17bc9083d4 -Size (mplayer/avifile.tar.bz2) = 42393 bytes -SHA1 (mplayer/BlueHeart.tar.bz2) = eb6f3a6ffbe6475209b66699d9291f864dcc719f -Size (mplayer/BlueHeart.tar.bz2) = 281084 bytes -SHA1 (mplayer/WindowsMediaPlayer6.tar.bz2) = 0dff31ac1d7e9ded8874155fccf5d89b5d92a507 -Size (mplayer/WindowsMediaPlayer6.tar.bz2) = 31057 bytes -SHA1 (mplayer/xanim.tar.bz2) = 3863564c8079e87a85e8b665f4db467ffd4066b8 -Size (mplayer/xanim.tar.bz2) = 94557 bytes -SHA1 (mplayer/neutron.tar.bz2) = 0b319ff0c4f222cfa379d945b34d7e46d3de9688 -Size (mplayer/neutron.tar.bz2) = 369323 bytes -SHA1 (mplayer/plastic.tar.bz2) = f7a1747f2026820448289ae796693610c77a4e6c -Size (mplayer/plastic.tar.bz2) = 454137 bytes -SHA1 (mplayer/Cyrus.tar.bz2) = 6caabc0235cebaa9cf6b85d3594ac6a77acbeda7 -Size (mplayer/Cyrus.tar.bz2) = 228840 bytes -SHA1 (mplayer/xine-lcd.tar.bz2) = 617d2ad6fb6681aee719b67150813c2a75a60842 -Size (mplayer/xine-lcd.tar.bz2) = 168411 bytes -SHA1 (mplayer/phony.tar.bz2) = ab8d291b7ecaf1c8e1f3a759d378023031d9a449 -Size (mplayer/phony.tar.bz2) = 386409 bytes -SHA1 (mplayer/mentalic.tar.bz2) = f2560bcc8d39eef1556e2586025f36395fc997fa -Size (mplayer/mentalic.tar.bz2) = 166610 bytes -SHA1 (mplayer/proton.tar.bz2) = 0caa0b15f379eab6c6dfee70aebdadb89fe585e9 -Size (mplayer/proton.tar.bz2) = 322585 bytes -SHA1 (mplayer/slim.tar.bz2) = 337d948c422ff1c831ea74cc19adca6fdb469fa6 -Size (mplayer/slim.tar.bz2) = 398846 bytes -SHA1 (mplayer/netscape4.tar.bz2) = e9a9b042c4d813a344d370812e6bd1606f1d4c05 -Size (mplayer/netscape4.tar.bz2) = 204033 bytes -SHA1 (mplayer/CubicPlayer.tar.bz2) = d02548b8c948167c6f5b7a22780666a6e6ac9c17 -Size (mplayer/CubicPlayer.tar.bz2) = 124442 bytes -SHA1 (mplayer/AlienMind.tar.bz2) = 6ed3c83a53912f3144ca0c09c17447f711987e34 -Size (mplayer/AlienMind.tar.bz2) = 129525 bytes -SHA1 (mplayer/CornerMP.tar.bz2) = 43c0f5b38db36b0d463819d04051d081b4e48781 -Size (mplayer/CornerMP.tar.bz2) = 237486 bytes -SHA1 (mplayer/CornerMP-aqua.tar.bz2) = 4dc5a2f4cc90250f9c188ed93bf26d7e323d554d -Size (mplayer/CornerMP-aqua.tar.bz2) = 248136 bytes -SHA1 (mplayer/hwswskin.tar.bz2) = 00ecb41cf8b295fbd50422e2d7d1b7874b0fed12 -Size (mplayer/hwswskin.tar.bz2) = 20278 bytes -SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 +SHA1 (mplayer/MPlayer-0.90rc3.tar.bz2) = f42c9aefd230a20872711c1836d710c11e9389ef +Size (mplayer/MPlayer-0.90rc3.tar.bz2) = 3285759 bytes +SHA1 (mplayer/default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d +Size (mplayer/default.tar.bz2) = 167746 bytes +SHA1 (mplayer/MidnightLove.tar.bz2) = 7464060fbffd8ac93402616426620a590fda8d7f +Size (mplayer/MidnightLove.tar.bz2) = 539637 bytes +SHA1 (mplayer/avifile.tar.bz2) = 8f0d7268073af4c3b098845ccd861ca4cf53e408 +Size (mplayer/avifile.tar.bz2) = 42391 bytes +SHA1 (mplayer/BlueHeart.tar.bz2) = e9a6bdbd058160f3740ad7b08c3dc4bb4095da8c +Size (mplayer/BlueHeart.tar.bz2) = 281079 bytes +SHA1 (mplayer/WindowsMediaPlayer6.tar.bz2) = 632099a4155d23fb4e9f7bb153f916cf5fbe10e9 +Size (mplayer/WindowsMediaPlayer6.tar.bz2) = 31058 bytes +SHA1 (mplayer/xanim.tar.bz2) = f1bd9bdd1d89493cafbe9f186b399876a1f41ee1 +Size (mplayer/xanim.tar.bz2) = 94545 bytes +SHA1 (mplayer/neutron.tar.bz2) = f2d0c05555f81db10fe3a191ecabd82b42a45ad4 +Size (mplayer/neutron.tar.bz2) = 369578 bytes +SHA1 (mplayer/plastic.tar.bz2) = f9c3f857c8d69da68c3a58628b664a4f0883b719 +Size (mplayer/plastic.tar.bz2) = 454108 bytes +SHA1 (mplayer/Cyrus.tar.bz2) = dbe51d7615ee37360e0f1a8d4154d8c56eb9de0d +Size (mplayer/Cyrus.tar.bz2) = 228825 bytes +SHA1 (mplayer/xine-lcd.tar.bz2) = 870fa2b3745a32a1190074bdfe54d3488c8d6789 +Size (mplayer/xine-lcd.tar.bz2) = 168433 bytes +SHA1 (mplayer/phony.tar.bz2) = fe2b6ade44b90dcec48a93ab7136ff3ed20f0066 +Size (mplayer/phony.tar.bz2) = 386388 bytes +SHA1 (mplayer/mentalic.tar.bz2) = 0952d0fcda0dc52e43683ff0c8f0ac224a2de679 +Size (mplayer/mentalic.tar.bz2) = 166612 bytes +SHA1 (mplayer/proton.tar.bz2) = d3996e9b77dcde58706fd8ec92df150e6c1a1603 +Size (mplayer/proton.tar.bz2) = 323354 bytes +SHA1 (mplayer/slim.tar.bz2) = a1ca90d1f57132df0774595842b21d25eb38446e +Size (mplayer/slim.tar.bz2) = 398881 bytes +SHA1 (mplayer/netscape4.tar.bz2) = a5f399b6c538982678956d93f320588018e125d8 +Size (mplayer/netscape4.tar.bz2) = 204050 bytes +SHA1 (mplayer/CubicPlayer.tar.bz2) = bdc11265c81760d767f4f8beb7548937b6b608ad +Size (mplayer/CubicPlayer.tar.bz2) = 124388 bytes +SHA1 (mplayer/AlienMind.tar.bz2) = 493da3837ec35e679bfaa10b8e68f3919733570a +Size (mplayer/AlienMind.tar.bz2) = 129481 bytes +SHA1 (mplayer/CornerMP.tar.bz2) = 13cd804ef51957bcf0b81d72ebf0d4ed30efcfa0 +Size (mplayer/CornerMP.tar.bz2) = 237466 bytes +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) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6 diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile index c7cf894f832..27833d01c3f 100644 --- a/graphics/mencoder/Makefile +++ b/graphics/mencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/10/01 12:51:50 dillo Exp $ +# $NetBSD: Makefile,v 1.5 2003/01/20 07:10:43 fredb Exp $ .include "../../graphics/mplayer-share/Makefile.common" @@ -18,4 +18,6 @@ do-install: .include "../../graphics/mplayer-share/Makefile.depends" .include "../../audio/lame/buildlink2.mk" + +.include "../../graphics/mplayer-share/Makefile.cflags" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo index 7289ec72ec9..5f9a27d90e9 100644 --- a/graphics/mencoder/distinfo +++ b/graphics/mencoder/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2002/12/25 03:24:50 wiz Exp $ +$NetBSD: distinfo,v 1.16 2003/01/20 07:10:43 fredb Exp $ -SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee -Size (mplayer/MPlayer-0.90rc2.tar.bz2) = 3121703 bytes -SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 +SHA1 (mplayer/MPlayer-0.90rc3.tar.bz2) = f42c9aefd230a20872711c1836d710c11e9389ef +Size (mplayer/MPlayer-0.90rc3.tar.bz2) = 3285759 bytes +SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6 diff --git a/graphics/mplayer-share/Makefile.cflags b/graphics/mplayer-share/Makefile.cflags new file mode 100644 index 00000000000..72326bd166a --- /dev/null +++ b/graphics/mplayer-share/Makefile.cflags @@ -0,0 +1,19 @@ +# $NetBSD: Makefile.cflags,v 1.1 2003/01/20 07:10:41 fredb Exp $ + +# This must all come after the last "buildink2.mk" inclusion, as +# "buildlink2.mk" munges ${CFLAGS}, and if ${CFLAGS} is non-empty, +# the configure script refuses to add any optimizations at all. + +.if ${MPLAYER_ENABLE_RUNTIME_CPU_DETECTION} == YES +.if ${MACHINE_ARCH} == i386 +# Schedule for the typical machine fast enough to run mplayer. This +# is nearly optimal for K6-2 as well. Anything slowler will still run +# (but would probably benefit greatly from turning off the run-time +# cpu detection). +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro +.else +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer +.endif +.else +CFLAGS= # Let "configure" do its thing. +.endif diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common index 79141854f1f..9f0831e40c2 100644 --- a/graphics/mplayer-share/Makefile.common +++ b/graphics/mplayer-share/Makefile.common @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.common,v 1.21 2002/12/25 03:24:49 wiz Exp $ +# $NetBSD: Makefile.common,v 1.22 2003/01/20 07:10:41 fredb Exp $ -MPLAYER_DIST_VERSION= 0.90rc2 -#PKGREVISION= 1 - -# There is no need to change anything below here. +MPLAYER_DIST_VERSION= 0.90rc3 +#PKGREVISION= 0 # This variable is used in all packages which depend on this package -MPLAYER_PKG_VERSION= 0.90rc12 +# XXX Add 10, as the "rc" version numbers were used up for the "pre" versions. +MPLAYER_PKG_VERSION= 0.90rc13 DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} CATEGORIES?= graphics @@ -34,8 +33,8 @@ PTHREAD_OPTS+= require CONFIGURE_ARGS+= --prefix="${PREFIX}" CONFIGURE_ARGS+= --with-extraincdir="${LOCALBASE}/include" +CONFIGURE_ARGS+= --with-cdparanoiaincdir="${LOCALBASE}/include/cdparanoia" CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib" -#CONFIGURE_ARGS+= --enable-dvdread CONFIGURE_ARGS+= --disable-mpdvdkit CONFIGURE_ARGS+= --enable-faad CONFIGURE_ARGS+= --disable-arts diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends index 233d37956e6..687753f0fbc 100644 --- a/graphics/mplayer-share/Makefile.depends +++ b/graphics/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.9 2002/12/06 14:21:46 wiz Exp $ +# $NetBSD: Makefile.depends,v 1.10 2003/01/20 07:10:41 fredb Exp $ DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share @@ -15,6 +15,7 @@ DEPENDS+= realplayer>=8:../../audio/realplayer USE_X11= # defined +.include "../../audio/cdparanoia/buildlink2.mk" .include "../../audio/mad/buildlink2.mk" .include "../../audio/libvorbis/buildlink2.mk" .include "../../audio/faad2/buildlink2.mk" diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST index 69a50aa1e0c..1b464273b2e 100644 --- a/graphics/mplayer-share/PLIST +++ b/graphics/mplayer-share/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2002/12/25 03:24:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/01/20 07:10:41 fredb Exp $ man/man1/mplayer.1 share/mplayer/DOCS/Chinese/bugreports.html share/mplayer/DOCS/Chinese/cd-dvd.html @@ -36,6 +36,7 @@ share/mplayer/DOCS/German/faq.html share/mplayer/DOCS/German/formats.html share/mplayer/DOCS/German/mplayer.1 share/mplayer/DOCS/German/sound.html +share/mplayer/DOCS/German/users_against_developers.html share/mplayer/DOCS/German/video.html share/mplayer/DOCS/Hungarian/bugreports.html share/mplayer/DOCS/Hungarian/cd-dvd.html diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo index fb744d15a2c..91e118a11fd 100644 --- a/graphics/mplayer-share/distinfo +++ b/graphics/mplayer-share/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.17 2002/12/26 11:10:02 wiz Exp $ +$NetBSD: distinfo,v 1.18 2003/01/20 07:10:41 fredb Exp $ -SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee -Size (mplayer/MPlayer-0.90rc2.tar.bz2) = 3121703 bytes +SHA1 (mplayer/MPlayer-0.90rc3.tar.bz2) = f42c9aefd230a20872711c1836d710c11e9389ef +Size (mplayer/MPlayer-0.90rc3.tar.bz2) = 3285759 bytes SHA1 (mplayer/font-arial-iso-8859-1.tar.bz2) = cec0cad6145382dd15c801f9c6e9cda1ab71b1ed Size (mplayer/font-arial-iso-8859-1.tar.bz2) = 234810 bytes SHA1 (mplayer/font-arial-iso-8859-2.tar.bz2) = 12c05c32f64818378a32699bea0f5d3aa1551afa Size (mplayer/font-arial-iso-8859-2.tar.bz2) = 222677 bytes SHA1 (mplayer/font-arial-cp1250.tar.bz2) = 7b11d721e348a53abf9656f3ade61d0b99e2e7db Size (mplayer/font-arial-cp1250.tar.bz2) = 490101 bytes -SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 +SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6 diff --git a/graphics/mplayer-share/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa index 6a3e0048ecb..f53f09caadd 100644 --- a/graphics/mplayer-share/patches/patch-aa +++ b/graphics/mplayer-share/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/11/01 10:19:18 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2003/01/20 07:10:42 fredb Exp $ --- configure.orig Thu Oct 24 14:12:40 2002 +++ configure @@ -13,35 +13,3 @@ $NetBSD: patch-aa,v 1.4 2002/11/01 10:19:18 jlam Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -2970,8 +2970,22 @@ if test "$_ossaudio" = yes ; then - _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"' - _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"' - else -- if netbsd || openbsd ; then -+ cat > $TMPC << EOF -+#include <sys/ioctl.h> -+$_inc_soundcard -+#ifdef OPEN_SOUND_SYSTEM -+int main(void) { return 0; } -+#else -+#error Not the real thing -+#endif -+EOF -+ _real_ossaudio=no -+ cc_check && _real_ossaudio=yes -+ if test "$_real_ossaudio" = yes; then -+ _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' -+ elif netbsd || openbsd ; then - _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' -+ netbsd && _ld_arch="$_ld_arch -lossaudio" - openbsd && _ld_arch="$_ld_arch -lossaudio" - else - _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' -@@ -4324,7 +4338,6 @@ test "$_real" = yes && _ld_dl_dynamic='- - _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" - bsdos && _ld_arch="$_ld_arch -ldvd" - if netbsd ; then -- _ld_arch="$_ld_arch -lossaudio" - x86 && _ld_arch="$_ld_arch -li386" - fi - diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile index c139356f5b0..2eb0ca6a01a 100644 --- a/graphics/mplayer/Makefile +++ b/graphics/mplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/10/01 12:51:46 dillo Exp $ +# $NetBSD: Makefile,v 1.29 2003/01/20 07:10:42 fredb Exp $ .include "../../graphics/mplayer-share/Makefile.common" @@ -15,4 +15,6 @@ do-install: .include "../../graphics/mplayer-share/Makefile.depends" .include "../../audio/nas/buildlink2.mk" + +.include "../../graphics/mplayer-share/Makefile.cflags" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index 084cb37a0b4..10b3cb97754 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.27 2002/12/25 03:24:49 wiz Exp $ +$NetBSD: distinfo,v 1.28 2003/01/20 07:10:42 fredb Exp $ -SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee -Size (mplayer/MPlayer-0.90rc2.tar.bz2) = 3121703 bytes -SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 +SHA1 (mplayer/MPlayer-0.90rc3.tar.bz2) = f42c9aefd230a20872711c1836d710c11e9389ef +Size (mplayer/MPlayer-0.90rc3.tar.bz2) = 3285759 bytes +SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6 |