head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.8 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.6 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.4 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.2 pkgsrc-2011Q2-base:1.9 pkgsrc-2010Q2:1.8.0.30 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.28 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.26 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.24 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.22 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.20 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.18 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.16 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.14 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.12 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.10 pkgsrc-2008Q1:1.8.0.8 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.6 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.4 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.7.0.6 pkgsrc-2007Q1-base:1.7 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.6.0.4 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.2 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.5.0.4 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.2 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 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.9 date 2010.07.21.16.47.57; author drochner; state dead; branches; next 1.8; 1.8 date 2007.06.18.21.16.11; author joerg; state Exp; branches; next 1.7; 1.7 date 2006.08.06.10.36.50; author wiz; state dead; branches; next 1.6; 1.6 date 2006.01.25.20.06.33; author tron; state Exp; branches; next 1.5; 1.5 date 2005.07.29.16.09.11; author drochner; state dead; branches 1.5.4.1; next 1.4; 1.4 date 2005.05.02.11.29.35; author drochner; state Exp; branches; next 1.3; 1.3 date 2005.01.06.17.04.42; author drochner; state Exp; branches; next 1.2; 1.2 date 2004.12.21.18.56.44; author drochner; state Exp; branches; next 1.1; 1.1 date 2004.01.26.13.03.38; author jmmv; state Exp; branches 1.1.1.1; next ; 1.5.4.1 date 2006.01.27.01.05.09; 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.9 log @remove some patches which look unnecessary or obsolete @ text @$NetBSD: patch-aq,v 1.8 2007/06/18 21:16:11 joerg Exp $ --- src/libffmpeg/libavcodec/utils.c.orig 2007-06-17 20:11:32.000000000 +0000 +++ src/libffmpeg/libavcodec/utils.c @@@@ -34,6 +34,7 @@@@ #include #include #include +#include #ifdef __MINGW32__ #include #endif @ 1.8 log @Fix linkage with -lintl. In one plugin, disable the -Wl,-z,defs usage as it breaks on DragonFly. @ 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-aq,v 1.6 2006/01/25 20:06:33 tron Exp $ d3 10 a12 81 --- src/libffmpeg/libavcodec/utils.c.orig 2004-05-30 20:24:23.000000000 +0100 +++ src/libffmpeg/libavcodec/utils.c 2006-01-25 19:55:16.000000000 +0000 @@@@ -200,27 +200,11 @@@@ buf->last_pic_num= *picture_number; }else{ int h_chroma_shift, v_chroma_shift; - int s_align, pixel_size; - + int s_align, pixel_size, size[3]; + AVPicture picture; + avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); - switch(s->pix_fmt){ - case PIX_FMT_RGB555: - case PIX_FMT_RGB565: - case PIX_FMT_YUV422: - pixel_size=2; - break; - case PIX_FMT_RGB24: - case PIX_FMT_BGR24: - pixel_size=3; - break; - case PIX_FMT_RGBA32: - pixel_size=4; - break; - default: - pixel_size=1; - } - avcodec_align_dimensions(s, &w, &h); #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check s_align= 16; @@@@ -232,21 +216,39 @@@@ w+= EDGE_WIDTH*2; h+= EDGE_WIDTH*2; } - + avpicture_fill(&picture, NULL, s->pix_fmt, w, h); + pixel_size= picture.linesize[0]*8 / w; +//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); + assert(pixel_size>=1); + //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it + if(pixel_size == 3*8) + w= ALIGN(w, s_align<pix_fmt, w, h); + size[0] = picture.linesize[0] * h; + size[1] -= size[0]; + if(picture.data[2]) + size[1]= size[2]= size[1]/2; + else + size[2]= 0; + buf->last_pic_num= -256*256*256*64; + memset(buf->base, 0, sizeof(buf->base)); + memset(buf->data, 0, sizeof(buf->data)); - for(i=0; i<3; i++){ + for(i=0; i<3 && size[i]; i++){ const int h_shift= i==0 ? 0 : h_chroma_shift; const int v_shift= i==0 ? 0 : v_chroma_shift; - //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it - buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align<<(h_chroma_shift-h_shift)); + buf->linesize[i]= picture.linesize[i]; - buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 + buf->base[i]= av_malloc(size[i]+16); //FIXME 16 if(buf->base[i]==NULL) return -1; - memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); - - if(s->flags&CODEC_FLAG_EMU_EDGE) + memset(buf->base[i], 128, size[i]); + + // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ... + if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) buf->data[i] = buf->base[i]; else buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); @ 1.6 log @Backport security fix for CVE-2005-4048 to our old "xine-lib" version. Bump package revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 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 1 $NetBSD: patch-aq,v 1.4 2005/05/02 11:29:35 drochner Exp $ d3 58 a60 7 --- src/dxr3/Makefile.in.orig 2005-04-26 10:15:28.000000000 +0200 +++ src/dxr3/Makefile.in @@@@ -457,6 +457,7 @@@@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS @@HAVE_X11_TRUE@@link_x_libs = $(X_LIBS) -lXext @@HAVE_LIBFAME_TRUE@@link_fame = $(LIBFAME_LIBS) @@HAVE_LIBRTE_TRUE@@link_rte = -lrte +@@HAVE_XINERAMA_TRUE@@link_xinerama = -lXinerama d62 4 a65 1 lib_LTLIBRARIES = $(dxr3_modules) d67 3 a69 2 @@@@ -480,7 +481,7 @@@@ xineplug_vo_out_dxr3_la_SOURCES = \ video_out_dxr3.c d71 13 a83 6 -xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) +xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module noinst_HEADERS = \ @ 1.5.4.1 log @Pullup ticket 1065 - requested by Matthias Scheler security fix for xine-lib Revisions pulled up: - pkgsrc/multimedia/xine-lib/Makefile 1.30 - pkgsrc/multimedia/xine-lib/distinfo 1.27 - pkgsrc/multimedia/xine-lib/patches/patch-aq 1.6 Module Name: pkgsrc Committed By: tron Date: Wed Jan 25 20:06:33 UTC 2006 Modified Files: pkgsrc/multimedia/xine-lib: Makefile distinfo Added Files: pkgsrc/multimedia/xine-lib/patches: patch-aq Log Message: Backport security fix for CVE-2005-4048 to our old "xine-lib" version. Bump package revision. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.6 2006/01/25 20:06:33 tron Exp $ d3 7 a9 58 --- src/libffmpeg/libavcodec/utils.c.orig 2004-05-30 20:24:23.000000000 +0100 +++ src/libffmpeg/libavcodec/utils.c 2006-01-25 19:55:16.000000000 +0000 @@@@ -200,27 +200,11 @@@@ buf->last_pic_num= *picture_number; }else{ int h_chroma_shift, v_chroma_shift; - int s_align, pixel_size; - + int s_align, pixel_size, size[3]; + AVPicture picture; + avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); - switch(s->pix_fmt){ - case PIX_FMT_RGB555: - case PIX_FMT_RGB565: - case PIX_FMT_YUV422: - pixel_size=2; - break; - case PIX_FMT_RGB24: - case PIX_FMT_BGR24: - pixel_size=3; - break; - case PIX_FMT_RGBA32: - pixel_size=4; - break; - default: - pixel_size=1; - } - avcodec_align_dimensions(s, &w, &h); #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check s_align= 16; @@@@ -232,21 +216,39 @@@@ w+= EDGE_WIDTH*2; h+= EDGE_WIDTH*2; } - + avpicture_fill(&picture, NULL, s->pix_fmt, w, h); + pixel_size= picture.linesize[0]*8 / w; +//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); + assert(pixel_size>=1); + //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it + if(pixel_size == 3*8) + w= ALIGN(w, s_align<pix_fmt, w, h); + size[0] = picture.linesize[0] * h; + size[1] -= size[0]; + if(picture.data[2]) + size[1]= size[2]= size[1]/2; + else + size[2]= 0; + buf->last_pic_num= -256*256*256*64; + memset(buf->base, 0, sizeof(buf->base)); + memset(buf->data, 0, sizeof(buf->data)); d11 1 a11 4 - for(i=0; i<3; i++){ + for(i=0; i<3 && size[i]; i++){ const int h_shift= i==0 ? 0 : h_chroma_shift; const int v_shift= i==0 ? 0 : v_chroma_shift; d13 2 a14 3 - //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it - buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align<<(h_chroma_shift-h_shift)); + buf->linesize[i]= picture.linesize[i]; d16 6 a21 13 - buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 + buf->base[i]= av_malloc(size[i]+16); //FIXME 16 if(buf->base[i]==NULL) return -1; - memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); - - if(s->flags&CODEC_FLAG_EMU_EDGE) + memset(buf->base[i], 128, size[i]); + + // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ... + if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) buf->data[i] = buf->base[i]; else buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); @ 1.4 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$ @ 1.3 log @update to 1.0 changes: -security issue regarding the AIFF demuxer (CAN-2004-1300) -Xv plugin dynamically linked again -some fixes @ text @d3 1 a3 1 --- src/dxr3/Makefile.in.orig 2004-12-25 23:35:02.000000000 +0100 d5 1 a5 1 @@@@ -548,6 +548,7 @@@@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS d10 1 d12 2 a13 4 xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) @@@@ -566,7 +567,7 @@@@ xineplug_vo_out_dxr3_la_SOURCES = \ dxr3_scr.c \ d16 1 d20 1 a21 1 em8300.h \ @ 1.2 log @update to 1-rc8 fixes some security vulnerabilities, bugfixes @ text @d3 1 a3 1 --- src/dxr3/Makefile.in.orig 2004-12-15 14:02:28.000000000 +0100 d5 1 a5 1 @@@@ -458,6 +458,7 @@@@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS a9 1 d11 4 a14 2 @@@@ -481,7 +482,7 @@@@ xineplug_vo_out_dxr3_la_SOURCES = \ a16 1 a19 1 d21 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.1 2003/10/05 09:27:13 mycroft Exp $ d3 3 a5 3 --- src/dxr3/Makefile.in.orig 2003-08-02 13:50:11.000000000 +0000 +++ src/dxr3/Makefile.in 2003-10-05 09:05:25.000000000 +0000 @@@@ -235,6 +235,7 @@@@ d13 1 a13 1 @@@@ -257,7 +258,7 @@@@ @ 1.1.1.1 log @Move xine-lib to the multimedia category (coming from graphics). This is version 1rc0anb3. @ text @@