UPDATE: multimedia/xine-lib

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: multimedia/xine-lib

j4nKy
- Update to latest, some patches no longer relevant
- Reorganize/update CONFIGURE_ARGS
- Use some CONFIGURE_ENV instead of patching
- Use new port devel/libcdio and updated graphics/vcdimager to get
  CD support

tested on amd64 with xine-ui, kaffeine and amarok.  kdemultimedia3
builds with this update as well.

please test and comment, thanks.

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 25 May 2007 16:16:37 -0000 1.13
+++ Makefile 27 May 2007 21:43:05 -0000
@@ -2,12 +2,11 @@
 
 COMMENT= "multimedia decoding library"
 
-V= 1.1.2
+V= 1.1.6
 DISTNAME= xine-lib-${V}
-PKGNAME= ${DISTNAME}p7
 EXTRACT_SUFX= .tar.bz2
 CATEGORIES= multimedia
-SHARED_LIBS= xine 14.1
+SHARED_LIBS= xine 18.0
 
 HOMEPAGE= http://xinehq.de/
 
@@ -19,8 +18,8 @@
 
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
 
-WANTLIB= ICE SM X11 Xau Xdmcp Xext Xinerama Xv freetype \
- jpeg lcms m usbhid z
+WANTLIB= X11 Xau Xdmcp Xext Xinerama Xv expat \
+ freetype fontconfig jpeg lcms m usbhid z
 
 .if ${MACHINE_ARCH} == "i386"
 PKG_ARGS+= -Di386=1
@@ -39,7 +38,9 @@
  ogg.>=5::audio/libogg \
                         vorbis.>=4::audio/libvorbis \
  speex.>=3::audio/speex \
- theora.>=1::multimedia/libtheora
+ theora.>=1::multimedia/libtheora \
+ cdio.>=8,iso9660.>=5::devel/libcdio \
+ vcdinfo.>=2::graphics/vcdimager
 
 SHARED_ONLY= Yes
 USE_X11= Yes
@@ -55,33 +56,45 @@
  --disable-mlib \
  --disable-opengl \
  --disable-fb \
+ --disable-syncfb \
+ --disable-directfb \
+ --disable-v4l \
+ --disable-dxr3 \
  --disable-vidix \
  --disable-aalib \
- --disable-caca \
- --disable-polypaudio \
+ --without-caca \
+ --without-xcb \
+ --without-pulseaudio \
  --disable-oss \
- --disable-alsa \
- --disable-arts \
- --disable-esd \
- --disable-gnome \
- --disable-imagemagick \
+ --without-alsa \
+ --without-arts \
+ --without-esound \
+ --without-jack \
+ --without-imagemagick \
  --disable-samba \
- --disable-vcd \
+ --disable-xvmc \
  --enable-shared-xv \
  --disable-static-xv \
  --disable-gnomevfs \
  --disable-gdkpixbuf \
- --with-external-ffmpeg=${LOCALBASE} \
- --with-external-dvdnav \
- --with-external-a52dec \
- --with-external-libmad \
- --with-internal-vcdlibs
+ --with-libflac \
+ --with-freetype \
+ --with-fontconfig \
+ --with-external-ffmpeg=yes \
+ --with-external-dvdnav=yes \
+ --with-external-a52dec=yes \
+ --with-external-libmad=yes
 
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib" \
  FFMPEG_CPPFLAGS="$$(pkg-config --cflags libavcodec libpostproc)" \
  FFMPEG_LIBS="$$(pkg-config --libs libavcodec libpostproc)" \
- FFMPEG_POSTPROC_LIBS="$$(pkg-config --libs libpostproc)"
+ FFMPEG_POSTPROC_LIBS="$$(pkg-config --libs libavcodec libpostproc)" \
+ PTHREAD_LIBS="-pthread" \
+ PTHREAD_CFLAGS="-pthread" \
+ XV_LIBS="-lXv" \
+ SDL_LIBS="$$(sdl-config --libs)" \
+ SDL_CFLAGS="$$(sdl-config --cflags)"
 
 post-patch:
 .if ${MACHINE_ARCH} == "i386"
Index: distinfo
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 5 Apr 2007 16:20:07 -0000 1.3
+++ distinfo 27 May 2007 21:43:05 -0000
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.2.tar.bz2) = xN0mLEfKrm9CjrkCrI7A6A==
-RMD160 (xine-lib-1.1.2.tar.bz2) = ITItbX4IUjeSZ0FJXXD1zndkkQs=
-SHA1 (xine-lib-1.1.2.tar.bz2) = B+RU4ih+NEFLWY+veK5tirj/u2k=
-SHA256 (xine-lib-1.1.2.tar.bz2) = hxkzx0X1gkgIqIcgUYwBZBZpBlNsf4cjvTjoT3gxkiY=
-SIZE (xine-lib-1.1.2.tar.bz2) = 6457108
+MD5 (xine-lib-1.1.6.tar.bz2) = ncGk+BzNZE5MDilP81+3bQ==
+RMD160 (xine-lib-1.1.6.tar.bz2) = k4vk0kpBQ5QoFi3eDx0N1ZpLN2o=
+SHA1 (xine-lib-1.1.6.tar.bz2) = 98hl0ImRvodeuYbasmQOeIlG5CY=
+SHA256 (xine-lib-1.1.6.tar.bz2) = 6tTNm521VOCnRzZw3WZt96Q/h5Re5wFBmiyiWMvDGjo=
+SIZE (xine-lib-1.1.6.tar.bz2) = 7293043
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-configure,v
retrieving revision 1.7
diff -u -r1.7 patch-configure
--- patches/patch-configure 1 May 2007 20:20:49 -0000 1.7
+++ patches/patch-configure 27 May 2007 21:43:05 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.7 2007/05/01 20:20:49 naddy Exp $
---- configure.orig Sun Jul  9 16:51:14 2006
-+++ configure Tue May  1 22:06:27 2007
-@@ -25613,8 +25613,12 @@ _ACEOF
+$OpenBSD$
+--- configure.orig Tue Apr 17 15:18:11 2007
++++ configure Sun May 20 23:50:59 2007
+@@ -24480,6 +24480,9 @@ _ACEOF
  fi
  done
 
@@ -10,67 +10,24 @@
 +INTLLIBS=$LTLIBINTL
 
 
-+
  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
