head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.26 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.24 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.22 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.20 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.18 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.16 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.14 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.12 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.10 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 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.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2007.06.15.18.20.06; author drochner; state dead; branches; next 1.3; 1.3 date 2006.12.08.09.24.26; author abs; state Exp; branches; next 1.2; 1.2 date 2004.03.11.17.26.02; author jmmv; state Exp; branches 1.2.22.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.22.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.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 @$NetBSD: patch-ac,v 1.3 2006/12/08 09:24:26 abs Exp $ --- src/audio_out/audio_sun_out.c.orig 2006-07-16 17:18:09.000000000 +0100 +++ src/audio_out/audio_sun_out.c @@@@ -41,6 +41,11 @@@@ #ifdef __svr4__ #include #endif +#include + +#if (defined(BSD) && BSD >= 199306) +typedef unsigned uint_t; +#endif #include "xine_internal.h" #include "xineutils.h" @@@@ -89,7 +94,9 @@@@ typedef struct sun_driver_s { uint32_t num_channels; int bytes_per_frame; +#ifndef __NetBSD__ uint32_t frames_in_buffer; /* number of frames writen to audio hardware */ +#endif enum { RTSC_UNKNOWN = 0, @@@@ -114,12 +121,14 @@@@ typedef struct sun_driver_s { unsigned buf_len; #endif +#ifndef __NetBSD__ #if SW_SAMPLE_COUNT struct timeval tv0; uint_t sample0; #endif uint_t last_samplecnt; +#endif } sun_driver_t; @@@@ -129,6 +138,7 @@@@ typedef struct sun_driver_s { */ static int realtime_samplecounter_available(xine_t *xine, char *dev) { +#ifndef __NetBSD__ int fd = -1; audio_info_t info; int rtsc_ok = RTSC_DISABLED; @@@@ -247,6 +257,9 @@@@ error: } return rtsc_ok; +#else + return RTSC_ENABLED; +#endif } @@@@ -430,7 +443,9 @@@@ static int ao_sun_open(ao_driver_t *this this->mode = mode; this->input_sample_rate = rate; +#ifndef __NetBSD__ this->frames_in_buffer = 0; +#endif /* * open audio device @@@@ -462,6 +477,9 @@@@ static int ao_sun_open(ao_driver_t *this info.play.sample_rate = this->input_sample_rate; info.play.eof = 0; info.play.samples = 0; +#ifdef __NetBSD__ + info.blocksize = 1024; +#endif this->convert_u8_s8 = 0; @@@@ -523,7 +541,9 @@@@ static int ao_sun_open(ao_driver_t *this return 0; } +#ifndef __NetBSD__ this->last_samplecnt = 0; +#endif this->output_sample_rate = info.play.sample_rate; this->num_channels = info.play.channels; @@@@ -564,6 +584,7 @@@@ static int ao_sun_delay(ao_driver_t *thi sun_driver_t *this = (sun_driver_t *) this_gen; audio_info_t info; +#ifndef __NetBSD__ if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 && (this->frames_in_buffer == 0 || info.play.samples > 0)) { @@@@ -610,6 +631,10 @@@@ static int ao_sun_delay(ao_driver_t *thi } #endif } +#else + if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0) + return info.play.seek / this->bytes_per_frame; +#endif return NOT_REAL_TIME; } @@@@ -718,7 +743,9 @@@@ static int ao_sun_write(ao_driver_t *thi if (num_written > 0) { int buffered_samples; +#ifndef __NetBSD__ this->frames_in_buffer += num_written / this->bytes_per_frame; +#endif /* * Avoid storing too much data in the sound driver's buffers. @ 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-ac,v 1.2 2004/03/11 17:26:02 jmmv Exp $ @ 1.2 log @Update to 1rc3a. Summary of changes since rc0a: - Fixed some bugs which caused xine to segfault under certain conditions, and a long-standing issue that would make xine hang with the NPTL implementation in Linux kernel 2.6. - Stabilized core engine and much improved subtitles. - Built-in VCD navigation, XvMC support and better handling of funny filenames. - A security hole regarding the "#save" MRL option has been closed. - Added a feature: append "#save:filename" to an MRL to save the stream during playback. - Lots of bugfixes. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ d3 1 a3 1 --- src/audio_out/audio_sun_out.c.orig 2003-12-14 23:13:22.000000000 +0100 d27 1 a27 1 @@@@ -113,12 +120,14 @@@@ typedef struct sun_driver_s { d42 1 a42 1 @@@@ -128,6 +137,7 @@@@ typedef struct sun_driver_s { d50 1 a50 1 @@@@ -246,6 +256,9 @@@@ error: d60 1 a60 1 @@@@ -429,7 +442,9 @@@@ static int ao_sun_open(ao_driver_t *this d70 1 a70 1 @@@@ -461,6 +476,9 @@@@ static int ao_sun_open(ao_driver_t *this d80 1 a80 1 @@@@ -522,7 +540,9 @@@@ static int ao_sun_open(ao_driver_t *this d90 1 a90 1 @@@@ -563,6 +583,7 @@@@ static int ao_sun_delay(ao_driver_t *thi d98 1 a98 1 @@@@ -609,6 +630,10 @@@@ static int ao_sun_delay(ao_driver_t *thi d109 1 a109 1 @@@@ -717,7 +742,9 @@@@ static int ao_sun_write(ao_driver_t *thi @ 1.2.22.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-ac,v 1.3 2006/12/08 09:24:26 abs Exp $ d3 1 a3 1 --- src/audio_out/audio_sun_out.c.orig 2006-07-16 17:18:09.000000000 +0100 d27 1 a27 1 @@@@ -114,12 +121,14 @@@@ typedef struct sun_driver_s { d42 1 a42 1 @@@@ -129,6 +138,7 @@@@ typedef struct sun_driver_s { d50 1 a50 1 @@@@ -247,6 +257,9 @@@@ error: d60 1 a60 1 @@@@ -430,7 +443,9 @@@@ static int ao_sun_open(ao_driver_t *this d70 1 a70 1 @@@@ -462,6 +477,9 @@@@ static int ao_sun_open(ao_driver_t *this d80 1 a80 1 @@@@ -523,7 +541,9 @@@@ static int ao_sun_open(ao_driver_t *this d90 1 a90 1 @@@@ -564,6 +584,7 @@@@ static int ao_sun_delay(ao_driver_t *thi d98 1 a98 1 @@@@ -610,6 +631,10 @@@@ static int ao_sun_delay(ao_driver_t *thi d109 1 a109 1 @@@@ -718,7 +743,9 @@@@ static int ao_sun_write(ao_driver_t *thi @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2003/10/02 10:11:49 mycroft Exp $ d3 2 a4 2 --- src/audio_out/audio_sun_out.c.orig 2003-07-13 19:29:04.000000000 +0000 +++ src/audio_out/audio_sun_out.c 2003-10-02 09:51:34.000000000 +0000 d17 1 a17 1 @@@@ -89,7 +94,9 @@@@ d27 1 a27 1 @@@@ -113,12 +120,14 @@@@ d42 1 a42 1 @@@@ -128,6 +137,7 @@@@ d44 1 a44 1 static int realtime_samplecounter_available(char *dev) d50 1 a50 1 @@@@ -246,6 +256,9 @@@@ d60 1 a60 1 @@@@ -431,7 +444,9 @@@@ d70 1 a70 1 @@@@ -463,6 +478,9 @@@@ d80 1 a80 1 @@@@ -524,7 +542,9 @@@@ d90 1 a90 1 @@@@ -566,6 +586,7 @@@@ d98 1 a98 1 @@@@ -611,6 +632,10 @@@@ d109 1 a109 1 @@@@ -719,7 +744,9 @@@@ @ 1.1.1.1 log @Move xine-lib to the multimedia category (coming from graphics). This is version 1rc0anb3. @ text @@