head 1.11; access; symbols pkgsrc-2014Q4:1.10.0.6 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.4 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.2 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.9.0.72 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.70 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.68 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.66 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.64 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.62 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.60 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.58 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.56 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.54 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.52 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.50 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.48 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.46 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.44 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.42 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.40 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.38 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.36 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.34 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.32 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.30 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.28 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.26 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.24 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.22 pkgsrc-2008Q1:1.9.0.20 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.18 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.16 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.14 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.12 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.10 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.8 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.6 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.4 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.2 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 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.11 date 2014.12.30.13.34.59; author wiz; state dead; branches; next 1.10; commitid 09m0QnHlkm5bg44y; 1.10 date 2014.05.18.15.38.18; author wiz; state Exp; branches; next 1.9; commitid XtKPIl52qo1Gc2Bx; 1.9 date 2005.11.01.06.15.33; author reed; state Exp; branches; next 1.8; 1.8 date 2005.10.13.10.48.01; author jmmv; state dead; branches; next 1.7; 1.7 date 2005.05.26.22.47.22; author reed; state Exp; branches 1.7.4.1; next 1.6; 1.6 date 2005.05.02.11.29.35; author drochner; state dead; branches; next 1.5; 1.5 date 2005.04.26.12.48.35; author tron; state Exp; branches; next 1.4; 1.4 date 2005.01.06.17.04.42; author drochner; state dead; branches 1.4.2.1; next 1.3; 1.3 date 2005.01.06.12.04.08; author tron; state Exp; branches; next 1.2; 1.2 date 2004.03.11.17.26.02; author jmmv; state dead; branches 1.2.8.1; next 1.1; 1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches 1.1.1.1; next ; 1.7.4.1 date 2005.10.15.16.07.46; author salo; state dead; branches; next ; 1.4.2.1 date 2005.04.27.02.53.42; author snj; state Exp; branches; next ; 1.2.8.1 date 2005.01.07.01.22.20; 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.11 log @Update to 1.2.6: xine-lib (1.2.6) 2014-07-06 * Add libmmal video output plugin for Raspberry Pi. * Add libmmal HW video decoder plugin for Raspberry Pi. * Add overlay colormatrix support. * Add "sqare monitor pixels" config option. * Add VAAPI colormatrix and fullrange video support. * Add "radeonhd" XV colormatrix support. * Add Opus audio support. * Update german translation. * Optimize OpenGL2 video out. * Optimize raw RGB video decoder. * Fix multithread ffmpeg video decoding. * Fix/optimize DVB subtitles. * Fix external text subtitles. * BSD build fixes. * Clang build fixes. * Build optimization fixes (aliasing). * AVformat demux build fix. * More safety on memory allocation failure. * Fix detection of and compilation with libcaca 0.99 beta 19. @ text @$NetBSD: patch-aj,v 1.10 2014/05/18 15:38:18 wiz Exp $ https://bugs.xine-project.org/show_bug.cgi?id=521 --- src/input/libdvdnav/bswap.h.orig 2005-10-31 21:49:47.000000000 -0800 +++ src/input/libdvdnav/bswap.h 2005-10-31 21:53:43.000000000 -0800 @@@@ -53,7 +53,7 @@@@ #define B2N_32(x) x = swap32(x) #define B2N_64(x) x = swap64(x) -#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 +#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 470000) #include #define B2N_16(x) x = be16toh(x) #define B2N_32(x) x = be32toh(x) @ 1.10 log @Remove three patches that I think are not needed any longer. If I'm wrong, let me know why. Add upstream bug report URLs to nearly all remaining patches, after filing these upstream bug reports. Hi everyone who patched this without doing that! @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.9 2005/11/01 06:15:33 reed Exp $ @ 1.9 log @Add patch to fix DragonFly issue in bswap.h: "You need to add endian swap macros for you're system" This was noted by Jonathan Fosburgh on DragonFly users list. @ text @d1 3 a3 1 $NetBSD$ @ 1.8 log @Update to 1.0.3a. Man... I hate this package in its actual form... it's completely unmaintenable. Changes: * fixed format string vulnerability in audio CD input plugin * some build system fixes for Windows @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.7 2005/05/26 22:47:22 reed Exp $ d3 5 a7 4 --- src/input/input_cdda.c.orig Sat May 7 11:23:26 2005 +++ src/input/input_cdda.c Sat May 7 12:01:28 2005 @@@@ -32,6 +32,9 @@@@ #include d9 5 a13 34 #include +#ifdef __FreeBSD__ +#include +#endif #include #include #include @@@@ -684,18 +687,26 @@@@ unsigned char *data) { int fd = this_gen->fd; +#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106) struct ioc_read_audio cdda; +#endif while( num_frames ) { +#if !defined(__FreeBSD__) || (__FreeBSD_version < 501106) 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; cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND; cdda.nframes = 1; cdda.buffer = data; +#endif +#if defined(__FreeBSD__) && (__FreeBSD_version >= 501106) + if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) { +#else /* read a frame */ if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) { +#endif perror("CDIOCREADAUDIO"); return -1; } @ 1.7 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.7.4.1 log @Pullup ticket 828 - requested by Julio M. Merino Vidal security update and portability fixes for xine-lib Revisions pulled up: - pkgsrc/multimedia/xine-lib/Makefile 1.26 - pkgsrc/multimedia/xine-lib/Makefile.common 1.28 - pkgsrc/multimedia/xine-lib/PLIST.FreeBSD 1.2 - pkgsrc/multimedia/xine-lib/PLIST.Linux 1.7 - pkgsrc/multimedia/xine-lib/PLIST.NetBSD 1.6 - pkgsrc/multimedia/xine-lib/PLIST.SunOS 1.2 - pkgsrc/multimedia/xine-lib/PLIST.common 1.13 - pkgsrc/multimedia/xine-lib/PLIST.common_end 1.5 - pkgsrc/multimedia/xine-lib/PLIST.i386 1.4 - pkgsrc/multimedia/xine-lib/buildlink3.mk 1.11 - pkgsrc/multimedia/xine-lib/distinfo 1.23, 1.24 - pkgsrc/multimedia/xine-lib/patches/patch-aa 1.4 - pkgsrc/multimedia/xine-lib/patches/patch-ab 1.3 - pkgsrc/multimedia/xine-lib/patches/patch-ag 1.9, 1.10 - pkgsrc/multimedia/xine-lib/patches/patch-ai 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-aj removed - pkgsrc/multimedia/xine-lib/patches/patch-ao 1.9 - pkgsrc/multimedia/xine-lib/patches/patch-au removed - pkgsrc/multimedia/xine-lib/patches/patch-be 1.5 - pkgsrc/multimedia/xine-lib/patches/patch-bi 1.2 - pkgsrc/multimedia/xine-lib/patches/patch-cd 1.1 - pkgsrc/multimedia/xine-lib/patches/patch-ce 1.1 Module Name: pkgsrc Committed By: joerg Date: Mon Oct 10 22:51:04 UTC 2005 Modified Files: pkgsrc/multimedia/xine-lib: distinfo pkgsrc/multimedia/xine-lib/patches: patch-ag Added Files: pkgsrc/multimedia/xine-lib/patches: patch-cd Log Message: Allowing building on DragonFly. --- Module Name: pkgsrc Committed By: jmmv Date: Thu Oct 13 10:48:01 UTC 2005 Modified Files: pkgsrc/multimedia/xine-lib: Makefile Makefile.common PLIST.FreeBSD PLIST.Linux PLIST.NetBSD PLIST.SunOS PLIST.common PLIST.common_end PLIST.i386 buildlink3.mk distinfo pkgsrc/multimedia/xine-lib/patches: patch-aa patch-ab patch-ag patch-ai patch-ao patch-be patch-bi Added Files: pkgsrc/multimedia/xine-lib/patches: patch-ce Removed Files: pkgsrc/multimedia/xine-lib/patches: patch-aj patch-au Log Message: Update to 1.0.3a. Man... I hate this package in its actual form... it's completely unmaintenable. Changes: * fixed format string vulnerability in audio CD input plugin * some build system fixes for Windows @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.7 2005/05/26 22:47:22 reed Exp $ @ 1.6 log @update to 1.0.1 changes: -Big XvMC quality / correctness / cpu-usage fix -added support for WMA Voice codec -support for Windows Media Audio Lossless -bugfixes -security fixes (were already patched in pkgsrc) also add a patch to correct the path for win32 codecs, needed if xine-lib in embedded into other applications (as totem) @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.5 2005/04/26 12:48:35 tron Exp $ d3 39 a41 19 --- src/input/mms.c 2005/01/18 23:25:34 1.55 +++ src/input/mms.c 2005/04/21 19:02:43 1.56 @@@@ -583,9 +583,13 @@@@ lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n", stream_id, type, encrypted); - this->stream_types[stream_id] = type; - this->stream_ids[this->num_stream_ids] = stream_id; - this->num_stream_ids++; + if (this->num_stream_ids < ASF_MAX_NUM_STREAMS && stream_id < ASF_MAX_NUM_STREAMS) { + this->stream_types[stream_id] = type; + this->stream_ids[this->num_stream_ids] = stream_id; + this->num_stream_ids++; + } else { + lprintf ("too many streams, skipping\n"); + } } break; @ 1.5 log @Add patches to fix security vulnerability reported in XSA-2004-8. Bump package revision because of this change. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @update to 1.0 changes: -security issue regarding the AIFF demuxer (CAN-2004-1300) -Xv plugin dynamically linked again -some fixes @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 2005/01/06 12:04:08 tron Exp $ d3 19 a21 12 --- src/demuxers/demux_aiff.c.orig 2004-06-13 22:28:52.000000000 +0100 +++ src/demuxers/demux_aiff.c 2005-01-06 11:38:44.000000000 +0000 @@@@ -122,7 +122,8 @@@@ chunk_size = BE_32(&preamble[4]); if (chunk_type == COMM_TAG) { - if (this->input->read(this->input, buffer, chunk_size) != + if (chunk_size > sizeof (buffer) || + this->input->read(this->input, buffer, chunk_size) != chunk_size) { this->status = DEMUX_FINISHED; return 0; @ 1.4.2.1 log @Pullup ticket 469 - requested by Matthias Scheler security fix for xine-lib Revisions pulled up: - pkgsrc/multimedia/xine-lib/Makefile 1.20 - pkgsrc/multimedia/xine-lib/buildlink3.mk 1.10 - pkgsrc/multimedia/xine-lib/distinfo 1.17 - pkgsrc/multimedia/xine-lib/patches/patch-aj 1.5 - pkgsrc/multimedia/xine-lib/patches/patch-ak 1.3 Module Name: pkgsrc Committed By: tron Date: Tue Apr 26 12:48:35 UTC 2005 Modified Files: pkgsrc/multimedia/xine-lib: Makefile distinfo Added Files: pkgsrc/multimedia/xine-lib/patches: patch-aj patch-ak Log Message: Add patches to fix security vulnerability reported in XSA-2004-8. Bump package revision because of this change. ---- Module Name: pkgsrc Committed By: salo Date: Wed Apr 27 02:40:07 UTC 2005 Modified Files: pkgsrc/multimedia/xine-lib: buildlink3.mk Log Message: Bump BUIDLINK_RECOMMENDED after the recent security fix. (hi tron!) @ text @d1 1 a1 1 $NetBSD$ d3 12 a14 19 --- src/input/mms.c 2005/01/18 23:25:34 1.55 +++ src/input/mms.c 2005/04/21 19:02:43 1.56 @@@@ -583,9 +583,13 @@@@ lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n", stream_id, type, encrypted); - this->stream_types[stream_id] = type; - this->stream_ids[this->num_stream_ids] = stream_id; - this->num_stream_ids++; + if (this->num_stream_ids < ASF_MAX_NUM_STREAMS && stream_id < ASF_MAX_NUM_STREAMS) { + this->stream_types[stream_id] = type; + this->stream_ids[this->num_stream_ids] = stream_id; + this->num_stream_ids++; + } else { + lprintf ("too many streams, skipping\n"); + } } break; @ 1.3 log @Fix buffer overflow reported in CAN-2004-1300, bump package revision. @ 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 1 a1 1 $NetBSD: patch-aj,v 1.1 2004/01/26 13:03:38 jmmv Exp $ d3 4 a6 3 --- include/xine.h.in.orig 2003-07-13 19:29:04.000000000 +0000 +++ include/xine.h.in @@@@ -1677,7 +1677,7 @@@@ void xine_osd_get_palette (xine d8 7 a14 7 typedef enum { XINE_TVSYSTEM_PAL = 0, - XINE_TVSYSTEM_NTSC = 1, + XINE_TVSYSTEM_NTSC = 1 } xine_tvsystem; /* connect to nvtvd server and save current TV and X settings */ @ 1.2.8.1 log @Pullup ticket 110 - requested by Matthias Scheler security fix for xine-lib Module Name: pkgsrc Committed By: tron Date: Thu Jan 6 12:04:08 UTC 2005 Modified Files: pkgsrc/multimedia/xine-lib: Makefile buildlink3.mk distinfo Added Files: pkgsrc/multimedia/xine-lib/patches: patch-aj Log Message: Fix buffer overflow reported in CAN-2004-1300, bump package revision. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 2005/01/06 12:04:08 tron Exp $ d3 3 a5 4 --- src/demuxers/demux_aiff.c.orig 2004-06-13 22:28:52.000000000 +0100 +++ src/demuxers/demux_aiff.c 2005-01-06 11:38:44.000000000 +0000 @@@@ -122,7 +122,8 @@@@ chunk_size = BE_32(&preamble[4]); d7 7 a13 7 if (chunk_type == COMM_TAG) { - if (this->input->read(this->input, buffer, chunk_size) != + if (chunk_size > sizeof (buffer) || + this->input->read(this->input, buffer, chunk_size) != chunk_size) { this->status = DEMUX_FINISHED; return 0; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2003/09/30 12:17:01 seb Exp $ @ 1.1.1.1 log @Move xine-lib to the multimedia category (coming from graphics). This is version 1rc0anb3. @ text @@