head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2010Q2:1.7.0.6 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.4 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.2 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.6.0.4 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.2 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.5.0.14 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.4 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 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.1.1.0.18 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.16 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.14 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.12 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.10 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 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.8 date 2010.07.28.09.24.14; author drochner; state dead; branches; next 1.7; 1.7 date 2009.12.09.10.13.03; author drochner; state Exp; branches; next 1.6; 1.6 date 2009.04.17.16.35.40; author drochner; state Exp; branches; next 1.5; 1.5 date 2008.01.11.16.05.27; author drochner; state Exp; branches; next 1.4; 1.4 date 2007.06.15.18.20.06; author drochner; state Exp; branches; next 1.3; 1.3 date 2006.12.08.09.24.26; author abs; state Exp; branches; next 1.2; 1.2 date 2006.06.26.17.13.11; author wiz; state Exp; branches 1.2.4.1; next 1.1; 1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches 1.1.1.1; next ; 1.2.4.1 date 2006.12.09.09.13.15; author salo; state Exp; branches; next ; 1.1.1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches; next ; desc @@ 1.8 log @update to 1.1.19 changes: -bugfixes -support WebM container format -support Xv gamma adjustment -handle some more formats and Ogg tags many pkgsrc patches were integrated upstream @ text @$NetBSD: patch-ae,v 1.7 2009/12/09 10:13:03 drochner Exp $ --- src/input/input_vcd.c.orig 2009-11-30 21:55:44.000000000 +0100 +++ src/input/input_vcd.c @@@@ -29,6 +29,7 @@@@ #include #include #include +#include #include #include #ifdef HAVE_LINUX_CDROM_H @@@@ -92,7 +93,7 @@@@ typedef struct { #if defined (__linux__) || defined(__sun) struct cdrom_tochdr tochdr; struct cdrom_tocentry tocent[100]; -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) struct ioc_toc_header tochdr; struct cd_toc_entry *tocent; off_t cur_sec; @@@@ -117,7 +118,7 @@@@ typedef struct { int cur_track; -#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306) uint8_t cur_min, cur_sec, cur_frame; #endif @@@@ -177,7 +178,7 @@@@ static int input_vcd_read_toc (vcd_input return 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { struct ioc_read_toc_entry te; @@@@ -393,7 +394,7 @@@@ static off_t vcd_plugin_read (input_plug memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ return VCDSECTORSIZE; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_read (input_plugin_t *this_gen, char *buf, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; @@@@ -531,7 +532,7 @@@@ static buf_element_t *vcd_plugin_read_bl memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { @@@@ -690,7 +691,7 @@@@ static off_t vcd_plugin_seek (input_plug return offset ; /* FIXME */ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { @@@@ -764,7 +765,7 @@@@ static off_t vcd_plugin_get_length (inpu return (off_t) 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; off_t len ; @@@@ -859,7 +860,7 @@@@ static int vcd_plugin_open (input_plugin this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame; -#elif defined (__OpenBSD__) +#elif defined (__OpenBSD__) || defined(__NetBSD__) this->cur_min = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.frame; @ 1.7 log @update to 1.1.17 changes: -improved Matroska support -UTF-16 fixes -hack for Apple film trailers -improved BluRay support -OpenBSD sndio support @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @update to 1.1.16.3 changes: -security fixes (were already patched in pkgsrc) -misc bugfixes -build fixes @ text @d3 1 a3 1 --- src/input/input_vcd.c.orig 2009-02-17 03:55:21.000000000 +0100 d46 1 a46 1 static off_t vcd_plugin_read (input_plugin_t *this_gen, d55 1 a55 1 static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, d57 1 a57 1 d64 1 a64 1 static off_t vcd_plugin_seek (input_plugin_t *this_gen, @ 1.5 log @update to 1.1.9 changes: There are improvements to DVB subtitle support and H.264 video, and fixes for MP3 playback, DVB, ivtv, Flash video streams and some playlist types (particularly XML ones). One significant fix is that the special "be nice to the user" '#' handling has been dropped since it seems to have been causing more problems than it fixes. pkgsrc note: a fix for CVE-2008-0225 (RTSP buffer overflow) is already included @ text @d3 1 a3 1 --- src/input/input_vcd.c.orig 2008-01-01 14:30:08.000000000 +0100 d17 1 a17 1 -#elif defined (__FreeBSD_kernel__) d26 1 a26 1 -#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) d35 1 a35 1 -#elif defined (__FreeBSD_kernel__) d44 1 a44 1 -#elif defined (__FreeBSD_kernel__) d53 1 a53 1 -#elif defined (__FreeBSD_kernel__) d62 1 a62 1 -#elif defined (__FreeBSD_kernel__) d71 1 a71 1 -#elif defined (__FreeBSD_kernel__) d76 1 a76 1 @@@@ -859,6 +860,10 @@@@ static int vcd_plugin_open (input_plugin d80 5 a84 7 +#elif defined(__NetBSD__) + this->cur_min = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.minute; + this->cur_sec = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.second; + this->cur_frame = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.frame; #elif defined (__FreeBSD_kernel__) { int bsize = 2352; @ 1.4 log @update to 1.1.7 changes: -bugfixes, among others for VCD playback -adds support for libdca (formerly libdts) -handle disappearing audio devices (possibly ALSA specific) @ text @d3 1 a3 1 --- src/input/input_vcd.c.orig 2007-04-05 00:18:00.000000000 +0200 d5 1 a5 1 @@@@ -32,6 +32,7 @@@@ d13 1 a13 1 @@@@ -95,7 +96,7 @@@@ typedef struct { d17 1 a17 1 -#elif defined (__FreeBSD__) d22 1 a22 1 @@@@ -120,7 +121,7 @@@@ typedef struct { d26 1 a26 1 -#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__) d31 1 a31 1 @@@@ -180,7 +181,7 @@@@ static int input_vcd_read_toc (vcd_input d35 1 a35 1 -#elif defined (__FreeBSD__) d40 1 a40 1 @@@@ -396,7 +397,7 @@@@ static off_t vcd_plugin_read (input_plug d44 1 a44 1 -#elif defined (__FreeBSD__) d49 1 a49 1 @@@@ -534,7 +535,7 @@@@ static buf_element_t *vcd_plugin_read_bl d53 1 a53 1 -#elif defined (__FreeBSD__) d58 1 a58 1 @@@@ -693,7 +694,7 @@@@ static off_t vcd_plugin_seek (input_plug d62 1 a62 1 -#elif defined (__FreeBSD__) d67 1 a67 1 @@@@ -767,7 +768,7 @@@@ static off_t vcd_plugin_get_length (inpu d71 1 a71 1 -#elif defined (__FreeBSD__) d76 1 a76 1 @@@@ -862,6 +863,10 @@@@ static int vcd_plugin_open (input_plugin d84 1 a84 1 #elif defined (__FreeBSD__) @ 1.3 log @Update xine-lib to 1.1.3 * Security fixes: - Heap overflow in libmms (related to CVE-2006-2200) - Buffer overrun in Real Media input plugin. [bug #1603458] Thanks to Roland Kay for reporting and JW for the patch. * Update build system to support x86 Darwin setups, and merge patches to support Darwin OS better. * Replace custom ALSA check with pkg-config check, and make sure 0.9.0 is the requried version. * When the compiler supports it, enable hidden visibility for all the plugins to export only the plugin info entry (and eventual needed special functions), to replace the min-symtab option that wasn't working. * Add "m4b" to the list of supported file extensions for the Qt demuxer, to allow playing (unprotected) audiobooks in AAC format. * Remove --disable-fpic hack, prefer using --without-pic instead. * Add new output plugin: PulseAudio (based on PolypAudio plugin), that uses 0.9 API (PulseAudio is PolypAudio renamed). * Remove PolypAudio plugin, latest version supported 0.7 API that is no more supported by upstream, and it's replaced by PulseAudio. * Allow 0 for DVD title/chapter (navigation or full title). * New experimental JACK audio driver. * Fix switch from alsa/dmix 2.0 to 5.1 [bug #1226595] * Don't use proxy for localhost connection. [bug #1553633] * Use mmap() to open local files if available. * Use pkg-config to look for external FFmpeg. * Allow FFmpeg to play MP3s in case MAD is not present. * Reduce the dead time when trying to connect to dead hosts, by falling back to non-blocking sockets on the last address found for an host, and allowing users to provide a connection timeout. [bug #1550844] * Return the correct error message to frontends when a file is inaccessible or the network connection is broken. [bug #1550763] * Support libcaca 0.99, thanks to cjacker huang. * Fix crash on video-only WMV streams. [bug #1564598] * Report audio stream on Shorten files (required for Amarok to play them). * Optionally use fontconfig to look up fonts to use for OSD. [bug #1551042] * Prefer FreeType2 rendered fonts to bitmap fonts. * Stone age platforms update * Enabled TrueSpeech codec * New X11 visual type: xine-lib may now use frontend's mutex/lock mechanism instead of XLockDisplay/XUnlockDisplay. * Allow playing of OggFlac files. [bug #1590690] * Allow playing FLAC files with an ID3 tag at the start. * Fix some crashes caused by MP3 files (and possibly others) being misdetected as AAC. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2006/06/26 17:13:11 wiz Exp $ d3 1 a3 1 --- src/input/input_vcd.c.orig 2006-07-10 23:08:16.000000000 +0100 d5 1 a5 1 @@@@ -33,6 +33,7 @@@@ d11 1 a12 1 # include @ 1.2 log @regen (with correct offsets) @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ d3 1 a3 1 --- src/input/input_vcd.c.orig 2005-04-20 17:21:08.000000000 +0000 d5 1 a5 1 @@@@ -32,6 +32,7 @@@@ d13 1 a13 1 @@@@ -94,7 +95,7 @@@@ typedef struct { d22 1 a22 1 @@@@ -119,7 +120,7 @@@@ typedef struct { d31 1 a31 1 @@@@ -179,7 +180,7 @@@@ static int input_vcd_read_toc (vcd_input d40 1 a40 1 @@@@ -395,7 +396,7 @@@@ static off_t vcd_plugin_read (input_plug d49 1 a49 1 @@@@ -533,7 +534,7 @@@@ static buf_element_t *vcd_plugin_read_bl d58 1 a58 1 @@@@ -692,7 +693,7 @@@@ static off_t vcd_plugin_seek (input_plug d67 1 a67 1 @@@@ -766,7 +767,7 @@@@ static off_t vcd_plugin_get_length (inpu d76 1 a76 1 @@@@ -861,6 +862,10 @@@@ static int vcd_plugin_open (input_plugin @ 1.2.4.1 log @Pullup ticket 1948 - requested by abs security update for xine-lib Revisions pulled up: - pkgsrc/multimedia/xine-lib/Makefile 1.42 - pkgsrc/multimedia/xine-lib/Makefile.common 1.36 - pkgsrc/multimedia/xine-lib/distinfo 1.38 - pkgsrc/multimedia/xine-lib/patches/patch-aa 1.5 - pkgsrc/multimedia/xine-lib/patches/patch-ab 1.4 - pkgsrc/multimedia/xine-lib/patches/patch-ac 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-ae 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-ag 1.14 - pkgsrc/multimedia/xine-lib/patches/patch-ah 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-ai 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-ao 1.11 - pkgsrc/multimedia/xine-lib/patches/patch-ap 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-av 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-az 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-bb removed - pkgsrc/multimedia/xine-lib/patches/patch-bd 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-be 1.7 - pkgsrc/multimedia/xine-lib/patches/patch-bg 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-bh removed - pkgsrc/multimedia/xine-lib/patches/patch-da 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-db 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-dc 1.2 Module Name: pkgsrc Committed By: abs Date: Fri Dec 8 09:24:26 UTC 2006 Modified Files: pkgsrc/multimedia/xine-lib: Makefile Makefile.common distinfo pkgsrc/multimedia/xine-lib/patches: patch-aa patch-ab patch-ac patch-ae patch-ag patch-ah patch-ai patch-ao patch-ap patch-av patch-az patch-bd patch-be patch-bg patch-da patch-db patch-dc Removed Files: pkgsrc/multimedia/xine-lib/patches: patch-bb patch-bh Log Message: Update xine-lib to 1.1.3 * Security fixes: - Heap overflow in libmms (related to CVE-2006-2200) - Buffer overrun in Real Media input plugin. [bug #1603458] Thanks to Roland Kay for reporting and JW for the patch. * Update build system to support x86 Darwin setups, and merge patches to support Darwin OS better. * Replace custom ALSA check with pkg-config check, and make sure 0.9.0 is the requried version. * When the compiler supports it, enable hidden visibility for all the plugins to export only the plugin info entry (and eventual needed special functions), to replace the min-symtab option that wasn't working. * Add "m4b" to the list of supported file extensions for the Qt demuxer, to allow playing (unprotected) audiobooks in AAC format. * Remove --disable-fpic hack, prefer using --without-pic instead. * Add new output plugin: PulseAudio (based on PolypAudio plugin), that uses 0.9 API (PulseAudio is PolypAudio renamed). * Remove PolypAudio plugin, latest version supported 0.7 API that is no more supported by upstream, and it's replaced by PulseAudio. * Allow 0 for DVD title/chapter (navigation or full title). * New experimental JACK audio driver. * Fix switch from alsa/dmix 2.0 to 5.1 [bug #1226595] * Don't use proxy for localhost connection. [bug #1553633] * Use mmap() to open local files if available. * Use pkg-config to look for external FFmpeg. * Allow FFmpeg to play MP3s in case MAD is not present. * Reduce the dead time when trying to connect to dead hosts, by falling back to non-blocking sockets on the last address found for an host, and allowing users to provide a connection timeout. [bug #1550844] * Return the correct error message to frontends when a file is inaccessible or the network connection is broken. [bug #1550763] * Support libcaca 0.99, thanks to cjacker huang. * Fix crash on video-only WMV streams. [bug #1564598] * Report audio stream on Shorten files (required for Amarok to play them). * Optionally use fontconfig to look up fonts to use for OSD. [bug #1551042] * Prefer FreeType2 rendered fonts to bitmap fonts. * Stone age platforms update * Enabled TrueSpeech codec * New X11 visual type: xine-lib may now use frontend's mutex/lock mechanism instead of XLockDisplay/XUnlockDisplay. * Allow playing of OggFlac files. [bug #1590690] * Allow playing FLAC files with an ID3 tag at the start. * Fix some crashes caused by MP3 files (and possibly others) being misdetected as AAC. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2006/12/08 09:24:26 abs Exp $ d3 1 a3 1 --- src/input/input_vcd.c.orig 2006-07-10 23:08:16.000000000 +0100 d5 1 a5 1 @@@@ -33,6 +33,7 @@@@ d13 1 a13 1 @@@@ -95,7 +96,7 @@@@ typedef struct { d22 1 a22 1 @@@@ -120,7 +121,7 @@@@ typedef struct { d31 1 a31 1 @@@@ -180,7 +181,7 @@@@ static int input_vcd_read_toc (vcd_input d40 1 a40 1 @@@@ -396,7 +397,7 @@@@ static off_t vcd_plugin_read (input_plug d49 1 a49 1 @@@@ -534,7 +535,7 @@@@ static buf_element_t *vcd_plugin_read_bl d58 1 a58 1 @@@@ -693,7 +694,7 @@@@ static off_t vcd_plugin_seek (input_plug d67 1 a67 1 @@@@ -767,7 +768,7 @@@@ static off_t vcd_plugin_get_length (inpu d76 1 a76 1 @@@@ -862,6 +863,10 @@@@ static int vcd_plugin_open (input_plugin @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2003/04/11 09:19:54 rh Exp $ d3 1 a3 1 --- src/input/input_vcd.c.orig 2003-04-07 02:17:07.000000000 +1000 d31 1 a31 1 @@@@ -176,7 +177,7 @@@@ static int input_vcd_read_toc (vcd_input d40 1 a40 1 @@@@ -388,7 +389,7 @@@@ static off_t vcd_plugin_read (input_plug d49 1 a49 1 @@@@ -526,7 +527,7 @@@@ static buf_element_t *vcd_plugin_read_bl d58 1 a58 1 @@@@ -684,7 +685,7 @@@@ static off_t vcd_plugin_seek (input_plug d67 1 a67 1 @@@@ -758,7 +759,7 @@@@ static off_t vcd_plugin_get_length (inpu d76 1 a76 1 @@@@ -886,6 +887,10 @@@@ static input_plugin_t *open_plugin (inpu @ 1.1.1.1 log @Move xine-lib to the multimedia category (coming from graphics). This is version 1rc0anb3. @ text @@