From 8a2ba2ac4c6dba7a40c263c979ca46047bd075b9 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 6 Aug 2006 10:36:50 +0000 Subject: 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 --- multimedia/xine-lib/patches/patch-af | 17 ------- multimedia/xine-lib/patches/patch-ag | 87 +++++++++++++++++------------------- multimedia/xine-lib/patches/patch-ak | 17 +++---- multimedia/xine-lib/patches/patch-am | 25 ----------- multimedia/xine-lib/patches/patch-an | 11 +---- multimedia/xine-lib/patches/patch-ao | 30 ++++++------- multimedia/xine-lib/patches/patch-aq | 83 ---------------------------------- multimedia/xine-lib/patches/patch-ar | 13 ------ multimedia/xine-lib/patches/patch-at | 13 ------ multimedia/xine-lib/patches/patch-au | 45 ------------------- multimedia/xine-lib/patches/patch-ax | 18 -------- multimedia/xine-lib/patches/patch-ay | 19 -------- multimedia/xine-lib/patches/patch-ba | 13 ------ multimedia/xine-lib/patches/patch-bb | 6 +-- multimedia/xine-lib/patches/patch-bc | 12 ----- multimedia/xine-lib/patches/patch-be | 14 +++--- multimedia/xine-lib/patches/patch-bh | 13 ------ multimedia/xine-lib/patches/patch-bi | 22 --------- multimedia/xine-lib/patches/patch-cb | 27 ++++++----- multimedia/xine-lib/patches/patch-ce | 22 --------- 20 files changed, 90 insertions(+), 417 deletions(-) delete mode 100644 multimedia/xine-lib/patches/patch-af delete mode 100644 multimedia/xine-lib/patches/patch-am delete mode 100644 multimedia/xine-lib/patches/patch-aq delete mode 100644 multimedia/xine-lib/patches/patch-ar delete mode 100644 multimedia/xine-lib/patches/patch-at delete mode 100644 multimedia/xine-lib/patches/patch-au delete mode 100644 multimedia/xine-lib/patches/patch-ax delete mode 100644 multimedia/xine-lib/patches/patch-ay delete mode 100644 multimedia/xine-lib/patches/patch-ba delete mode 100644 multimedia/xine-lib/patches/patch-bc delete mode 100644 multimedia/xine-lib/patches/patch-bh delete mode 100644 multimedia/xine-lib/patches/patch-bi delete mode 100644 multimedia/xine-lib/patches/patch-ce (limited to 'multimedia/xine-lib/patches') diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af deleted file mode 100644 index e79376c1a0a..00000000000 --- a/multimedia/xine-lib/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.3 2005/05/26 22:47:22 reed Exp $ - ---- src/video_out/video_out_sdl.c.orig Sat May 7 11:04:14 2005 -+++ src/video_out/video_out_sdl.c Sat May 7 11:04:27 2005 -@@ -47,11 +47,7 @@ - #include - #include - #include --#if defined (__FreeBSD__) --# include --#else --# include --#endif -+#include - - #define LOG_MODULE "video_out_sdl" - #define LOG_VERBOSE diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index 508e8e1abdb..bf0f4f1207e 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ +$NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ --- configure.ac.orig 2005-10-08 16:08:37.000000000 +0200 +++ configure.ac -@@ -200,7 +200,7 @@ AC_ARG_WITH(pthread-prefix, +@@ -196,7 +196,7 @@ AC_ARG_WITH(pthread-prefix, [pthread_prefix="no"]) case "$host" in @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ if test x"$pthread_prefix" = "xno"; then pthread_prefix="/usr/local" fi -@@ -437,6 +437,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -462,6 +462,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -21,16 +21,16 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -630,7 +633,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub" +@@ -653,7 +656,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub" AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) AC_MSG_RESULT() dnl Check if vld "extended" XvMC is available --if test x$xxmc_stub == "xXvMCW"; then -+if test x$xxmc_stub = "xXvMCW"; then +-if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then ++if test x$xxmc_stub = "xXvMCW" && test x$ac_have_xv = "xyes"; then AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -660,7 +663,7 @@ if test x$ac_have_xxmc = "xyes"; then +@@ -683,7 +686,7 @@ if test x$ac_have_xxmc = "xyes"; then fi dnl Try fallback to standard XvMC if vld failed if test x$ac_have_xxmc = "xno"; then @@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -714,7 +717,7 @@ saved_libs="$LIBS" +@@ -737,7 +740,7 @@ saved_libs="$LIBS" XVMC_LIB="-L$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() @@ -48,60 +48,57 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", [ac_have_xvmc="no" -@@ -754,8 +757,7 @@ dnl Checks for Xinerama extension - dnl --------------------------------------------- +@@ -782,8 +785,7 @@ AC_ARG_ENABLE([xinerama], - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + if test "x$with_xinerama" = "xyes"; then + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - [X_LIBS="$X_LIBS -lXinerama" - AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) + [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) ac_have_xinerama="yes"],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) - dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -1194,9 +1196,19 @@ dnl ------------------------------------ - dnl OSS style audio interface - dnl --------------------------------------------- + else +@@ -1293,6 +1295,16 @@ AC_ARG_ENABLE([oss], + [with_oss=$enableval], [with_oss=yes]) -+case "$host" in -+ *-*-netbsd*|*-*-openbsd*) -+ OSS_LIBS="-lossaudio" -+ ;; -+ *) -+ OSS_LIBS="" -+ ;; -+esac + if test "x$with_oss" = "xyes"; then ++ ++ case "$host" in ++ *-*-netbsd*|*-*-openbsd*) ++ OSS_LIBS="-lossaudio" ++ ;; ++ *) ++ OSS_LIBS="" ++ ;; ++ esac + - AC_MSG_CHECKING(for OSS audio support) - have_ossaudio=no - AC_TRY_COMPILE([ -+ #include - #ifdef __NetBSD__ - #include - #else -@@ -1209,7 +1221,7 @@ AC_TRY_COMPILE([ - ]) - AC_MSG_RESULT($have_ossaudio) + AC_MSG_CHECKING(for OSS audio support) + have_ossaudio=no + AC_TRY_COMPILE([ +@@ -1311,7 +1323,7 @@ else + have_ossaudio=no + fi AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") - +AC_SUBST(OSS_LIBS) dnl --------------------------------------------- dnl Alsa support -@@ -1250,9 +1262,10 @@ dnl ------------------------------------ - dnl gnome-vfs support - dnl --------------------------------------------- +@@ -1392,9 +1404,10 @@ AC_ARG_ENABLE([gnomevfs], + [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) --PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, + if test "x$with_gnome_vfs" = "xyes"; then +- PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, - no_gnome_vfs=no, - no_gnome_vfs=yes) -+dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -+dnl no_gnome_vfs=no, -+dnl no_gnome_vfs=yes) -+no_gnome_vfs=yes - AC_SUBST(GNOME_VFS_CFLAGS) - AC_SUBST(GNOME_VFS_LIBS) - if test x"$no_gnome_vfs" != "xyes"; then -@@ -1568,7 +1581,7 @@ int has_timeout=sizeof(test.timeout);], ++ dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, ++ dnl no_gnome_vfs=no, ++ dnl no_gnome_vfs=yes) ++ no_gnome_vfs=yes + AC_SUBST(GNOME_VFS_CFLAGS) + AC_SUBST(GNOME_VFS_LIBS) + if test x"$no_gnome_vfs" != "xyes"; then +@@ -1742,7 +1755,7 @@ int has_timeout=sizeof(test.timeout);], AC_DEFINE([HAVE_WIN32_CDROM], [1], [Define 1 if you have MinGW CD-ROM support]) ;; diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak index 4054dd03f47..3a9f4c434b2 100644 --- a/multimedia/xine-lib/patches/patch-ak +++ b/multimedia/xine-lib/patches/patch-ak @@ -1,18 +1,15 @@ -$NetBSD: patch-ak,v 1.7 2005/09/15 01:15:47 dmcmahill Exp $ +$NetBSD: patch-ak,v 1.8 2006/08/06 10:36:50 wiz Exp $ --- src/video_out/video_out_opengl.c.orig 2005-07-17 17:50:07.000000000 -0400 +++ src/video_out/video_out_opengl.c -@@ -710,9 +710,11 @@ static void *getdladdr (const GLubyte *_ - return res; +@@ -710,9 +710,7 @@ static void *getdladdr (const GLubyte *_ #elif defined (__sun) || defined (__sgi) -- static void *handle = dlopen (NULL, RTLD_LAZY); -+ { -+ static void *handle; + static void *handle = NULL; +- if (!handle) { +- handle = dlopen (NULL, RTLD_LAZY); +- } + handle = dlopen (NULL, RTLD_LAZY); return dlsym (handle, funcName); -- -+ } + #else /* all other Un*xes */ - return dlsym (0, funcName); - diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am deleted file mode 100644 index c87336b0ba2..00000000000 --- a/multimedia/xine-lib/patches/patch-am +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-am,v 1.3 2004/06/21 15:55:55 drochner Exp $ - ---- src/libw32dll/wine/ldt_keeper.c.orig 2004-06-13 01:19:56.000000000 +0200 -+++ src/libw32dll/wine/ldt_keeper.c -@@ -155,18 +155,9 @@ void Setup_FS_Segment(void) - - void Check_FS_Segment(void) - { -- int fs; -- __asm__ __volatile__( -- "movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax" -+ __asm__ __volatile__( -+ "movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax" - ); -- fs = fs & 0xffff; -- -- if( fs != teb_sel ) { -- printf("ldt_keeper: FS segment is not set or has being lost!\n"); -- printf(" Please report this error to xine-devel@lists.sourceforge.net\n"); -- printf(" Aborting....\n"); -- abort(); -- } - } - - #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an index b227e51f4db..23c46aa8d59 100644 --- a/multimedia/xine-lib/patches/patch-an +++ b/multimedia/xine-lib/patches/patch-an @@ -1,16 +1,7 @@ -$NetBSD: patch-an,v 1.6 2006/07/24 20:42:07 drochner Exp $ +$NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ --- src/input/input_cdda.c.orig 2005-10-08 15:57:42.000000000 +0200 +++ src/input/input_cdda.c -@@ -32,7 +32,7 @@ - #include - - #include --#ifdef SYS_PARAM_H -+#ifdef HAVE_SYS_PARAM_H - #include - #endif - #ifdef HAVE_DIRENT_H @@ -613,14 +613,20 @@ static int read_cdrom_frames(cdda_input_ return 0; } diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index 49e4524ee15..946edb97f3d 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,21 +1,21 @@ -$NetBSD: patch-ao,v 1.9 2005/10/13 10:48:01 jmmv Exp $ +$NetBSD: patch-ao,v 1.10 2006/08/06 10:36:50 wiz Exp $ --- src/libw32dll/wine/Makefile.in.orig 2005-10-09 13:28:12.000000000 +0200 +++ src/libw32dll/wine/Makefile.in -@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@ - W32DLL_DEP = @W32DLL_DEP@ - W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ - WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ -+WINE_LIBS = @WINE_LIBS@ - XINE_ACFLAGS = @XINE_ACFLAGS@ - XINE_BIN_AGE = @XINE_BIN_AGE@ - XINE_BUILD_CC = @XINE_BUILD_CC@ -@@ -355,7 +356,7 @@ CONFIG_CLEAN_FILES = +@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) - - libwine_la_LDFLAGS = -libwine_la_LIBADD = +libwine_la_LIBADD = ${WINE_LIBS} - am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \ - module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \ - vfl.lo win32.lo stubs.lo wrapper.lo + am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \ + ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \ + registry.lo vfl.lo win32.lo stubs.lo wrapper.lo +@@ -436,6 +436,7 @@ WAND_CPPFLAGS = @WAND_CPPFLAGS@ + WAND_LDFLAGS = @WAND_LDFLAGS@ + WAND_LIBS = @WAND_LIBS@ + WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ ++WINE_LIBS = @WINE_LIBS@ + WIN32_FALSE = @WIN32_FALSE@ + WIN32_TRUE = @WIN32_TRUE@ + XGETTEXT = @XGETTEXT@ diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq deleted file mode 100644 index 4522dd8506b..00000000000 --- a/multimedia/xine-lib/patches/patch-aq +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-aq,v 1.6 2006/01/25 20:06:33 tron Exp $ - ---- 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); diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar deleted file mode 100644 index 2a06db104e9..00000000000 --- a/multimedia/xine-lib/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2004/03/11 17:26:02 jmmv Exp $ - ---- src/video_out/video_out_aa.c.orig 2003-12-14 23:13:25.000000000 +0100 -+++ src/video_out/video_out_aa.c -@@ -113,6 +113,8 @@ static vo_frame_t *aa_alloc_frame(vo_dri - if (!frame) - return NULL; - -+ pthread_mutex_init (&frame->vo_frame.mutex, NULL); -+ - frame->vo_frame.proc_slice = NULL; - frame->vo_frame.proc_frame = NULL; - frame->vo_frame.field = aa_frame_field; diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at deleted file mode 100644 index 2ff68495b28..00000000000 --- a/multimedia/xine-lib/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.3 2006/05/18 18:45:37 tron Exp $ - ---- src/xine-utils/list.c.orig 2004-12-20 21:38:24.000000000 +0000 -+++ src/xine-utils/list.c 2006-05-18 12:04:23.000000000 +0100 -@@ -229,6 +229,8 @@ - xine_node_t *node_cur; - - node_cur = l->cur; -+ if (node_cur == NULL) -+ return; - - if(node_cur->prev) { - node_cur->prev->next = node_cur->next; diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au deleted file mode 100644 index 5b2dbda54fa..00000000000 --- a/multimedia/xine-lib/patches/patch-au +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-au,v 1.4 2006/06/26 17:13:36 wiz Exp $ - -gcc4 fix from ffmpeg subversion repository revision 3945 - ---- src/libffmpeg/libavcodec/i386/dsputil_mmx.c.orig 2006-06-26 11:55:29.000000000 +0000 -+++ src/libffmpeg/libavcodec/i386/dsputil_mmx.c -@@ -651,26 +651,22 @@ static void h263_h_loop_filter_mmx(uint8 - "punpcklwd %%mm0, %%mm1 \n\t" - "punpckhwd %%mm4, %%mm3 \n\t" - "punpckhwd %%mm0, %%mm6 \n\t" -- "movd %%mm5, %0 \n\t" -+ "movd %%mm5, (%0) \n\t" - "punpckhdq %%mm5, %%mm5 \n\t" -- "movd %%mm5, %1 \n\t" -- "movd %%mm3, %2 \n\t" -+ "movd %%mm5, (%0,%2) \n\t" -+ "movd %%mm3, (%0,%2,2) \n\t" - "punpckhdq %%mm3, %%mm3 \n\t" -- "movd %%mm3, %3 \n\t" -- "movd %%mm1, %4 \n\t" -+ "movd %%mm3, (%0,%3) \n\t" -+ "movd %%mm1, (%1) \n\t" - "punpckhdq %%mm1, %%mm1 \n\t" -- "movd %%mm1, %5 \n\t" -- "movd %%mm6, %6 \n\t" -+ "movd %%mm1, (%1,%2) \n\t" -+ "movd %%mm6, (%1,%2,2) \n\t" - "punpckhdq %%mm6, %%mm6 \n\t" -- "movd %%mm6, %7 \n\t" -- : "=m" (*(uint32_t*)(src + 0*stride)), -- "=m" (*(uint32_t*)(src + 1*stride)), -- "=m" (*(uint32_t*)(src + 2*stride)), -- "=m" (*(uint32_t*)(src + 3*stride)), -- "=m" (*(uint32_t*)(src + 4*stride)), -- "=m" (*(uint32_t*)(src + 5*stride)), -- "=m" (*(uint32_t*)(src + 6*stride)), -- "=m" (*(uint32_t*)(src + 7*stride)) -+ "movd %%mm6, (%1,%3) \n\t" -+ :: "r" (src), -+ "r" (src + 4*stride), -+ "r" ((long) stride ), -+ "r" ((long)(3*stride)) - ); - } - diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax deleted file mode 100644 index 7a3286ae8ef..00000000000 --- a/multimedia/xine-lib/patches/patch-ax +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2006/06/26 17:13:36 wiz Exp $ - ---- src/libffmpeg/libavcodec/avcodec.h.orig 2004-05-30 19:24:19.000000000 +0000 -+++ src/libffmpeg/libavcodec/avcodec.h -@@ -1639,6 +1639,13 @@ typedef struct AVOption { - #define FF_OPT_MAX_DEPTH 10 - } AVOption; - -+#ifdef HAVE_MMX -+extern const struct AVOption avoptions_common[3 + 5]; -+#else -+extern const struct AVOption avoptions_common[3]; -+#endif -+extern const struct AVOption avoptions_workaround_bug[11]; -+ - /** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay deleted file mode 100644 index ca083224d8a..00000000000 --- a/multimedia/xine-lib/patches/patch-ay +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2006/06/26 17:13:36 wiz Exp $ - ---- src/libffmpeg/libavcodec/common.h.orig 2005-10-09 14:51:00.000000000 +0000 -+++ src/libffmpeg/libavcodec/common.h -@@ -66,14 +66,6 @@ - #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } - #define AVOPTION_END() AVOPTION_SUB(NULL) - --struct AVOption; --#ifdef HAVE_MMX --extern const struct AVOption avoptions_common[3 + 5]; --#else --extern const struct AVOption avoptions_common[3]; --#endif --extern const struct AVOption avoptions_workaround_bug[11]; -- - #endif /* HAVE_AV_CONFIG_H */ - - /* Suppress restrict if it was not defined in config.h. */ diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba deleted file mode 100644 index 22c8777247e..00000000000 --- a/multimedia/xine-lib/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2005/07/29 16:09:11 drochner Exp $ - ---- src/input/vcd/xineplug_inp_vcd.c.orig 2005-07-17 23:50:00.000000000 +0200 -+++ src/input/vcd/xineplug_inp_vcd.c -@@ -999,7 +999,7 @@ vcd_class_get_description (input_class_t - static const char * - vcd_class_get_identifier (input_class_t *this_gen) { - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); -- return SHORT_PLUGIN_NAME; -+ return strdup(SHORT_PLUGIN_NAME); - } - - /* HACK until we put modify and put in vcdplayer. */ diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb index 99cd7de99c1..d7ce6d19239 100644 --- a/multimedia/xine-lib/patches/patch-bb +++ b/multimedia/xine-lib/patches/patch-bb @@ -1,10 +1,10 @@ -$NetBSD: patch-bb,v 1.2 2004/12/21 18:56:44 drochner Exp $ +$NetBSD: patch-bb,v 1.3 2006/08/06 10:36:50 wiz Exp $ --- m4/ffmpeg.m4.orig 2004-12-16 00:57:33.000000000 +0100 +++ m4/ffmpeg.m4 -@@ -50,14 +50,6 @@ if test x"$external_ffmpeg" != "xno"; th +@@ -56,14 +56,6 @@ if test x"$external_ffmpeg" != "xno"; th CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" - LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}" + LDFLAGS="${FFMPEG_LDFLAGS} ${ac_save_LDFLAGS}" - dnl drop the cache - for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \ diff --git a/multimedia/xine-lib/patches/patch-bc b/multimedia/xine-lib/patches/patch-bc deleted file mode 100644 index e7a0cf90a04..00000000000 --- a/multimedia/xine-lib/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2006/07/04 16:42:38 tron Exp $ - ---- misc/fonts/Makefile.in.orig 2005-10-09 11:27:59.000000000 +0000 -+++ misc/fonts/Makefile.in -@@ -25,6 +25,7 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - sysconfdir = @sysconfdir@ -+datarootdir = @datarootdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be index 1f1409861b8..31009cb9c5f 100644 --- a/multimedia/xine-lib/patches/patch-be +++ b/multimedia/xine-lib/patches/patch-be @@ -1,21 +1,21 @@ -$NetBSD: patch-be,v 1.5 2005/10/13 10:48:01 jmmv Exp $ +$NetBSD: patch-be,v 1.6 2006/08/06 10:36:50 wiz Exp $ --- src/audio_out/Makefile.in.orig 2005-10-09 13:28:00.000000000 +0200 +++ src/audio_out/Makefile.in -@@ -197,6 +197,7 @@ OGG_CFLAGS = @OGG_CFLAGS@ +@@ -473,6 +473,7 @@ OGG_CFLAGS = @OGG_CFLAGS@ OGG_LIBS = @OGG_LIBS@ OPENGL_CFLAGS = @OPENGL_CFLAGS@ OPENGL_LIBS = @OPENGL_LIBS@ +OSS_LIBS = @OSS_LIBS@ PACKAGE = @PACKAGE@ - PASS1_CFLAGS = @PASS1_CFLAGS@ - PASS2_CFLAGS = @PASS2_CFLAGS@ -@@ -337,7 +338,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -665,7 +666,7 @@ xineplug_ao_out_file_la_SOURCES = audio_ + xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c -xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) +xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS) xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c + xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) diff --git a/multimedia/xine-lib/patches/patch-bh b/multimedia/xine-lib/patches/patch-bh deleted file mode 100644 index ed658f22dc6..00000000000 --- a/multimedia/xine-lib/patches/patch-bh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2005/09/20 12:11:37 dmcmahill Exp $ - ---- src/video_out/Makefile.am.orig 2005-04-25 10:43:15.000000000 -0400 -+++ src/video_out/Makefile.am -@@ -124,7 +124,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha - xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - --xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c -+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c - xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - diff --git a/multimedia/xine-lib/patches/patch-bi b/multimedia/xine-lib/patches/patch-bi deleted file mode 100644 index 6a2323d9040..00000000000 --- a/multimedia/xine-lib/patches/patch-bi +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bi,v 1.2 2005/10/13 10:48:01 jmmv Exp $ - ---- src/video_out/Makefile.in.orig 2005-10-09 13:28:16.000000000 +0200 -+++ src/video_out/Makefile.in -@@ -370,7 +370,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha - xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - --xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c -+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c - xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -@@ -479,7 +479,7 @@ am_xineplug_vo_out_opengl_la_OBJECTS = y - xineplug_vo_out_opengl_la_OBJECTS = \ - $(am_xineplug_vo_out_opengl_la_OBJECTS) - xineplug_vo_out_pgx32_la_DEPENDENCIES = --am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo -+am_xineplug_vo_out_pgx32_la_OBJECTS = alphablend.lo video_out_pgx32.lo - xineplug_vo_out_pgx32_la_OBJECTS = \ - $(am_xineplug_vo_out_pgx32_la_OBJECTS) - xineplug_vo_out_pgx64_la_DEPENDENCIES = diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb index b5ef2e1f58b..ad7af6bd923 100644 --- a/multimedia/xine-lib/patches/patch-cb +++ b/multimedia/xine-lib/patches/patch-cb @@ -1,13 +1,16 @@ -$NetBSD: patch-cb,v 1.1 2005/05/02 11:29:35 drochner Exp $ +$NetBSD: patch-cb,v 1.2 2006/08/06 10:36:50 wiz Exp $ ---- src/libw32dll/wine/module.c.orig 2005-04-30 23:33:18.000000000 +0200 -+++ src/libw32dll/wine/module.c -@@ -362,7 +362,7 @@ static WIN_BOOL MODULE_FreeLibrary( WINE - HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) - { - WINE_MODREF *wm = 0; -- char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 }; -+ char* listpath[] = { "", "", "@W32PATH@", 0 }; - char path[512]; - char checked[2000]; - int i = -1; +--- src/libw32dll/common.c.orig 2006-06-12 00:09:47.000000000 +0900 ++++ src/libw32dll/common.c +@@ -6,10 +6,7 @@ static char *get_win32_codecs_path(confi + DIR *dir; + char *path, *cfgpath; + char *listpath[] = { "", +- "/usr/lib/codecs", +- "/usr/local/lib/codecs", +- "/usr/lib/win32", +- "/usr/local/lib/win32", ++ "@W32PATH@", + NULL }; + int i = 0; + diff --git a/multimedia/xine-lib/patches/patch-ce b/multimedia/xine-lib/patches/patch-ce deleted file mode 100644 index 90526b57127..00000000000 --- a/multimedia/xine-lib/patches/patch-ce +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2005/10/13 10:48:01 jmmv Exp $ - ---- aclocal.m4.orig 2005-10-09 13:27:36.000000000 +0200 -+++ aclocal.m4 -@@ -7841,7 +7841,7 @@ if test x"$external_ffmpeg" != "xno"; th - "ac_cv_lib_avcodec_pp_get_context" \ - "ac_cv_lib_postproc_pp_get_context" \ - "ac_cv_lib_avcodec_register_avcodec"; do -- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } -+ $as_unset $i || test \"\${$i+set}\" != set || { eval $i=; export $i; } - done - - dnl look for headers -@@ -7889,7 +7889,7 @@ configure option --with-external-ffmpeg. - else - dnl check specified flags - CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" -- LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}" -+ LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}" - AC_LINK_IFELSE([#include - #include - -- cgit v1.2.3