head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.52 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.50 pkgsrc-2012Q4-base:1.12 pkgsrc-2011Q4:1.12.0.48 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q2:1.12.0.46 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.44 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.12.0.42 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.40 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.38 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.36 pkgsrc-2008Q2-base:1.12 pkgsrc-2008Q1:1.12.0.34 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.32 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.30 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.28 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.26 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.24 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.22 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.20 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.18 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.16 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.12.0.14 pkgsrc-2005Q3-base:1.12 pkgsrc-2005Q2:1.12.0.12 pkgsrc-2005Q2-base:1.12 pkgsrc-2005Q1:1.12.0.10 pkgsrc-2005Q1-base:1.12 pkgsrc-2004Q4:1.12.0.8 pkgsrc-2004Q4-base:1.12 pkgsrc-2004Q3:1.12.0.6 pkgsrc-2004Q3-base:1.12 pkgsrc-2004Q2:1.12.0.4 pkgsrc-2004Q2-base:1.12 pkgsrc-2004Q1:1.12.0.2 pkgsrc-2004Q1-base:1.12 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 netbsd-1-6:1.3.0.4 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.12 date 2004.01.26.12.26.40; author jmmv; state dead; branches; next 1.11; 1.11 date 2004.01.24.15.00.26; author tron; state Exp; branches; next 1.10; 1.10 date 2003.12.08.19.20.49; author wiz; state dead; branches; next 1.9; 1.9 date 2003.09.26.12.04.46; author salo; state Exp; branches; next 1.8; 1.8 date 2003.09.02.17.46.35; author jmmv; state dead; branches; next 1.7; 1.7 date 2003.02.22.16.26.18; author fredb; state Exp; branches; next 1.6; 1.6 date 2002.12.25.03.25.24; author wiz; state dead; branches; next 1.5; 1.5 date 2002.10.01.12.51.48; author dillo; state Exp; branches; next 1.4; 1.4 date 2002.09.29.16.18.50; author wiz; state dead; branches; next 1.3; 1.3 date 2002.08.07.13.06.45; author veego; state Exp; branches; next 1.2; 1.2 date 2002.08.07.12.53.07; author veego; state Exp; branches; next 1.1; 1.1 date 2002.06.11.23.22.43; author fredb; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.11.23.22.43; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.46.48; author jlam; state Exp; branches; next ; desc @@ 1.12 log @Moved to the multimedia category. @ text @$NetBSD: patch-ab,v 1.11 2004/01/24 15:00:26 tron 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; } @ 1.11 log @Fix Posix Threads locking problem as suggested by Min Sik Kim on the "current-users" mailing list. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Update to 1.0pre2 (rc2). Changes: DOCS: * Spanish and Russian translations almost finished * French, Hungarian, Polish translations updated * New Romanian translation started * numerous sections updated Ports: * initial Amiga/MorphOS (through GeekGadgets) support * FreeBSD 5.x (libkse/libthr) support in win32 DLL loader * finally fixed the compilation on non-mvi capable alpha CPUs * OSD menu now works on MinGW * slave mode, vobsub and MEncoder support on Windows * MinGW 3.1.0 supports MPlayer out of the box! Codecs and demuxers: * support for QuickTime version 6.3 DLLs * fixed some bugs in imported FAAD * disabled internal FAAD when using buggy GCC * --enable-externalfaad option to force using external FAAD library * imaadpcm bug fixed * ViVD v2 codec support (DLL only) * QuickTime codecs support inside Matroska * improved seeking inside Matroska * some bugs with DMO codecs have been fixed * fix for MOV files with bogus user data length * fixed some demuxers which read after the EOF * better RTP synchronisation * FLAC support through imported libmpflac Filters: * new delogo filter (for removing TV channel logos) * presets support in swscaler filter * new audio filter export, for supporting visual effect applications * correct select handling in bmovl filter FFmpeg/libavcodec: * better divx/xvid bug detection code * Id RoQ decoder * Interplay MVE decoder * WC3/Xan video decoder * Xan DPCM, DK3 & DK4 ADPCM audio decoders * detect old xvid with fourcc=DIVX * vp3 decoder fixes * improved the Alpha optimizations * x86 optimizations are threadsafe now * settable scene change threshold * better MPEG1/MPEG2 conformance encoder * quality improvement for high bitrate videos with trellis quantization * indeo3 decoder fixed * new options: mv0, cbp * DV video encoder * MPEG1 now works with Trellis quantization Faad2: * synced to latest CVS * HE_AAC profile added * SBR QMF improvements * DRM updates * Covariance speedup * reduced memory usage * overall cleanups and fixes Drivers: * VIDIX driver for nVidia cards * VIDIX and libdha ported to Windows * SDL on IRIX support * directfb2 fixed for latest directfb * opengl video output for Windows * smoother audio playback with alsa9 * fullscreen and geometry support in directx * fullscreen support with opengl drivers * OSD fixed with svga * new cvidix and winvidix drivers * user settable colorkey Others: * several leak fixes * selecting optimizations for PPC 7455 CPU * CPU detection code now measures speed on x86 * unrarlib cleaned up a bit * updated the list of known x86 CPUs (including Opteron!) * alignment and smart line splitting option on subtitles @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2003/09/26 12:04:46 salo Exp $ d3 16 a18 20 Fixes remotely exploitable buffer overflow vulnerability. A malicious host can craft a harmful ASX header, and trick MPlayer into executing arbitrary code upon parsing that header. --- libmpdemux/asf_streaming.c.orig 2003-08-15 21:13:23.000000000 +0200 +++ libmpdemux/asf_streaming.c 2003-09-26 13:27:04.000000000 +0200 @@@@ -502,11 +502,11 @@@@ return NULL; } http_set_uri( http_hdr, server_url->url ); - sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port ); + sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port ); url_free( server_url ); } else { http_set_uri( http_hdr, url->file ); - sprintf( str, "Host: %s:%d", url->hostname, url->port ); + sprintf( str, "Host: %.220s:%d", url->hostname, url->port ); } http_set_field( http_hdr, str ); @ 1.9 log @PKGREVISION++ Fix remotely exploitable buffer overflow vulnerability. A malicious host can craft a harmful ASX header, and trick MPlayer into executing arbitrary code upon parsing that header. http://www.mplayerhq.hu/homepage/design6/news.html @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Update to 1.0pre1 (renamed to 1.0rc1 for pkgsrc): mplayer (1.0) pre1: "Development" on the beach NOTE: the mplayer 'main' branch was forked at the time of 0.90-rc4, so 0.90-rc5 (and later 0.90 releases) changes are independent! (it also means that there are main-only and 0_90-only changes) DOCS: * DOCS/Language/ dirs renamed to DOCS/id, English files moved to DOCS/en * HTML --> XML format conversion (English, Russian and French for now) * new Spanish DOCS translation * man page restructured, options ordered * Finally merged libavc-option.txt into the man page. * slave mode commands moved from the man page to DOCS/tech/ * traditional Chinese help file added * massive help file updates, most languages are up to date now * new and improved Windows port section with Cygwin and MinGW subsections * almost all options documented * fixes and small updates all over the place Big/Structural changes: * linux/ dir renamed to osdep/ * postproc/postproc* files moved to libavcodec * old libmpeg2 replaced with patched version of the 0.3.1 release * docs priority & installation (--language=ab,cd,ef,all and so on) * yuv2rgb conversion removed from most vo drivers (like fbdev, gif89 etc) * -vop option obsoleted by reverse-order -vf, big config layer changes * stream layer "cleanup", -dvd -> dvd:// etc * autosub fuzziness, it tries to load all subs with similar filenames * removed the whole old config reader, leaving only the newer one (no backward compatibilty!) Ports: * HP-UX fixes * Ported to Darwin / Mac OS X (with extra accurate Darwin timers) * Ported to Win32/MinGW (including network, timers, getch etc) * win32 codecs DLL support on Win32/Cygwin (and MinGW too!) * Lots of PPC (including Altivec) optimizations * Some ARM fixes * Alpha fixes (especially non-gcc3 support) * Initial Hitachi SuperH support (SH3/SH4) Codecs/demuxers support: * realaudio win32 DLLs support * various realaudio/realvideo fixes, including WxH bugs, Sipr etc * various realmedia a-v sync fixes * realaudio v4 demuxer * realaudio 14_4 and 28_8 codecs support (both binary DLLs and native code) * realmedia rtsp:// support (independent from the live.com rtsp stuff!) * Matroska demuxer * demuxer: enabling mpeg4-es autodetection, h264-es support * .wav extradata parsing (for truespeech, atrac3 etc) * MPEG-TS (Transport Stream) and TIVO demuxers * DVB (Digital Video Broadcasting) input driver * hwac3: DTS passthru support * new filters: down3dright, detc, telecine, tfields, ilpack, ivtc, dsize, tinterlace, pullup (mmx optimized!), framestep, tile * vf layer: slices support (crop, expand, swscale only) * vf scale aspect fixes * swscaler: cleanup & API change, yv12 -> yuy2 in alpha asm, -fPIC compileable * swscaler: brightness/cont/sat. and different YUV matrices support * NUV encoding * SGI image files decoding (-mf) * Theora video (using libtheora/libogg) support * DivX.com 5.0.5 libs support * support for latest XviD en/decoder features * decoder for Hauppauge PVR 250/350 MB-YUV format (fourcc HM12) * support for Vanguard's win32 h264 etc codecs * Video for Linux 1: various bugfixes, video eq support * Video for Linux 2 support * TV support: kick-ass image format handling * mp3lib: moved the assembly sources into gcc inline assembly (c) * mp3lib: sync with mpg123 0.59s-pre * mp3lib: final layer-1 support * mp3lib: skip trashed first mp3 frame, fixes lot of buggy/misdetected files * imported a working FAAD version * 8BPS (Planar RGB) support * working DVD (libmpdvdkit) support for Cygwin/MinGW FFmpeg/libavcodec: * libavcodec: static,const,compiler warning cleanup, UINTX -> uintx_t * old HuffYUV v1 support * PAL 4:1:1 SMPTE 314M DV streams support, NTSC DV last MB column fix * fixing padding bug autodetection for some rare files * DspContext.(i)dct_* bitexact cleanup * user settable quantizer bias * MPEG1 slice encoding support * MSMPEG4 2-pass support * H264 video decoding * Indeo 3 video decoding * VP3 video decoder (buggy somtimes) * Sorenson 3 (SVQ3) video decoder (it's actually a h264 variant) * 3IV1 (3ivx v1) decoding * ASV1 (ASUS Video v1) and ASV2 (ASUS Video v2) en/decoding * Improved SVQ1 decoding (using FFmpeg VLC functions) * truncated unary binarization, unary k-th order exp golomb binarization :) * FFV1: lossless YUV codec, compresses a lot better than huffyuv, but slower * lossless MJPEG en/decoding, pegasus "pseudo yuv" (=RCT) decoding * ATI VCR1 and VCR2 decoding * full featured SH4 optimizations * ARM optimized simple_idct * MPEG2 encoding * PSX MDEC decoder * user settable quantization matrices Drivers: * x11_common: fix detection of metacity * x11_common: 10l fix in original layer detection code * x11_common: extended fstype config options * x11_common: smooth window moving * tdfx_vid driver (3dfx cards overlay with AGP support) * vo_xover: general x11 overlay driver, currently only tdfx_vid uses it * mga_vid: various fixes, 16MB G400 detection, support for multiple cards * new svgalib vo driver * vo_directfb2: triple buffering support, configuration sys changed, fixes * OpenGL driver cleanups/fixes (both vo_gl and vo_gl2) * vo_fbdev cleanup/partial rewrite, now with real direct rendering * vo_xvmc: new driver featuring XvMC (HW MC/IDCT) acceleration * new TGA output driver * new vo_fbdev2 (written from scratch) Others: * gcc can now detect badly called mp_msg()s * a lot of config/cmdline parsing fixes (some of them were at least 100000l bugs) * configure: enable VIDIX for PPC * configure: full featured PPC optimizations and rewritten architecture handling * spudec.c: Fix "invalid fragment" handling, Improved subtitle queueing * network streaming layer: IPv6 support * FTP support * playtree parsing speedup :) * various URL parsing fixes * crashing on broken config files finally fixed! * GUI: PPC (reverse byteorder) fixes * GUI: revert to 'default' skin if configured skin failed * TOOLS/plotpsnr.pl: PSNR plotting tool using gnuplot * DOCS/tech/mpcf.txt: MPCF/NUT draft/specification * TVout/matroxtv: various improvements * spelling/grammar fixes in numerous files @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2003/02/22 16:26:18 fredb Exp $ d3 20 a22 29 --- libavcodec/alpha/simple_idct_alpha.c.orig Tue Nov 26 19:20:20 2002 +++ libavcodec/alpha/simple_idct_alpha.c Sat Feb 22 05:57:45 2003 @@@@ -49,7 +49,7 @@@@ static inline int idct_row(DCTELEM *row) { int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3, t; - uint64_t l, r; + uint64_t l, r, t2; l = ldq(row); r = ldq(row + 4); @@@@ -60,12 +60,12 @@@@ if (((l & ~0xffffUL) | r) == 0) { a0 >>= ROW_SHIFT; - a0 = (uint16_t) a0; - a0 |= a0 << 16; - a0 |= a0 << 32; + t2 = (uint16_t) a0; + t2 |= t2 << 16; + t2 |= t2 << 32; - stq(a0, row); - stq(a0, row + 4); + stq(t2, row); + stq(t2, row + 4); return 1; } @ 1.7 log @Enable on NetBSD/alpha, with patches submitted by Dave Huang in PR/20468. One more platform (maybe NetBSD/amiga?), and I think we could just remove the platform restriction entirely. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Obsoleted by 0.90rc2 (rc12). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2002/10/01 12:51:48 dillo Exp $ d3 12 a14 5 --- libmpdemux/vcd_read_nbsd.h.orig Tue Oct 1 13:24:26 2002 +++ libmpdemux/vcd_read_nbsd.h @@@@ -21,6 +21,20 @@@@ vcd_set_msf(unsigned int sect) vcd_entry_data.addr.msf.minute = sect; } d16 15 a30 24 +static inline void +vcd_inc_msf(void) +{ + vcd_entry_data.addr.msf.frame++; + if (vcd_entry_data.addr.msf.frame==75){ + vcd_entry_data.addr.msf.frame=0; + vcd_entry_data.addr.msf.second++; + if (vcd_entry_data.addr.msf.second==60){ + vcd_entry_data.addr.msf.second=0; + vcd_entry_data.addr.msf.minute++; + } + } +} + static inline unsigned int vcd_get_msf() { @@@@ -145,6 +159,7 @@@@ vcd_read(int fd, char *mem) sc.error); return -1; } + vcd_inc_msf(); return VCD_SECTOR_DATA; } @ 1.5 log @fix VCD playback search for config files where we install them bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 0.90pre8. Changes: pre8: A fix for the http:// infinite memory leak bug, some WMS9 mms:// fixes, various SPARC, HP/UX, and NetBSD/OpenBSD portability fixes, demuxer fixes for >2GB nuppelvideo files, an mencoder -ss fix for 3-pass encoding, another fix for the gui.conf locale bug, an X11 fullscreen switching fix, and a MOV files edit-list handling fix were made. The manpage has been re-formatted, small DOCS updates were made, and the ChangeLog files came back. Code cleanup was continued (more obsolete files were removed or merged), and the Win32 DLL loader has been synced with AviFile CVS. pre7: Obsolete code (such as libvo2 and old input methods) was removed. libmpcodecs was cleaned up. The behavior the of -afm/-vfm options has changed. Various demuxer and codec fixes were mad for realvideo support. The 'sipr' audio codec was added. New 2-pass bitrate control was implemented, and various rv10 and MPEG4 en/decoding fixes were made in libavcodec. New video filters include soft-eq, halfpack, and film noise. Networking fixes were made. Live.com support was improved. The v4l capturing code was nearly rewritten. A new audio input layer is used. Libmpdvdkit was upgraded to use libdvdcss 1.2.2. Better ac3 passthrough was implemented with ALSA 9. Various GUI fixes were made. Subtitle selection and drag & drop support was added. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2002/08/07 13:06:45 veego Exp $ d3 31 a33 14 --- mplayer.c.orig Mon Aug 5 20:37:14 2002 +++ mplayer.c Wed Aug 7 15:00:51 2002 @@@@ -2390,9 +2390,9 @@@@ } #endif } break; - case MP_CMD_MUTE: { + case MP_CMD_MUTE: mixer_mute(); - } + break; case MP_CMD_LOADFILE : { play_tree_t* e = play_tree_new(); play_tree_add_file(e,cmd->args[0].v.s); @ 1.3 log @I modified the local patch-ab but forgot to copy it and now I have to regernate all distinfos. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update from 0.90pre5 (rc5) to 0.90pre6 (rc6). Local changes: - Restore the dependency to win32codecs which was lost 4 month ago (Hi Rene) - Depends on audio/realplayer if MPLAYER_USE_REALMEDIA is set to YES - Add a patch which was commited after the release to fix crashes while muting the sound. Changelog: - WMV1, Sorenson v1 (SVQ1) and RealPlayer 8.0 (RV20/30, Cook) codecs support - libavcodec M1 direct rendering, IPB support with Xv - libavcodec improvements, bugfixes - both encoder & decoder side - Raw DV demuxer, libdv-based DV audio/video decoder - Various MOV/MP4, RM and ASF/WMV demuxer bugfixes, improvements - Detection of AVI files which needs -ni, workaround for some Nandub bugs - Support for live.com RTP/RTSP streaming libraries - Support to rip DVD subs in VobSub format, bugfixes of mpsub/srt converter - Closed Captioning (ascii subs on RC1 DVDs) support - Massive directfb updates - Vidix fixes/updates, including fixes of all known radeon bugs - dithered 1/4/8 bpp support with -vo svga (EGA rulez:)) - AO: alsa9 fixes/improvements, native ARTS driver - various endianess and 64-bit fixes, including mencoder and -ao pcm - tons of small compatibility/portability fixes, better cygwin, darwin support - GUI fixes, new features - playlist, audio/video equalizer, preferences - Skins: fixed many small glitches, few new skins - 'mencvcd' script - helps creating VCD/SVCD with mencoder - html DOCS updates, manpage & README restructured (again :)) @ text @d4 4 a7 2 +++ mplayer.c Wed Aug 7 13:51:30 2002 @@@@ -2392,6 +2392,7 @@@@ d9 2 a10 1 case MP_CMD_MUTE: { d12 1 a13 1 } d16 1 @ 1.1 log @Take advantage of some capabilities of the NetBSD audio driver layer that are evidently not available with the Sun audio interface it resembles, to better sync audio with video. The native "sun" driver (the current default) should now work at least as well as the "oss" driver (once the default, but now disabled) used to. @ text @d3 7 a9 3 --- libao2/ao_sun.c.orig Mon Apr 29 03:47:30 2002 +++ libao2/ao_sun.c @@@@ -445,13 +445,19 @@@@ d11 2 a12 28 #endif -#ifndef __OpenBSD__ +#if !defined(__OpenBSD__) && !defined(__NetBSD__) ioctl(audio_fd, AUDIO_GETINFO, &info); if (queued_bursts - info.play.eof > 2) return 0; #endif +#if defined(__NetBSD__) + ioctl(audio_fd, AUDIO_GETINFO, &info); + return info.hiwat * info.blocksize - info.play.seek; +#else return ao_data.outburst; +#endif + } // plays 'len' bytes of 'data' @@@@ -507,7 +513,7 @@@@ static float get_delay(){ audio_info_t info; ioctl(audio_fd, AUDIO_GETINFO, &info); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) return (float) info.play.seek/ (float)byte_per_sec ; #else if (info.play.samples && enable_sample_timing == RTSC_ENABLED) @ 1.1.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 18:46:48 +0000 @ text @d1 34 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 34 $NetBSD: patch-ab,v 1.1.2.1 2002/06/23 18:46:48 jlam Exp $ --- libao2/ao_sun.c.orig Mon Apr 29 03:47:30 2002 +++ libao2/ao_sun.c @@@@ -445,13 +445,19 @@@@ } #endif -#ifndef __OpenBSD__ +#if !defined(__OpenBSD__) && !defined(__NetBSD__) ioctl(audio_fd, AUDIO_GETINFO, &info); if (queued_bursts - info.play.eof > 2) return 0; #endif +#if defined(__NetBSD__) + ioctl(audio_fd, AUDIO_GETINFO, &info); + return info.hiwat * info.blocksize - info.play.seek; +#else return ao_data.outburst; +#endif + } // plays 'len' bytes of 'data' @@@@ -507,7 +513,7 @@@@ static float get_delay(){ audio_info_t info; ioctl(audio_fd, AUDIO_GETINFO, &info); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) return (float) info.play.seek/ (float)byte_per_sec ; #else if (info.play.samples && enable_sample_timing == RTSC_ENABLED) @