update to 1-rc8

fixes some security vulnerabilities, bugfixes

8 files changed, 59 insertions, 62 deletions

diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index fc68a1d8d0f..75b294a47a0 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2004/11/23 03:04:56 tv Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/12/21 18:56:44 drochner Exp $
 #
 
-DISTNAME=		xine-lib-1-rc6a
-XINE_PKGNAME=		xine-lib-1rc6a
+DISTNAME=		xine-lib-1-rc8
+XINE_PKGNAME=		xine-lib-1rc8
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -27,9 +27,11 @@ USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
+CONFIGURE_ARGS+=	--enable-shared-xv
 CONFIGURE_ENV+=		have_libpng="yes"
 CONFIGURE_ENV+=		PNG_CFLAGS="-I${PREFIX}/include"
 CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
+BUILD_ENV+=		"mkdir_p"="mkdir -p"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index a2f0b17fc32..b9c23b5ede7 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/10/27 20:31:33 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2004/12/21 18:56:44 drochner Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -13,9 +13,11 @@ include/xine/info_helper.h
 include/xine/input_plugin.h
 include/xine/io_helper.h
 include/xine/metronom.h
+include/xine/os_types.h
 include/xine/osd.h
 include/xine/plugin_catalog.h
 include/xine/post.h
+include/xine/refcounter.h
 include/xine/resample.h
 include/xine/scratch.h
 include/xine/spu_decoder.h
@@ -88,6 +90,8 @@ lib/xine/plugins/1.0.0/xineplug_decode_spucc.a
 lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
 lib/xine/plugins/1.0.0/xineplug_decode_spucmml.a
 lib/xine/plugins/1.0.0/xineplug_decode_spucmml.so
+lib/xine/plugins/1.0.0/xineplug_decode_spudvb.a
+lib/xine/plugins/1.0.0/xineplug_decode_spudvb.so
 lib/xine/plugins/1.0.0/xineplug_decode_sputext.a
 lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
 lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a
@@ -193,6 +197,7 @@ share/doc/xine/README.network_dvd
 share/doc/xine/README.opengl
 share/doc/xine/README.solaris
 share/doc/xine/README.syncfb
+share/doc/xine/README_xxmc.html
 share/doc/xine/faq/faq.html
 share/doc/xine/faq/faq.txt
 share/doc/xine/hackersguide/architecture.png
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index e4b9deb65b5..66f57a1fdbb 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/10/27 20:31:33 drochner Exp $
+$NetBSD: distinfo,v 1.10 2004/12/21 18:56:44 drochner Exp $
 
-SHA1 (xine-lib-1-rc6a.tar.gz) = 9359543ae3cc34f25af08ef42cbd13f08cae8398
-Size (xine-lib-1-rc6a.tar.gz) = 7003035 bytes
+SHA1 (xine-lib-1-rc8.tar.gz) = de130119fa177273e3c16186b24e347ebba8d7b6
+Size (xine-lib-1-rc8.tar.gz) = 7354157 bytes
 SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
 SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
@@ -11,13 +11,13 @@ SHA1 (patch-ag) = f9e0a5e57e24739e2526266e1804b2a0b4ff41ed
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
-SHA1 (patch-ao) = ccf11ec7335b745a9c998906c4ff61e7a5631ed6
+SHA1 (patch-ao) = 9df576ba11a393c3a8e886e7a9948b2adc5f2ba2
 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
-SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded
+SHA1 (patch-aq) = 897bc7a6e4e014c8c6b5e4c2c0173a9d1a8f5dbe
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
-SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9
 SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
 SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
 SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b
-SHA1 (patch-bb) = fcfdf5dae066837cb35e51a5d114c366a5b3a7b2
+SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
+SHA1 (patch-bc) = b0ad58ac1f06cebe5990caeeeff5a5e3e40d480b
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index d281eafd318..d11892b58a2 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,16 +1,16 @@
-$NetBSD: patch-ao,v 1.4 2004/10/27 20:31:33 drochner Exp $
+$NetBSD: patch-ao,v 1.5 2004/12/21 18:56:44 drochner Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2004-09-16 17:14:15.000000000 +0200
+--- src/libw32dll/wine/Makefile.in.orig	2004-12-15 14:02:43.000000000 +0100
 +++ src/libw32dll/wine/Makefile.in
