diff options
| author | wiz <wiz@pkgsrc.org> | 2004-04-28 15:54:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-04-28 15:54:46 +0000 |
| commit | 1c0bac11712ba8e3641abde278e3a3a1981152c4 (patch) | |
| tree | de9d43998547f99cb7042d40084ac88b37b15abb | |
| parent | 031357ac8c77792d495a3691ed93db20465ca56a (diff) | |
| download | pkgsrc-1c0bac11712ba8e3641abde278e3a3a1981152c4.tar.gz | |
Update to 1.0pre4:
MPlayer 1.0pre4: "YAML Counter"
Security:
* HTTP parser remote heap overflow vulnerability fixed
[already fixed in package previously]
* Real RTSP remote buffer overflow vulnerability fixed
* buffer overflow in the Matroska demuxer
* potentially exploitable buffer overflow in CDDB TOC code
DOCS:
* new Copyright file covers files from other projects and their licenses
* new DOCS/tech/translations.txt explains how to properly translate MPlayer
* new Japanese console message translation
* Polish translation finished
* Italian man page translation
* DVD ripping guide
* telecine/interlacing guide
* video out driver section added to the man page
* XML build system rewritten - now supports building individual languages
* miscellaneous updates all over the place
Ports:
* better PA-RISC detection
* support for VAX (tested on VAXstation 4000/VLC) -- really, believe me!
* optimizing for specific MIPS CPUs under IRIX
* AMD64 detection under BSDs
* fbdev driver updated for Linux 2.6
* support for ELF only OpenBSD
* optimizing for PPC 970 (aka G5)
* SDL support fixed on MinGW
* VIDIX working under Windows XP/2000 (native dhahelper)
* builds out of the box under GNU Hurd
* SSE optimizations enabled under MinGW
* SSE support under OpenBSD
* AltiVec support under NetBSD
* GCC 3.4 support (due to changed behaviour in ASM code snippets)
Demuxers:
* Matroska containing RealVideo works better
* fixed random segfaults in VIVO
* endianess fixes in CDDA
* UYVY support in tvi/v4l2
* tvi/bsdbt848 now working under FreeBSD 5.2-CURRENT
* tvi/bsdbt848 audio part working under NetBSD
* LIVE.COM demuxer updated to conform with latest libraries
* new, independent, C implementation of the Matroska demuxer
* fix for rare Real files
* more robust Real demuxer (can resync after errors)
* support for AAC inside Real
* MPEG Aspect code 4 fixed
* support for selecting subtitle streams with -slang inside Ogg
* wrapper demuxer for FFMpeg's libavformat (Nut is playable this way)
* much improved seeking in Ogg
* Nullsoft streaming video (NSV) demuxer
* AVI OpenDML read and write support
Streaming:
* smil playlist parser
* support for URL redirection
* support for seeking in HTTP streams
* updated LIVE.COM streaming code
* fallback to live.com RTSP after Real RTSP
* suggests -playlist if normal streaming fails
* many improvements and bug fixes in the streaming code
Decoders:
* compilation failure without zlib in vd/lcl fixed
* removed obsoleted decoders (which were moved to libavcodec), affected: vd/8bps, vd/msrle, vd/msvideo1, vd/rpza, vd/smc
* workaround for buggy codecs in ad/acm (support for Sharp G.726)
* fixed chroma-swapping in Hauppauge Macroblock decoder
* AltiVec optimized resampler in liba52
* support for VP5 and VP6 DLL decoders
* support for Alparysoft lossless video codec (through DLLs)
* support for Lead MCMW wavelet video codec (through DLLs)
* HE-AAC working through libfaad
* removed libmpflac in favor of FFmpeg's FLAC implementation
* liba52 dynamic range compression support
Filters:
* vf_bmovl bugfixes
* vf_filmdint now handles 15fps NTSC input
* huge updates and speedup on vf_pullup
* big updates to vf_ilpack (proper interpolation and MMX optimizations)
* vf_zrmjpeg: fast MJPEG encoder using libavcodec for Zoran
* interlaced scaling support in vf_scale
* vf_kerndeint: adaptive deinterlacer
* vf_rgbtest: rgb test pattern generator for developers
* vf_qp: qp change filter
* vf_noformat: the same as vf_format but with reversed meaning
* AltiVec optimized SWScaler
* vf_phase: phase shift fields
* vf_divtc: duplicate frame removal from deinterlaced telecined video
Drivers:
* ao/esd behaves better over network now
* support for Radeon 9200/9600/9600 Pro/9700 in VIDIX
* -mixer support for alsa9
* fixed OSS audio grabber module with hardware not supporting 44khz
* native ALSA 1.x support (not through 0.9 emulation)
* better multibuffer support in VIDIX nVidia driver
* pan & scan support in VIDIX nVidia driver
* support for more cards in VIDIX nVidia driver
* vo_libcaca: color ASCII art output driver
* vo_quartz: native MacOS X/Quartz video output
* support for VIDIX when ATI FireGLX drivers are used
FFmpeg/libavcodec:
* H.263 AIC and MQ encoding support
* fixed low delay decoding
* fixed H.263+ encoding without UMV
* lots of CBR improvements
* MB type and QP visualization
* lots of code cleanup
* intra & inter dequantization split -> speedup
* fixed stereo IMA ADPCM encoding
* VBV delay setting support (MPEG2 CBR)
* improved RV20 decoder (most known errors eliminated)
* interlaced DCT
* interlaced motion estimation
* interlaced MPEG2 encoding
* 4MV encoding fixes
* initial interlaced MPEG4 encoding
* improved visual quality in SVQ3 decoder
* fixed never-before-tested embedded string decoder in SVQ1
* optimized quantization (including the trellis way)
* Sierra VMD video decoder
* MMX and SSE2 optimized H263 denoiser
* better SVCD compliance (encoder side)
* MMX and MMX2 optimized interlaced DCT decision
* various cleanup, memleak and segfault fixes
* optimized (2x faster) the MPEG layer 3 decoder
* grayscale coded MJPEG decoding support
* avimszh and avizlib decoders
* "packed" XviD decoding
* fixed some bugs in RV20 B-frames decoding
* closed GOP encoding
* SSE2 optimized FDCT
* support for quantizer noise shaping
* support for EA ADPCM and SMJPEG IMA ADPCM
* QT RLE decoder
* OBMC fixes
* FLAC decoder
* better support for DivX5
* MMX and SSE2 optimized VP3/Theora decoding
* support for Theora alpha3
* many H.264 improvements
* more robust MJPEG startcode search mechanism
* better WMV8 decoding
* native Sparc VIS optimizations
* native G.726 codec
Others:
* -codecs-file option for specifying alternative codecs.conf file
* fixed some minor bugs in the GUI
* prevent sig11 when $HOME is not set
* fix some command line handling corruptions
* Swedish and Polish yes/no options in config files
* support binding F11 and F12 keys
* TOOLS/divx2svcd updated
* stricter thread code in Win32 loader (works under NetBSD)
* PJS subtitle support (was: dunnowhat)
* TOOLS/avifix: simple tool to fix chunk sizes in AVI files
* proper extraheader handling when libavcodec is used in MEncoder
* AVI OpenDML read and write support
* AVI VPRP (video property) read and write support
* fixed long standing lame quality option off-by-one bug in MEncoder
* MPL2 subtitle support
* less verbosity in Win32 loader and other places
| -rw-r--r-- | multimedia/gmplayer/Makefile | 19 | ||||
| -rw-r--r-- | multimedia/gmplayer/PLIST | 4 | ||||
| -rw-r--r-- | multimedia/gmplayer/distinfo | 93 | ||||
| -rw-r--r-- | multimedia/mencoder/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mencoder/distinfo | 13 | ||||
| -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 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mplayer/distinfo | 13 |
16 files changed, 134 insertions, 213 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 25023a583cc..f9f992d6d8c 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2004/04/19 22:23:02 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/28 15:54:46 wiz Exp $ PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 5 SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \ ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \ @@ -15,14 +14,14 @@ SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \ COMMENT= Software only MPEG-1/2/4 video decoder with a GTK+ interface SKINS += default-1.7${EXTRACT_SUFX} \ - AlienMind-1.1${EXTRACT_SUFX} \ - BlueHeart-1.4${EXTRACT_SUFX} \ - CornerMP-1.0${EXTRACT_SUFX} \ - CornerMP-aqua-1.0${EXTRACT_SUFX} \ - Cyrus-1.0${EXTRACT_SUFX} \ - MidnightLove-1.5${EXTRACT_SUFX} \ - WindowsMediaPlayer6-1.2${EXTRACT_SUFX} \ - avifile-1.5${EXTRACT_SUFX} \ + AlienMind-1.2${EXTRACT_SUFX} \ + BlueHeart-1.5${EXTRACT_SUFX} \ + CornerMP-1.1${EXTRACT_SUFX} \ + CornerMP-aqua-1.3${EXTRACT_SUFX} \ + Cyrus-1.2${EXTRACT_SUFX} \ + MidnightLove-1.6${EXTRACT_SUFX} \ + WindowsMediaPlayer6-1.3${EXTRACT_SUFX} \ + avifile-1.6${EXTRACT_SUFX} \ gnome-1.1${EXTRACT_SUFX} \ hayraphon-1.0${EXTRACT_SUFX} \ hwswskin-1.0${EXTRACT_SUFX} \ diff --git a/multimedia/gmplayer/PLIST b/multimedia/gmplayer/PLIST index 04d17774074..fdcc31035e5 100644 --- a/multimedia/gmplayer/PLIST +++ b/multimedia/gmplayer/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:09:09 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/04/28 15:54:46 wiz Exp $ bin/gmplayer share/mplayer/Skin/AlienMind/README share/mplayer/Skin/AlienMind/VERSION @@ -80,7 +80,6 @@ share/mplayer/Skin/CornerMP-aqua/sub.png share/mplayer/Skin/CornerMP-aqua/subt.png share/mplayer/Skin/CornerMP-aqua/symbols.fnt share/mplayer/Skin/CornerMP-aqua/symbols.png -share/mplayer/Skin/CornerMP-aqua/vol.png share/mplayer/Skin/CornerMP/README share/mplayer/Skin/CornerMP/VERSION share/mplayer/Skin/CornerMP/about.png @@ -110,7 +109,6 @@ share/mplayer/Skin/CornerMP/sub.png share/mplayer/Skin/CornerMP/subt.png share/mplayer/Skin/CornerMP/symbols.fnt share/mplayer/Skin/CornerMP/symbols.png -share/mplayer/Skin/CornerMP/vol.png share/mplayer/Skin/Cyrus/README share/mplayer/Skin/Cyrus/VERSION share/mplayer/Skin/Cyrus/eq.png diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index c5c5f641970..4d2098ac5dd 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,49 +1,46 @@ -$NetBSD: distinfo,v 1.5 2004/04/07 12:57:58 salo Exp $ +$NetBSD: distinfo,v 1.6 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/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3 -Size (mplayer-1.0rc3/default-1.7.tar.bz2) = 173439 bytes -SHA1 (mplayer-1.0rc3/AlienMind-1.1.tar.bz2) = 93c1ec4a0b26c456730101bf45c7fdcf4cf96dd9 -Size (mplayer-1.0rc3/AlienMind-1.1.tar.bz2) = 131362 bytes -SHA1 (mplayer-1.0rc3/BlueHeart-1.4.tar.bz2) = b8298e7862eb61fd1d9e57091a2df397b649508d -Size (mplayer-1.0rc3/BlueHeart-1.4.tar.bz2) = 281128 bytes -SHA1 (mplayer-1.0rc3/CornerMP-1.0.tar.bz2) = 347ad066585386e11872e479dcecf6fb9242c3a4 -Size (mplayer-1.0rc3/CornerMP-1.0.tar.bz2) = 237483 bytes -SHA1 (mplayer-1.0rc3/CornerMP-aqua-1.0.tar.bz2) = 7cceeb260a2d78e2af63ed451093a2a9cae0ff08 -Size (mplayer-1.0rc3/CornerMP-aqua-1.0.tar.bz2) = 248102 bytes -SHA1 (mplayer-1.0rc3/Cyrus-1.0.tar.bz2) = 54582822ade62334473a791aed2034f1c1a4eb48 -Size (mplayer-1.0rc3/Cyrus-1.0.tar.bz2) = 228907 bytes -SHA1 (mplayer-1.0rc3/MidnightLove-1.5.tar.bz2) = 36fa598cee849f168d3a795131d2854792456647 -Size (mplayer-1.0rc3/MidnightLove-1.5.tar.bz2) = 539660 bytes -SHA1 (mplayer-1.0rc3/WindowsMediaPlayer6-1.2.tar.bz2) = 3ae9d0053922ec0f43af38740c8d904a32b711e7 -Size (mplayer-1.0rc3/WindowsMediaPlayer6-1.2.tar.bz2) = 31057 bytes -SHA1 (mplayer-1.0rc3/avifile-1.5.tar.bz2) = 27acd5a3a3574a36f8de1c7bdd2a367b6326de57 -Size (mplayer-1.0rc3/avifile-1.5.tar.bz2) = 42398 bytes -SHA1 (mplayer-1.0rc3/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd -Size (mplayer-1.0rc3/gnome-1.1.tar.bz2) = 368720 bytes -SHA1 (mplayer-1.0rc3/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541 -Size (mplayer-1.0rc3/hayraphon-1.0.tar.bz2) = 77628 bytes -SHA1 (mplayer-1.0rc3/hwswskin-1.0.tar.bz2) = ff96c63ad6750e83a85ba96c600ad275ae57e0fc -Size (mplayer-1.0rc3/hwswskin-1.0.tar.bz2) = 20340 bytes -SHA1 (mplayer-1.0rc3/mentalic-1.1.tar.bz2) = 054b713ff2985719351462604ac3d8e341f3fa3a -Size (mplayer-1.0rc3/mentalic-1.1.tar.bz2) = 166599 bytes -SHA1 (mplayer-1.0rc3/neutron-1.4.tar.bz2) = 79f7df9a86572fe81d2f905fcf1678cebf11c534 -Size (mplayer-1.0rc3/neutron-1.4.tar.bz2) = 369319 bytes -SHA1 (mplayer-1.0rc3/phony-1.0.tar.bz2) = 7c31d6f98cb98f5cb74c85b0759002cdbd902a41 -Size (mplayer-1.0rc3/phony-1.0.tar.bz2) = 386446 bytes -SHA1 (mplayer-1.0rc3/plastic-1.1.1.tar.bz2) = fbd3ce681e6ab786828c842b87fe1779d4f13f32 -Size (mplayer-1.0rc3/plastic-1.1.1.tar.bz2) = 454180 bytes -SHA1 (mplayer-1.0rc3/proton-1.1.tar.bz2) = 0574cc2b17864a5bfb67a12b774b425d3785123f -Size (mplayer-1.0rc3/proton-1.1.tar.bz2) = 322590 bytes -SHA1 (mplayer-1.0rc3/slim-1.0.tar.bz2) = ebdfc875f037f2fbadd4d217f08835b678a1c9ca -Size (mplayer-1.0rc3/slim-1.0.tar.bz2) = 398938 bytes -SHA1 (mplayer-1.0rc3/xanim-1.5.tar.bz2) = 205a763e424bf140f682b725adf780fa5f27f4a3 -Size (mplayer-1.0rc3/xanim-1.5.tar.bz2) = 94535 bytes -SHA1 (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d -Size (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 168441 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/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3 +Size (mplayer-1.0rc4/default-1.7.tar.bz2) = 173439 bytes +SHA1 (mplayer-1.0rc4/AlienMind-1.2.tar.bz2) = a7796cf0827ceda4579edb918b864d783a879979 +Size (mplayer-1.0rc4/AlienMind-1.2.tar.bz2) = 131315 bytes +SHA1 (mplayer-1.0rc4/BlueHeart-1.5.tar.bz2) = 3a32cc553c8abab8ef4129e00fa61215c37288e5 +Size (mplayer-1.0rc4/BlueHeart-1.5.tar.bz2) = 281091 bytes +SHA1 (mplayer-1.0rc4/CornerMP-1.1.tar.bz2) = 676f528d370899617b0a53b86b01058b2c2262ba +Size (mplayer-1.0rc4/CornerMP-1.1.tar.bz2) = 237264 bytes +SHA1 (mplayer-1.0rc4/CornerMP-aqua-1.3.tar.bz2) = aaac4fb3878021ddd81045d43d64fcc82adfd041 +Size (mplayer-1.0rc4/CornerMP-aqua-1.3.tar.bz2) = 247755 bytes +SHA1 (mplayer-1.0rc4/Cyrus-1.2.tar.bz2) = 420b079f9480fcba1da6085754ff9ea1f60401f2 +Size (mplayer-1.0rc4/Cyrus-1.2.tar.bz2) = 228490 bytes +SHA1 (mplayer-1.0rc4/MidnightLove-1.6.tar.bz2) = 79c70c79e3916cf6f8d40d7e46aebe669e84b27e +Size (mplayer-1.0rc4/MidnightLove-1.6.tar.bz2) = 539649 bytes +SHA1 (mplayer-1.0rc4/WindowsMediaPlayer6-1.3.tar.bz2) = 44ac8f22b44fe7e30b77f2c47c48b99047fa72a9 +Size (mplayer-1.0rc4/WindowsMediaPlayer6-1.3.tar.bz2) = 31033 bytes +SHA1 (mplayer-1.0rc4/avifile-1.6.tar.bz2) = d3b66f779abe2c70f9cb0db2d9ffe4b4591db215 +Size (mplayer-1.0rc4/avifile-1.6.tar.bz2) = 42446 bytes +SHA1 (mplayer-1.0rc4/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd +Size (mplayer-1.0rc4/gnome-1.1.tar.bz2) = 368720 bytes +SHA1 (mplayer-1.0rc4/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541 +Size (mplayer-1.0rc4/hayraphon-1.0.tar.bz2) = 77628 bytes +SHA1 (mplayer-1.0rc4/hwswskin-1.0.tar.bz2) = ff96c63ad6750e83a85ba96c600ad275ae57e0fc +Size (mplayer-1.0rc4/hwswskin-1.0.tar.bz2) = 20340 bytes +SHA1 (mplayer-1.0rc4/mentalic-1.1.tar.bz2) = 054b713ff2985719351462604ac3d8e341f3fa3a +Size (mplayer-1.0rc4/mentalic-1.1.tar.bz2) = 166599 bytes +SHA1 (mplayer-1.0rc4/neutron-1.4.tar.bz2) = 79f7df9a86572fe81d2f905fcf1678cebf11c534 +Size (mplayer-1.0rc4/neutron-1.4.tar.bz2) = 369319 bytes +SHA1 (mplayer-1.0rc4/phony-1.0.tar.bz2) = 7c31d6f98cb98f5cb74c85b0759002cdbd902a41 +Size (mplayer-1.0rc4/phony-1.0.tar.bz2) = 386446 bytes +SHA1 (mplayer-1.0rc4/plastic-1.1.1.tar.bz2) = fbd3ce681e6ab786828c842b87fe1779d4f13f32 +Size (mplayer-1.0rc4/plastic-1.1.1.tar.bz2) = 454180 bytes +SHA1 (mplayer-1.0rc4/proton-1.1.tar.bz2) = 0574cc2b17864a5bfb67a12b774b425d3785123f +Size (mplayer-1.0rc4/proton-1.1.tar.bz2) = 322590 bytes +SHA1 (mplayer-1.0rc4/slim-1.0.tar.bz2) = ebdfc875f037f2fbadd4d217f08835b678a1c9ca +Size (mplayer-1.0rc4/slim-1.0.tar.bz2) = 398938 bytes +SHA1 (mplayer-1.0rc4/xanim-1.5.tar.bz2) = 205a763e424bf140f682b725adf780fa5f27f4a3 +Size (mplayer-1.0rc4/xanim-1.5.tar.bz2) = 94535 bytes +SHA1 (mplayer-1.0rc4/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d +Size (mplayer-1.0rc4/xine-lcd-1.0.tar.bz2) = 168441 bytes +SHA1 (patch-aa) = 1b09896da6e37512abb1306df4b1674d96b11c4b +SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index a88c2ffa05c..a3c88ca0874 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2004/04/10 12:23:55 salo Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/28 15:54:46 wiz Exp $ # PKGNAME= mencoder-${MPLAYER_PKG_VERSION} -PKGREVISION= 5 COMMENT= Simple movie encoder for MPlayer-playable movies .include "../../multimedia/mplayer-share/Makefile.common" diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index 46e531fc4d4..c4fa0c12e95 100644 --- a/multimedia/mencoder/distinfo +++ b/multimedia/mencoder/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.5 2004/04/07 12:57:58 salo Exp $ +$NetBSD: distinfo,v 1.6 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 (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 (patch-aa) = 1b09896da6e37512abb1306df4b1674d96b11c4b +SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e 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 :( */ diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index fcdfc03154d..81b1f0183a8 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2004/04/10 12:16:12 salo Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/28 15:54:46 wiz Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 5 COMMENT= Software-only MPEG-1/2/4 video decoder .include "../../multimedia/mplayer-share/Makefile.common" diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index 77fcac0b2f2..42879566cae 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.4 2004/04/07 12:57:58 salo Exp $ +$NetBSD: distinfo,v 1.5 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 (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 (patch-aa) = 1b09896da6e37512abb1306df4b1674d96b11c4b +SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e |