diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 74be4c09642..ce55a167ce7 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2006/08/01 10:50:19 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2006/10/12 04:48:14 brad Exp $
 
 COMMENT=		"multimedia decoding library"
 
-V=			1.1.1
+V=			1.1.2
 DISTNAME=		xine-lib-${V}
-PKGNAME=		${DISTNAME}p0
+EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		multimedia
-SHARED_LIBS=		xine	14.0
+SHARED_LIBS=		xine	14.1
 
 HOMEPAGE=		http://xinehq.de/
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
-WANTLIB=		X11 Xext Xinerama Xv freetype \
+WANTLIB=		ICE SM X11 Xext Xinerama Xv freetype \
 			jpeg lcms m usbhid z
 
 .if ${MACHINE_ARCH} == "i386"
@@ -46,6 +46,7 @@ LIB_DEPENDS=		FLAC.>=5::audio/flac \
 SHARED_ONLY=		Yes
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
+USE_GMAKE=		Yes
 LIBTOOL_FLAGS+=		--tag=disable-static
 
 SUBST_VARS+=		V
@@ -70,6 +71,8 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-vcd \
 			--enable-shared-xv \
 			--disable-static-xv \
+			--disable-gnomevfs \
+			--disable-gdkpixbuf \
 			--with-external-ffmpeg=${LOCALBASE} \
 			--with-external-dvdnav \
 			--with-external-a52dec \
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index b7a62b67555..f0ee995daa6 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-MD5 (xine-lib-1.1.1.tar.gz) = b1f42602c776bb93e3cbf127e220cbfd
-RMD160 (xine-lib-1.1.1.tar.gz) = 5b7ba57c675414e84649701b3f356404ec7c9f0a
-SHA1 (xine-lib-1.1.1.tar.gz) = c06aa67ad4d161434fc629232d742b5c7fd3cb4c
-SIZE (xine-lib-1.1.1.tar.gz) = 7990031
+MD5 (xine-lib-1.1.2.tar.bz2) = c4dd262c47caae6f428eb902ac8ec0e8
+RMD160 (xine-lib-1.1.2.tar.bz2) = 21322d6d7e085237926741495d70f5ce7764910b
+SHA1 (xine-lib-1.1.2.tar.bz2) = 07e454e2287e34414b598faf78ae6d8ab8ffbb69
+SIZE (xine-lib-1.1.2.tar.bz2) = 6457108
diff --git a/multimedia/xine-lib/patches/patch-configure b/multimedia/xine-lib/patches/patch-configure
index 05d32f571fc..0fb4ff74d7c 100644
--- a/multimedia/xine-lib/patches/patch-configure
+++ b/multimedia/xine-lib/patches/patch-configure
@@ -1,8 +1,8 @@
-$OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
---- configure.orig	Tue Nov 15 03:40:27 2005
-+++ configure	Sat Mar 25 17:56:18 2006
-@@ -25296,6 +25296,13 @@ case "$host" in
- 
+$OpenBSD: patch-configure,v 1.3 2006/10/12 04:48:14 brad Exp $
+--- configure.orig	Sun Jul  9 10:51:14 2006
++++ configure	Fri Sep 15 17:53:21 2006
+@@ -27729,6 +27729,13 @@ echo "$as_me: WARNING:
+     fi
      ;;
  
 +  *-*-openbsd*)
@@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
    *-*-hpux11*)
      THREAD_LIBS="-lpthread"
      have_pthread=yes
-@@ -26269,7 +26276,7 @@ fi;
+@@ -28905,7 +28912,7 @@ fi
                   "ac_cv_lib_avcodec_pp_get_context" \
                   "ac_cv_lib_postproc_pp_get_context" \
                   "ac_cv_lib_avcodec_register_avcodec"; do
@@ -24,16 +24,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
          done
  
                  if test "${ac_cv_header_avcodec_h+set}" = set; then
-@@ -26804,7 +26811,7 @@ configure option --with-external-ffmpeg.
-       fi
-     else
-             CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
--      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
-+      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}"
-       cat >conftest.$ac_ext <<_ACEOF
- #include <avcodec.h>
- #include <postprocess.h>
-@@ -29925,8 +29932,12 @@ _ACEOF
+@@ -33078,8 +33085,12 @@ _ACEOF
  
  
       ac_have_xv="yes"
