head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.84 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.82 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.80 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.78 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.76 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.74 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.72 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.70 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.68 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.66 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.64 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.62 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.60 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.58 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.56 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.54 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.52 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.50 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.48 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.46 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.44 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.42 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.40 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.36 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.16 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.38 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.34 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.32 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.30 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.28 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.26 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.24 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.22 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.20 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.18 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.14 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.12 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.10 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.8 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.6 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.4 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.2 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.4.0.28 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.26 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.24 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.22 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.20 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.18 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.16 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.14 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.12 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.8 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.2.0.20 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.18 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.16 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.14 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.12 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.10 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.8 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.6 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.4 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.1.0.10 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.8 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.6 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.4 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.2; locks; strict; comment @# @; 1.5 date 2015.11.21.09.47.23; author leot; state Exp; branches; next 1.4; commitid AsLuTCIkweHAuWJy; 1.4 date 2012.06.11.21.55.34; author wiz; state Exp; branches; next 1.3; 1.3 date 2012.06.11.13.41.13; author wiz; state Exp; branches; next 1.2; 1.2 date 2009.10.18.22.22.10; author ahoka; state Exp; branches; next 1.1; 1.1 date 2008.10.20.07.40.00; author wiz; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2008.10.20.07.40.00; author rtr; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2008.12.17.12.50.31; author rtr; state Exp; branches; next ; desc @@ 1.5 log @Update gmplayer, mencoder, mplayer and mplayer-share to 1.2. pkgsrc changes: * Various misc fixes (thanks to pkglint) * Do not pass --with-dvdread-config and --with-dvdnav-config, the dvdread-config and dvdnav-config seems that no longer exist. * Avoid to pass --enable-libvorbis otherwise libvorbis can not be recognised by the mplayer configure script. * (re)Use patches from multimedia/ffmpeg2 instead of using mplayer-specific ones Changes: 1.2: "FrameCounter" Decoders: * Hardware accelerated decoding on OS X via VDA. * Internal libmpeg2 disabled by default, on the assumption that nobody really needs it anymore. Other: * "run" slave/keybinding command now supports expanding properties * better support for > 8 bit formats in -vo gl * support for XYZ color space in -vo gl * -vo gl now supports OSD (not EOSD though) with GLES backend. * GLES backend now uses GLES v2 with YUV support via shaders * -vo gl supports rotated display without needing video filters via -monitor-orientation command-line option. * -vo gl now has an OSX/Cocoa backend, so it should be a better alternative to -vo corevideo now. * -vo gl2 renamed to -vo gl_tiled to stop people from assuming it is better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. * Support binding keys corresponding to non-ASCII characters. * Limited -endpos support for -dump* * Danish messages header file renamed from help_mp-dk.h to help_mp-da.h in order to comply with ISO 639 language code (configure language options will now require da instead of dk) * configure: options --enable-gtk1, --with-glib-config= and --with-gtk-config= removed * Change ID3 genre name for genre ID 67 from "Psychadelic" to "Psychedelic" * support for audio bin/cue images Ports: * Windows: support file names as UTF-8 in slave mode and passing file names as wchar command line arguments. * Android: MPlayer can be run from adb shell and display videos via OpenGL ES. Note that just a bit of seeking etc. would cause reproducible system reboots after just a few seconds on my Galaxy S2. * Android: -wid is supported. This should allow using MPlayer in slave mode, a native window pointer needs to be passed as -wid. Untested. GUI: * Support for TV/DVB * Various improvements of the context menu and the preferences dialog * Revision of the user interface texts * Console message with information on deprecated (but still supported) entries in the skin configuration file * New symbol character (r) and new dynamic label variables ($D, $U, $P) * New items (pimage, rpotmeter) * Updated skins (avifile, Blue, Blue-small, Clearlooks, Corelian, disappearer, mentalic, mplayer_red, nativeRed, neutron, phony, plastic, slim, softgrip, standard, trium, tvisor, xanim) * Video can be rotated * New GUI message: evSetRotation * GUI now officially needs GTK+ and GLib versions 2 (it hadn't compiled with versions 1 for quite some time) * Support for audio and video bin/cue image playback * Support for Audio CD / (Super) Video CD / DVD image and DVD copy playback through the respective scheme (cd://, vcd://, dvd://) * Support for arbitrary non-binary data file cue sheets (i.e. cue sheets describing playlists for data files containing multiple titles) FFmpeg: * Version 2.8 with local patches Thanks to wiz@@ for misc private discussion. @ text @$NetBSD: patch-an,v 1.4 2012/06/11 21:55:34 wiz Exp $ http://bugzilla.mplayerhq.hu/show_bug.cgi?id=751 Please also see: pkg/20549. --- stream/vcd_read_fbsd.h.orig 2013-12-02 13:53:03.000000000 +0000 +++ stream/vcd_read_fbsd.h @@@@ -63,9 +63,8 @@@@ typedef struct mp_vcd_priv_st { vcd_tocentry entry; #ifdef VCD_NETBSD struct cd_toc_entry entry_data; -#else - cdsector_t buf; #endif + cdsector_t buf; struct ioc_toc_header tochdr; unsigned int track; } mp_vcd_priv_t; @@@@ -237,8 +236,8 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) sc.cmd[9] = 1 << 4; // user data only sc.cmd[10] = 0; // no subchannel sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; - sc.datalen = VCD_SECTOR_DATA; + sc.databuf = (caddr_t) vcd->buf.data; + sc.datalen = VCD_SECTOR_DATA + 4; // MMC-3 spec says there are 4 extra bytes sc.senselen = sizeof(sc.sense); sc.flags = SCCMD_READ; sc.timeout = 10000; @@@@ -255,9 +254,9 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) #else if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) != VCD_SECTOR_SIZE) return 0; // EOF? +#endif memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); -#endif vcd_inc_msf(vcd); return VCD_SECTOR_DATA; } @ 1.4 log @Add comments to patches. From Leonardo Taccari in private mail. XXX: patch-ae and patch-sub_osd.c (OS X support) need to reviewed if they are still needed. The same holds for patch-ve_x264 @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.3 2012/06/11 13:41:13 wiz Exp $ d7 1 a7 1 --- stream/vcd_read_fbsd.h.orig 2011-05-07 21:32:50.000000000 +0000 d18 1 d20 1 a20 2 @@@@ -236,8 +235,8 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) d31 1 a31 1 @@@@ -254,9 +253,9 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) @ 1.3 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 @d1 5 a5 1 $NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $ @ 1.2 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-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ d3 1 a3 1 --- stream/vcd_read_fbsd.h.orig 2008-03-10 20:28:42.000000000 +0100 d5 1 a5 1 @@@@ -41,9 +41,8 @@@@ typedef struct mp_vcd_priv_st { d16 1 a16 1 @@@@ -209,8 +208,8 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) d27 1 a27 1 @@@@ -227,9 +226,9 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) d31 4 a34 5 - - memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); #endif + + memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); @ 1.1 log @Add a patch for better VCD support from Sergey Svishchev. Fixes PR 20549. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- stream/vcd_read_fbsd.h.orig 2007-10-07 19:49:26.000000000 +0000 d5 1 a5 1 @@@@ -37,9 +37,8 @@@@ typedef struct mp_vcd_priv_st { d13 1 d16 1 a16 2 static inline void @@@@ -208,8 +207,8 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) d21 1 a21 1 - sc.datalen = 2328; d27 1 a27 1 @@@@ -226,9 +225,9 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) d31 5 a35 4 +#endif memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); -#endif @ 1.1.2.1 log @file patch-an was added on branch pkgsrc-2008Q3 on 2008-12-17 12:50:31 +0000 @ text @d1 37 @ 1.1.2.2 log @pullup ticket #2611 - requested by tron mplayer, gmplayer, mencoder: security and vcd support patches revisions pulled up: pkgsrc/multimedia/gmplayer/Makefile 1.72, 1.73 pkgsrc/multimedia/gmplayer/distinfo 1.58, 1.59 pkgsrc/multimedia/mencoder/Makefile 1.40, 1.41 pkgsrc/multimedia/mplayer-share/distinfo 1.55, 1.56 pkgsrc/multimedia/mplayer-share/patches/patch-an 1.1 pkgsrc/multimedia/mplayer-share/patches/patch-ca 1.1 pkgsrc/multimedia/mplayer/Makefile 1.62, 1.63 Module Name: pkgsrc Committed By: wiz Date: Mon Oct 20 07:40:00 UTC 2008 Modified Files: pkgsrc/multimedia/gmplayer: Makefile distinfo pkgsrc/multimedia/mencoder: Makefile pkgsrc/multimedia/mplayer: Makefile pkgsrc/multimedia/mplayer-share: distinfo Added Files: pkgsrc/multimedia/mplayer-share/patches: patch-an Log Message: Add a patch for better VCD support from Sergey Svishchev. Fixes PR 20549. ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: tron Date: Mon Dec 15 15:37:59 UTC 2008 Modified Files: pkgsrc/multimedia/gmplayer: Makefile distinfo pkgsrc/multimedia/mencoder: Makefile pkgsrc/multimedia/mplayer: Makefile pkgsrc/multimedia/mplayer-share: distinfo Added Files: pkgsrc/multimedia/mplayer-share/patches: patch-ca Log Message: Add security patch from MPlayer SVN repository to fix a buffer overflow in the TwinVQ media file decoder. @ text @a0 37 $NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ --- stream/vcd_read_fbsd.h.orig 2007-10-07 19:49:26.000000000 +0000 +++ stream/vcd_read_fbsd.h @@@@ -37,9 +37,8 @@@@ typedef struct mp_vcd_priv_st { vcd_tocentry entry; #ifdef VCD_NETBSD struct cd_toc_entry entry_data; -#else - cdsector_t buf; #endif + cdsector_t buf; } mp_vcd_priv_t; static inline void @@@@ -208,8 +207,8 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) sc.cmd[9] = 1 << 4; // user data only sc.cmd[10] = 0; // no subchannel sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; - sc.datalen = 2328; + sc.databuf = (caddr_t) vcd->buf.data; + sc.datalen = VCD_SECTOR_DATA + 4; // MMC-3 spec says there are 4 extra bytes sc.senselen = sizeof(sc.sense); sc.flags = SCCMD_READ; sc.timeout = 10000; @@@@ -226,9 +225,9 @@@@ vcd_read(mp_vcd_priv_t* vcd, char *mem) #else if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) != VCD_SECTOR_SIZE) return 0; // EOF? +#endif memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); -#endif vcd_inc_msf(vcd); return VCD_SECTOR_DATA; } @