-@@ -27729,6 +27733,13 @@ echo "$as_me: WARNING:
-     fi
-     ;;
-
-+  *-*-openbsd*)
-+    THREAD_LIBS="-pthread"
-+    THREAD_CPPFLAGS="-pthread"
-+    have_pthread=yes
-+
-+    ;;
-+
-   *-*-hpux11*)
-     THREAD_LIBS="-lpthread"
-     have_pthread=yes
-@@ -28905,7 +28916,7 @@ fi
-                  "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 || { $i=; export $i; }
-         done
-
-                 if test "${ac_cv_header_avcodec_h+set}" = set; then
-@@ -33078,8 +33089,12 @@ _ACEOF
-
-
-      ac_have_xv="yes"
-+
-+XV_LIB="-lXv"
-+
-+if test 0 -eq 1 ; then
-      case x$XV_LIB in
--      x*.a)
-+      x*_pic.a)
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XV_STATIC 1
-@@ -33088,8 +33103,8 @@ _ACEOF
-         ac_have_xv_static="yes"
-         XV_LIB="$xv_path/$XV_LIB"
-         ;;
--      x*.so)
--        XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
-+      x*.so.*)
-+        XV_LIB="-lXv"
-         ;;
-       *)
-         { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB" >&5
-@@ -33113,6 +33128,7 @@ fi
+@@ -30535,13 +30538,13 @@ t q
+ b
+ :q
+ q"
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed 1q`"
 
- fi
+ cat >>confdefs.h <<_ACEOF
+ #define LIBX11_SO "${x_lib_location:-libX11.so}"
+ _ACEOF
 
-+fi
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*  "${x_libraries:-/usr/lib}/libXv.so"*  2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*  "${x_libraries:-/usr/lib}/libXv.so"*  2>/dev/null | sed 1q`"
 
- if test x$ac_have_xv = "xyes"; then
-   HAVE_XV_TRUE=
-@@ -40297,7 +40313,7 @@ elif test x"$external_a52dec" = "xyes"; then
+ cat >>confdefs.h <<_ACEOF
+ #define LIBXV_SO "${x_lib_location:-libXv.so}"
+@@ -37681,7 +37684,7 @@ elif test "x$external_a52dec" = "xyes"; then
    have_a52="yes"
 
 
@@ -79,7 +36,7 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -40469,7 +40485,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -37820,7 +37823,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
  #define HAVE_LIBA52 1
  _ACEOF
 
@@ -88,7 +45,7 @@
 
  else
    have_a52="no"
-@@ -40900,7 +40916,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38398,7 +38401,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -97,7 +54,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41123,7 +41139,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38581,7 +38584,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
  fi
  if test $ac_cv_header_libmng_h = yes; then
     have_libmng=yes
@@ -106,30 +63,30 @@
  else
    { echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
  echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
-@@ -53028,7 +53044,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -49391,7 +49394,7 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
 
-         CFLAGS="$CFLAGS -faltivec"
--        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec"
-+        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -faltivec"
+         CFLAGS="$CFLAGS -faltivec -maltivec"
+-        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec -maltivec"
++        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -faltivec -maltivec"
      fi
      ;;
    ppc-*-linux* | powerpc-*)
-@@ -53208,7 +53224,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
+@@ -49859,7 +49862,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
 
-         CFLAGS="$CFLAGS -maltivec"
--        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -maltivec"
-+        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -maltivec"
-     fi
-     ;;
-   sparc*-*-linux*)
-@@ -53489,7 +53505,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
-
- XINE_BUILD_CC="`$CC -v 2>&1 | tail -n 1`"
+ XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
  XINE_BUILD_OS="`uname -s -r -m`"
 -XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`"
-+XINE_BUILD_DATE=`date "+%a %d %b %Y %T"`
++XINE_BUILD_DATE="`date "+%a %d %b %Y %T"`"
 
 
 
+@@ -50691,7 +50694,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
+     { echo "$as_me:$LINENO: result: $ac_cv_try_ldflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_ldflags_ok" >&6; }
+     if test x"$ac_cv_try_ldflags_ok" = x"yes"; then
+-        NOUNDEF="-Wl,-z,defs"
++        : # NOUNDEF="-Wl,-z,defs"
+     else
+         :
+     fi
Index: patches/patch-misc_libxine_pc_in
===================================================================
RCS file: patches/patch-misc_libxine_pc_in
diff -N patches/patch-misc_libxine_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-misc_libxine_pc_in 27 May 2007 21:43:05 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- misc/libxine.pc.in.orig Fri May 25 23:09:41 2007
++++ misc/libxine.pc.in Fri May 25 23:10:32 2007
+@@ -7,7 +7,7 @@ Name: libxine
+ Description: The xine engine library
+ Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
+ Requires:
+-Libs: -L${libdir} -lxine
++Libs: -L${libdir} -lxine @PTHREAD_LIBS@
+ Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} @PTHREAD_CFLAGS@
+ Cflags.private: @PTHREAD_CFLAGS@
Index: patches/patch-misc_xine-config_in
===================================================================
RCS file: patches/patch-misc_xine-config_in
diff -N patches/patch-misc_xine-config_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-misc_xine-config_in 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- misc/xine-config.in.orig Fri May 25 23:08:44 2007
++++ misc/xine-config.in Fri May 25 23:09:14 2007
+@@ -104,7 +104,7 @@ if test "$echo_cflags" = "yes"; then
+ fi
+
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
++      echo -L@libdir@ -lxine @PTHREAD_LIBS@
+ fi      
+ if test "$echo_plugindir" = "yes"; then
+       echo "@XINE_PLUGINPATH@"
Index: patches/patch-src_audio_out_audio_sun_out_c
===================================================================
RCS file: patches/patch-src_audio_out_audio_sun_out_c
diff -N patches/patch-src_audio_out_audio_sun_out_c
--- patches/patch-src_audio_out_audio_sun_out_c 1 May 2007 20:05:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,136 +0,0 @@
-$OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/audio_out/audio_sun_out.c.orig Sun Jul  9 16:37:12 2006
-+++ src/audio_out/audio_sun_out.c Tue May  1 22:03:06 2007
-@@ -41,7 +41,12 @@
- #ifdef __svr4__
- #include <stropts.h>
- #endif
-+#include <sys/param.h>
-
-+#if (defined(BSD) && BSD >= 199306)
-+typedef unsigned uint_t;
-+#endif
-+
- #include "xine_internal.h"
- #include "xineutils.h"
- #include "audio_out.h"
-@@ -89,7 +94,9 @@ typedef struct sun_driver_s {
-   uint32_t       num_channels;
-   int bytes_per_frame;
-
-+#ifndef __OpenBSD__
-   uint32_t       frames_in_buffer;     /* number of frames writen to audio hardware   */
-+#endif
-
-   enum {
-       RTSC_UNKNOWN = 0,
-@@ -114,12 +121,14 @@ typedef struct sun_driver_s {
-   unsigned buf_len;
- #endif
-
-+#ifndef __OpenBSD__
- #if SW_SAMPLE_COUNT
-   struct timeval tv0;
-   uint_t sample0;
- #endif
-
-   uint_t last_samplecnt;
-+#endif
- } sun_driver_t;
-
-
-@@ -129,6 +138,7 @@ typedef struct sun_driver_s {
-  */
- static int realtime_samplecounter_available(xine_t *xine, char *dev)
- {
-+#ifndef __OpenBSD__
-   int fd = -1;
-   audio_info_t info;
-   int rtsc_ok = RTSC_DISABLED;
-@@ -247,6 +257,9 @@ error:
-   }
-
-   return rtsc_ok;
-+#else
-+  return RTSC_ENABLED;
-+#endif
- }
-
-
-@@ -430,7 +443,9 @@ static int ao_sun_open(ao_driver_t *this_gen,
-  
-   this->mode = mode;
-   this->input_sample_rate = rate;
-+#ifndef __OpenBSD__
-   this->frames_in_buffer = 0;
-+#endif
-
-   /*
-    * open audio device
-@@ -462,6 +477,9 @@ static int ao_sun_open(ao_driver_t *this_gen,
-       info.play.sample_rate = this->input_sample_rate;
-       info.play.eof = 0;
-       info.play.samples = 0;
-+#ifdef __OpenBSD__
-+      info.blocksize = 1024;
-+#endif
-
-       this->convert_u8_s8 = 0;
-
-@@ -523,7 +541,9 @@ static int ao_sun_open(ao_driver_t *this_gen,
-       return 0;
-   }
-
-+#ifndef __OpenBSD__
-   this->last_samplecnt = 0;
-+#endif
-
-   this->output_sample_rate = info.play.sample_rate;
-   this->num_channels = info.play.channels;
-@@ -564,6 +584,7 @@ static int ao_sun_delay(ao_driver_t *this_gen)
-   sun_driver_t *this = (sun_driver_t *) this_gen;
-   audio_info_t info;
-
-+#ifndef __OpenBSD__
-   if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
-       (this->frames_in_buffer == 0 || info.play.samples > 0)) {
-
-@@ -610,6 +631,10 @@ static int ao_sun_delay(ao_driver_t *this_gen)
-     }
- #endif
-   }
-+#else
-+  if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0)
-+    return info.play.seek / this->bytes_per_frame;
-+#endif
-   return NOT_REAL_TIME;
- }
-
-@@ -718,7 +743,9 @@ static int ao_sun_write(ao_driver_t *this_gen,
-   if (num_written > 0) {
-     int buffered_samples;
-
-+#ifndef __OpenBSD__
-     this->frames_in_buffer += num_written / this->bytes_per_frame;
-+#endif
-
-     /*
-      * Avoid storing too much data in the sound driver's buffers.
-@@ -778,7 +805,7 @@ static int ao_sun_get_property (ao_driver_t *this_gen,
-       this->mixer_volume = info.play.gain * 100 / AUDIO_MAX_GAIN;
-     }
-     return this->mixer_volume;
--#if !defined(__NetBSD__)    /* audio_info.output_muted is missing on NetBSD */
-+#if !defined(__OpenBSD__)    /* audio_info.output_muted is missing on NetBSD */
-   case AO_PROP_MUTE_VOL:
-     if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) < 0)
-       return 0;
-@@ -807,7 +834,7 @@ static int ao_sun_set_property (ao_driver_t *this_gen,
-     if (ioctl(this->audio_fd, AUDIO_SETINFO, &info) < 0)
-       return ~value;
-     return value;
--#if !defined(__NetBSD__)    /* audio_info.output_muted is missing on NetBSD */
-+#if !defined(__OpenBSD__)    /* audio_info.output_muted is missing on NetBSD */
-   case AO_PROP_MUTE_VOL:
-     info.output_muted = value != 0;
-     if (ioctl(this->audio_fd, AUDIO_SETINFO, &info) < 0)
Index: patches/patch-src_demuxers_demux_asf_c
===================================================================
RCS file: patches/patch-src_demuxers_demux_asf_c
diff -N patches/patch-src_demuxers_demux_asf_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_demuxers_demux_asf_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/demuxers/demux_asf.c.orig Sun Apr 15 10:42:15 2007
++++ src/demuxers/demux_asf.c Sun May 20 22:40:02 2007
+@@ -427,7 +427,7 @@ static int asf_read_header (demux_asf_t *this) {
+ xine_log(this->stream->xine, XINE_LOG_MSG,
+ _("demux_asf: warning: The stream id=%d is encrypted.\n"), asf_stream->stream_number);
+ _x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,
+-   _("Media stream scrambled/encrypted"), NULL);
++   _("Media stream scrambled/encrypted"), (char *)NULL);
+ this->mode = ASF_MODE_ENCRYPTED_CONTENT;
+       }
+     }
Index: patches/patch-src_demuxers_demux_mpeg_block_c
===================================================================
RCS file: patches/patch-src_demuxers_demux_mpeg_block_c
diff -N patches/patch-src_demuxers_demux_mpeg_block_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_demuxers_demux_mpeg_block_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/demuxers/demux_mpeg_block.c.orig Sun Apr 15 10:42:15 2007
++++ src/demuxers/demux_mpeg_block.c Sun May 20 22:40:02 2007
+@@ -650,7 +650,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_block_t *t
+      _("demux_mpeg_block: warning: PES header indicates that this stream "
+ "may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
+       _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
+-  "Media stream scrambled/encrypted", NULL);
++  "Media stream scrambled/encrypted", (char *)NULL);
+       this->status = DEMUX_FINISHED;
+       buf->free_buffer(buf);
+       return -1;
Index: patches/patch-src_demuxers_demux_mpeg_pes_c
===================================================================
RCS file: patches/patch-src_demuxers_demux_mpeg_pes_c
diff -N patches/patch-src_demuxers_demux_mpeg_pes_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_demuxers_demux_mpeg_pes_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/demuxers/demux_mpeg_pes.c.orig Mon Apr 16 18:00:49 2007
++++ src/demuxers/demux_mpeg_pes.c Sun May 20 22:40:02 2007
+@@ -787,7 +787,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_pes_t *thi
+      _("demux_mpeg_pes: warning: PES header indicates that "
+ "this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
+       _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
+-                      "Media stream scrambled/encrypted", NULL);
++                      "Media stream scrambled/encrypted", (char *)NULL);
+       this->status = DEMUX_FINISHED;
+       buf->free_buffer(buf);
+       return -1;
Index: patches/patch-src_demuxers_demux_qt_c
===================================================================
RCS file: patches/patch-src_demuxers_demux_qt_c
diff -N patches/patch-src_demuxers_demux_qt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_demuxers_demux_qt_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/demuxers/demux_qt.c.orig Mon Apr 16 18:00:50 2007
++++ src/demuxers/demux_qt.c Sun May 20 22:40:02 2007
+@@ -2981,7 +2981,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
+       /* special consideration for DRM-protected files */
+       if (this->qt->last_error == QT_DRM_NOT_SUPPORTED)
+         _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
+-          "DRM-protected Quicktime file", NULL);
++          "DRM-protected Quicktime file", (char *)NULL);
+
+     } else if (last_error != QT_OK) {
+
Index: patches/patch-src_input_Makefile_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-src_input_Makefile_in
--- patches/patch-src_input_Makefile_in 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_input_Makefile_in 27 May 2007 21:43:05 -0000
@@ -1,24 +1,7 @@
-$OpenBSD: patch-src_input_Makefile_in,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/input/Makefile.in.orig Sun Jul  9 16:51:15 2006
-+++ src/input/Makefile.in Tue May  1 22:03:06 2007
-@@ -150,11 +150,11 @@ xineplug_inp_v4l_la_DEPENDENCIES = $(am__DEPENDENCIES_
- am_xineplug_inp_v4l_la_OBJECTS = input_v4l.lo
- xineplug_inp_v4l_la_OBJECTS = $(am_xineplug_inp_v4l_la_OBJECTS)
- @HAVE_V4L_TRUE@am_xineplug_inp_v4l_la_rpath = -rpath $(libdir)
--xineplug_inp_vcdo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
--am_xineplug_inp_vcdo_la_OBJECTS = input_vcd.lo media_helper.lo
--xineplug_inp_vcdo_la_OBJECTS = $(am_xineplug_inp_vcdo_la_OBJECTS)
--@HAVE_CDROM_IOCTLS_TRUE@am_xineplug_inp_vcdo_la_rpath = -rpath \
--@HAVE_CDROM_IOCTLS_TRUE@ $(libdir)
-+@ENABLE_VCD_TRUE@xineplug_inp_vcdo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+@ENABLE_VCD_TRUE@am_xineplug_inp_vcdo_la_OBJECTS = input_vcd.lo media_helper.lo
-+@ENABLE_VCD_TRUE@xineplug_inp_vcdo_la_OBJECTS = $(am_xineplug_inp_vcdo_la_OBJECTS)
-+@ENABLE_VCD_TRUE@@HAVE_CDROM_IOCTLS_TRUE@am_xineplug_inp_vcdo_la_rpath = -rpath \
-+@ENABLE_VCD_TRUE@@HAVE_CDROM_IOCTLS_TRUE@ $(libdir)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -638,7 +638,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
+$OpenBSD$
+--- src/input/Makefile.in.orig Tue Apr 17 15:17:43 2007
++++ src/input/Makefile.in Sun May 20 22:40:02 2007
+@@ -667,7 +667,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
  # ---------
  # All of xine input plugins should be named like the scheme "xineplug_inp_"
  #
Index: patches/patch-src_input_input_cdda_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_input_cdda_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_input_input_cdda_c
--- patches/patch-src_input_input_cdda_c 24 Mar 2006 22:43:41 -0000 1.1.1.1
+++ patches/patch-src_input_input_cdda_c 27 May 2007 21:43:05 -0000
@@ -1,12 +1,75 @@
-$OpenBSD: patch-src_input_input_cdda_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_cdda.c.orig Tue Nov 15 05:36:44 2005
-+++ src/input/input_cdda.c Thu Dec 29 23:39:05 2005
+$OpenBSD$
+--- src/input/input_cdda.c.orig Mon Apr 16 18:00:50 2007
++++ src/input/input_cdda.c Sat May 26 01:45:42 2007
 @@ -73,7 +73,7 @@
  #elif defined(WIN32)
  #define DEFAULT_CDDA_DEVICE "d:\\"
  #else
 -#define DEFAULT_CDDA_DEVICE "/dev/cdrom"
-+#define DEFAULT_CDDA_DEVICE "/dev/cd0c"
++#define DEFAULT_CDDA_DEVICE "/dev/rcd0c"
  #endif
 
  #define CDDB_SERVER             "freedb.freedb.org"
+@@ -614,7 +614,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
+   return 0;
+ }
+
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+
+ #include <sys/cdio.h>
+ #include <sys/scsiio.h>
+@@ -624,7 +624,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+   struct ioc_toc_header tochdr;
+ #if defined(__FreeBSD__)
+   struct ioc_read_toc_single_entry tocentry;
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+   struct ioc_read_toc_entry tocentry;
+   struct cd_toc_entry data;
+ #endif
+@@ -660,7 +660,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+       perror("CDIOREADTOCENTRY");
+       return -1;
+     }
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+     memset(&data, 0, sizeof(data));
+     tocentry.data_len = sizeof(data);
+     tocentry.data = &data;
+@@ -681,7 +681,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+       (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
+       (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
+        tocentry.entry.addr.msf.frame;
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+     toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
+     toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute;
+     toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second;
+@@ -703,7 +703,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+     perror("CDIOREADTOCENTRY");
+     return -1;
+   }
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+   memset(&data, 0, sizeof(data));
+   tocentry.data_len = sizeof(data);
+   tocentry.data = &data;
+@@ -724,7 +724,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+     (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
+     (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
+      tocentry.entry.addr.msf.frame;
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+   toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
+   toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute;
+   toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second;
+@@ -765,7 +765,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
+       perror("CDIOCREADAUDIO");
+       return -1;
+     }
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+     scsireq_t req;
+     int nblocks = 1;
+
Index: patches/patch-src_input_input_dvb_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_input_dvb_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_input_input_dvb_c
--- patches/patch-src_input_input_dvb_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_input_input_dvb_c 27 May 2007 21:43:05 -0000
@@ -1,14 +1,21 @@
-$OpenBSD: patch-src_input_input_dvb_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/input/input_dvb.c.orig Sun Jul  9 16:37:35 2006
-+++ src/input/input_dvb.c Tue May  1 22:03:06 2007
-@@ -986,8 +986,8 @@ static int tuner_tune_it (tuner_t *this, struct dvb_fr
+$OpenBSD$
+--- src/input/input_dvb.c.orig Mon Apr 16 18:00:50 2007
++++ src/input/input_dvb.c Sun May 20 22:40:02 2007
+@@ -892,7 +892,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
+   if (!f) {
+     xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s': %s\n"), filename, strerror (errno));
+     if (!f && stream)
+-      _x_message(stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", NULL);
++      _x_message(stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", (char *)NULL);
+     return NULL;
+   }
+   if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) {
+@@ -2544,7 +2544,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
 
-   if (poll(pfd,1,3000)){
-       if (pfd[0].revents & POLLIN){
--  if (ioctl(this->fd_frontend, FE_GET_EVENT, &event) == -EOVERFLOW){
--      print_error("EOVERFLOW");
-+  if (ioctl(this->fd_frontend, FE_GET_EVENT, &event) == -EINVAL){
-+      print_error("EINVAL");
-      return 0;
-  }
-  if (event.parameters.frequency <= 0)
+   /* no data for several seconds - tell the user a possible reason */
+   if(this->read_failcount==5){
+-    _x_message(this->stream,1,"DVB Signal Lost.  Please check connections.", NULL);
++    _x_message(this->stream,1,"DVB Signal Lost.  Please check connections.", (char *)NULL);
+   }
+ #ifdef DVB_NO_BUFFERING
+   if(this->newchannel){
Index: patches/patch-src_input_input_dvd_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_input_dvd_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_input_input_dvd_c
--- patches/patch-src_input_input_dvd_c 24 Mar 2006 22:43:41 -0000 1.1.1.1
+++ patches/patch-src_input_input_dvd_c 27 May 2007 21:43:05 -0000
@@ -1,16 +1,7 @@
-$OpenBSD: patch-src_input_input_dvd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_dvd.c.orig Fri Oct 14 16:02:16 2005
-+++ src/input/input_dvd.c Thu Dec 29 23:39:05 2005
-@@ -64,7 +64,7 @@
- #endif /* WIN32 */
-
-
--#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <sys/dvdio.h>
- #include <sys/cdio.h> /* CDIOCALLOW etc... */
- #elif defined(HAVE_LINUX_CDROM_H)
-@@ -123,8 +123,8 @@
+$OpenBSD$
+--- src/input/input_dvd.c.orig Mon Apr 16 18:00:50 2007
++++ src/input/input_dvd.c Sun May 20 22:40:02 2007
+@@ -119,8 +119,8 @@
  #define DVD_PATH "d:\\"
  #define RDVD_PATH "d:\\"
  #else
@@ -21,3 +12,21 @@
  #endif
 
  /* Some misc. defines */
+@@ -609,7 +609,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
+       xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+      _("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
+       _x_message(this->stream, XINE_MSG_READ_ERROR,
+-                   dvdnav_err_to_string(this->dvdnav), NULL);
++                   dvdnav_err_to_string(this->dvdnav), (char *)NULL);
+       if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
+       buf->free_buffer(buf);
+       return NULL;
+@@ -1498,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
+     xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
+     _x_message(this->stream, XINE_MSG_READ_ERROR,
+       /* FIXME: see FIXME in dvd_parse_try_open() */
+-      (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
++      (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL);
+     return 0;
+   }
+  
Index: patches/patch-src_input_input_file_c
===================================================================
RCS file: patches/patch-src_input_input_file_c
diff -N patches/patch-src_input_input_file_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_input_input_file_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- src/input/input_file.c.orig Mon Apr 16 18:00:50 2007
++++ src/input/input_file.c Sun May 20 22:40:02 2007
+@@ -202,7 +202,7 @@ static buf_element_t *file_plugin_read_block (input_pl
+  xine_log (this->stream->xine, XINE_LOG_MSG,
+    _("input_file: read error (%s)\n"), strerror(errno));
+  _x_message(this->stream, XINE_MSG_READ_ERROR,
+-                     this->mrl, NULL);
++                     this->mrl, (char *)NULL);
+ }
+ buf->free_buffer (buf);
+ buf = NULL;
+@@ -395,12 +395,12 @@ static int file_plugin_open (input_plugin_t *this_gen
+
+     if (this->fh == -1) {
+       if (errno == EACCES) {
+-        _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
++        _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, (char *)NULL);
+ xine_log (this->stream->xine, XINE_LOG_MSG,
+  _("input_file: Permission denied: >%s<\n"), this->mrl);
+ return -1;
+       } else if (errno == ENOENT) {
+-        _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
++        _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, (char *)NULL);
+ xine_log (this->stream->xine, XINE_LOG_MSG,
+  _("input_file: File not found: >%s<\n"), this->mrl);
+       }
+@@ -431,7 +431,7 @@ static int file_plugin_open (input_plugin_t *this_gen
+ #endif
+
+   if (file_plugin_get_length (this_gen) == 0) {
+-      _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, NULL);
++      _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, (char *)NULL);
+       close (this->fh);
+       xine_log (this->stream->xine, XINE_LOG_MSG,
+ _("input_file: File empty: >%s<\n"), this->mrl);
Index: patches/patch-src_input_input_http_c
===================================================================
RCS file: patches/patch-src_input_input_http_c
diff -N patches/patch-src_input_input_http_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_input_input_http_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,99 @@
+$OpenBSD$
+--- src/input/input_http.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/input_http.c Sun May 20 22:40:02 2007
+@@ -396,7 +396,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
+  
+ error:
+   if (!_x_action_pending(this->stream))
+-    _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
++    _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, (char *)NULL);
+   xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
+   return read_bytes;
+ }
+@@ -651,7 +651,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+       if (http_plugin_basicauth (this_class->proxyuser,
+         this_class->proxypassword,
+ this->proxyauth, BUFSIZE)) {
+- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL);
++ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", (char *)NULL);
+ return 0;
+       }
+     }
+@@ -660,7 +660,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+  
+   if (!_x_parse_url(this->mrl, &this->proto, &this->host, &this->port,
+                     &this->user, &this->password, &this->uri)) {
+-    _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", NULL);
++    _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", (char *)NULL);
+     return 0;
+   }
+   if (use_proxy && _x_use_proxy(this_class, this->host)) {
+@@ -671,7 +671,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+  
+   if (this->user && strlen(this->user)) {
+     if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
+-      _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
++      _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", (char *)NULL);
+       return -1;
+     }
+   }
+@@ -725,7 +725,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+     } while ((res == XIO_TIMEOUT) && (progress <= 100000));
+
+     if (res != XIO_READY) {
+-      _x_message(this->stream, XINE_MSG_NETWORK_UNREACHABLE, this->mrl, NULL);
++      _x_message(this->stream, XINE_MSG_NETWORK_UNREACHABLE, this->mrl, (char *)NULL);
+       return -3;
+     }
+   }
+@@ -770,7 +770,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+            VERSION);
+   buflen = strlen(this->buf);
+   if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) {
+-    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL);
++    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", (char *)NULL);
+     xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't send request\n");
+     return -4;
+   }
+@@ -814,7 +814,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+    (sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
+    &httpcode, httpstatus) != 2)
+   ) {
+-    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
++    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", (char *)NULL);
+    xine_log (this->stream->xine, XINE_LOG_MSG,
+      _("input_http: invalid http answer\n"));
+    return -6;
+@@ -825,20 +825,20 @@ static int http_plugin_open (input_plugin_t *this_gen
+    _("input_http: 3xx redirection: >%d %s<\n"),
+    httpcode, httpstatus);
+ } else if (httpcode == 404) {
+-  _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
++  _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, (char *)NULL);
+  xine_log (this->stream->xine, XINE_LOG_MSG,
+    _("input_http: http status not 2xx: >%d %s<\n"),
+                        httpcode, httpstatus);
+  return -7;
+ } else if (httpcode == 403) {
+-          _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
++          _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, (char *)NULL);
+  xine_log (this->stream->xine, XINE_LOG_MSG,
+    _("input_http: http status not 2xx: >%d %s<\n"),
+    httpcode, httpstatus);
+  return -8;
+ } else if (httpcode < 200 || httpcode >= 300) {
+  _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ",
+-               httpstatus, NULL);
++               httpstatus, (char *)NULL);
+        xine_log (this->stream->xine, XINE_LOG_MSG,
+    _("input_http: http status not 2xx: >%d %s<\n"),
+    httpcode, httpstatus);
+@@ -917,7 +917,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+     } else
+       len ++;
+     if ( len >= BUFSIZE ) {
+-       _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
++       _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, (char *)NULL);
+        xine_log (this->stream->xine, XINE_LOG_MSG,
+          _("input_http: buffer exhausted after %d bytes."), BUFSIZE);
+        return -10;
Index: patches/patch-src_input_input_net_c
===================================================================
RCS file: patches/patch-src_input_input_net_c
diff -N patches/patch-src_input_input_net_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_input_input_net_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/input/input_net.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/input_net.c Sun May 20 22:40:02 2007
+@@ -274,7 +274,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen
+     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len);
+  
+     if (n < 0) {
+-      _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
++      _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, (char *)NULL);
+       return 0;
+     }
+
Index: patches/patch-src_input_input_stdin_fifo_c
===================================================================
RCS file: patches/patch-src_input_input_stdin_fifo_c
diff -N patches/patch-src_input_input_stdin_fifo_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_input_input_stdin_fifo_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/input/input_stdin_fifo.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/input_stdin_fifo.c Sun May 20 22:40:02 2007
+@@ -106,7 +106,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_g
+     lprintf ("got %"PRId64" bytes (%"PRId64"/%"PRId64" bytes read)\n", n,total,len);
+  
+     if (n < 0) {
+-      _x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
++      _x_message(this->stream, XINE_MSG_READ_ERROR, (char *)NULL);
+       return 0;
+     }
+
Index: patches/patch-src_input_input_vcd_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_input_vcd_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_input_input_vcd_c
--- patches/patch-src_input_input_vcd_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_input_input_vcd_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_input_vcd_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/input/input_vcd.c.orig Sun Jul  9 16:37:35 2006
-+++ src/input/input_vcd.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/input/input_vcd.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/input_vcd.c Sun May 20 22:40:02 2007
 @@ -95,7 +95,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
Index: patches/patch-src_input_libreal_asmrp_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_libreal_asmrp_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_input_libreal_asmrp_c
--- patches/patch-src_input_libreal_asmrp_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_input_libreal_asmrp_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_libreal_asmrp_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/input/libreal/asmrp.c.orig Fri Aug 27 20:34:16 2004
-+++ src/input/libreal/asmrp.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/input/libreal/asmrp.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/libreal/asmrp.c Sun May 20 22:40:02 2007
 @@ -37,6 +37,7 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -9,49 +9,3 @@
 
  #define LOG_MODULE "asmrp"
  #define LOG_VERBOSE
-@@ -604,7 +605,7 @@ static int asmrp_rule (asmrp_t *p) {
-   return ret;
- }
-
--static int asmrp_eval (asmrp_t *p, int *matches) {
-+static int asmrp_eval (asmrp_t *p, int *matches, int matchsize) {
-
-   int rule_num, num_matches;
-
-@@ -613,13 +614,15 @@ static int asmrp_eval (asmrp_t *p, int *matches) {
-   asmrp_get_sym (p);
-
-   rule_num = 0; num_matches = 0;
--  while (p->sym != ASMRP_SYM_EOF) {
-+  while (p->sym != ASMRP_SYM_EOF && num_matches < matchsize -1) {
-
-     if (asmrp_rule (p)) {
-       lprintf ("rule #%d is true\n", rule_num);
-
--      matches[num_matches] = rule_num;
--      num_matches++;
-+      if(num_matches < MAX_RULEMATCHES - 1)
-+        matches[num_matches++] = rule_num;
-+      else
-+        printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
-     }
-
-     rule_num++;
-@@ -629,7 +632,7 @@ static int asmrp_eval (asmrp_t *p, int *matches) {
-   return num_matches;
- }
-
--int asmrp_match (const char *rules, int bandwidth, int *matches) {
-+int asmrp_match (const char *rules, int bandwidth, int *matches, int matchsize) {
-
-   asmrp_t *p;
-   int      num_matches;
-@@ -641,7 +644,7 @@ int asmrp_match (const char *rules, int bandwidth, int
-   asmrp_set_id (p, "Bandwidth", bandwidth);
-   asmrp_set_id (p, "OldPNMPlayer", 0);
-
--  num_matches = asmrp_eval (p, matches);
-+  num_matches = asmrp_eval (p, matches, matchsize);
-
-   asmrp_dispose (p);
-
Index: patches/patch-src_input_libreal_asmrp_h
===================================================================
RCS file: patches/patch-src_input_libreal_asmrp_h
diff -N patches/patch-src_input_libreal_asmrp_h
--- patches/patch-src_input_libreal_asmrp_h 2 Jan 2007 19:42:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_input_libreal_asmrp_h,v 1.2 2007/01/02 19:42:59 robert Exp $
---- src/input/libreal/asmrp.h.orig Mon Dec  8 19:02:30 2003
-+++ src/input/libreal/asmrp.h Mon Jan  1 15:27:47 2007
-@@ -37,6 +37,8 @@
- #ifndef HAVE_ASMRP_H
- #define HAVE_ASMRP_H
-
--int asmrp_match (const char *rules, int bandwidth, int *matches) ;
-+#define MAX_RULEMATCHES 16
-+
-+int asmrp_match (const char *rules, int bandwidth, int *matches, int matchsize) ;
-
- #endif
Index: patches/patch-src_input_libreal_real_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_libreal_real_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_input_libreal_real_c
--- patches/patch-src_input_libreal_real_c 1 May 2007 20:05:10 -0000 1.5
+++ patches/patch-src_input_libreal_real_c 27 May 2007 21:43:05 -0000
@@ -1,29 +1,14 @@
-$OpenBSD: patch-src_input_libreal_real_c,v 1.5 2007/05/01 20:05:10 naddy Exp $
---- src/input/libreal/real.c.orig Sun Jul  9 16:37:40 2006
-+++ src/input/libreal/real.c Tue May  1 22:03:06 2007
-@@ -51,9 +51,10 @@ static const unsigned char xor_table[] = {
+$OpenBSD$
+--- src/input/libreal/real.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/libreal/real.c Sun May 20 22:40:02 2007
+@@ -51,8 +51,9 @@ static const unsigned char xor_table[] = {
  #define BE_32C(x,y) do { *(uint32_t *)(x) = be2me_32((y)); } while(0)
  #define LE_32C(x,y) do { *(uint32_t *)(x) = le2me_32((y)); } while(0)
 
 +#ifndef MAX
  #define MAX(x,y) ((x>y) ? x : y)
+-
 +#endif
 
--
  static void hash(char *field, char *param) {
 
-   uint32_t a, b, c, d;
-@@ -472,11 +473,11 @@ rmff_header_t *real_parse_sdp(char *data, char **strea
-     int j=0;
-     int n;
-     char b[64];
--    int rulematches[16];
-+    int rulematches[MAX_RULEMATCHES];
-
-     lprintf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
-
--    n=asmrp_match(desc->stream[i]->asm_rule_book, bandwidth, rulematches);
-+    n=asmrp_match(desc->stream[i]->asm_rule_book, bandwidth, rulematches, sizeof(rulematches)/sizeof(rulematches[0]));
-     for (j=0; j<n; j++) {
-       lprintf("asmrp rule match: %u for stream %u\n", rulematches[j], desc->stream[i]->stream_id);
-       sprintf(b,"stream=%u;rule=%u,", desc->stream[i]->stream_id, rulematches[j]);
Index: patches/patch-src_input_media_helper_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_media_helper_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_input_media_helper_c
--- patches/patch-src_input_media_helper_c 1 May 2007 20:05:10 -0000 1.2
+++ patches/patch-src_input_media_helper_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_media_helper_c,v 1.2 2007/05/01 20:05:10 naddy Exp $
---- src/input/media_helper.c.orig Sun Jul  9 16:37:35 2006
-+++ src/input/media_helper.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/input/media_helper.c.orig Thu Mar 29 15:44:56 2007
++++ src/input/media_helper.c Sun May 20 22:40:02 2007
 @@ -59,7 +59,7 @@ static int media_umount_media(const char *device)
 
    pid=fork();
Index: patches/patch-src_input_mms_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_mms_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_input_mms_c
--- patches/patch-src_input_mms_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_input_mms_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_mms_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/input/mms.c.orig Sun Jul  9 16:37:35 2006
-+++ src/input/mms.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/input/mms.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/mms.c Sun May 20 22:40:02 2007
 @@ -50,6 +50,7 @@
  #include <iconv.h>
  #include <locale.h>
@@ -9,16 +9,7 @@
  #endif
 
  /********** logging **********/
-@@ -138,7 +139,7 @@ struct mms_s {
-   int           num_stream_ids;
-   int           stream_ids[ASF_MAX_NUM_STREAMS];
-   int           stream_types[ASF_MAX_NUM_STREAMS];
--  int           asf_packet_len;
-+  uint32_t      asf_packet_len;
-   uint64_t      file_len;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -299,7 +300,7 @@ static int send_command (mms_t *this, int command,
+@@ -290,7 +291,7 @@ static int send_command (mms_t *this, int command,
 
  #ifdef USE_ICONV
  static iconv_t string_utf16_open() {
@@ -27,47 +18,3 @@
  }
 
  static void string_utf16_close(iconv_t url_conv) {
-@@ -371,13 +372,17 @@ static int get_packet_header (mms_t *this, mms_packet_
-       goto error;
-    
-     header->packet_len = LE_32(this->buf + 8) + 4;
-+    if (header->packet_len > BUF_SIZE - 12) {
-+      header->packet_len = 0;
-+      goto error;
-+    }
-     lprintf("mms command\n");
-     packet_type = MMS_PACKET_COMMAND;
-   } else {
-     header->packet_seq     = LE_32(this->buf);
-     header->packet_id_type = this->buf[4];
-     header->flags          = this->buf[5];
--    header->packet_len     = LE_16(this->buf + 6) - 8;
-+    header->packet_len     = (LE_16(this->buf + 6) - 8) & 0xffff;
-     if (header->packet_id_type == ASF_HEADER_PACKET_ID_TYPE) {
-       lprintf("asf header\n");
-       packet_type = MMS_PACKET_ASF_HEADER;
-@@ -497,6 +502,11 @@ static int get_asf_header (mms_t *this) {
-         break;
-       case MMS_PACKET_ASF_HEADER:
-       case MMS_PACKET_ASF_PACKET:
-+        if (header.packet_len + this->asf_header_len > ASF_HEADER_LEN) {
-+            xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+                     "libmms: asf packet too large\n");
-+            return 0;
-+        }
-         len = _x_io_tcp_read (this->stream, this->s,
-                               (char*)(this->asf_header + this->asf_header_len), header.packet_len);
-         if (len != header.packet_len) {
-@@ -542,6 +552,12 @@ static void interp_asf_header (mms_t *this) {
-       case GUID_ASF_FILE_PROPERTIES:
-
-         this->asf_packet_len = LE_32(this->asf_header + i + 92 - 24);
-+        if (this->asf_packet_len > BUF_SIZE) {
-+          this->asf_packet_len = 0;
-+          xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+                   "libmms: asf packet len too large\n");
-+          break;
-+        }
-         this->file_len       = LE_64(this->asf_header + i + 40 - 24);
-         lprintf ("file object, file_length = %lld, packet length = %d",
- this->file_len, this->asf_packet_len);
Index: patches/patch-src_input_mmsh_c
===================================================================
RCS file: patches/patch-src_input_mmsh_c
diff -N patches/patch-src_input_mmsh_c
--- patches/patch-src_input_mmsh_c 1 May 2007 20:05:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_input_mmsh_c,v 1.2 2007/05/01 20:05:10 naddy Exp $
---- src/input/mmsh.c.orig Sun Jul  9 16:37:35 2006
-+++ src/input/mmsh.c Tue May  1 22:03:06 2007
-@@ -182,7 +182,7 @@ struct mmsh_s {
-   int           num_stream_ids;
-   int           stream_ids[ASF_MAX_NUM_STREAMS];
-   int           stream_types[ASF_MAX_NUM_STREAMS];
--  int           packet_length;
-+  uint32_t      packet_length;
-   int64_t       file_length;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -491,6 +491,10 @@ static void interp_header (mmsh_t *this) {
-       case GUID_ASF_FILE_PROPERTIES:
-
-         this->packet_length = LE_32(this->asf_header + i + 92 - 24);
-+        if (this->packet_length > CHUNK_SIZE) {
-+          this->packet_length = 0;
-+          break;
-+        }
-         this->file_length   = LE_64(this->asf_header + i + 40 - 24);
-         /*lprintf ("file object, file_length = %lld, packet length = %d",
- this->file_length, this->packet_count);*/
Index: patches/patch-src_input_vcd_libcdio_iso9660_fs_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_input_vcd_libcdio_iso9660_fs_c
--- patches/patch-src_input_vcd_libcdio_iso9660_fs_c 12 Oct 2006 04:48:14 -0000 1.2
+++ patches/patch-src_input_vcd_libcdio_iso9660_fs_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_vcd_libcdio_iso9660_fs_c,v 1.2 2006/10/12 04:48:14 brad Exp $
---- src/input/vcd/libcdio/iso9660_fs.c.orig Sun Jul  9 10:37:48 2006
-+++ src/input/vcd/libcdio/iso9660_fs.c Fri Sep 15 17:53:21 2006
+$OpenBSD$
+--- src/input/vcd/libcdio/iso9660_fs.c.orig Sun Apr 15 10:42:16 2007
++++ src/input/vcd/libcdio/iso9660_fs.c Sun May 20 22:40:02 2007
 @@ -33,6 +33,7 @@
 
  #ifdef HAVE_ICONV
Index: patches/patch-src_libmusepack_musepack_internal_h
===================================================================
RCS file: patches/patch-src_libmusepack_musepack_internal_h
diff -N patches/patch-src_libmusepack_musepack_internal_h
--- patches/patch-src_libmusepack_musepack_internal_h 24 Mar 2006 22:43:41 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_libmusepack_musepack_internal_h,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/libmusepack/musepack/internal.h.orig Sat Dec 24 20:53:47 2005
-+++ src/libmusepack/musepack/internal.h Sat Dec 24 20:55:07 2005
-@@ -8,6 +8,7 @@ enum {
-     MPC_DECODER_SYNTH_DELAY = 481
- };
-
-+#ifndef swap32
- /// Big/little endian 32 bit byte swapping routine.
- static inline
- mpc_uint32_t swap32(mpc_uint32_t val) {
-@@ -16,6 +17,7 @@ mpc_uint32_t swap32(mpc_uint32_t val) {
-         (mpc_uint32_t)src[0] |
-         ((mpc_uint32_t)src[1] << 8) | ((mpc_uint32_t)src[2] << 16) | ((mpc_uint32_t)src[3] << 24);
- }
-+#endif
-
- /// Searches for a ID3v2-tag and reads the length (in bytes) of it.
- /// \param reader supplying raw stream data
Index: patches/patch-src_libreal_audio_decoder_c
===================================================================
RCS file: patches/patch-src_libreal_audio_decoder_c
diff -N patches/patch-src_libreal_audio_decoder_c
--- patches/patch-src_libreal_audio_decoder_c 1 May 2007 20:05:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_libreal_audio_decoder_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/libreal/audio_decoder.c.orig Sun Jul  9 16:39:11 2006
-+++ src/libreal/audio_decoder.c Tue May  1 22:03:06 2007
-@@ -32,8 +32,10 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <dlfcn.h>
--#ifdef __x86_64__
--  #include <elf.h>
-+#ifdef __linux__
-+  #ifdef __x86_64__
-+    #include <elf.h>
-+  #endif
- #endif
-
- #define LOG_MODULE "real_audio_decoder"
-@@ -121,7 +123,8 @@ void __builtin_delete (void *foo) {
-   free (foo);
- }
-
--#ifdef __x86_64__
-+#ifdef __linux__
-+  #ifdef __x86_64__
- /* (gb) quick-n-dirty check to be run natively */
- static int is_x86_64_object_(FILE *f)
- {
-@@ -162,6 +165,7 @@ static inline int is_x86_64_object(const char *filenam
-   fclose(f);
-   return ret;
- }
-+  #endif
- #endif
-
- static int load_syms_linux (realdec_decoder_t *this, char *codec_name,
Index: patches/patch-src_libreal_real_common_c
===================================================================
RCS file: patches/patch-src_libreal_real_common_c
diff -N patches/patch-src_libreal_real_common_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libreal_real_common_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/libreal/real_common.c.orig Sun Apr 15 10:42:16 2007
++++ src/libreal/real_common.c Sun May 20 22:40:10 2007
+@@ -145,7 +145,7 @@ void *_x_real_codec_open(xine_stream_t *const stream,
+     LOG_MODULE ": error loading %s: %s\n", codecpath, dlerror());
+   }
+
+-  _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL);
++  _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, (char *)NULL);
+  
+   return NULL;
+ }
Index: patches/patch-src_libreal_xine_decoder_c
===================================================================
RCS file: patches/patch-src_libreal_xine_decoder_c
diff -N patches/patch-src_libreal_xine_decoder_c
--- patches/patch-src_libreal_xine_decoder_c 1 May 2007 20:05:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-src_libreal_xine_decoder_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/libreal/xine_decoder.c.orig Sun Jul  9 16:39:11 2006
-+++ src/libreal/xine_decoder.c Tue May  1 22:03:06 2007
-@@ -32,8 +32,10 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <dlfcn.h>
--#ifdef __x86_64__
--  #include <elf.h>
-+#ifdef __linux__
-+  #ifdef __x86_64__
-+    #include <elf.h>
-+  #endif
- #endif
-
- #define LOG_MODULE "real_decoder"
-@@ -106,7 +108,8 @@ void *__builtin_vec_new(uint32_t size);
- void __builtin_vec_delete(void *mem);
- void __pure_virtual(void);
-
--#ifdef __x86_64__
-+#ifdef __linux__
-+  #ifdef __x86_64__
- /* (gb) quick-n-dirty check to be run natively */
- static int is_x86_64_object_(FILE *f)
- {
-@@ -147,6 +150,7 @@ static inline int is_x86_64_object(const char *filenam
-   fclose(f);
-   return ret;
- }
-+  #endif
- #endif
-
- /*
-@@ -165,10 +169,12 @@ static int load_syms_linux (realdec_decoder_t *this, c
-   if (stat(path, &sb))
-     snprintf (path, sizeof(path), "%s/%s", entry->str_value, alt_codec_name);
-
--#ifdef __x86_64__
-+#ifdef __linux__
-+  #ifdef __x86_64__
-   /* check whether it's a real x86-64 library */
-   if (!is_x86_64_object(path))
- return 0;
-+  #endif
- #endif
-
-   lprintf ("opening shared obj '%s'\n", path);
Index: patches/patch-src_libsputext_demux_sputext_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_libsputext_demux_sputext_c
--- patches/patch-src_libsputext_demux_sputext_c 24 Mar 2006 22:43:41 -0000 1.1.1.1
+++ patches/patch-src_libsputext_demux_sputext_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libsputext_demux_sputext_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/libsputext/demux_sputext.c.orig Thu Jan  5 01:07:12 2006
-+++ src/libsputext/demux_sputext.c Thu Jan  5 01:08:23 2006
+$OpenBSD$
+--- src/libsputext/demux_sputext.c.orig Sun Apr 15 10:42:16 2007
++++ src/libsputext/demux_sputext.c Sun May 20 22:40:13 2007
 @@ -57,7 +57,7 @@
  #define SUB_MAX_TEXT  5
  #define SUB_BUFSIZE   1024
Index: patches/patch-src_libw32dll_dmo_DMO_VideoDecoder_c
===================================================================
RCS file: patches/patch-src_libw32dll_dmo_DMO_VideoDecoder_c
diff -N patches/patch-src_libw32dll_dmo_DMO_VideoDecoder_c
--- patches/patch-src_libw32dll_dmo_DMO_VideoDecoder_c 1 May 2007 20:05:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_libw32dll_dmo_DMO_VideoDecoder_c,v 1.2 2007/05/01 20:05:10 naddy Exp $
---- src/libw32dll/dmo/DMO_VideoDecoder.c.orig Wed Dec 24 17:55:36 2003
-+++ src/libw32dll/dmo/DMO_VideoDecoder.c Tue May  1 22:03:06 2007
-@@ -118,6 +118,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname
-      
-         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
-
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
Index: patches/patch-src_libw32dll_wine_Makefile_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_libw32dll_wine_Makefile_in
--- patches/patch-src_libw32dll_wine_Makefile_in 12 Oct 2006 04:48:14 -0000 1.2
+++ patches/patch-src_libw32dll_wine_Makefile_in 27 May 2007 21:43:05 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.2 2006/10/12 04:48:14 brad Exp $
---- src/libw32dll/wine/Makefile.in.orig Sun Jul  9 10:51:15 2006
-+++ src/libw32dll/wine/Makefile.in Fri Sep 15 17:53:21 2006
-@@ -68,7 +68,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
+$OpenBSD$
+--- src/libw32dll/wine/Makefile.in.orig Tue Apr 17 15:17:58 2007
++++ src/libw32dll/wine/Makefile.in Sun May 20 22:40:13 2007
+@@ -65,7 +65,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
  libwine_la_LIBADD =
  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 \
@@ -10,7 +10,7 @@
  libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
  @HAVE_W32DLL_TRUE@am_libwine_la_rpath =
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -547,6 +547,7 @@ libwine_la_SOURCES = \
+@@ -562,6 +562,7 @@ libwine_la_SOURCES = \
  registry.c \
  vfl.c \
  win32.c \
@@ -18,7 +18,7 @@
  stubs.s \
  wrapper.S
 
-@@ -651,6 +652,7 @@ distclean-compile:
+@@ -666,6 +667,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
Index: patches/patch-src_libw32dll_wine_pe_image_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_libw32dll_wine_pe_image_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_libw32dll_wine_pe_image_c
--- patches/patch-src_libw32dll_wine_pe_image_c 27 Mar 2006 11:04:28 -0000 1.1
+++ patches/patch-src_libw32dll_wine_pe_image_c 27 May 2007 21:43:05 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_libw32dll_wine_pe_image_c,v 1.1 2006/03/27 11:04:28 jakemsr Exp $
---- src/libw32dll/wine/pe_image.c.orig Sun Mar 26 18:06:55 2006
-+++ src/libw32dll/wine/pe_image.c Sun Mar 26 18:06:55 2006
-@@ -897,7 +897,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm)
+$OpenBSD$
+--- src/libw32dll/wine/pe_image.c.orig Sun Apr 15 10:42:16 2007
++++ src/libw32dll/wine/pe_image.c Sun May 20 22:40:14 2007
+@@ -900,7 +900,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm)
   */
  static void extend_stack_for_dll_alloca(void)
  {
Index: patches/patch-src_xine-engine_audio_decoder_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_xine-engine_audio_decoder_c
--- patches/patch-src_xine-engine_audio_decoder_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_xine-engine_audio_decoder_c 27 May 2007 21:43:05 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/xine-engine/audio_decoder.c.orig Sun Jul  9 16:40:08 2006
-+++ src/xine-engine/audio_decoder.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/xine-engine/audio_decoder.c.orig Sun Apr 15 10:42:17 2007
++++ src/xine-engine/audio_decoder.c Sun May 20 22:40:14 2007
 @@ -462,7 +462,9 @@ static void *audio_decoder_loop (void *stream_gen) {
- void _x_audio_decoder_init (xine_stream_t *stream) {
+ int _x_audio_decoder_init (xine_stream_t *stream) {
 
    pthread_attr_t       pth_attrs;
 +#if !defined(__OpenBSD__)
@@ -11,7 +11,7 @@
    int                  err;
 
    if (stream->audio_out == NULL) {
-@@ -500,10 +502,12 @@ void _x_audio_decoder_init (xine_stream_t *stream) {
+@@ -500,10 +502,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
       */
 
      pthread_attr_init(&pth_attrs);
Index: patches/patch-src_xine-engine_audio_out_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_xine-engine_audio_out_c
--- patches/patch-src_xine-engine_audio_out_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_xine-engine_audio_out_c 27 May 2007 21:43:05 -0000
@@ -1,7 +1,34 @@
-$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/xine-engine/audio_out.c.orig Sun Jul  9 16:40:08 2006
-+++ src/xine-engine/audio_out.c Tue May  1 22:03:06 2007
-@@ -2188,7 +2188,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
+$OpenBSD$
+--- src/xine-engine/audio_out.c.orig Mon Apr 16 18:00:50 2007
++++ src/xine-engine/audio_out.c Sun May 20 22:40:14 2007
+@@ -1052,7 +1052,7 @@ static void *ao_loop (void *this_gen) {
+                                 in_buf->format.rate,
+                                 in_buf->format.mode) == 0 ) {
+              in_buf->stream->emergency_brake = 1;
+-             _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
++             _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
+          }
+       }
+     }
+@@ -1083,7 +1083,7 @@ static void *ao_loop (void *this_gen) {
+  stream = xine_list_get_value (this->streams, ite);
+           if( !stream->emergency_brake ) {
+             stream->emergency_brake = 1;
+-            _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
++            _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
+           }
+ }
+ pthread_mutex_unlock(&this->streams_lock);
+@@ -1451,7 +1451,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
+      
+       if( !ret ) {
+         stream->emergency_brake = 1;
+-        _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
++        _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
+         return 0;
+       }
+     } else {
+@@ -2193,7 +2193,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
      this->audio_loop_running = 1;  
     
      pthread_attr_init(&pth_attrs);
Index: patches/patch-src_xine-engine_input_rip_c
===================================================================
RCS file: patches/patch-src_xine-engine_input_rip_c
diff -N patches/patch-src_xine-engine_input_rip_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xine-engine_input_rip_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/xine-engine/input_rip.c.orig Mon Apr 16 18:00:50 2007
++++ src/xine-engine/input_rip.c Sun May 20 22:40:14 2007
+@@ -568,7 +568,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
+     xine_log(stream->xine, XINE_LOG_MSG,
+     _("input_rip: target directory wasn't specified, please fill out the option 'media.capture.save_dir'\n"));
+     _x_message(stream, XINE_MSG_SECURITY,
+-       _("The stream save feature is disabled until you set media.capture.save_dir in the configuration."), NULL);
++       _("The stream save feature is disabled until you set media.capture.save_dir in the configuration."), (char *)NULL);
+     return NULL;
+   }
+
+@@ -577,7 +577,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
+     xine_log(stream->xine, XINE_LOG_MSG,
+     _("input_rip: ripping/caching of this source is not permitted!\n"));
+     _x_message(stream, XINE_MSG_SECURITY,
+-       _("xine is not allowed to save from this source. (possibly copyrighted material?)"), NULL);
++       _("xine is not allowed to save from this source. (possibly copyrighted material?)"), (char *)NULL);
+     return NULL;
+   }
+ #endif
Index: patches/patch-src_xine-engine_io_helper_c
===================================================================
RCS file: patches/patch-src_xine-engine_io_helper_c
diff -N patches/patch-src_xine-engine_io_helper_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xine-engine_io_helper_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,122 @@
+$OpenBSD$
+--- src/xine-engine/io_helper.c.orig Sun Apr 15 10:42:17 2007
++++ src/xine-engine/io_helper.c Sun May 20 22:40:14 2007
+@@ -56,19 +56,19 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
+  
+   h = gethostbyname(host);
+   if (h == NULL) {
+-    _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL);
++    _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, (char *)NULL);
+     return -1;
+   }
+
+   s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);  
+   if (s == -1) {
+-    _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL);
++    _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), (char *)NULL);
+     return -1;
+   }
+
+ #ifndef WIN32
+   if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
+-    _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
++    _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
+     return -1;
+   }
+ #else
+@@ -79,7 +79,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
+     rc = ioctlsocket(s, FIONBIO, &non_block);
+
+     if (rc == SOCKET_ERROR) {
+-      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
++      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
+  return -1;
+     }
+   }
+@@ -102,7 +102,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
+         xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "io_helper: WSAGetLastError() = %d\n", WSAGetLastError());
+ #endif /* WIN32 */
+
+-      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL);
++      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), (char *)NULL);
+       close(s);
+       continue;
+     }
+@@ -136,7 +136,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
+
+   if (error) {
+     _x_message(stream, XINE_MSG_UNKNOWN_HOST,
+- "unable to resolve", host, NULL);
++ "unable to resolve", host, (char *)NULL);
+     return -1;
+   }
+
+@@ -147,7 +147,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
+       s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);  
+       if (s == -1) {
+  _x_message(stream, XINE_MSG_CONNECTION_REFUSED,
+-       "failed to create socket", strerror(errno), NULL);
++       "failed to create socket", strerror(errno), (char *)NULL);
+  tmpaddr = tmpaddr->ai_next;
+  continue;
+       }
+@@ -160,7 +160,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
+       if ( ! tmpaddr->ai_next ) {
+ #ifndef WIN32
+ if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
+-  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
++  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
+  return -1;
+ }
+ #else
+@@ -170,7 +170,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
+ rc = ioctlsocket(s, FIONBIO, &non_block);
+
+ if (rc == SOCKET_ERROR) {
+-  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
++  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
+  return -1;
+ }
+ #endif
+@@ -200,7 +200,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
+     tmpaddr = tmpaddr->ai_next;
+   }
+
+-  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), NULL);
++  _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), (char *)NULL);
+  
+   return -1;
+ #endif
+@@ -311,11 +311,11 @@ int _x_io_tcp_connect_finish(xine_stream_t *stream, in
+     int err;
+    
+     if ((getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len)) == -1) {
+-      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), NULL);
++      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), (char *)NULL);
+       return XIO_ERROR;
+     }
+     if (err) {
+-      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL);
++      _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), (char *)NULL);
+       return XIO_ERROR;
+     }
+   }
+@@ -383,15 +383,15 @@ static off_t xio_rw_abort(xine_stream_t *stream, int f
+         continue;
+
+       if (errno == EACCES) {
+-        _x_message(stream, XINE_MSG_PERMISSION_ERROR, NULL, NULL);
++        _x_message(stream, XINE_MSG_PERMISSION_ERROR, NULL, (char *)NULL);
+ xine_log (stream->xine, XINE_LOG_MSG,
+  _("io_helper: Permission denied\n"));
+       } else if (errno == ENOENT) {
+-        _x_message(stream, XINE_MSG_FILE_NOT_FOUND, NULL, NULL);
++        _x_message(stream, XINE_MSG_FILE_NOT_FOUND, NULL, (char *)NULL);
+ xine_log (stream->xine, XINE_LOG_MSG,
+  _("io_helper: File not found\n"));
+       } else if (errno == ECONNREFUSED) {
+- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, NULL, NULL);
++ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, NULL, (char *)NULL);
+ xine_log (stream->xine, XINE_LOG_MSG,
+  _("io_helper: Connection Refused\n"));
+       } else {
Index: patches/patch-src_xine-engine_video_decoder_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_xine-engine_video_decoder_c
--- patches/patch-src_xine-engine_video_decoder_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_xine-engine_video_decoder_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/xine-engine/video_decoder.c.orig Sun Jul  9 16:40:08 2006
-+++ src/xine-engine/video_decoder.c Tue May  1 22:03:06 2007
+$OpenBSD$
+--- src/xine-engine/video_decoder.c.orig Sun Apr 15 10:42:17 2007
++++ src/xine-engine/video_decoder.c Sun May 20 22:40:14 2007
 @@ -43,6 +43,9 @@
 
  #define SPU_SLEEP_INTERVAL (90000/2)
@@ -11,7 +11,7 @@
 
  static void update_spu_decoder (xine_stream_t *stream, int type) {
 
-@@ -473,7 +476,9 @@ void _x_video_decoder_init (xine_stream_t *stream) {
+@@ -479,7 +482,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -21,7 +21,7 @@
      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
-@@ -497,10 +502,12 @@ void _x_video_decoder_init (xine_stream_t *stream) {
+@@ -508,10 +513,12 @@ int _x_video_decoder_init (xine_stream_t *stream) {
      stream->spu_track_map_entries = 0;
   
      pthread_attr_init(&pth_attrs);
Index: patches/patch-src_xine-engine_video_out_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_xine-engine_video_out_c
--- patches/patch-src_xine-engine_video_out_c 1 May 2007 20:05:10 -0000 1.3
+++ patches/patch-src_xine-engine_video_out_c 27 May 2007 21:43:05 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_video_out_c,v 1.3 2007/05/01 20:05:10 naddy Exp $
---- src/xine-engine/video_out.c.orig Sat Mar 25 02:26:34 2006
-+++ src/xine-engine/video_out.c Tue May  1 22:03:06 2007
-@@ -1848,7 +1848,9 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_dr
+$OpenBSD$
+--- src/xine-engine/video_out.c.orig Tue Apr 17 08:44:03 2007
++++ src/xine-engine/video_out.c Sun May 20 22:40:14 2007
+@@ -1864,7 +1864,9 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_dr
      this->grab_only            = 0;
     
      pthread_attr_init(&pth_attrs);
Index: patches/patch-src_xine-engine_xine_c
===================================================================
RCS file: patches/patch-src_xine-engine_xine_c
diff -N patches/patch-src_xine-engine_xine_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xine-engine_xine_c 27 May 2007 21:43:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/xine-engine/xine.c.orig Tue Apr 17 08:44:03 2007
++++ src/xine-engine/xine.c Sun May 20 22:40:14 2007
+@@ -1525,7 +1525,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
+     pthread_mutex_lock(&this->streams_lock);
+     if ( (ite = xine_list_front(this->streams)) ) {
+       stream = xine_list_get_value(this->streams, ite);
+-      _x_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), NULL);
++      _x_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), (char *)NULL);
+     }
+     pthread_mutex_unlock(&this->streams_lock);
+   }
Index: patches/patch-src_xine-utils_cpu_accel_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_xine-utils_cpu_accel_c
--- patches/patch-src_xine-utils_cpu_accel_c 24 Mar 2006 22:43:41 -0000 1.1.1.1
+++ patches/patch-src_xine-utils_cpu_accel_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_xine-utils_cpu_accel_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-utils/cpu_accel.c.orig Fri Jul 29 13:31:13 2005
-+++ src/xine-utils/cpu_accel.c Fri Dec 30 00:36:21 2005
+$OpenBSD$
+--- src/xine-utils/cpu_accel.c.orig Thu Mar 29 15:45:12 2007
++++ src/xine-utils/cpu_accel.c Sun May 20 22:40:14 2007
 @@ -56,6 +56,12 @@ static uint32_t arch_accel (void)
    /* No need to test for this on AMD64, we know what the
       platform has.  */
Index: patches/patch-src_xine-utils_utils_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_xine-utils_utils_c
--- patches/patch-src_xine-utils_utils_c 12 Oct 2006 04:48:14 -0000 1.2
+++ patches/patch-src_xine-utils_utils_c 27 May 2007 21:43:05 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_xine-utils_utils_c,v 1.2 2006/10/12 04:48:14 brad Exp $
---- src/xine-utils/utils.c.orig Fri Jun 23 14:24:22 2006
-+++ src/xine-utils/utils.c Fri Sep 15 17:53:22 2006
+$OpenBSD$
+--- src/xine-utils/utils.c.orig Sun Apr 15 10:42:17 2007
++++ src/xine-utils/utils.c Sun May 20 22:40:14 2007
 @@ -52,6 +52,7 @@
 
  #ifdef HAVE_NL_LANGINFO
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/xine-lib/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 12 Oct 2006 04:48:15 -0000 1.2
+++ pkg/PLIST 27 May 2007 21:43:05 -0000
@@ -46,6 +46,7 @@
 lib/xine/
 lib/xine/plugins/
 lib/xine/plugins/${V}/
+lib/xine/plugins/${V}/mime.types
 lib/xine/plugins/${V}/post/
 lib/xine/plugins/${V}/post/xineplug_post_audio_filters.so
 lib/xine/plugins/${V}/post/xineplug_post_goom.so
@@ -71,7 +72,6 @@
 lib/xine/plugins/${V}/xineplug_decode_mpeg2.so
 lib/xine/plugins/${V}/xineplug_decode_nsf.so
 lib/xine/plugins/${V}/xineplug_decode_real.so
-lib/xine/plugins/${V}/xineplug_decode_real_audio.so
 lib/xine/plugins/${V}/xineplug_decode_rgb.so
 lib/xine/plugins/${V}/xineplug_decode_speex.so
 lib/xine/plugins/${V}/xineplug_decode_spu.so
@@ -118,6 +118,8 @@
 lib/xine/plugins/${V}/xineplug_inp_rtp.so
 lib/xine/plugins/${V}/xineplug_inp_rtsp.so
 lib/xine/plugins/${V}/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/${V}/xineplug_inp_vcd.so
+lib/xine/plugins/${V}/xineplug_inp_vcdo.so
 lib/xine/plugins/${V}/xineplug_vo_out_none.so
 lib/xine/plugins/${V}/xineplug_vo_out_sdl.so
 lib/xine/plugins/${V}/xineplug_vo_out_xshm.so
@@ -125,33 +127,30 @@
 @man man/man1/xine-config.1
 @man man/man5/xine.5
 share/aclocal/xine.m4
-share/doc/xine/
-share/doc/xine/README
-share/doc/xine/README.MINGWCROSS
-share/doc/xine/README.WIN32
-share/doc/xine/README.dvb
-share/doc/xine/README.dxr3
-share/doc/xine/README.freebsd
-share/doc/xine/README.irix
-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/
-share/doc/xine/faq/faq.html
-share/doc/xine/faq/faq.txt
-share/doc/xine/hackersguide/
-share/doc/xine/hackersguide/architecture.png
-share/doc/xine/hackersguide/hackersguide.html
-share/doc/xine/hackersguide/library.png
-share/doc/xine/hackersguide/overlays.png
-share/doc/xine/hackersguide/post_frame.png
+share/doc/xine-lib/
+share/doc/xine-lib/README
+share/doc/xine-lib/README.MINGWCROSS
+share/doc/xine-lib/README.WIN32
+share/doc/xine-lib/README.dvb
+share/doc/xine-lib/README.dxr3
+share/doc/xine-lib/README.freebsd
+share/doc/xine-lib/README.irix
+share/doc/xine-lib/README.network_dvd
+share/doc/xine-lib/README.opengl
+share/doc/xine-lib/README.solaris
+share/doc/xine-lib/README.syncfb
+share/doc/xine-lib/README_xxmc.html
+share/doc/xine-lib/faq.html
+share/doc/xine-lib/faq.txt
+share/doc/xine-lib/hackersguide/
+share/doc/xine-lib/hackersguide/architecture.png
+share/doc/xine-lib/hackersguide/hackersguide.html
+share/doc/xine-lib/hackersguide/library.png
+share/doc/xine-lib/hackersguide/overlays.png
+share/doc/xine-lib/hackersguide/post_frame.png
 share/locale/cs/LC_MESSAGES/libxine1.mo
 share/locale/de/LC_MESSAGES/libxine1.mo
 share/locale/es/LC_MESSAGES/libxine1.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/libxine1.mo
 share/locale/fr/LC_MESSAGES/libxine1.mo
 share/locale/it/LC_MESSAGES/libxine1.mo