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

10 files changed, 94 insertions, 125 deletions

diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa
index f44c17401d3..e347569f249 100644
--- a/multimedia/xine-lib/patches/patch-aa
+++ b/multimedia/xine-lib/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/13 10:48:01 jmmv Exp $
 
---- src/xine-engine/video_decoder.c.orig	2004-04-08 16:03:42.000000000 +0000
-+++ src/xine-engine/video_decoder.c	2004-04-16 14:29:15.000000000 +0000
+--- src/xine-engine/video_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
++++ src/xine-engine/video_decoder.c
 @@ -43,6 +43,10 @@
  
  #define SPU_SLEEP_INTERVAL (90000/2)
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
  
  static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-@@ -443,7 +447,9 @@
+@@ -472,7 +476,9 @@ void _x_video_decoder_init (xine_stream_
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
      int		       err, num_buffers;
      /* The fifo size is based on dvd playback where buffers are filled
       * with 2k of data. With 500 buffers and a typical video data rate
-@@ -464,10 +470,12 @@
+@@ -496,10 +502,12 @@ void _x_video_decoder_init (xine_stream_
      stream->spu_track_map_entries = 0;
    
      pthread_attr_init(&pth_attrs);
@@ -33,6 +33,6 @@ $NetBSD: patch-aa,v 1.3 2004/04/16 14:44:33 mycroft Exp $
      pthread_attr_setschedparam(&pth_attrs, &pth_params);
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-     
+ 
+     stream->video_thread_created = 1;
      if ((err = pthread_create (&stream->video_thread,
-                                &pth_attrs, video_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ab b/multimedia/xine-lib/patches/patch-ab
index 4b5187aede9..0b5a82a218d 100644
--- a/multimedia/xine-lib/patches/patch-ab
+++ b/multimedia/xine-lib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/13 10:48:01 jmmv Exp $
 
---- src/xine-engine/audio_decoder.c.orig	2003-12-12 20:30:51.000000000 +0100
+--- src/xine-engine/audio_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
 +++ src/xine-engine/audio_decoder.c
-@@ -338,7 +338,9 @@ static void *audio_decoder_loop (void *s
+@@ -448,7 +448,9 @@ static void *audio_decoder_loop (void *s
  void _x_audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -364,10 +366,12 @@ void _x_audio_decoder_init (xine_stream_
+@@ -486,10 +488,12 @@ void _x_audio_decoder_init (xine_stream_
       */
  
      pthread_attr_init(&pth_attrs);
@@ -22,6 +22,6 @@ $NetBSD: patch-ab,v 1.2 2004/03/11 17:26:02 jmmv Exp $
      pthread_attr_setschedparam(&pth_attrs, &pth_params);
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-   
+  
+     stream->audio_thread_created = 1; 
      if ((err = pthread_create (&stream->audio_thread,
-                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 185568fa385..023b1134383 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
+$NetBSD: patch-ag,v 1.10 2005/10/13 10:48:01 jmmv Exp $
 
---- configure.ac.orig	2005-04-26 08:09:18.000000000 +0000
+--- configure.ac.orig	2005-10-08 16:08:37.000000000 +0200
 +++ configure.ac
-@@ -192,7 +192,7 @@ dnl threads and OS specific stuff
- dnl ---------------------------------------------
+@@ -200,7 +200,7 @@ AC_ARG_WITH(pthread-prefix, 
+   [pthread_prefix="no"])
  
  case "$host" in
 -  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     THREAD_LIBS="-L/usr/local/lib -pthread"
-     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
- 
-@@ -402,6 +402,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
++  *-*-freebsd* | -*-*-dragonfly*)
+     if test x"$pthread_prefix" = "xno"; then
+       pthread_prefix="/usr/local"
+     fi
+@@ -437,6 +437,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -573,7 +576,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
+@@ -630,7 +633,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
@@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
               	     ac_have_xxmc="yes",
  	             [ac_have_xxmc="no"
-@@ -603,7 +606,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -660,7 +663,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.9 2005/10/10 22:51:04 joerg Exp $
  	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
  	       [ac_have_xxmc="no"
-@@ -657,7 +660,7 @@ saved_libs="$LIBS"
+@@ -714,7 +717,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,7 +48,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
  	     [ac_have_xvmc="no"
-@@ -697,8 +700,7 @@ dnl Checks for Xinerama extension
+@@ -754,8 +757,7 @@ dnl Checks for Xinerama extension
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -58,7 +58,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg 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")
-@@ -1078,9 +1080,19 @@ dnl ------------------------------------
+@@ -1194,9 +1196,19 @@ dnl ------------------------------------
  dnl OSS style audio interface
  dnl ---------------------------------------------
  
@@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  	    #ifdef __NetBSD__
  	    #include <soundcard.h>
  	    #else
-@@ -1093,7 +1105,7 @@ AC_TRY_COMPILE([
+@@ -1209,7 +1221,7 @@ AC_TRY_COMPILE([
  	])
  AC_MSG_RESULT($have_ossaudio)
  AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
@@ -87,7 +87,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  
  dnl ---------------------------------------------
  dnl Alsa support
-@@ -1134,9 +1146,10 @@ dnl ------------------------------------
+@@ -1250,9 +1262,10 @@ dnl ------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
  AC_SUBST(GNOME_VFS_CFLAGS)
  AC_SUBST(GNOME_VFS_LIBS)
  if test x"$no_gnome_vfs" != "xyes"; then
-@@ -1452,7 +1465,7 @@ int has_timeout=sizeof(test.timeout);],
+@@ -1568,7 +1581,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-ai b/multimedia/xine-lib/patches/patch-ai
index acbbdaa4eb6..db3d237c58e 100644
--- a/multimedia/xine-lib/patches/patch-ai
+++ b/multimedia/xine-lib/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+$NetBSD: patch-ai,v 1.2 2005/10/13 10:48:01 jmmv Exp $
 
---- src/xine-engine/audio_out.c.orig	2003-04-06 10:23:10.000000000 +1000
+--- src/xine-engine/audio_out.c.orig	2005-10-08 15:57:49.000000000 +0200
 +++ src/xine-engine/audio_out.c
-@@ -1671,7 +1671,9 @@ xine_audio_port_t *ao_new_port (xine_t *
+@@ -2103,7 +2103,9 @@ xine_audio_port_t *_x_ao_new_port (xine_
      this->audio_loop_running = 1;  
      
      pthread_attr_init(&pth_attrs);
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
      pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
 +#endif
-     
+ 
+     this->audio_thread_created = 1;
      if ((err = pthread_create (&this->audio_thread,
- 			       &pth_attrs, ao_loop, this)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index f57f69fb34a..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aj,v 1.7 2005/05/26 22:47:22 reed Exp $
-
---- 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 <unistd.h>
- 
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
- #include <dirent.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -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;
-     }
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index bcced17ba61..49e4524ee15 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,21 +1,21 @@
-$NetBSD: patch-ao,v 1.8 2005/07/29 16:09:11 drochner Exp $
+$NetBSD: patch-ao,v 1.9 2005/10/13 10:48:01 jmmv Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2005-07-26 20:33:21.000000000 +0200
+--- src/libw32dll/wine/Makefile.in.orig	2005-10-09 13:28:12.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
-@@ -423,6 +423,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -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@
- WIN32_FALSE = @WIN32_FALSE@
- WIN32_TRUE = @WIN32_TRUE@
- XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -355,7 +356,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-au b/multimedia/xine-lib/patches/patch-au
deleted file mode 100644
index 2f5889c901c..00000000000
--- a/multimedia/xine-lib/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.2 2004/05/12 16:37:07 drochner Exp $
-
---- src/xine-engine/xine.c.orig	2004-04-27 18:56:39.000000000 +0200
-+++ src/xine-engine/xine.c	2004-05-11 22:20:16.000000000 +0200
-@@ -238,6 +238,7 @@
-   pthread_mutex_init(&port_ticket->lock, NULL);
-   pthread_mutex_init(&port_ticket->revoke_lock, NULL);
-   pthread_cond_init(&port_ticket->issued, NULL);
-+  pthread_cond_init(&port_ticket->revoked, NULL);
-   
-   return port_ticket;
- }
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index 2892ae2fa2d..1f1409861b8 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,21 +1,21 @@
-$NetBSD: patch-be,v 1.4 2005/07/29 16:09:11 drochner Exp $
+$NetBSD: patch-be,v 1.5 2005/10/13 10:48:01 jmmv Exp $
 
---- src/audio_out/Makefile.in.orig	2005-07-26 20:32:23.000000000 +0200
+--- src/audio_out/Makefile.in.orig	2005-10-09 13:28:00.000000000 +0200
 +++ src/audio_out/Makefile.in
-@@ -449,6 +449,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
+@@ -197,6 +197,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
  OGG_LIBS = @OGG_LIBS@
  OPENGL_CFLAGS = @OPENGL_CFLAGS@
  OPENGL_LIBS = @OPENGL_LIBS@
 +OSS_LIBS = @OSS_LIBS@
  PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -640,7 +641,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
- xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+@@ -337,7 +338,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-bi b/multimedia/xine-lib/patches/patch-bi
index d375ffd6fdc..6a2323d9040 100644
--- a/multimedia/xine-lib/patches/patch-bi
+++ b/multimedia/xine-lib/patches/patch-bi
@@ -1,22 +1,22 @@
-$NetBSD: patch-bi,v 1.1 2005/09/20 12:11:37 dmcmahill Exp $
+$NetBSD: patch-bi,v 1.2 2005/10/13 10:48:01 jmmv Exp $
 
---- src/video_out/Makefile.in.orig	2005-07-26 14:33:37.000000000 -0400
+--- src/video_out/Makefile.in.orig	2005-10-09 13:28:16.000000000 +0200
 +++ src/video_out/Makefile.in
-@@ -139,7 +139,7 @@ xineplug_vo_out_opengl_la_OBJECTS =  \
- @HAVE_OPENGL_TRUE@@HAVE_X11_TRUE@	-rpath $(libdir)
- xineplug_vo_out_pgx32_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--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)
- @HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_pgx32_la_rpath =  \
-@@ -775,7 +775,7 @@ xineplug_vo_out_syncfb_la_LDFLAGS = -avo
- xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
+@@ -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@
- xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c $(X11OSD)
+ 
+@@ -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-ce b/multimedia/xine-lib/patches/patch-ce
new file mode 100644
index 00000000000..90526b57127
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ce
@@ -0,0 +1,22 @@
+$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 <avcodec.h>
+ #include <postprocess.h>
+