@@ -47,7 +38,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XV_STATIC 1
-@@ -29935,8 +29946,8 @@ _ACEOF
+@@ -33088,8 +33099,8 @@ _ACEOF
          ac_have_xv_static="yes"
          XV_LIB="$xv_path/$XV_LIB"
          ;;
@@ -58,7 +49,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
          ;;
        *)
          { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB" >&5
-@@ -29960,6 +29971,7 @@ fi
+@@ -33113,6 +33124,7 @@ fi
  
  fi
  
@@ -66,7 +57,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
  
  if test x$ac_have_xv = "xyes"; then
    HAVE_XV_TRUE=
-@@ -36061,7 +36073,7 @@ elif test x"$external_a52dec" = "xyes"; 
+@@ -40297,7 +40309,7 @@ elif test x"$external_a52dec" = "xyes"; 
    have_a52="yes"
  
  
@@ -74,8 +65,8 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
 +for ac_header in a52dec/a52.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -36206,7 +36218,7 @@ if test $ac_cv_lib_a52_a52_init = yes; t
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -40469,7 +40481,7 @@ if test $ac_cv_lib_a52_a52_init = yes; t
  #define HAVE_LIBA52 1
  _ACEOF
  
@@ -84,7 +75,7 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
  
  else
    have_a52="no"
-@@ -36561,7 +36573,7 @@ if test "${ac_cv_lib_mng_mng_initialize+
+@@ -40900,7 +40912,7 @@ if test "${ac_cv_lib_mng_mng_initialize+
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -93,12 +84,12 @@ $OpenBSD: patch-configure,v 1.2 2006/03/27 11:04:28 jakemsr Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36759,7 +36771,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >
+@@ -41123,7 +41135,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >
  fi
  if test $ac_cv_header_libmng_h = yes; then
     have_libmng=yes
 -		  MNG_LIBS="-lmng"
 +		  MNG_LIBS="-lmng -llcms -ljpeg -lz -lm"
  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
+   { echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
+ echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
diff --git a/multimedia/xine-lib/patches/patch-src_audio_out_audio_sun_out_c b/multimedia/xine-lib/patches/patch-src_audio_out_audio_sun_out_c
index 6305c9f9716..8839f176e6a 100644
--- a/multimedia/xine-lib/patches/patch-src_audio_out_audio_sun_out_c
+++ b/multimedia/xine-lib/patches/patch-src_audio_out_audio_sun_out_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/audio_out/audio_sun_out.c.orig	Sun Dec 12 16:01:02 2004
-+++ src/audio_out/audio_sun_out.c	Fri Dec 30 02:22:36 2005
+$OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/audio_out/audio_sun_out.c.orig	Sun Jul  9 10:37:12 2006
++++ src/audio_out/audio_sun_out.c	Fri Sep 15 18:26:24 2006
 @@ -41,7 +41,12 @@
  #ifdef	__svr4__
  #include <stropts.h>
@@ -24,7 +24,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  
    enum {
        RTSC_UNKNOWN = 0,
-@@ -113,12 +120,14 @@ typedef struct sun_driver_s {
+@@ -114,12 +121,14 @@ typedef struct sun_driver_s {
    unsigned	 buf_len;
  #endif
  
@@ -39,7 +39,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  } sun_driver_t;
  
  
-@@ -128,6 +137,7 @@ typedef struct sun_driver_s {
+@@ -129,6 +138,7 @@ typedef struct sun_driver_s {
   */
  static int realtime_samplecounter_available(xine_t *xine, char *dev)
  {
@@ -47,7 +47,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
    int fd = -1;
    audio_info_t info;
    int rtsc_ok = RTSC_DISABLED;
-@@ -246,6 +256,9 @@ error:
+@@ -247,6 +257,9 @@ error:
    }
  
    return rtsc_ok;
@@ -57,7 +57,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  }
  
  
-@@ -429,7 +442,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -430,7 +443,9 @@ static int ao_sun_open(ao_driver_t *this
    
    this->mode			= mode;
    this->input_sample_rate	= rate;
@@ -67,7 +67,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  
    /*
     * open audio device
-@@ -461,6 +476,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -462,6 +477,9 @@ static int ao_sun_open(ao_driver_t *this
        info.play.sample_rate = this->input_sample_rate;
        info.play.eof = 0;
        info.play.samples = 0;
@@ -77,7 +77,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  
        this->convert_u8_s8 = 0;
  
-@@ -522,7 +540,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -523,7 +541,9 @@ static int ao_sun_open(ao_driver_t *this
        return 0;
    }
  
@@ -87,7 +87,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  
    this->output_sample_rate = info.play.sample_rate;
    this->num_channels = info.play.channels;
-@@ -563,6 +583,7 @@ static int ao_sun_delay(ao_driver_t *thi
+@@ -564,6 +584,7 @@ static int ao_sun_delay(ao_driver_t *thi
    sun_driver_t *this = (sun_driver_t *) this_gen;
    audio_info_t info;
  
@@ -95,7 +95,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
    if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
        (this->frames_in_buffer == 0 || info.play.samples > 0)) {
  
-@@ -609,6 +630,10 @@ static int ao_sun_delay(ao_driver_t *thi
+@@ -610,6 +631,10 @@ static int ao_sun_delay(ao_driver_t *thi
      }
  #endif
    }
@@ -106,7 +106,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
    return NOT_REAL_TIME;
  }
  
-@@ -717,7 +742,9 @@ static int ao_sun_write(ao_driver_t *thi
+@@ -718,7 +743,9 @@ static int ao_sun_write(ao_driver_t *thi
    if (num_written > 0) {
      int buffered_samples;
  
@@ -116,16 +116,16 @@ $OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.1.1.1 2006/03/24 22:43:41 jake
  
      /* 
       * Avoid storing too much data in the sound driver's buffers.
-@@ -776,7 +803,7 @@ static int ao_sun_get_property (ao_drive
-     if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) < 0)
-       return 0;
-     return info.play.gain * 100 / AUDIO_MAX_GAIN;
+@@ -778,7 +805,7 @@ static int ao_sun_get_property (ao_drive
+       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;
-@@ -804,7 +831,7 @@ static int ao_sun_set_property (ao_drive
+@@ -807,7 +834,7 @@ static int ao_sun_set_property (ao_drive
      if (ioctl(this->audio_fd, AUDIO_SETINFO, &info) < 0)
        return ~value;
      return value;
diff --git a/multimedia/xine-lib/patches/patch-src_input_Makefile_in b/multimedia/xine-lib/patches/patch-src_input_Makefile_in
index 5e797ab0080..094333a2e66 100644
--- a/multimedia/xine-lib/patches/patch-src_input_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_input_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_Makefile_in,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/Makefile.in.orig	Tue Nov 15 05:39:45 2005
-+++ src/input/Makefile.in	Thu Dec 29 23:39:05 2005
+$OpenBSD: patch-src_input_Makefile_in,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/input/Makefile.in.orig	Sun Jul  9 10:51:15 2006
++++ src/input/Makefile.in	Fri Sep 15 17:53:21 2006
 @@ -150,11 +150,11 @@ xineplug_inp_v4l_la_DEPENDENCIES = $(am_
  am_xineplug_inp_v4l_la_OBJECTS = input_v4l.lo
  xineplug_inp_v4l_la_OBJECTS = $(am_xineplug_inp_v4l_la_OBJECTS)
@@ -18,7 +18,7 @@ $OpenBSD: patch-src_input_Makefile_in,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -630,7 +630,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c inp
+@@ -638,7 +638,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c inp
  # ---------
  # All of xine input plugins should be named like the scheme "xineplug_inp_"
  #
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_dvb_c b/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
index abca55de73f..07e4376d1ac 100644
--- a/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
+++ b/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_input_dvb_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_dvb.c.orig	Fri Oct 14 16:02:16 2005
-+++ src/input/input_dvb.c	Thu Dec 29 23:39:05 2005
-@@ -965,8 +965,8 @@ static int tuner_tune_it (tuner_t *this,
+$OpenBSD: patch-src_input_input_dvb_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/input/input_dvb.c.orig	Sun Jul  9 10:37:35 2006
++++ src/input/input_dvb.c	Fri Sep 15 17:53:21 2006
+@@ -986,8 +986,8 @@ static int tuner_tune_it (tuner_t *this,
  
    if (poll(pfd,1,3000)){
        if (pfd[0].revents & POLLIN){
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_mms_c b/multimedia/xine-lib/patches/patch-src_input_input_mms_c
deleted file mode 100644
index 3453c2097ac..00000000000
--- a/multimedia/xine-lib/patches/patch-src_input_input_mms_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_input_input_mms_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_mms.c.orig	Thu Jan  5 00:57:23 2006
-+++ src/input/input_mms.c	Thu Jan  5 00:58:04 2006
-@@ -56,7 +56,9 @@
- #define PROTOCOL_MMSH      2
- 
- #if !defined(NDELAY) && defined(O_NDELAY)
-+#ifndef FNDELAY
- #define FNDELAY O_NDELAY
-+#endif
- #endif
- 
- /* network bandwidth */
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_pnm_c b/multimedia/xine-lib/patches/patch-src_input_input_pnm_c
deleted file mode 100644
index 2934af98bec..00000000000
--- a/multimedia/xine-lib/patches/patch-src_input_input_pnm_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_input_input_pnm_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_pnm.c.orig	Fri Oct 14 14:02:16 2005
-+++ src/input/input_pnm.c	Thu Jan  5 00:58:49 2006
-@@ -51,7 +51,9 @@
- #define BUFSIZE 4096
- 
- #if !defined(NDELAY) && defined(O_NDELAY)
-+#ifndef FNDELAY
- #define FNDELAY O_NDELAY
-+#endif
- #endif
- 
- typedef struct {
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_rtsp_c b/multimedia/xine-lib/patches/patch-src_input_input_rtsp_c
deleted file mode 100644
index 0b61d606a57..00000000000
--- a/multimedia/xine-lib/patches/patch-src_input_input_rtsp_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_input_input_rtsp_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_rtsp.c.orig	Thu Jan  5 00:59:02 2006
-+++ src/input/input_rtsp.c	Thu Jan  5 00:59:29 2006
-@@ -51,7 +51,9 @@
- #define BUFSIZE 1025
- 
- #if !defined(NDELAY) && defined(O_NDELAY)
-+#ifndef FNDELAY
- #define FNDELAY O_NDELAY
-+#endif
- #endif
- 
- typedef struct {
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_vcd_c b/multimedia/xine-lib/patches/patch-src_input_input_vcd_c
index 9bce7e49942..4a48de9f237 100644
--- a/multimedia/xine-lib/patches/patch-src_input_input_vcd_c
+++ b/multimedia/xine-lib/patches/patch-src_input_input_vcd_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/input_vcd.c.orig	Wed Apr 20 10:21:08 2005
-+++ src/input/input_vcd.c	Sun Dec 25 02:08:31 2005
-@@ -94,7 +94,7 @@ typedef struct {
+$OpenBSD: patch-src_input_input_vcd_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/input/input_vcd.c.orig	Sun Jul  9 10:37:35 2006
++++ src/input/input_vcd.c	Fri Sep 15 17:53:21 2006
+@@ -95,7 +95,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
    struct cdrom_tocentry  tocent[100];
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
    struct ioc_toc_header  tochdr;
    struct cd_toc_entry    *tocent;
    off_t                  cur_sec;
-@@ -119,7 +119,7 @@ typedef struct {
+@@ -120,7 +120,7 @@ typedef struct {
  
    int                    cur_track;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
    uint8_t                cur_min, cur_sec, cur_frame;
  #endif
  
-@@ -179,7 +179,7 @@ static int input_vcd_read_toc (vcd_input
+@@ -180,7 +180,7 @@ static int input_vcd_read_toc (vcd_input
  
    return 0;
  }
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
  
    struct ioc_read_toc_entry te;
-@@ -395,7 +395,7 @@ static off_t vcd_plugin_read (input_plug
+@@ -396,7 +396,7 @@ static off_t vcd_plugin_read (input_plug
    memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
    return VCDSECTORSIZE;
  }
@@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  static off_t vcd_plugin_read (input_plugin_t *this_gen, 
  				char *buf, off_t nlen) {
    vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
-@@ -533,7 +533,7 @@ static buf_element_t *vcd_plugin_read_bl
+@@ -534,7 +534,7 @@ static buf_element_t *vcd_plugin_read_bl
    memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
    return buf;
  }
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, 
  					     fifo_buffer_t *fifo, off_t nlen) {
    
-@@ -692,7 +692,7 @@ static off_t vcd_plugin_seek (input_plug
+@@ -693,7 +693,7 @@ static off_t vcd_plugin_seek (input_plug
  
    return offset ; /* FIXME */
  }
@@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  static off_t vcd_plugin_seek (input_plugin_t *this_gen, 
  				off_t offset, int origin) {
  
-@@ -766,7 +766,7 @@ static off_t vcd_plugin_get_length (inpu
+@@ -767,7 +767,7 @@ static off_t vcd_plugin_get_length (inpu
  
    return (off_t) 0;
  }
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_vcd_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp
  static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
    vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
    off_t len ;
-@@ -861,6 +861,10 @@ static int vcd_plugin_open (input_plugin
+@@ -862,6 +862,10 @@ static int vcd_plugin_open (input_plugin
    this->cur_min   = this->cls->tocent[this->cur_track].cdte_addr.msf.minute;
    this->cur_sec   = this->cls->tocent[this->cur_track].cdte_addr.msf.second;
    this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame;
diff --git a/multimedia/xine-lib/patches/patch-src_input_libreal_real_c b/multimedia/xine-lib/patches/patch-src_input_libreal_real_c
index 03a37e1c96e..f54888c0b37 100644
--- a/multimedia/xine-lib/patches/patch-src_input_libreal_real_c
+++ b/multimedia/xine-lib/patches/patch-src_input_libreal_real_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_libreal_real_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/libreal/real.c.orig	Thu Jan  5 00:55:43 2006
-+++ src/input/libreal/real.c	Thu Jan  5 00:56:17 2006
-@@ -50,8 +50,9 @@ const unsigned char xor_table[] = {
+$OpenBSD: patch-src_input_libreal_real_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/input/libreal/real.c.orig	Sun Jul  9 10:37:40 2006
++++ src/input/libreal/real.c	Fri Sep 15 17:53:21 2006
+@@ -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)
  
diff --git a/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c b/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c
index db202fd948b..a4646dd489f 100644
--- a/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c
+++ b/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_input_vcd_libcdio_iso9660_fs_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/input/vcd/libcdio/iso9660_fs.c.orig	Sat Dec 24 23:41:05 2005
-+++ src/input/vcd/libcdio/iso9660_fs.c	Sat Dec 24 23:42:04 2005
+$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
 @@ -33,6 +33,7 @@
  
  #ifdef HAVE_ICONV
@@ -8,13 +8,4 @@ $OpenBSD: patch-src_input_vcd_libcdio_iso9660_fs_c,v 1.1.1.1 2006/03/24 22:43:41
 +# include <localcharset.h>
  #endif
  
- #ifdef HAVE_LANGINFO_CODESET
-@@ -149,7 +150,7 @@ ucs2be_to_locale(ICONV_CONST char *psz_u
- 
-   iconv_t ic = 
- #if defined(HAVE_LANGINFO_CODESET)
--    iconv_open(nl_langinfo(CODESET), "UCS-2BE");
-+    iconv_open(locale_charset(), "UCS-2BE");
- #else 
-     iconv_open("ASCII", "UCS-2BE");
- #endif
+ #ifdef HAVE_NL_LANGINFO
diff --git a/multimedia/xine-lib/patches/patch-src_libreal_audio_decoder_c b/multimedia/xine-lib/patches/patch-src_libreal_audio_decoder_c
index abd1226e179..d22f961fbe0 100644
--- a/multimedia/xine-lib/patches/patch-src_libreal_audio_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_libreal_audio_decoder_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libreal_audio_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/libreal/audio_decoder.c.orig	Mon Feb 21 02:05:15 2005
-+++ src/libreal/audio_decoder.c	Mon Feb 21 02:06:50 2005
+$OpenBSD: patch-src_libreal_audio_decoder_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/libreal/audio_decoder.c.orig	Sun Jul  9 10:39:11 2006
++++ src/libreal/audio_decoder.c	Fri Sep 15 17:53:21 2006
 @@ -32,8 +32,10 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -31,18 +31,4 @@ $OpenBSD: patch-src_libreal_audio_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakems
 +  #endif
  #endif
  
- static int load_syms_linux (realdec_decoder_t *this, char *codec_name) {
-@@ -172,10 +176,12 @@ static int load_syms_linux (realdec_deco
- 
-   snprintf (path, sizeof(path), "%s/%s", entry->str_value, 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 ("(audio) opening shared obj '%s'\n", path);
+ static int load_syms_linux (realdec_decoder_t *this, char *codec_name,
diff --git a/multimedia/xine-lib/patches/patch-src_libreal_xine_decoder_c b/multimedia/xine-lib/patches/patch-src_libreal_xine_decoder_c
index 45fdf36f918..d00ec1be9e4 100644
--- a/multimedia/xine-lib/patches/patch-src_libreal_xine_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_libreal_xine_decoder_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libreal_xine_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/libreal/xine_decoder.c.orig	Mon Feb 21 02:02:03 2005
-+++ src/libreal/xine_decoder.c	Mon Feb 21 02:04:41 2005
+$OpenBSD: patch-src_libreal_xine_decoder_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/libreal/xine_decoder.c.orig	Sun Jul  9 10:39:11 2006
++++ src/libreal/xine_decoder.c	Fri Sep 15 17:53:21 2006
 @@ -32,8 +32,10 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -32,9 +32,9 @@ $OpenBSD: patch-src_libreal_xine_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr
  #endif
  
  /*
-@@ -161,10 +165,12 @@ static int load_syms_linux (realdec_deco
- 
-   snprintf (path, sizeof(path), "%s/%s", entry->str_value, codec_name);
+@@ -165,10 +169,12 @@ static int load_syms_linux (realdec_deco
+   if (stat(path, &sb))
+     snprintf (path, sizeof(path), "%s/%s", entry->str_value, alt_codec_name);
  
 -#ifdef __x86_64__
 +#ifdef __linux__
diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
index c155f730259..9f0f562d346 100644
--- a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.1 2006/03/27 11:04:28 jakemsr Exp $
---- src/libw32dll/wine/Makefile.in.orig	Tue Nov 15 03:40:09 2005
-+++ src/libw32dll/wine/Makefile.in	Sat Mar 25 17:48:28 2006
+$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)
  libwine_la_LIBADD =
  am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.1 2006/03/27 11:04:28 jakemsr
  libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
  @HAVE_W32DLL_TRUE@am_libwine_la_rpath =
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -539,6 +539,7 @@ libwine_la_SOURCES = \
+@@ -547,6 +547,7 @@ libwine_la_SOURCES = \
  	registry.c \
  	vfl.c \
  	win32.c \
@@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.1 2006/03/27 11:04:28 jakemsr
  	stubs.s \
  	wrapper.S 
  
-@@ -643,6 +644,7 @@ distclean-compile:
+@@ -651,6 +652,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@
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c b/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c
index d800d43a4c7..ef84a77f84f 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-engine/audio_decoder.c.orig	Sat Oct 29 21:18:35 2005
-+++ src/xine-engine/audio_decoder.c	Fri Dec 30 02:33:47 2005
-@@ -449,7 +449,9 @@ static void *audio_decoder_loop (void *s
+$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/xine-engine/audio_decoder.c.orig	Sun Jul  9 10:40:08 2006
++++ src/xine-engine/audio_decoder.c	Fri Sep 15 17:53:21 2006
+@@ -462,7 +462,9 @@ static void *audio_decoder_loop (void *s
  void _x_audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
@@ -11,7 +11,7 @@ $OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 ja
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -487,10 +489,12 @@ void _x_audio_decoder_init (xine_stream_
+@@ -500,10 +502,12 @@ void _x_audio_decoder_init (xine_stream_
       */
  
      pthread_attr_init(&pth_attrs);
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c b/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
index caa6ab138f7..2185aed74b7 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-engine/audio_out.c.orig	Sat Oct 29 19:18:35 2005
-+++ src/xine-engine/audio_out.c	Mon Jan  9 20:55:41 2006
-@@ -2152,7 +2152,9 @@ xine_audio_port_t *_x_ao_new_port (xine_
+$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/xine-engine/audio_out.c.orig	Sun Jul  9 10:40:08 2006
++++ src/xine-engine/audio_out.c	Fri Sep 15 17:53:21 2006
+@@ -2188,7 +2188,9 @@ xine_audio_port_t *_x_ao_new_port (xine_
      this->audio_loop_running = 1;  
      
      pthread_attr_init(&pth_attrs);
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c b/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c
index 14f42eeeefc..cf77e12fbef 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-engine/video_decoder.c.orig	Sat Oct 29 21:18:35 2005
-+++ src/xine-engine/video_decoder.c	Fri Dec 30 02:32:50 2005
-@@ -43,7 +43,11 @@
+$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/xine-engine/video_decoder.c.orig	Sun Jul  9 10:40:08 2006
++++ src/xine-engine/video_decoder.c	Fri Sep 15 18:12:20 2006
+@@ -43,6 +43,9 @@
  
  #define SPU_SLEEP_INTERVAL (90000/2)
  
@@ -9,11 +9,9 @@ $OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 ja
 +#define SCHED_OTHER 0
 +#endif
  
-+
  static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-   int streamtype = (type>>16) & 0xFF;
-@@ -473,7 +477,9 @@ void _x_video_decoder_init (xine_stream_
+@@ -473,7 +476,9 @@ void _x_video_decoder_init (xine_stream_
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -23,7 +21,7 @@ $OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.1.1.1 2006/03/24 22:43:41 ja
      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 +503,12 @@ void _x_video_decoder_init (xine_stream_
+@@ -497,10 +502,12 @@ void _x_video_decoder_init (xine_stream_
      stream->spu_track_map_entries = 0;
    
      pthread_attr_init(&pth_attrs);
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c b/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c
index da04674fa7d..1f610111104 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_video_out_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-engine/video_out.c.orig	Mon Nov 14 15:48:19 2005
-+++ src/xine-engine/video_out.c	Mon Jan  9 20:55:41 2006
-@@ -1839,7 +1839,9 @@ xine_video_port_t *_x_vo_new_port (xine_
+$OpenBSD: patch-src_xine-engine_video_out_c,v 1.2 2006/10/12 04:48:14 brad Exp $
+--- src/xine-engine/video_out.c.orig	Fri Mar 24 20:26:34 2006
++++ src/xine-engine/video_out.c	Fri Sep 15 17:53:21 2006
+@@ -1848,7 +1848,9 @@ xine_video_port_t *_x_vo_new_port (xine_
      this->grab_only            = 0;
      
      pthread_attr_init(&pth_attrs);
diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c b/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
index 85591b3b484..57cee804706 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
@@ -1,20 +1,11 @@
-$OpenBSD: patch-src_xine-utils_utils_c,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
---- src/xine-utils/utils.c.orig	Mon Sep  5 12:02:57 2005
-+++ src/xine-utils/utils.c	Thu Dec 29 23:39:06 2005
+$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
 @@ -52,6 +52,7 @@
  
- #ifdef HAVE_LANGINFO_CODESET
+ #ifdef HAVE_NL_LANGINFO
  #include <langinfo.h>
 +#include <localcharset.h>
  #endif
  
  #if defined(__CYGWIN__) || defined(WIN32)
-@@ -523,7 +524,7 @@ char *xine_get_system_encoding(void) {
-   char *codeset = NULL;
-   
- #ifdef HAVE_LANGINFO_CODESET
--  codeset = nl_langinfo(CODESET);
-+  codeset = locale_charset();
- #endif
-   /*
-    * guess locale codeset according to shell variables
diff --git a/multimedia/xine-lib/pkg/PLIST b/multimedia/xine-lib/pkg/PLIST
index d336030ccab..230d4c25e10 100644
--- a/multimedia/xine-lib/pkg/PLIST
+++ b/multimedia/xine-lib/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/03/24 22:43:41 jakemsr Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/10/12 04:48:15 brad Exp $
 %%i386%%
 bin/xine-config
 include/xine/
 include/xine.h
 include/xine/alphablend.h
+include/xine/array.h
 include/xine/attributes.h
 include/xine/audio_decoder.h
 include/xine/audio_out.h
@@ -15,14 +16,18 @@ include/xine/demux.h
 include/xine/info_helper.h
 include/xine/input_plugin.h
 include/xine/io_helper.h
+include/xine/list.h
 include/xine/metronom.h
 include/xine/os_types.h
 include/xine/osd.h
 include/xine/plugin_catalog.h
+include/xine/pool.h
 include/xine/post.h
 include/xine/refcounter.h
 include/xine/resample.h
+include/xine/ring_buffer.h
 include/xine/scratch.h
+include/xine/sorted_array.h
 include/xine/spu_decoder.h
 include/xine/video_decoder.h
 include/xine/video_out.h