head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.4 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.2 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q1:1.6.0.20 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.18 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.16 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.14 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.12 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.10 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.8 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.6 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.4 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.2 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.4.0.20 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.18 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.16 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.6 pkgsrc-2008Q1:1.4.0.4 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.7 date 2012.06.11.13.41.13; author wiz; state dead; branches; next 1.6; 1.6 date 2009.10.19.00.13.07; author ahoka; state Exp; branches; next 1.5; 1.5 date 2009.10.18.22.22.10; author ahoka; state Exp; branches; next 1.4; 1.4 date 2007.12.21.11.31.16; author tron; state Exp; branches; next 1.3; 1.3 date 2007.12.18.22.58.53; author tron; state Exp; branches; next 1.2; 1.2 date 2006.04.13.14.05.34; author drochner; state dead; branches; next 1.1; 1.1 date 2005.08.27.06.59.52; author dogcow; state Exp; branches; next ; desc @@ 1.7 log @Update mplayer packages to 1.1, provided by Leonardo Taccari in PR 46566. Pkgsrc changes: * Fix some pkglint(1) warnings (no functional changes intended) * Modified options.mk in order to always enable or disable a PKG_SUPPORTED_OPTION (for more information please give a look to the second "Note" of options.mk) * Removed the mplayer-internal-faad PKG_SUPPORTED_OPTION, now faad support is only enabled via audio/faad2. * Changed MASTER_SITES, now MPlayer distfile is fetched directly from its mirror. MPlayer changes: 1.1: "We gave up on 1.0" Decoders: * FFmpeg AAC decoder is now preferred over libfaad2 and the internal libfaad2 forked copy has been removed in its favor Demuxers: * experimental support for using binary Quicktime codecs with -demuxer lavf. * correct runtime and average bitrate for VBR (variable bitrate) MP3 Filters: * delogo: allow to change the rectangle based on the time. * lavfi: libavfilter filter graphs (experimental). Other: * support adding noise at output resolution with -vo gl:noise-strength=8 * experimental support for OpenGL ES 1.0 in -vo gl * support for PGS (BluRay-compatible), DVB and XSUB subtitles. * af_cmdline slave command to change e.g. audio equalizer options at runtime. * vo x11: don't hide or show cursor any more if attached to an existing window (-wid) * try reconnecting network streams e.g. after network timeouts * lots of bug fixes as always (and surely a few new bugs, too :-( ) GUI: Support for the GUI continues. * numerous fixes, improvements and updates * UTF-8 support * all skin messages available as slave commands (gui ) * fancy new icon Ports: * Wine (see DOCS/tech/crosscompile.txt) MEncoder: * -force-key-frames option to set explicit seek points. MPlayer (1.0) rc4: "Yes We Can" GUI: Changes towards removing the GUI * The GUI will no longer display any error or warning messages. * Special GUI slave commands (gui_*) were removed, along with the related key bindings. Decoders: * YUY2 Lossless Codec (YLC0) via binary DLL * Truemotion RT codec (TR20) via binary DLL * Nogantech Codec (NTN1 and NTN2) via binary DLL * add new FourCCs (m1v1, yuvs, VYUY, Y42B, V422, YUNV, UYNV, UYNY, uyv1, 2Vu1, P422, HDYC, IJLV, MVJP) TwoCCs (0xA106, 0x6c75, 0xAAC0, 0x55005354) to existing decoders * AMR now handled via OpenCORE decoder * updated Windows Media Screen Codec (MSS1, MSS2) via binary DLL * CoreAVC H.264 decoder via binary DLL (Windows only) * Kega Game video codec (KGV1) via binary DLL * SoftLab-NSK Forward MPEG-2 I-frames (SLIF) via binary DLL * JPEG 2000 support via OpenJPEG * internal liba52 copy removed * CineForm HD (CFHD) via binary DLL * VP8 en-/decoding through libvpx wrapper and native decoder in FFmpeg * support for external libmpeg2 added * hardware MPEG decoder priority lowered * external libmpg123 support Demuxers: * Mostly fixed timing issues with some H.264 (PAFF) samples * Matroska and Ogg demuxers switched to use libavformat by default. Report issues and use -demuxer ogg and -demuxer mkv to work around them. * support for TrueHD in Blu-ray streams in libmpdemux * more Blu-ray codec support with lavf * fix length in ASF/WMV files * support ISDB-Tb DVB streams Filters: * remove vf_yuy2, functionality is replaced by -vf format=yuv2 * remove vf_rgb2bgr, functionality is replaced by sws and vf_format Streaming: * Support for unencrypted Blu-ray playback through libbluray. Use it through: mplayer br:////path/to/disc Drivers: * -vo yuv4mpeg:interlaced no longer does its own interlaced RGB->YUV conversion. Use -vf scale=::1 to keep the same behavior and report if there are any issues with that. * X11: Window manager chooses Window position by default. Add geometry=50%:50% to your configuration to get the old behavior. * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5 * Support for more formats in OpenGL video output drivers (different YUV subsampling, 16 bit per component) * Selectable YUV to RGB conversion standard for -vo gl (-vo gl:colorspace=...:levelconv=...) * -vo gl now tries to use yuv=2 by default if possible * -vo gl:stereo=... for experimental stereo (3D) support * -vo matrixview finally added * add OS/2 KAI audio driver (-ao kai) Other: * -nosub option for disabling auto-selected subtitles * support for displaying subs in the terminal (FIXME) * support for subtitles with audio-only files * support for right-to-left languages with embedded subtitles * support for UTF-16 encoded external subtitles * support for 8 channel audio * sync dvd:// and dvdnav:// features * support for MPEG-4 ASP in VDPAU video output (non-B-frame only) * support for live and non-live DVB teletext with demuxer lavf * -name, -title and -use-filename-title options for MPlayer * support for stream handling via FFmpeg, in particular RTMP and RTSP (use e.g. ffmpeg://http://example.com/test) * experimental support for external libass, configure with --disable-ass-internal * better support for 16-bit-per-component formats and formats with alpha channel * better out-of-the-box support for compiling for ARM, IA64, MinGW32 and MinGW-w64, MinGW has ASLR enabled with recent enough binutils * libdvdcss synced with upstream Subversion snapshot MEncoder: * add -tsprog for demuxer lavf @ text @$NetBSD: patch-ag,v 1.6 2009/10/19 00:13:07 ahoka Exp $ --- libvo/osd.c.orig 2009-04-08 22:21:21.000000000 +0200 +++ libvo/osd.c @@@@ -29,6 +29,11 @@@@ #include #include "cpudetect.h" +#if ARCH_X86 && defined(__APPLE__) +#undef ARCH_X86 +#define ARCH_X86 0 +#endif + #if ARCH_X86 static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF000000000000ULL; @ 1.6 log @Take 2 on trying to make this work on OSX. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.5 2009/10/18 22:22:10 ahoka Exp $ @ 1.5 log @Upgrade to the SVN snapshot as of 2009-10-17. The builtin libavcodec now uses yasm to assemble hand written h264 code. The older x264 we currently have in pkgsrc is not supported by mplayer, so I had to do some hand tweaking to make it work. It may contain bugs because of this, so report any fallouts with h264. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.4 2007/12/21 11:31:16 tron Exp $ d5 3 a7 3 @@@@ -41,7 +41,7 @@@@ static const unsigned long long mask24hl #define COMPILE_C #endif d9 8 a16 5 -#if ARCH_X86 +#if defined(ARCH_X86) && !defined(__APPLE__) #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT #define COMPILE_MMX @ 1.4 log @Update "mplayer", "mplayer-share", "mencoder" and "gmplayer" packages to version 1.0rc2 (as 1.0rc10). Changes since version 1.0rc1 (known as 1.0rc9 in "pkgsrc"): - A lot of new audio and video decoders and other improvements - A large number of bug fixes - Updated documentation - Support for Mac OS X Intel Approved by Thomas Klausner (because it fixes the Darwin-i386 build). @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 5 --- libvo/osd.c.orig 2007-10-07 20:49:28.000000000 +0100 +++ libvo/osd.c 2007-12-20 21:37:45.000000000 +0000 @@@@ -12,7 +12,7 @@@@ #include "cpudetect.h" #include "mangle.h" d9 1 a9 1 -#ifdef ARCH_X86 a10 2 #define CAN_COMPILE_X86_ASM #endif d12 2 @ 1.3 log @Fix inconsistency (using "#pragma pack()" without ever using "#pragma pack()". This brings us one step closer to building the "mplayer" package under Mac OS X Intel. @ text @d3 10 a12 4 --- loader/wine/poppack.h.orig 2006-10-22 23:32:30.000000000 +0100 +++ loader/wine/poppack.h 2007-12-18 22:56:25.000000000 +0000 @@@@ -2,7 +2,7 @@@@ #undef __WINE_PSHPACK_H a13 6 #if defined(__GNUC__) || defined(__SUNPRO_C) -#pragma pack() +// #pragma pack() #elif defined(__SUNPRO_CC) #warning "Assumes default alignment is 4" #pragma pack(4) @ 1.2 log @-use the "try2" distfile, it already contains the fix for the PCM decoder which we had a patch for -add another patch from the Mplayer site which fixes CVE-2006-0579 (ASF demuxer overflows) bump PKGREVISIONS of mplayer, mencoder and gmplayer @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2005/08/27 06:59:52 dogcow Exp $ d3 4 a6 3 --- libmpcodecs/ad_pcm.c 2005/07/28 13:43:24 1.18 +++ libmpcodecs/ad_pcm.c 2005/08/25 19:46:20 1.19 @@@@ -98,8 +98,8 @@@@ d8 6 a13 10 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) { - int len=sh_audio->channels*sh_audio->samplesize-1; - len=(minlen+len)&(~len); // sample align + unsigned len = sh_audio->channels*sh_audio->samplesize; + len = maxlen - maxlen % len; // sample align len=demux_read_data(sh_audio->ds,buf,len); return len; } @ 1.1 log @Security fix for mplayer as given in http://www.sven-tantau.de/public_files/mplayer/mplayer_20050824.txt . bump PKGREVISION of affected pkgs. @ text @d1 1 a1 1 $NetBSD: patch-do,v 1.1 2005/05/31 19:15:11 jmmv Exp $ @