-@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -368,6 +368,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@
-@@ -351,7 +352,7 @@ CONFIG_CLEAN_FILES =
+ WIN32_FALSE = @WIN32_FALSE@
+ WIN32_TRUE = @WIN32_TRUE@
+ XGETTEXT = @XGETTEXT@
+@@ -528,7 +529,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  
  libwine_la_LDFLAGS =
diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq
index 0517d8fa848..0969f75b338 100644
--- a/multimedia/xine-lib/patches/patch-aq
+++ b/multimedia/xine-lib/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-aq,v 1.2 2004/12/21 18:56:44 drochner Exp $
 
---- 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 @@
+--- src/dxr3/Makefile.in.orig	2004-12-15 14:02:28.000000000 +0100
++++ src/dxr3/Makefile.in
+@@ -458,6 +458,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
@@ -10,7 +10,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
  
  lib_LTLIBRARIES = $(dxr3_modules) 
  
-@@ -257,7 +258,7 @@
+@@ -481,7 +482,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
  	video_out_dxr3.c 
  
  
diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at
deleted file mode 100644
index a1aa951803c..00000000000
--- a/multimedia/xine-lib/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/03/28 20:14:22 mycroft Exp $
-
---- m4/xvid.m4.orig	2004-03-16 20:21:15.000000000 +0000
-+++ m4/xvid.m4	2004-03-28 02:26:26.000000000 +0000
-@@ -18,7 +18,7 @@
-     XVID_LIBS="-L$xvid_prefix/$XINE_LIBNAME"
-   fi
- 
--  XVID_LIBS="$XVID_LIBS -lxvidcore"
-+  XVID_LIBS="$XVID_LIBS -lxvidcore -lm"
- 
-   AC_MSG_CHECKING(for XviD)
-   no_xvid=""
diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb
index 771ec7bca57..99cd7de99c1 100644
--- a/multimedia/xine-lib/patches/patch-bb
+++ b/multimedia/xine-lib/patches/patch-bb
@@ -1,35 +1,19 @@
-$NetBSD: patch-bb,v 1.1 2004/10/27 20:31:33 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2004/12/21 18:56:44 drochner Exp $
 
---- aclocal.m4.orig	2004-09-16 17:12:40.000000000 +0200
-+++ aclocal.m4
-@@ -7941,12 +7941,6 @@ if test x"$external_ffmpeg" != "xno"; th
+--- 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
+         CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
          LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
    
-         dnl drop the cache
+-        dnl drop the cache
 -        for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
 -                 "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; }
 -        done
-   
-         dnl check the headers
-         AC_CHECK_HEADERS(avcodec.h postprocess.h,
-@@ -8069,7 +8063,7 @@ AC_DEFUN([AM_PATH_OPENGL], [
-         AC_CHECK_LIB(GL, glBegin,
-          [AC_CHECK_HEADER(GL/gl.h,
-            [ac_have_opengl="yes"
--            OPENGL_LIBS="-lGL"
-+            OPENGL_LIBS="-lGL -lm"
-             dnl check for glut
-             AC_CHECK_LIB(glut, glutInit,
-              [ac_have_glut="yes"
-@@ -8094,7 +8088,7 @@ AC_DEFUN([AM_PATH_OPENGL], [
-            ]
-          )],
-          [],
--         [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]
-+         [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]
-         )
-         if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then
-           ac_use_opengl=yes
+-
+         dnl look for headers
+         AC_CHECK_HEADER(avcodec.h, , continue)
+         AC_CHECK_HEADER(postprocess.h, , continue)
diff --git a/multimedia/xine-lib/patches/patch-bc b/multimedia/xine-lib/patches/patch-bc
new file mode 100644
index 00000000000..45242901766
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-bc
@@ -0,0 +1,19 @@
+$NetBSD: patch-bc,v 1.1 2004/12/21 18:56:44 drochner Exp $
+
+--- aclocal.m4.orig	2004-12-18 01:22:24.000000000 +0100
++++ aclocal.m4
+@@ -7886,14 +7886,6 @@ if test x"$external_ffmpeg" != "xno"; th
+         CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
+         LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
+   
+-        dnl drop the cache
+-        for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
+-                 "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; }
+-        done
+-
+         dnl look for headers
+         AC_CHECK_HEADER(avcodec.h, , continue)
+         AC_CHECK_HEADER(postprocess.h, , continue)