head 1.13; access; symbols pkgsrc-2026Q1:1.13.0.112 pkgsrc-2026Q1-base:1.13 pkgsrc-2025Q4:1.13.0.110 pkgsrc-2025Q4-base:1.13 pkgsrc-2025Q3:1.13.0.108 pkgsrc-2025Q3-base:1.13 pkgsrc-2025Q2:1.13.0.106 pkgsrc-2025Q2-base:1.13 pkgsrc-2025Q1:1.13.0.104 pkgsrc-2025Q1-base:1.13 pkgsrc-2024Q4:1.13.0.102 pkgsrc-2024Q4-base:1.13 pkgsrc-2024Q3:1.13.0.100 pkgsrc-2024Q3-base:1.13 pkgsrc-2024Q2:1.13.0.98 pkgsrc-2024Q2-base:1.13 pkgsrc-2024Q1:1.13.0.96 pkgsrc-2024Q1-base:1.13 pkgsrc-2023Q4:1.13.0.94 pkgsrc-2023Q4-base:1.13 pkgsrc-2023Q3:1.13.0.92 pkgsrc-2023Q3-base:1.13 pkgsrc-2023Q2:1.13.0.90 pkgsrc-2023Q2-base:1.13 pkgsrc-2023Q1:1.13.0.88 pkgsrc-2023Q1-base:1.13 pkgsrc-2022Q4:1.13.0.86 pkgsrc-2022Q4-base:1.13 pkgsrc-2022Q3:1.13.0.84 pkgsrc-2022Q3-base:1.13 pkgsrc-2022Q2:1.13.0.82 pkgsrc-2022Q2-base:1.13 pkgsrc-2022Q1:1.13.0.80 pkgsrc-2022Q1-base:1.13 pkgsrc-2021Q4:1.13.0.78 pkgsrc-2021Q4-base:1.13 pkgsrc-2021Q3:1.13.0.76 pkgsrc-2021Q3-base:1.13 pkgsrc-2021Q2:1.13.0.74 pkgsrc-2021Q2-base:1.13 pkgsrc-2021Q1:1.13.0.72 pkgsrc-2021Q1-base:1.13 pkgsrc-2020Q4:1.13.0.70 pkgsrc-2020Q4-base:1.13 pkgsrc-2020Q3:1.13.0.68 pkgsrc-2020Q3-base:1.13 pkgsrc-2020Q2:1.13.0.64 pkgsrc-2020Q2-base:1.13 pkgsrc-2020Q1:1.13.0.44 pkgsrc-2020Q1-base:1.13 pkgsrc-2019Q4:1.13.0.66 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.62 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.13.0.60 pkgsrc-2019Q2-base:1.13 pkgsrc-2019Q1:1.13.0.58 pkgsrc-2019Q1-base:1.13 pkgsrc-2018Q4:1.13.0.56 pkgsrc-2018Q4-base:1.13 pkgsrc-2018Q3:1.13.0.54 pkgsrc-2018Q3-base:1.13 pkgsrc-2018Q2:1.13.0.52 pkgsrc-2018Q2-base:1.13 pkgsrc-2018Q1:1.13.0.50 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.13.0.48 pkgsrc-2017Q4-base:1.13 pkgsrc-2017Q3:1.13.0.46 pkgsrc-2017Q3-base:1.13 pkgsrc-2017Q2:1.13.0.42 pkgsrc-2017Q2-base:1.13 pkgsrc-2017Q1:1.13.0.40 pkgsrc-2017Q1-base:1.13 pkgsrc-2016Q4:1.13.0.38 pkgsrc-2016Q4-base:1.13 pkgsrc-2016Q3:1.13.0.36 pkgsrc-2016Q3-base:1.13 pkgsrc-2016Q2:1.13.0.34 pkgsrc-2016Q2-base:1.13 pkgsrc-2016Q1:1.13.0.32 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.13.0.30 pkgsrc-2015Q4-base:1.13 pkgsrc-2015Q3:1.13.0.28 pkgsrc-2015Q3-base:1.13 pkgsrc-2015Q2:1.13.0.26 pkgsrc-2015Q2-base:1.13 pkgsrc-2015Q1:1.13.0.24 pkgsrc-2015Q1-base:1.13 pkgsrc-2014Q4:1.13.0.22 pkgsrc-2014Q4-base:1.13 pkgsrc-2014Q3:1.13.0.20 pkgsrc-2014Q3-base:1.13 pkgsrc-2014Q2:1.13.0.18 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.13.0.16 pkgsrc-2014Q1-base:1.13 pkgsrc-2013Q4:1.13.0.14 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.12 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.10 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.13.0.8 pkgsrc-2013Q1-base:1.13 pkgsrc-2012Q4:1.13.0.6 pkgsrc-2012Q4-base:1.13 pkgsrc-2012Q3:1.13.0.4 pkgsrc-2012Q3-base:1.13 pkgsrc-2012Q2:1.13.0.2 pkgsrc-2012Q2-base:1.13 pkgsrc-2012Q1:1.11.0.14 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.12 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.10 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.8 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.6 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.4 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.2 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.10.0.6 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.4 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.2 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.8.0.20 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.18 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.16 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.14 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.12 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.10 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.8 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.6 pkgsrc-2008Q1:1.8.0.4 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.2 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.7.0.4 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.2 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.6.0.8 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.6 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.4 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.2 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2012.06.11.21.55.34; author wiz; state Exp; branches; next 1.12; 1.12 date 2012.06.11.13.41.13; author wiz; state Exp; branches; next 1.11; 1.11 date 2010.09.16.18.56.12; author wiz; state Exp; branches; next 1.10; 1.10 date 2009.10.19.00.13.07; author ahoka; state Exp; branches; next 1.9; 1.9 date 2009.10.18.22.22.10; author ahoka; state Exp; branches; next 1.8; 1.8 date 2007.12.21.11.31.15; author tron; state Exp; branches; next 1.7; 1.7 date 2007.06.07.13.19.54; author tron; state Exp; branches; next 1.6; 1.6 date 2006.06.13.17.25.00; author drochner; state dead; branches 1.6.8.1; next 1.5; 1.5 date 2005.05.31.19.15.11; author jmmv; state Exp; branches; next 1.4; 1.4 date 2005.05.30.12.43.30; author wiz; state Exp; branches; next 1.3; 1.3 date 2005.01.06.14.40.45; author drochner; state Exp; branches; next 1.2; 1.2 date 2004.04.28.15.54.46; author wiz; state dead; branches; next 1.1; 1.1 date 2004.01.26.12.06.43; author jmmv; state Exp; branches 1.1.1.1; next ; 1.6.8.1 date 2007.06.15.06.31.53; author ghen; state Exp; branches; next ; 1.1.1.1 date 2004.01.26.12.06.43; author jmmv; state Exp; branches; next ; desc @@ 1.13 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 @$NetBSD: patch-ae,v 1.12 2012/06/11 13:41:13 wiz Exp $ XXX: OS X support --- libvo/aclib.c.orig 2011-11-07 19:54:49.000000000 +0000 +++ libvo/aclib.c @@@@ -29,6 +29,11 @@@@ #include "fastmemcpy.h" #undef memcpy +#if ARCH_X86 && defined(__APPLE__) +#undef ARCH_X86 +#define ARCH_X86 0 +#endif + #define BLOCK_SIZE 4096 #define CONFUSION_FACTOR 0 //Feel free to fine-tune the above 2, it might be possible to get some speedup with them :) @ 1.12 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 3 a3 1 $NetBSD: patch-ae,v 1.11 2010/09/16 18:56:12 wiz Exp $ @ 1.11 log @Update to 20100913, provided by Aleksey Cheusov via wip. One year of changes. Ok ahoka@@ @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.10 2009/10/19 00:13:07 ahoka Exp $ d3 1 a3 1 --- libvo/aclib.c.orig 2010-01-03 09:20:01.000000000 +0000 d5 2 a6 2 @@@@ -30,6 +30,11 @@@@ #include "libavutil/x86_cpu.h" @ 1.10 log @Take 2 on trying to make this work on OSX. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.9 2009/10/18 22:22:10 ahoka Exp $ d3 1 a3 1 --- libvo/aclib.c.orig 2009-04-08 22:21:21.000000000 +0200 d5 2 a6 2 @@@@ -28,6 +28,11 @@@@ #include "fastmemcpy.h" @ 1.9 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-ae,v 1.8 2007/12/21 11:31:15 tron Exp $ d5 3 a7 3 @@@@ -40,7 +40,7 @@@@ //#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.8 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 4 --- libvo/aclib.c.orig 2007-10-07 20:49:28.000000000 +0100 +++ libvo/aclib.c 2007-12-20 21:37:53.000000000 +0000 @@@@ -18,7 +18,7 @@@@ //Feel free to fine-tune the above 2, it might be possible to get some speedup with them :) d9 1 a9 2 //#define STATISTICS -#ifdef ARCH_X86 a10 2 #define CAN_COMPILE_X86_ASM #endif d12 2 @ 1.7 log @Add patch from the MPlayer SVN repository to fix an overflow in the CDDB code reported in CVE-2007-2948. Bump package revision. @ text @d3 10 a12 3 --- stream/stream_cddb.c.orig 2006-10-22 23:32:25.000000000 +0100 +++ stream/stream_cddb.c 2007-06-07 13:57:35.000000000 +0100 @@@@ -435,7 +435,7 @@@@ a13 25 switch(status) { case 210: - ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id); + ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@@@ -496,7 +496,7 @@@@ ptr++; // We have a list of exact/inexact matches, so which one do we use? // So let's take the first one. - ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@@@ -533,7 +533,7 @@@@ switch(status) { case 200: // Found exact match - ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=4 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @ 1.6 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: patch-ae,v 1.5 2005/05/31 19:15:11 jmmv Exp $ d3 3 a5 5 --- cpudetect.c.orig 2005-01-12 22:56:25.000000000 +0100 +++ cpudetect.c 2005-05-20 20:00:44.000000000 +0200 @@@@ -20,7 +20,7 @@@@ #include #endif d7 25 a31 42 -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #include #endif @@@@ -169,7 +169,7 @@@@ #endif /* FIXME: Does SSE2 need more OS support, too? */ -#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__) if (caps->hasSSE) check_os_katmai_support(); if (!caps->hasSSE) @@@@ -324,7 +324,7 @@@@ #ifdef ARCH_X86_64 gCpuCaps.hasSSE=1; gCpuCaps.hasSSE2=1; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) int has_sse=0, ret; size_t len=sizeof(has_sse); @@@@ -334,6 +334,10 @@@@ #elif defined(__NetBSD__) || defined (__OpenBSD__) #if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__) +#ifdef __x86_64__ + gCpuCaps.hasSSE=1; + gCpuCaps.hasSSE2=1; +#else int has_sse, has_sse2, ret, mib[2]; size_t varlen; @@@@ -362,6 +366,7 @@@@ static void check_os_katmai_support( voi gCpuCaps.hasSSE2=1; mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" ); } +#endif /* x86_64 */ #else gCpuCaps.hasSSE = 0; mp_msg(MSGT_CPUDETECT,MSGL_WARN, "No OS support for SSE, disabling to be safe.\n" ); @ 1.6.8.1 log @Pullup ticket 2107 - requested by tron security fix for mplayer - pkgsrc/multimedia/gmplayer/Makefile 1.60 - pkgsrc/multimedia/gmplayer/distinfo 1.47 - pkgsrc/multimedia/mplayer/Makefile 1.42-1.43 - pkgsrc/multimedia/mplayer-share/distinfo 1.40 - pkgsrc/multimedia/mplayer-share/patches/patch-ae 1.7 Module Name: pkgsrc Committed By: tron Date: Thu Jun 7 13:19:55 UTC 2007 Modified Files: pkgsrc/multimedia/gmplayer: Makefile distinfo pkgsrc/multimedia/mplayer: Makefile Added Files: pkgsrc/multimedia/mplayer-share/patches: patch-ae Log Message: Add patch from the MPlayer SVN repository to fix an overflow in the CDDB code reported in CVE-2007-2948. Bump package revision. --- Module Name: pkgsrc Committed By: tron Date: Fri Jun 8 10:07:17 UTC 2007 Modified Files: pkgsrc/multimedia/mplayer: Makefile pkgsrc/multimedia/mplayer-share: distinfo Log Message: Regenerate the "distinfo" for the "mplayer" package, too. Bump the package revision again because the patch didn't get applied previously. Problem pointed out by Geert Hendrickx. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 3 --- stream/stream_cddb.c.orig 2006-10-22 23:32:25.000000000 +0100 +++ stream/stream_cddb.c 2007-06-07 13:57:35.000000000 +0100 @@@@ -435,7 +435,7 @@@@ d9 42 a50 25 switch(status) { case 210: - ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id); + ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@@@ -496,7 +496,7 @@@@ ptr++; // We have a list of exact/inexact matches, so which one do we use? // So let's take the first one. - ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@@@ -533,7 +533,7 @@@@ switch(status) { case 200: // Found exact match - ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=4 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @ 1.5 log @Apply a set of fixes to improve support of other OSes (specially DragonFly). All these changes are already in mplayer's repository. Patches provided by Joerg Sonnenberger in private mail. @ text @d1 1 a1 1 $NetBSD: pkgsrc/multimedia/mplayer-share/patches/patch-ae,v 1.4 2005/05/30 12:43:30 wiz Exp $ @ 1.4 log @regen with updated line numbers @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2005/01/06 14:40:45 drochner Exp $ d4 29 a32 2 +++ cpudetect.c @@@@ -334,6 +334,10 @@@@ static void check_os_katmai_support( voi @ 1.3 log @SSE(2) support is always present on amd64 - ifdef out the sysctl @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- cpudetect.c.orig 2005-01-06 13:37:02.000000000 +0100 d5 1 a5 1 @@@@ -330,6 +330,10 @@@@ static void check_os_katmai_support( voi d16 1 a16 1 @@@@ -358,6 +362,7 @@@@ static void check_os_katmai_support( voi @ 1.2 log @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 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2004/01/26 12:06:43 jmmv Exp $ d3 3 a5 3 --- libmpdemux/tvi_bsdbt848.c.orig Sat Oct 4 19:29:01 2003 +++ libmpdemux/tvi_bsdbt848.c @@@@ -41,6 +41,7 @@@@ d7 5 a11 26 #ifdef __NetBSD__ #include +#include #else #include #include @@@@ -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; */ + } d13 2 a14 6 if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0) { perror("FIONREAD"); return(TVI_CONTROL_FALSE); } +#endif d16 8 a23 2 /* When mencoder wants audio data, it wants data.. it won't go do anything else until it gets it :( */ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2003/12/08 19:20:49 wiz Exp $ @ 1.1.1.1 log @Move mplayer-share to the multimedia category (coming from graphics). This is version 1.0rc3. @ text @@