head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q1:1.5.0.4 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.2 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.4.0.10 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.8 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.6 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.4 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.3.0.34 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.32 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.30 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.28 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.26 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.24 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.14 pkgsrc-2008Q1:1.3.0.12 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 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.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2012.06.11.13.41.13; author wiz; state dead; branches; next 1.5; 1.5 date 2011.10.18.16.04.36; author drochner; state Exp; branches; next 1.4; 1.4 date 2010.09.16.18.56.12; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.10.31.22.33.28; author wiz; state Exp; branches; next 1.2; 1.2 date 2006.06.13.17.25.00; author drochner; state Exp; branches; next 1.1; 1.1 date 2005.10.24.19.46.05; author minskim; state Exp; branches; next ; desc @@ 1.6 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-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $ --- subreader.c.orig 2010-09-11 11:11:10.000000000 +0000 +++ subreader.c @@@@ -92,10 +92,10 @@@@ static int eol(char p) { /* Remove leading and trailing space */ static void trail_space(char *s) { int i = 0; - while (isspace(s[i])) ++i; + while (isspace((unsigned char)s[i])) ++i; if (i) strcpy(s, s + i); i = strlen(s) - 1; - while (i > 0 && isspace(s[i])) s[i--] = '\0'; + while (i > 0 && isspace((unsigned char)s[i])) s[i--] = '\0'; } static char *stristr(const char *haystack, const char *needle) { @@@@ -171,6 +171,8 @@@@ static subtitle *sub_read_line_sami(stre break; case 3: /* get all text until '<' appears */ + if (p - text >= LINE_LEN) + sami_add_line(current, text, &p); if (*s == '\0') break; else if (!strncasecmp (s, "
", 4)) { sami_add_line(current, text, &p); @@@@ -723,7 +725,7 @@@@ static subtitle *sub_read_line_pjs(strea if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; /* skip spaces */ - for (s=line; *s && isspace(*s); s++); + for (s=line; *s && isspace((unsigned char)*s); s++); /* allow empty lines at the end of the file */ if (*s==0) return NULL; @@@@ -776,7 +778,7 @@@@ static subtitle *sub_read_line_mpsub(str else return current; } p=line; - while (isspace(*p)) p++; + while (isspace(*(unsigned char*)p)) p++; if (eol(*p) && num > 0) return current; if (eol(*p)) return NULL; @@@@ -1822,18 +1824,18 @@@@ char * strreplace( char * in,char * what static void strcpy_trim(char *d, char *s) { // skip leading whitespace - while (*s && isspace(*s)) { + while (*s && isspace((unsigned char)*s)) { s++; } for (;;) { // copy word - while (*s && !isspace(*s)) { + while (*s && !isspace((unsigned char)*s)) { *d = tolower(*s); s++; d++; } if (*s == 0) break; // trim excess whitespace - while (*s && isspace(*s)) { + while (*s && isspace((unsigned char)*s)) { s++; } if (*s == 0) break; @@@@ -1872,7 +1874,7 @@@@ static void strcpy_get_ext(char *d, char static int whiteonly(char *s) { while (*s) { - if (!isspace(*s)) return 0; + if (!isspace((unsigned char)*s)) return 0; s++; } return 1; @ 1.5 log @add patch from upstream to fix possible buffer overflow in "sami" subtitle reader bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 20100913, provided by Aleksey Cheusov via wip. One year of changes. Ok ahoka@@ @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $ d3 1 a3 1 --- subreader.c.orig 2010-08-29 11:27:00.000000000 +0000 d5 1 a5 1 @@@@ -94,10 +94,10 @@@@ static int eol(char p) { d18 10 a27 1 @@@@ -725,7 +725,7 @@@@ static subtitle *sub_read_line_pjs(strea d36 1 a36 1 @@@@ -778,7 +778,7 @@@@ static subtitle *sub_read_line_mpsub(str d45 1 a45 1 @@@@ -1824,18 +1824,18 @@@@ char * strreplace( char * in,char * what d67 1 a67 1 @@@@ -1874,7 +1874,7 @@@@ static void strcpy_get_ext(char *d, char @ 1.3 log @Update mplayer-share, mplayer, mencoder, and gmplayer to 1.0rc9 (which is upstream 1.0rc1, but we already used rc for the previous versions). With valuable help from drochner, thanks! ChangeLog: MPlayer 1.0rc1: "Codename intentionally left blank" DOCS: * German documentation translation finished * Russian documentation translation synced and almost finished Drivers: * IVTV hardware MPEG audio/video decoder output * ALSA audio output: AC3 passthrough now works even when the device name of the digital output port has been set by the user * bicubic OpenGL scaling works with ATI cards * md5sum switched to the libavutil MD5 implementation * support for libcaca 1.0 via compatibility layer Decoders: * liba52 updated to 0.7.4 (slightly faster) * SSE optimizations for mp3lib * removed support for obsolete and non-free divx4 libraries Demuxers: * audio stream switching in MPEG-TS/PS, Matroska and streams supported by libavformat * audio stream switching between streams with different codecs * libavformat demuxer now honors -alang * chapter seeking in Matroska files * fixed seeking to absolute and percent position for libavformat demuxer * NUT demuxer using libnut * Matroska SimpleBlock support Inputs: * split of stream layer from libmpdemux to new stream library * PVR input for hardware MPEG encoder based cards, such as Hauppauge WinTV PVR-150/250/350/500 AKA IVTV but also pvrusb2 and cx88 (requires Linux >= 2.6.18 kernel, featuring native V4L2 MPEG API) * native RTSP input (handles MPEG-TS over RTP) for generic RTSP servers * support for seeking to chapters in dvd:// and dvdnav:// streams * radio support (radio://) FFmpeg/libavcodec: * VC-1/WMV3/WMV9 video decoder * Vorbis decoding speedup, now default Vorbis decoder * VMware Video decoder * On2 VP50 and VP62 decoder * lossless audio decoders: WavPack, TTA, Shorten * CAVS decoder * GXF muxer/demuxer * MXF demuxer * much improved FLAC encoder * more H.264 decoding speed improvements, plus support for -lavdopts fast * Theora decoder fixes * preliminary Vorbis encoder * MTV demuxer GUI: * Windows version added * drag-and-drop ignored last file * save and load cache setting correctly * working audio stream selection for Ogg and Matroska files * executable names like gmplayer_old etc. will now start GUI as well * -gui/-nogui options * xinerama fixes, now behaves similar to MPlayer without GUI Filters: * MMX-optimizations for -vf yadif * MMX-optimizations for -vf zrmjpeg MEncoder: * support of x264 encoding via libavcodec * rewrite -x264encopts option parser to use the 264 option parser; likely breaks 3rd party tools as the syntax of some options has changed * removed support for obsolete and non-free divx4 libraries Ports: * partial Intel Mac support, --disable-win32 --disable-mp3lib is needed * OpenGL can now create windows > screen size under Windows * allow filenames starting with \\ for remote paths on Windows Others: * SSA/ASS subtitle renderer * -endpos option for MPlayer * -correct-pts option * UTF-8 used for OSD and subtitles, some bitmap fonts will no longer work correctly and -subcp must be set for all non-UTF-8 subtitles * more audio-truncation fixes * libavutil mandatory for MPlayer compilation * more intuitive -edlout behaviour * -nortc is now default since -rtc has disadvantages with recent kernels @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $ d3 1 a3 1 --- subreader.c.orig 2006-10-22 22:32:31.000000000 +0000 d5 1 a5 1 @@@@ -74,10 +74,10 @@@@ static int eol(char p) { d18 2 a19 2 @@@@ -628,7 +628,7 @@@@ static subtitle *sub_read_line_pjs(strea if (!stream_read_line (st, line, LINE_LEN)) d23 1 a23 1 + for (s=line; *s && isspace(*(unsigned char*)s); s++); d27 1 a27 1 @@@@ -681,7 +681,7 @@@@ static subtitle *sub_read_line_mpsub(str d36 31 @ 1.2 log @update to 1.0pre8 too many changes to list here, see the ChangeLog most visible: security patches and DragonFly support were intrgrated upstream, new gmplayer look&feel (like it or not...) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- subreader.c.orig 2006-06-11 20:35:47.000000000 +0200 d18 1 a18 1 @@@@ -628,7 +628,7 @@@@ subtitle *sub_read_line_pjs(stream_t *st d27 1 a27 1 @@@@ -681,7 +681,7 @@@@ subtitle *sub_read_line_mpsub(stream_t * @ 1.1 log @Call isspace(3) with unsigned char, instead of char, to handle non-ASCII characters properly. Based on patches provided by Kevin Kim Bump PKGREVISION for mplayer and gmplayer. @ text @d3 1 a3 1 --- subreader.c.orig 2005-02-04 10:31:03.000000000 -0800 d5 1 a5 1 @@@@ -73,10 +73,10 @@@@ static int eol(char p) { d18 2 a19 2 @@@@ -627,7 +627,7 @@@@ subtitle *sub_read_line_pjs(FILE *fd,sub if (!fgets (line, LINE_LEN, fd)) d27 1 a27 1 @@@@ -680,7 +680,7 @@@@ subtitle *sub_read_line_mpsub(FILE *fd, @