head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.26 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.24 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.22 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.20 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.18 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.16 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.14 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.12 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.10 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.8 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.6 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.4 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.2 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.8.0.2 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.7.0.4 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.2 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.4.0.6 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.4 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 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.9 date 2007.06.15.18.20.07; author drochner; state dead; branches; next 1.8; 1.8 date 2007.02.01.07.33.34; author wiz; state Exp; branches; next 1.7; 1.7 date 2006.08.06.10.36.50; author wiz; state Exp; branches; next 1.6; 1.6 date 2006.07.24.20.42.07; author drochner; state Exp; branches; next 1.5; 1.5 date 2006.06.21.18.31.14; author drochner; state Exp; branches; next 1.4; 1.4 date 2005.07.29.16.09.11; author drochner; state dead; branches; next 1.3; 1.3 date 2005.05.26.22.47.22; author reed; state Exp; branches; next 1.2; 1.2 date 2004.03.11.17.26.02; author jmmv; state dead; branches; next 1.1; 1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches; next ; desc @@ 1.9 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-an,v 1.8 2007/02/01 07:33:34 wiz Exp $ --- src/input/input_cdda.c.orig 2006-08-11 21:40:02.000000000 +0000 +++ src/input/input_cdda.c @@@@ -86,6 +86,7 @@@@ #define CD_FRAMES_PER_SECOND 75 #define CD_RAW_FRAME_SIZE 2352 #define CD_LEADOUT_TRACK 0xAA +#define CD_BLOCK_OFFSET 150 typedef struct _cdrom_toc_entry { int track_mode; @@@@ -613,14 +614,20 @@@@ static int read_cdrom_frames(cdda_input_ return 0; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) #include +#include static int read_cdrom_toc(int fd, cdrom_toc *toc) { struct ioc_toc_header tochdr; +#if defined(__FreeBSD__) struct ioc_read_toc_single_entry tocentry; +#elif defined(__NetBSD__) + struct ioc_read_toc_entry tocentry; + struct cd_toc_entry data; +#endif int i; /* fetch the table of contents */ @@@@ -646,13 +653,26 @@@@ static int read_cdrom_toc(int fd, cdrom_ memset(&tocentry, 0, sizeof(tocentry)); +#if defined(__FreeBSD__) tocentry.track = i; tocentry.address_format = CD_MSF_FORMAT; if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) { perror("CDIOREADTOCENTRY"); return -1; } +#elif defined(__NetBSD__) + memset(&data, 0, sizeof(data)); + tocentry.data_len = sizeof(data); + tocentry.data = &data; + tocentry.starting_track = i; + tocentry.address_format = CD_MSF_FORMAT; + if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) { + perror("CDIOREADTOCENTRYS"); + return -1; + } +#endif +#if defined(__FreeBSD__) toc->toc_entries[i-1].track_mode = (tocentry.entry.control & 0x04) ? 1 : 0; toc->toc_entries[i-1].first_frame_minute = tocentry.entry.addr.msf.minute; toc->toc_entries[i-1].first_frame_second = tocentry.entry.addr.msf.second; @@@@ -661,18 +681,41 @@@@ static int read_cdrom_toc(int fd, cdrom_ (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) + tocentry.entry.addr.msf.frame; +#elif defined(__NetBSD__) + toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0; + toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute; + toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second; + toc->toc_entries[i-1].first_frame_frame = tocentry.data->addr.msf.frame; + toc->toc_entries[i-1].first_frame = + (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + + (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) + + tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET; +#endif } /* fetch the leadout as well */ memset(&tocentry, 0, sizeof(tocentry)); +#if defined(__FreeBSD__) tocentry.track = CD_LEADOUT_TRACK; tocentry.address_format = CD_MSF_FORMAT; if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) { perror("CDIOREADTOCENTRY"); return -1; } +#elif defined(__NetBSD__) + memset(&data, 0, sizeof(data)); + tocentry.data_len = sizeof(data); + tocentry.data = &data; + tocentry.starting_track = CD_LEADOUT_TRACK; + tocentry.address_format = CD_MSF_FORMAT; + if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) { + perror("CDIOREADTOCENTRYS"); + return -1; + } +#endif +#if defined(__FreeBSD__) toc->leadout_track.track_mode = (tocentry.entry.control & 0x04) ? 1 : 0; toc->leadout_track.first_frame_minute = tocentry.entry.addr.msf.minute; toc->leadout_track.first_frame_second = tocentry.entry.addr.msf.second; @@@@ -681,6 +724,16 @@@@ static int read_cdrom_toc(int fd, cdrom_ (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) + tocentry.entry.addr.msf.frame; +#elif defined(__NetBSD__) + toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0; + toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute; + toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second; + toc->leadout_track.first_frame_frame = tocentry.data->addr.msf.frame; + toc->leadout_track.first_frame = + (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + + (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) + + tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET; +#endif return 0; } @@@@ -689,12 +742,12 @@@@ static int read_cdrom_frames(cdda_input_ unsigned char *data) { int fd = this_gen->fd; -#if __FreeBSD_version < 501106 - struct ioc_read_audio cdda; -#endif while( num_frames ) { +#if defined(__FreeBSD__) #if __FreeBSD_version < 501106 + struct ioc_read_audio cdda; + cdda.address_format = CD_MSF_FORMAT; cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND; cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE; @@@@ -712,6 +765,33 @@@@ static int read_cdrom_frames(cdda_input_ perror("CDIOCREADAUDIO"); return -1; } +#elif defined(__NetBSD__) + scsireq_t req; + int nblocks = 1; + + memset(&req, 0, sizeof(req)); + req.cmd[0] = 0xbe; + req.cmd[1] = 0; + req.cmd[2] = (frame >> 24) & 0xff; + req.cmd[3] = (frame >> 16) & 0xff; + req.cmd[4] = (frame >> 8) & 0xff; + req.cmd[5] = (frame >> 0) & 0xff; + req.cmd[6] = (nblocks >> 16) & 0xff; + req.cmd[7] = (nblocks >> 8) & 0xff; + req.cmd[8] = (nblocks >> 0) & 0xff; + req.cmd[9] = 0x78; + req.cmdlen = 10; + + req.datalen = nblocks * CD_RAW_FRAME_SIZE; + req.databuf = data; + req.timeout = 10000; + req.flags = SCCMD_READ; + + if(ioctl(fd, SCIOCCOMMAND, &req) < 0) { + perror("SCIOCCOMMAND"); + return -1; + } +#endif data += CD_RAW_FRAME_SIZE; frame++; @ 1.8 log @Really include CD_BLOCK_OFFSET changes from Sergey Svishchev, sent in PR 34107. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to 1.1.2, provided by Kimura Fuyuki in PR 34107. xine-lib (1.1.2) * Security fixes: - CVE-2005-4048: possible buffer overflow in libavcodec (crafted PNGs). - CVE-2006-2802: possible buffer overflow in the HTTP plugin. - possible buffer overflow via bad indexes in specially-crafted AVI files * Update gettext support to 0.14.5, disable internal gettext, fix locales handling, use the correct domain for strings. * Italian translation update * Czech translation update * Disable the XXMC plugin if Xv support isn't there * Also look for Xv support in /usr/lib for X.org's new location * Fix using xine-lib on systems with SELinux enabled * Build right with libiconv in /usr/local as default on FreeBSD * Fix a potential crash with fixed-size lacing in the Matroska demuxer * Patch from SuSE to fix alsa after hardware suspend * Fix the ./configure --enable-static-xv parameter * Really fix the speed changing race that was mentioned in 1.1.1 * Send events for tvtime filmmode changes * Add an image decoder based on gdk-pixbuf * Add browseable capability to smb input plugin * Enable AMD64 mmx/sse support in some plugins (tvtime, libmpeg2, goom...) * Fix xxmc subpictures (broken since 1.1.1) * FFmpeg update (version 51.1.0) * Fix detection of locale containing a modifier (like "@@euro") * New volume normalization post plugin * New image noise post plugin (useful for mitigating some compression artifacts) * Support for Vorbis-style comments in FLAC files * Coverity fixes * Add ATSC support to the DVB plugin * Make various structures and arrays constant. * Fix up health check to find libX11 and libXv shared objects even if devel packages aren't installed (where appropriate). (Ubuntu 47357) * Fix install problems in case configure was generated by autoconf >= 2.59c. * Fixed some win32 codec freezes when configured w32-path doesn't exist * Add support for RealPlayer 10 codecs (from SUSE) xine-lib (1.1.1) * Improve sound quality when using alsa 1.0.9 or above. When playing a 44.1khz stream on a 48khz only capable sound card. It bypasses alsa-lib resampler and uses xine's * Windows ports bug fixes and improvements * Set up the framebuffer palette (fb video out). * build fixes and improvements, added --with-pthread-prefix and --with-zlib-prefix options * new DirectFB video output plugin with many improvements (output to overlay or TV, deinterlacing, image controls, zoom, OSD, double/triple buffering, vsync, flicker filtering, field parity control) * overlay cropping fixes for small streams or when using cropping support * experimental frame allocation optimization reduces cpu usage of the deinterlacer plugin by up 25% * implement time seeking on DVD plugin * move CFLAGS optimizations to a separated file (added --disable-optimizations) * use the same codec path as MPlayer (/usr[/local]/lib/codecs) * FFmpeg sync (new QDM2 decoder) * imported Duck TrueMotion 2 decoder from FFmpeg * sync libfaad2 to latest GPL compatible version; fixes AAC decoding on x86_64 arch * support gapless playback while switching streams (requires UI cooperation) * fix speed changing race causing deadlock with v4l plugin * cddb improvements/fixes (DTITLE/DYEAR parsing, timeout increase and multiline entries support) [#1205274] xine-lib (1.1.0) * new quality deinterlacer from dscaler: GreedyH (Greedy High Motion) * new quality deinterlacer from dscaler: TomsMoComp (Tom's Motion Compensated) * added help for most deinterlace methods * ffmpeg update * use ImageMagick to convert and display different type of images (png, jpg...) * improve ASX playlist parsing * add an extended MRL reference event (MRL title, start time, play time): needed for the ASX parser; deprecates plain MRL reference events. * goom updated to 2k4-0 xine-lib (1.0.4) * tiny doc update * build fixes and cross build improvements * fixed an align problem in Win32 DirectX video output plugin * fixed linking of X11 plugins for some platforms @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.6 2006/07/24 20:42:07 drochner Exp $ d3 1 a3 1 --- src/input/input_cdda.c.orig 2005-10-08 15:57:42.000000000 +0200 d5 9 a13 1 @@@@ -613,14 +613,20 @@@@ static int read_cdrom_frames(cdda_input_ d35 1 a35 1 @@@@ -646,13 +652,26 @@@@ static int read_cdrom_toc(int fd, cdrom_ d62 1 a62 1 @@@@ -661,18 +680,41 @@@@ static int read_cdrom_toc(int fd, cdrom_ d74 1 a74 1 + tocentry.data->addr.msf.frame; d104 1 a104 1 @@@@ -681,6 +723,16 @@@@ static int read_cdrom_toc(int fd, cdrom_ d116 1 a116 1 + tocentry.data->addr.msf.frame; d121 1 a121 1 @@@@ -689,12 +741,12 @@@@ static int read_cdrom_frames(cdda_input_ d137 1 a137 1 @@@@ -712,6 +764,33 @@@@ static int read_cdrom_frames(cdda_input_ @ 1.6 log @add CDDA input on NetBSD, from Kimura Fuyuki per PR pkg/34053 @ text @d1 1 a1 1 $NetBSD$ a4 9 @@@@ -32,7 +32,7 @@@@ #include #include -#ifdef SYS_PARAM_H +#ifdef HAVE_SYS_PARAM_H #include #endif #ifdef HAVE_DIRENT_H @ 1.5 log @make this build on FreeBSD-6.1, from Peter Schuller per PR pkg/33770 @ text @d3 1 a3 1 --- src/input/input_cdda.c.orig 2006-06-21 13:33:04.000000000 +0200 d14 158 @ 1.4 log @update to 1.0.2 changes: * fixed playback of single-session Real RTSP streams, such as rtsp://stream.samurai.fm/broadcast/live_hi.rm * fixed xxmc / xvmc mocomp / IDCT rendering errors caused by the big update. * support --enable-fpic with recent versions of gcc * clip goom fps value to >= 1 [bug #1193783] * fixed xvmc plugin segfault when it tried software blending on nonexistant xv image * cleaned up libmpeg2 behaviour on xxmc plugin abrupt software fallback * use -fno-inline-functions with gcc < 3.4.0 (bug known to be in 3.3.5) * fix xxmc plugin wanting to change vld xvmc context when stream changes from non-interlaced to interlaced [bug #1194350] * speed up xx44 alphablending of large transparent areas * stop libmpeg2 XvMC IDCT / MOCOMP attempting software motion compensation [bug #1194754] * improve xxmc cpu-usage for IDCT / MOCOMP acceleration through better locking [bug #1195282] * gcc4 build patches [bug #1175002] * don't assume that file is in /usr/bin (build fix) [bug #1195539] * plugin loader fixes - could cause xine to lock up hard on startup [bug #1196819] * Fix xxmc bob deinterlacing for field-coded interlaced streams * Fix LE_64/BE_64 macros on non-x86 plataforms. may fixes issues with some demuxers like avi, asf and ogg. * sputext improvements/workarounds * add a new error message when a file we tried to play is an empty (zero-sized) file * be more POSIX-compliant (head, tail) (build fix) * fixed deadlock when libxine was called from the event listener thread and tried to flush all pending events. * Added xine(5), documenting MRL syntax. * allow playing just a single title/chapter from dvd (useful for extracting audio - check media.dvd.play_single_chapter) * new stream infos allows frontends to query current title/chapter/angle on dvds * new upmix_mono audio post plugin to convert mono to stereo * added --with-external-a52dec and --with-external-libmad switches * fix a locking bug which affects configuration callback functions @ text @d1 1 a1 3 $NetBSD: patch-an,v 1.3 2005/05/26 22:47:22 reed Exp $ Support --enable-fpic with recent versions of gcc. From xine cvs. d3 11 a13 72 --- src/post/goom/xmmx.c.orig Sat May 7 18:06:07 2005 +++ src/post/goom/xmmx.c Sat May 7 18:06:59 2005 @@@@ -112,23 +112,23 @@@@ * post : mm3 & mm4 : coefs for this position * mm1 : X vector [0|X] * - * modif : eax,ebx + * modif : eax,ecx */ __asm__ __volatile__ ( - "movd %%mm0,%%ebx\n" + "movd %%mm0,%%ecx\n" "movq %%mm0,%%mm1\n" - "andl $15,%%ebx\n" + "andl $15,%%ecx\n" "psrlq $32,%%mm1\n" - "shll $6,%%ebx\n" + "shll $6,%%ecx\n" "movd %%mm1,%%eax\n" - "addl %0,%%ebx\n" + "addl %0,%%ecx\n" "andl $15,%%eax\n" - "movd (%%ebx,%%eax,4),%%mm3\n" - ::"g"(precalCoef):"eax","ebx"); + "movd (%%ecx,%%eax,4),%%mm3\n" + ::"g"(precalCoef):"eax","ecx"); /* * extraction des coefficients... @@@@ -158,7 +158,7 @@@@ * post : mm0 : expix1[position] * mm2 : expix1[position+largeur] * - * modif : eax,ebx + * modif : eax,ecx */ psrld_i2r (PERTEDEC,mm0); psrld_i2r (PERTEDEC,mm1); @@@@ -167,23 +167,23 @@@@ /*^*/ "movq %%mm3,%%mm5\n" /*^*/ "mull %1\n" - "movd %%mm0,%%ebx\n" + "movd %%mm0,%%ecx\n" /*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/ - "addl %%ebx,%%eax\n" + "addl %%ecx,%%eax\n" /*^*/ "movq %%mm3,%%mm4\n" /*^*/ /*^*/ "movq %%mm3,%%mm5\n" /*^*/ - "movl %0,%%ebx\n" + "movl %0,%%ecx\n" /*^*/ "punpcklbw %%mm5,%%mm3\n" /*^*/ - "movq (%%ebx,%%eax,4),%%mm0\n" + "movq (%%ecx,%%eax,4),%%mm0\n" /*^*/ "punpckhbw %%mm5,%%mm4\n" /*^*/ "addl %1,%%eax\n" - "movq (%%ebx,%%eax,4),%%mm2\n" + "movq (%%ecx,%%eax,4),%%mm2\n" - : : "X"(expix1), "X"(prevX):"eax","ebx" + : : "X"(expix1), "X"(prevX):"eax","ecx" ); /* @ 1.3 log @Add PLIST.FreeBSD and three patches to make it build for FreeBSD. Add patch-ak and patch-an to support -enable-fpic with recent versions of gcc. From xine cvs. Bump PKGREVISION just in case these patch-ak and patch-an change functionality. Tested builds and running on FreeBSD 5.4-STABLE with gcc 3.4.2 and FreeBSD 5.3, and Linux 2.6.9 with gcc 3.3.5. And tested build and install on NetBSD 1.6.2_STABLE. Okayed by jmmv a couple weeks ago. @ text @d1 1 a1 1 $NetBSD$ @ 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 3 a3 1 $NetBSD: patch-an,v 1.1 2004/01/26 13:03:38 jmmv Exp $ d5 13 a17 5 --- src/libw32dll/wine/Makefile.am.orig 2003-07-20 22:08:20.000000000 +0000 +++ src/libw32dll/wine/Makefile.am 2003-10-02 12:53:55.000000000 +0000 @@@@ -34,7 +34,7 @@@@ vfl.c \ win32.c d19 3 a21 2 -libwine_la_LIBADD = stubs.lo wrapper.lo +libwine_la_LIBADD = stubs.lo wrapper.lo ${WINE_LIBS} d23 54 a76 2 noinst_HEADERS = \ avifmt.h \ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2003/10/02 14:20:35 mycroft Exp $ @ 1.1.1.1 log @Move xine-lib to the multimedia category (coming from graphics). This is version 1rc0anb3. @ text @@