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)

9 files changed, 68 insertions, 99 deletions

diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 904b1aa64c0..5402da145e4 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
+$NetBSD: patch-ag,v 1.8 2005/05/02 11:29:35 drochner Exp $
 
---- configure.ac.orig	2004-12-25 18:40:24.000000000 +0100
+--- configure.ac.orig	2005-04-26 10:09:18.000000000 +0200
 +++ configure.ac
-@@ -400,6 +400,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+@@ -402,6 +402,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -12,15 +12,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -514,6 +517,7 @@ if test x"$no_x" != "xyes"; then
-   AC_FIND_LIBXV
- 
- fi
-+AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
- 
- 
- host_or_hostalias="$host"
-@@ -576,7 +580,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
+@@ -573,7 +576,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
@@ -29,7 +21,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
               	     ac_have_xxmc="yes",
  	             [ac_have_xxmc="no"
-@@ -605,7 +609,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -603,7 +606,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
@@ -38,7 +30,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
  	       [ac_have_xxmc="no"
-@@ -659,7 +663,7 @@ saved_libs="$LIBS"
+@@ -657,7 +660,7 @@ saved_libs="$LIBS"
  XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
  AC_MSG_CHECKING(whether to enable the xvmc plugin)
  AC_MSG_RESULT()
@@ -47,7 +39,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
  	     [ac_have_xvmc="no"
-@@ -699,8 +703,7 @@ dnl Checks for Xinerama extension
+@@ -697,8 +700,7 @@ dnl Checks for Xinerama extension
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -57,7 +49,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
                ac_have_xinerama="yes"],,
               [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
  dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
-@@ -1073,9 +1076,19 @@ dnl ------------------------------------
+@@ -1078,9 +1080,19 @@ dnl ------------------------------------
  dnl OSS style audio interface
  dnl ---------------------------------------------
  
@@ -77,7 +69,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  	    #ifdef __NetBSD__
  	    #include <soundcard.h>
  	    #else
-@@ -1088,7 +1101,7 @@ AC_TRY_COMPILE([
+@@ -1093,7 +1105,7 @@ AC_TRY_COMPILE([
  	])
  AC_MSG_RESULT($have_ossaudio)
  AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
@@ -86,7 +78,7 @@ $NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
  
  dnl ---------------------------------------------
  dnl Alsa support
-@@ -1129,9 +1142,10 @@ dnl ------------------------------------
+@@ -1134,9 +1146,10 @@ dnl ------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index 62b62d561f5..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2005/04/26 12:48:35 tron Exp $
-
---- 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;
diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak
deleted file mode 100644
index b5d02e71fae..00000000000
--- a/multimedia/xine-lib/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2005/04/26 12:48:35 tron Exp $
-
---- src/input/librtsp/rtsp.c	2004/07/25 17:13:54	1.18
-+++ src/input/librtsp/rtsp.c	2005/04/16 07:10:51	1.19
-@@ -218,6 +218,7 @@
-   unsigned int answer_seq;
-   char **answer_ptr=s->answers;
-   int code;
-+  int ans_count = 0;
-   
-   answer=rtsp_get(s);
-   if (!answer)
-@@ -268,7 +269,7 @@
-     }
-     *answer_ptr=answer;
-     answer_ptr++;
--  } while (strlen(answer)!=0);
-+  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-   
-   s->cseq++;
-   
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index b7dc54e47e2..620994d6a49 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,17 +1,8 @@
-$NetBSD: patch-ao,v 1.6 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-ao,v 1.7 2005/05/02 11:29:35 drochner Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2004-12-25 23:36:16.000000000 +0100
+--- src/libw32dll/wine/Makefile.in.orig	2005-04-26 10:16:53.000000000 +0200
 +++ src/libw32dll/wine/Makefile.in
-@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--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
-@@ -421,6 +421,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -364,6 +364,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
  W32DLL_DEP = @W32DLL_DEP@
  W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
  WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
@@ -19,3 +10,12 @@ $NetBSD: patch-ao,v 1.6 2005/01/06 17:04:42 drochner Exp $
  WIN32_FALSE = @WIN32_FALSE@
  WIN32_TRUE = @WIN32_TRUE@
  XGETTEXT = @XGETTEXT@
+@@ -527,7 +528,7 @@ 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
diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq
index d595c64a35b..783f5b8079e 100644
--- a/multimedia/xine-lib/patches/patch-aq
+++ b/multimedia/xine-lib/patches/patch-aq
@@ -1,21 +1,21 @@
-$NetBSD: patch-aq,v 1.3 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-aq,v 1.4 2005/05/02 11:29:35 drochner Exp $
 
---- src/dxr3/Makefile.in.orig	2004-12-25 23:35:02.000000000 +0100
+--- src/dxr3/Makefile.in.orig	2005-04-26 10:15:28.000000000 +0200
 +++ src/dxr3/Makefile.in
-@@ -548,6 +548,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
+@@ -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
+ 
  lib_LTLIBRARIES = $(dxr3_modules) 
- 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 \
+ 
+@@ -480,7 +481,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
  	video_out_dxr3.c 
  
+ 
 -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 = \
- 	em8300.h \
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index d76496dfd7e..7da007fce6c 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.2 2005/01/06 17:04:42 drochner Exp $
+$NetBSD: patch-be,v 1.3 2005/05/02 11:29:35 drochner Exp $
 
---- src/audio_out/Makefile.in.orig	2004-12-25 23:34:57.000000000 +0100
+--- src/audio_out/Makefile.in.orig	2005-04-26 10:15:23.000000000 +0200
 +++ src/audio_out/Makefile.in
-@@ -437,6 +437,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
+@@ -306,6 +306,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
  OGG_LIBS = @OGG_LIBS@
  OPENGL_CFLAGS = @OPENGL_CFLAGS@
  OPENGL_LIBS = @OPENGL_LIBS@
@@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.2 2005/01/06 17:04:42 drochner Exp $
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -623,7 +624,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
- xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+@@ -509,7 +510,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
  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-bf b/multimedia/xine-lib/patches/patch-bf
deleted file mode 100644
index a31541f19ec..00000000000
--- a/multimedia/xine-lib/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/03/28 08:12:48 jmmv Exp $
-
---- m4/xv.m4.orig	2004-12-13 22:35:21.000000000 +0100
-+++ m4/xv.m4
-@@ -43,8 +43,6 @@ AC_DEFUN([AC_TEST_LIBXV],
-      ,
-   [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
- 
--  AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
--
-   dnl -----------------------------------------------
-   dnl xine_check use Xv functions API.
-   dnl -----------------------------------------------
diff --git a/multimedia/xine-lib/patches/patch-ca b/multimedia/xine-lib/patches/patch-ca
new file mode 100644
index 00000000000..d0896b013ff
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ca
@@ -0,0 +1,19 @@
+$NetBSD: patch-ca,v 1.1 2005/05/02 11:29:35 drochner Exp $
+
+--- aclocal.m4.orig	2005-04-30 22:09:14.000000000 +0200
++++ aclocal.m4
+@@ -7869,14 +7869,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)
diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb
new file mode 100644
index 00000000000..b5ef2e1f58b
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2005/05/02 11:29:35 drochner 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;