Here is an update to Xine-lib 1.1.9.1.
There is a security fix in this release for a heap buffer overflow
with RTSP.
I also added a fix for the WMV decoding which was commited just
after the 1.1.9.1 release.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 25 Nov 2007 14:22:36 -0000 1.22
+++ Makefile 13 Jan 2008 02:00:21 -0000
@@ -4,13 +4,14 @@ COMMENT-main= multimedia decoding libra
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output muodule for xine-lib
-V= 1.1.8
+V= 1.1.9.1
DISTNAME= xine-lib-${V}
-PKGNAME-main= xine-lib-${V}p1
+PKGNAME-main= xine-lib-${V}
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
+EXTRACT_SUFX= .tar.bz2
CATEGORIES= multimedia
-SHARED_LIBS= xine 19.0
+SHARED_LIBS= xine 20.0
HOMEPAGE= http://xinehq.de/
@@ -28,7 +29,8 @@ WANTLIB= expat fontconfig freetype m z
WANTLIB-main= ${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
Xrender Xv faac jpeg lcms mp3lame usbhid x264
WANTLIB-esd= ${WANTLIB}
-WANTLIB-arts= ${WANTLIB} stdc++ glib-2.0 gmodule-2.0 gthread-2.0
+WANTLIB-arts= ${WANTLIB} pcre pthread stdc++ glib-2.0 \
+ gmodule-2.0 gthread-2.0
.if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Di386=1
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 31 Oct 2007 10:55:37 -0000 1.5
+++ distinfo 13 Jan 2008 02:00:46 -0000
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.8.tar.gz) = 7yNcyecFdoCqNcMVpt14/Q==
-RMD160 (xine-lib-1.1.8.tar.gz) = tCB+DQNzto2NPD+2akZ5U8ACRzI=
-SHA1 (xine-lib-1.1.8.tar.gz) = hpkFkIqDGpWa48aWLW0yBNxT05s=
-SHA256 (xine-lib-1.1.8.tar.gz) = 0WTISoQtvj1UjTV04uSJy7GdUueZf5NI6Ij2vXTNsHk=
-SIZE (xine-lib-1.1.8.tar.gz) = 8872132
+MD5 (xine-lib-1.1.9.1.tar.bz2) = PKHkM4bAEpPdw66vi1+ATw==
+RMD160 (xine-lib-1.1.9.1.tar.bz2) = k+LocALrA4uLagFQRR1a43GSxZ0=
+SHA1 (xine-lib-1.1.9.1.tar.bz2) = nOsytytuqo5qsD2wbDqkoUpuaMM=
+SHA256 (xine-lib-1.1.9.1.tar.bz2) =
AkmG339a2XPL7RjFCiq7MMqIIgs8trKwnsLbm5SY5Oc=
+SIZE (xine-lib-1.1.9.1.tar.bz2) = 7392199
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 31 Oct 2007 10:55:37 -0000 1.10
+++ patches/patch-configure 13 Jan 2008 02:02:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2007/10/31 10:55:37 jakemsr Exp $
---- configure.orig Mon Aug 27 14:28:18 2007
-+++ configure Wed Oct 17 20:29:23 2007
-@@ -24480,6 +24480,9 @@ _ACEOF
+--- configure.orig Fri Jan 11 10:12:24 2008
++++ configure Sat Jan 12 21:01:52 2008
+@@ -24490,6 +24490,9 @@ _ACEOF
fi
done
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -30589,13 +30592,13 @@ t q
+@@ -30599,13 +30602,13 @@ t q
b
:q
q"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
-@@ -37484,7 +37487,7 @@ fi
+@@ -37494,7 +37497,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
-@@ -37735,7 +37738,7 @@ elif test "x$external_a52dec" = "xyes"; then
+@@ -37745,7 +37748,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -37874,7 +37877,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -37884,7 +37887,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
else
have_a52="no"
-@@ -38452,7 +38455,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38462,7 +38465,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
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38635,7 +38638,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38645,7 +38648,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
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; }
-@@ -49444,7 +49447,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -49478,7 +49481,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -faltivec -maltivec"
@@ -81,7 +81,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
fi
;;
ppc-*-linux* | powerpc-*)
-@@ -49912,7 +49915,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
+@@ -49946,7 +49949,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
XINE_BUILD_OS="`uname -s -r -m`"
@@ -90,7 +90,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
-@@ -50744,7 +50747,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
+@@ -50778,7 +50781,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
Index: patches/patch-src_audio_out_Makefile_in
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_audio_out_Makefile_in
--- patches/patch-src_audio_out_Makefile_in 1 Nov 2007 04:01:36 -0000
1.3
+++ patches/patch-src_audio_out_Makefile_in 9 Jan 2008 07:05:06 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.3 2007/11/01 04:01:36 jakemsr
Exp $
---- src/audio_out/Makefile.in.orig Wed Jun 6 06:40:33 2007
-+++ src/audio_out/Makefile.in Wed Oct 3 14:27:00 2007
-@@ -716,7 +716,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
+--- src/audio_out/Makefile.in.orig Sun Jan 6 10:57:30 2008
++++ src/audio_out/Makefile.in Wed Jan 9 01:52:50 2008
+@@ -722,7 +722,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
#xineplug_ao_out_irixal_la_CFLAGS = $(VISIBILITY_FLAG) $(IRIXAL_CFLAGS)
#xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c
--xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) $(XINE_LIB)
-+xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) $(XINE_LIB) -lstdc++
+-xineplug_ao_out_arts_la_LIBADD = $(XINE_LIB) $(ARTS_LIBS)
++xineplug_ao_out_arts_la_LIBADD = $(XINE_LIB) $(ARTS_LIBS) -lstdc++
xineplug_ao_out_arts_la_CFLAGS = $(VISIBILITY_FLAG) $(ARTS_CFLAGS)
xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_directx_la_SOURCES = audio_directx_out.c
Index: patches/patch-src_audio_out_audio_sun_out_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_audio_out_audio_sun_out_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_audio_out_audio_sun_out_c
--- patches/patch-src_audio_out_audio_sun_out_c 14 Jul 2007 09:21:15 -0000
1.5
+++ patches/patch-src_audio_out_audio_sun_out_c 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_audio_out_audio_sun_out_c,v 1.5 2007/07/14 09:21:15
jakemsr Exp $
---- src/audio_out/audio_sun_out.c.orig Fri Jul 13 23:42:54 2007
-+++ src/audio_out/audio_sun_out.c Fri Jul 13 23:42:54 2007
-@@ -584,9 +584,9 @@ static int ao_sun_bytes_per_frame(ao_driver_t *this_ge
+--- src/audio_out/audio_sun_out.c.orig Tue Jan 1 08:30:08 2008
++++ src/audio_out/audio_sun_out.c Wed Jan 9 01:50:21 2008
+@@ -582,9 +582,9 @@ static int ao_sun_bytes_per_frame(ao_driver_t *this_ge
static int ao_sun_delay(ao_driver_t *this_gen)
{
sun_driver_t *this = (sun_driver_t *) this_gen;
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_
if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
(this->frames_in_buffer == 0 || info.play.samples > 0)) {
-@@ -634,8 +634,9 @@ static int ao_sun_delay(ao_driver_t *this_gen)
+@@ -632,8 +632,9 @@ static int ao_sun_delay(ao_driver_t *this_gen)
#endif
}
#else
@@ -24,7 +24,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_
#endif
return NOT_REAL_TIME;
}
-@@ -890,8 +891,7 @@ static int ao_sun_ctrl(ao_driver_t *this_gen, int cmd,
+@@ -888,8 +889,7 @@ static int ao_sun_ctrl(ao_driver_t *this_gen, int cmd,
this->frames_in_buffer = 0;
this->last_samplecnt = 0;
@@ -34,7 +34,7 @@ $OpenBSD: patch-src_audio_out_audio_sun_
ioctl(this->audio_fd, AUDIO_FLUSH);
#endif
break;
-@@ -966,11 +966,20 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_c
+@@ -964,11 +964,20 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_c
status = ioctl(this->audio_fd, AUDIO_SETINFO, &info);
if (status < 0) {
Index: patches/patch-src_demuxers_asfheader_c
===================================================================
RCS file: patches/patch-src_demuxers_asfheader_c
diff -N patches/patch-src_demuxers_asfheader_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_demuxers_asfheader_c 13 Jan 2008 02:14:32 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/demuxers/asfheader.c.orig Sat Jan 12 21:12:07 2008
++++ src/demuxers/asfheader.c Sat Jan 12 21:14:07 2008
+@@ -144,7 +144,7 @@ static char *asf_reader_get_string(asf_reader_t *reade
+ size_t inbytesleft, outbytesleft;
+ char scratch[2048];
+
+- if ((reader->size - reader->pos) < size)
++ if ((size == 0) || ((reader->size - reader->pos) < size))
+ return NULL;
+
+ inbuf = (char *)reader->buffer + reader->pos;
Index: patches/patch-src_demuxers_demux_asf_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_demuxers_demux_asf_c
--- patches/patch-src_demuxers_demux_asf_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_demuxers_demux_asf_c 13 Jan 2008 02:12:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp
$
---- 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) {
+--- src/demuxers/demux_asf.c.orig Tue Jan 1 08:30:08 2008
++++ src/demuxers/demux_asf.c Sat Jan 12 21:11:35 2008
+@@ -425,7 +425,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,
@@ -10,3 +10,24 @@ $OpenBSD: patch-src_demuxers_demux_asf_c
this->mode = ASF_MODE_ENCRYPTED_CONTENT;
}
}
+@@ -723,6 +723,9 @@ static void asf_send_buffer_nodefrag (demux_asf_t *thi
+ buf->size = bufsize;
+ timestamp = 0;
+
++ if (stream->frag_offset == 0)
++ buf->decoder_flags |= BUF_FLAG_FRAME_START;
++
+ stream->frag_offset += bufsize;
+ frag_len -= bufsize;
+
+@@ -733,10 +736,6 @@ static void asf_send_buffer_nodefrag (demux_asf_t *thi
+ else
+ check_newpts (this, buf->pts, PTS_AUDIO, package_done);
+
+-
+- if (frag_offset == 0)
+- buf->decoder_flags |= BUF_FLAG_FRAME_START;
+-
+ /* test if whole packet read */
+ if (package_done) {
+ buf->decoder_flags |= BUF_FLAG_FRAME_END;
Index: patches/patch-src_demuxers_demux_mpeg_block_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_demuxers_demux_mpeg_block_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_demuxers_demux_mpeg_block_c
--- patches/patch-src_demuxers_demux_mpeg_block_c 13 Jun 2007 10:58:29
-0000 1.1
+++ patches/patch-src_demuxers_demux_mpeg_block_c 9 Jan 2008 07:05:05
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_block_c,v 1.1 2007/06/13 10:58:29
jakemsr Exp $
---- 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
+--- src/demuxers/demux_mpeg_block.c.orig Tue Jan 1 08:30:08 2008
++++ src/demuxers/demux_mpeg_block.c Wed Jan 9 01:50:21 2008
+@@ -647,7 +647,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,
Index: patches/patch-src_demuxers_demux_mpeg_pes_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_demuxers_demux_mpeg_pes_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_demuxers_demux_mpeg_pes_c
--- patches/patch-src_demuxers_demux_mpeg_pes_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_demuxers_demux_mpeg_pes_c 9 Jan 2008 07:05:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_pes_c,v 1.1 2007/06/13 10:58:29
jakemsr Exp $
---- 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
+--- src/demuxers/demux_mpeg_pes.c.orig Tue Jan 1 08:30:08 2008
++++ src/demuxers/demux_mpeg_pes.c Wed Jan 9 01:50:21 2008
+@@ -816,7 +816,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,
Index: patches/patch-src_demuxers_demux_qt_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_demuxers_demux_qt_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_demuxers_demux_qt_c
--- patches/patch-src_demuxers_demux_qt_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_demuxers_demux_qt_c 9 Jan 2008 07:05:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $
---- src/demuxers/demux_qt.c.orig Thu May 31 08:57:27 2007
-+++ src/demuxers/demux_qt.c Fri Jun 8 17:27:46 2007
-@@ -2989,7 +2989,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
+--- src/demuxers/demux_qt.c.orig Tue Jan 1 08:30:08 2008
++++ src/demuxers/demux_qt.c Wed Jan 9 01:50:21 2008
+@@ -2986,7 +2986,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,
Index: patches/patch-src_input_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_input_Makefile_in
--- patches/patch-src_input_Makefile_in 31 Oct 2007 10:55:37 -0000 1.5
+++ patches/patch-src_input_Makefile_in 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_Makefile_in,v 1.5 2007/10/31 10:55:37 jakemsr Exp $
---- src/input/Makefile.in.orig Mon Aug 27 14:27:57 2007
-+++ src/input/Makefile.in Wed Oct 17 20:29:24 2007
-@@ -676,7 +676,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
+--- src/input/Makefile.in.orig Sun Jan 6 10:57:32 2008
++++ src/input/Makefile.in Wed Jan 9 01:50:21 2008
+@@ -678,7 +678,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: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_cdda_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_input_input_cdda_c
--- patches/patch-src_input_input_cdda_c 13 Jun 2007 10:58:29 -0000
1.2
+++ patches/patch-src_input_input_cdda_c 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.2 2007/06/13 10:58:29 jakemsr Exp $
---- src/input/input_cdda.c.orig Fri May 4 07:46:43 2007
-+++ src/input/input_cdda.c Fri Jun 8 17:27:46 2007
-@@ -73,7 +73,7 @@
+--- src/input/input_cdda.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_cdda.c Wed Jan 9 01:57:20 2008
+@@ -71,7 +71,7 @@
#elif defined(WIN32)
#define DEFAULT_CDDA_DEVICE "d:\\"
#else
@@ -10,25 +10,25 @@ $OpenBSD: patch-src_input_input_cdda_c,v
#endif
#define CDDB_SERVER "freedb.freedb.org"
-@@ -614,7 +614,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
+@@ -612,7 +612,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__)
+-#elif defined(__FreeBSD_kernel__) || defined(__NetBSD__)
++#elif defined(__FreeBSD_kernel__) || defined(__NetBSD__) ||
defined(__OpenBSD__)
#include <sys/cdio.h>
-@@ -627,7 +627,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+@@ -625,7 +625,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
struct ioc_toc_header tochdr;
- #if defined(__FreeBSD__)
+ #if defined(__FreeBSD_kernel__)
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
-@@ -663,7 +663,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+@@ -661,7 +661,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
@@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
-@@ -684,7 +684,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+@@ -682,7 +682,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;
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v
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;
-@@ -706,7 +706,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+@@ -704,7 +704,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
@@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
-@@ -727,7 +727,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+@@ -725,7 +725,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;
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v
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;
-@@ -768,7 +768,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
+@@ -763,7 +763,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
perror("CDIOCREADAUDIO");
return -1;
}
Index: patches/patch-src_input_input_dvd_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_dvd_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_input_input_dvd_c
--- patches/patch-src_input_input_dvd_c 31 Oct 2007 10:55:37 -0000 1.3
+++ patches/patch-src_input_input_dvd_c 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.3 2007/10/31 10:55:37 jakemsr Exp $
---- src/input/input_dvd.c.orig Sat Aug 18 19:36:45 2007
-+++ src/input/input_dvd.c Wed Oct 17 20:34:03 2007
-@@ -119,8 +119,8 @@
+--- src/input/input_dvd.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_dvd.c Wed Jan 9 01:50:22 2008
+@@ -116,8 +116,8 @@
#define DVD_PATH "d:\\"
#define RDVD_PATH "d:\\"
#else
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v
#endif
/* Some misc. defines */
-@@ -609,7 +609,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
+@@ -606,7 +606,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,
@@ -21,7 +21,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
buf->free_buffer(buf);
return NULL;
-@@ -1500,7 +1500,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
+@@ -1497,7 +1497,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() */
Index: patches/patch-src_input_input_file_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_file_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_input_input_file_c
--- patches/patch-src_input_input_file_c 31 Oct 2007 10:55:37 -0000
1.2
+++ patches/patch-src_input_input_file_c 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_file_c,v 1.2 2007/10/31 10:55:37 jakemsr Exp $
---- src/input/input_file.c.orig Sat Aug 18 19:36:45 2007
-+++ src/input/input_file.c Wed Oct 17 20:29:24 2007
-@@ -202,7 +202,7 @@ static buf_element_t *file_plugin_read_block (input_pl
+--- src/input/input_file.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_file.c Wed Jan 9 01:58:02 2008
+@@ -200,7 +200,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,
@@ -10,22 +10,21 @@ $OpenBSD: patch-src_input_input_file_c,v
}
buf->free_buffer (buf);
buf = NULL;
-@@ -375,12 +375,12 @@ static int file_plugin_open (input_plugin_t *this_gen
+@@ -356,11 +356,11 @@ 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);
- }
-@@ -415,7 +415,7 @@ 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);
+ } 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);
+ }
+@@ -397,7 +397,7 @@ static int file_plugin_open (input_plugin_t *this_gen
#endif
if (file_plugin_get_length (this_gen) == 0) {
Index: patches/patch-src_input_input_http_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_http_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_input_input_http_c
--- patches/patch-src_input_input_http_c 31 Oct 2007 10:55:37 -0000
1.2
+++ patches/patch-src_input_input_http_c 9 Jan 2008 07:05:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_http_c,v 1.2 2007/10/31 10:55:37 jakemsr Exp $
---- src/input/input_http.c.orig Sat Aug 18 19:36:45 2007
-+++ src/input/input_http.c Wed Oct 17 20:29:24 2007
-@@ -419,7 +419,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
+--- src/input/input_http.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_http.c Wed Jan 9 01:50:22 2008
+@@ -417,7 +417,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
error:
if (!_x_action_pending(this->stream))
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_http_c,v
xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error
%d\n"), errno);
return read_bytes;
}
-@@ -675,7 +675,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -673,7 +673,7 @@ static int http_plugin_open (input_plugin_t *this_gen
if (http_plugin_basicauth (this_class->proxyuser,
this_class->proxypassword,
this->proxyauth, BUFSIZE)) {
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_http_c,v
return 0;
}
}
-@@ -684,7 +684,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -682,7 +682,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)) {
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_http_c,v
return 0;
}
use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
-@@ -694,7 +694,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -692,7 +692,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)) {
@@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_http_c,v
return -1;
}
}
-@@ -748,7 +748,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -746,7 +746,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} while ((res == XIO_TIMEOUT) && (progress <= 100000));
if (res != XIO_READY) {
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_http_c,v
return -3;
}
}
-@@ -793,7 +793,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -791,7 +791,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) {
@@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_http_c,v
xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't
send request\n");
return -4;
}
-@@ -837,7 +837,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -835,7 +835,7 @@ static int http_plugin_open (input_plugin_t *this_gen
(sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
&httpcode, httpstatus) != 2)
) {
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_http_c,v
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: invalid http answer\n"));
return -6;
-@@ -848,20 +848,20 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -846,20 +846,20 @@ static int http_plugin_open (input_plugin_t *this_gen
_("input_http: 3xx redirection: >%d %s<\n"),
httpcode, httpstatus);
} else if (httpcode == 404) {
@@ -88,7 +88,7 @@ $OpenBSD: patch-src_input_input_http_c,v
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
-@@ -954,7 +954,7 @@ static int http_plugin_open (input_plugin_t *this_gen
+@@ -952,7 +952,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} else
len ++;
if ( len >= BUFSIZE ) {
Index: patches/patch-src_input_input_net_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_net_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_input_input_net_c
--- patches/patch-src_input_input_net_c 13 Jun 2007 10:58:29 -0000 1.1
+++ patches/patch-src_input_input_net_c 9 Jan 2008 07:05:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_net_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $
---- 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
+--- src/input/input_net.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_net.c Wed Jan 9 01:50:22 2008
+@@ -272,7 +272,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) {
Index: patches/patch-src_input_input_stdin_fifo_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_stdin_fifo_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_input_input_stdin_fifo_c
--- patches/patch-src_input_input_stdin_fifo_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_input_input_stdin_fifo_c 9 Jan 2008 07:05:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_stdin_fifo_c,v 1.1 2007/06/13 10:58:29 jakemsr
Exp $
---- 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
+--- src/input/input_stdin_fifo.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_stdin_fifo.c Wed Jan 9 01:50:22 2008
+@@ -104,7 +104,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) {
Index: patches/patch-src_input_input_vcd_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_vcd_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_input_input_vcd_c
--- patches/patch-src_input_input_vcd_c 13 Jun 2007 10:58:29 -0000 1.4
+++ patches/patch-src_input_input_vcd_c 9 Jan 2008 07:05:07 -0000
@@ -1,70 +1,70 @@
$OpenBSD: patch-src_input_input_vcd_c,v 1.4 2007/06/13 10:58:29 jakemsr Exp $
---- 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 {
+--- src/input/input_vcd.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/input_vcd.c Wed Jan 9 02:04:58 2008
+@@ -92,7 +92,7 @@ typedef struct {
#if defined (__linux__) || defined(__sun)
struct cdrom_tochdr tochdr;
struct cdrom_tocentry tocent[100];
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
struct ioc_toc_header tochdr;
struct cd_toc_entry *tocent;
off_t cur_sec;
-@@ -120,7 +120,7 @@ typedef struct {
+@@ -117,7 +117,7 @@ typedef struct {
int cur_track;
--#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__)
-+#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__) || defined
(__OpenBSD__)
+-#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__)
++#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) ||
defined (__OpenBSD__)
uint8_t cur_min, cur_sec, cur_frame;
#endif
-@@ -180,7 +180,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this
+@@ -177,7 +177,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this
return 0;
}
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
struct ioc_read_toc_entry te;
-@@ -396,7 +396,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen
+@@ -393,7 +393,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen
memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
return VCDSECTORSIZE;
}
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
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;
-@@ -534,7 +534,7 @@ static buf_element_t *vcd_plugin_read_block (input_plu
+@@ -531,7 +531,7 @@ static buf_element_t *vcd_plugin_read_block (input_plu
memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
return buf;
}
--#elif defined (__FreeBSD__)
-+#elif (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
fifo_buffer_t *fifo, off_t nlen) {
-@@ -693,7 +693,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen
+@@ -690,7 +690,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen
return offset ; /* FIXME */
}
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static off_t vcd_plugin_seek (input_plugin_t *this_gen,
off_t offset, int origin) {
-@@ -767,7 +767,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *th
+@@ -764,7 +764,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *th
return (off_t) 0;
}
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+-#elif defined (__FreeBSD_kernel__)
++#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
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 ;
-@@ -862,6 +862,10 @@ static int vcd_plugin_open (input_plugin_t *this_gen)
+@@ -859,6 +859,10 @@ static int vcd_plugin_open (input_plugin_t *this_gen)
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;
@@ -72,6 +72,6 @@ $OpenBSD: patch-src_input_input_vcd_c,v
+ this->cur_min = this->cls->tocent[this->cur_track + 1 -
this->cls->tochdr.starting_track].addr.msf.minute;
+ this->cur_sec = this->cls->tocent[this->cur_track + 1 -
this->cls->tochdr.starting_track].addr.msf.second;
+ this->cur_frame = this->cls->tocent[this->cur_track + 1 -
this->cls->tochdr.starting_track].addr.msf.frame;
- #elif defined (__FreeBSD__)
+ #elif defined (__FreeBSD_kernel__)
{
int bsize = 2352;
Index: patches/patch-src_input_libreal_real_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_input_libreal_real_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_input_libreal_real_c
--- patches/patch-src_input_libreal_real_c 31 Oct 2007 10:55:37 -0000
1.7
+++ patches/patch-src_input_libreal_real_c 9 Jan 2008 07:05:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_libreal_real_c,v 1.7 2007/10/31 10:55:37 jakemsr Exp
$
---- src/input/libreal/real.c.orig Sat Aug 18 19:36:47 2007
-+++ src/input/libreal/real.c Wed Oct 17 20:29:25 2007
-@@ -51,8 +51,9 @@ static const unsigned char xor_table[] = {
+--- src/input/libreal/real.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/libreal/real.c Wed Jan 9 01:50:22 2008
+@@ -48,8 +48,9 @@ static const unsigned char xor_table[] = {
#define _X_BE_32C(x,y) do { *(uint32_t *)(x) = be2me_32((y)); } while(0)
#define _X_LE_32C(x,y) do { *(uint32_t *)(x) = le2me_32((y)); } while(0)
Index: patches/patch-src_input_mms_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_mms_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_input_mms_c
--- patches/patch-src_input_mms_c 13 Jun 2007 10:58:29 -0000 1.4
+++ patches/patch-src_input_mms_c 9 Jan 2008 07:05:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_mms_c,v 1.4 2007/06/13 10:58:29 jakemsr Exp $
---- 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 @@
+--- src/input/mms.c.orig Tue Jan 1 08:30:08 2008
++++ src/input/mms.c Wed Jan 9 01:50:22 2008
+@@ -48,6 +48,7 @@
#include <iconv.h>
#include <locale.h>
#include <langinfo.h>
@@ -9,7 +9,7 @@ $OpenBSD: patch-src_input_mms_c,v 1.4 20
#endif
/********** logging **********/
-@@ -290,7 +291,7 @@ static int send_command (mms_t *this, int command,
+@@ -288,7 +289,7 @@ static int send_command (mms_t *this, int command,
#ifdef USE_ICONV
static iconv_t string_utf16_open() {
Index: patches/patch-src_libfaad_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libfaad_Makefile_in
--- patches/patch-src_libfaad_Makefile_in 31 Oct 2007 10:55:37 -0000
1.2
+++ patches/patch-src_libfaad_Makefile_in 9 Jan 2008 07:05:06 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.2 2007/10/31 10:55:37 jakemsr Exp $
---- src/libfaad/Makefile.in.orig Mon Aug 27 14:28:01 2007
-+++ src/libfaad/Makefile.in Wed Oct 17 20:38:25 2007
+--- src/libfaad/Makefile.in.orig Sun Jan 6 10:57:38 2008
++++ src/libfaad/Makefile.in Wed Jan 9 01:56:17 2008
@@ -73,43 +73,7 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/l
am__DEPENDENCIES_2 =
xineplug_decode_faad_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,
xineplug_decode_faad_la-xine_faad_decoder.lo
xineplug_decode_faad_la_OBJECTS = \
$(am_xineplug_decode_faad_la_OBJECTS)
-@@ -594,97 +558,11 @@ SUBDIRS = codebook
+@@ -596,97 +560,11 @@ SUBDIRS = codebook
xineplug_LTLIBRARIES = $(faad_module)
xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-fno-strict-aliasing
xineplug_decode_faad_la_SOURCES = \
@@ -91,7 +91,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,
xine_faad_decoder.c
xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags)
--xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) $(LTLIBINTL)
+-xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lm $(LTLIBINTL)
-noinst_HEADERS = \
- analysis.h \
- bits.h \
@@ -141,7 +141,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,
- structs.h \
- syntax.h \
- tns.h
-+xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) -lfaad $(LTLIBINTL)
++xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lm -lfaad $(LTLIBINTL)
+noinst_HEADERS =
all: all-recursive
Index: patches/patch-src_libfaad_xine_faad_decoder_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_libfaad_xine_faad_decoder_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libfaad_xine_faad_decoder_c
--- patches/patch-src_libfaad_xine_faad_decoder_c 4 Sep 2007 00:44:26
-0000 1.1
+++ patches/patch-src_libfaad_xine_faad_decoder_c 9 Jan 2008 07:05:06
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.1 2007/09/04 00:44:26
jakemsr Exp $
---- src/libfaad/xine_faad_decoder.c.orig Fri Aug 31 21:54:08 2007
-+++ src/libfaad/xine_faad_decoder.c Fri Aug 31 22:26:08 2007
-@@ -34,16 +34,21 @@
+--- src/libfaad/xine_faad_decoder.c.orig Tue Jan 1 08:30:08 2008
++++ src/libfaad/xine_faad_decoder.c Wed Jan 9 01:50:22 2008
+@@ -31,16 +31,21 @@
#define LOG
*/
@@ -23,7 +23,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
typedef struct {
audio_decoder_class_t decoder_class;
-@@ -55,26 +60,26 @@ typedef struct faad_decoder_s {
+@@ -52,26 +57,26 @@ typedef struct faad_decoder_s {
xine_stream_t *stream;
/* faad2 stuff */
@@ -59,7 +59,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
uint32_t ao_cap_mode;
int output_open;
-@@ -125,33 +130,33 @@ static void faad_meta_info_set ( faad_decoder_t *this
+@@ -122,33 +127,33 @@ static void faad_meta_info_set ( faad_decoder_t *this
static int faad_open_dec( faad_decoder_t *this ) {
int used;
@@ -101,7 +101,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
this->rate, this->num_channels, used);
this->size -= used;
-@@ -165,7 +170,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
+@@ -162,7 +167,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
if( this->faac_failed ) {
if( this->faac_dec ) {
@@ -110,7 +110,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
this->faac_dec = NULL;
}
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-@@ -189,9 +194,9 @@ static int faad_open_output( faad_decoder_t *this ) {
+@@ -186,9 +191,9 @@ static int faad_open_output( faad_decoder_t *this ) {
this->ao_cap_mode = AO_CAP_MODE_5_1CHANNEL;
break;
} else {
@@ -122,7 +122,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
this->num_channels = 2;
}
case 2:
-@@ -212,7 +217,7 @@ static void faad_decode_audio ( faad_decoder_t *this,
+@@ -211,7 +216,7 @@ static void faad_decode_audio ( faad_decoder_t *this,
uint8_t *sample_buffer;
uint8_t *inbuf;
audio_buffer_t *audio_buffer;
@@ -131,7 +131,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
if( !this->faac_dec )
return;
-@@ -221,12 +226,12 @@ static void faad_decode_audio ( faad_decoder_t *this,
+@@ -220,12 +225,12 @@ static void faad_decode_audio ( faad_decoder_t *this,
while( (!this->raw_mode && end_frame && this->size >= 10) ||
(this->raw_mode && this->size >= this->rec_audio_src_size) ) {
@@ -146,7 +146,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_de
used = 1;
} else {
used = this->faac_finfo.bytesconsumed;
-@@ -406,7 +411,7 @@ static void faad_dispose (audio_decoder_t *this_gen) {
+@@ -405,7 +410,7 @@ static void faad_dispose (audio_decoder_t *this_gen) {
this->dec_config_size = 0;
if( this->faac_dec )
Index: patches/patch-src_libreal_real_common_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_libreal_real_common_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libreal_real_common_c
--- patches/patch-src_libreal_real_common_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_libreal_real_common_c 9 Jan 2008 07:05:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_libreal_real_common_c,v 1.1 2007/06/13 10:58:29 jakemsr
Exp $
---- 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,
+--- src/libreal/real_common.c.orig Tue Jan 1 08:30:08 2008
++++ src/libreal/real_common.c Wed Jan 9 01:50:22 2008
+@@ -177,7 +177,7 @@ void *_x_real_codec_open(xine_stream_t *const stream,
LOG_MODULE ": error loading %s: %s\n", codecpath, dlerror());
}
Index: patches/patch-src_libsputext_demux_sputext_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libsputext_demux_sputext_c
--- patches/patch-src_libsputext_demux_sputext_c 13 Jun 2007 10:58:29
-0000 1.2
+++ patches/patch-src_libsputext_demux_sputext_c 9 Jan 2008 07:05:05
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_libsputext_demux_sputext_c,v 1.2 2007/06/13 10:58:29
jakemsr Exp $
---- 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 @@
+--- src/libsputext/demux_sputext.c.orig Tue Jan 1 08:30:08 2008
++++ src/libsputext/demux_sputext.c Wed Jan 9 01:50:22 2008
+@@ -55,7 +55,7 @@
#define SUB_MAX_TEXT 5
#define SUB_BUFSIZE 1024
#define LINE_LEN 1000
Index: patches/patch-src_libw32dll_wine_Makefile_in
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libw32dll_wine_Makefile_in
--- patches/patch-src_libw32dll_wine_Makefile_in 31 Oct 2007 10:55:37
-0000 1.4
+++ patches/patch-src_libw32dll_wine_Makefile_in 9 Jan 2008 07:05:07
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.4 2007/10/31 10:55:37
jakemsr Exp $
---- src/libw32dll/wine/Makefile.in.orig Mon Aug 27 14:28:09 2007
-+++ src/libw32dll/wine/Makefile.in Wed Oct 17 20:29:25 2007
+--- src/libw32dll/wine/Makefile.in.orig Sun Jan 6 10:57:48 2008
++++ src/libw32dll/wine/Makefile.in Wed Jan 9 01:50:22 2008
@@ -65,7 +65,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_Makef
libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
@[EMAIL PROTECTED] =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
-@@ -562,6 +562,7 @@ libwine_la_SOURCES = \
+@@ -564,6 +564,7 @@ libwine_la_SOURCES = \
registry.c \
vfl.c \
win32.c \
@@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makef
stubs.s \
wrapper.S
-@@ -666,6 +667,7 @@ distclean-compile:
+@@ -668,6 +669,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
Index: patches/patch-src_xine-engine_audio_decoder_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_audio_decoder_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_xine-engine_audio_decoder_c
--- patches/patch-src_xine-engine_audio_decoder_c 31 Oct 2007 10:55:37
-0000 1.5
+++ patches/patch-src_xine-engine_audio_decoder_c 9 Jan 2008 07:05:07
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.5 2007/10/31 10:55:37
jakemsr Exp $
---- src/xine-engine/audio_decoder.c.orig Sat Aug 18 19:36:59 2007
-+++ src/xine-engine/audio_decoder.c Wed Oct 17 20:29:25 2007
-@@ -463,7 +463,9 @@ static void *audio_decoder_loop (void *stream_gen) {
+--- src/xine-engine/audio_decoder.c.orig Tue Jan 1 08:30:09 2008
++++ src/xine-engine/audio_decoder.c Wed Jan 9 01:50:22 2008
+@@ -461,7 +461,9 @@ static void *audio_decoder_loop (void *stream_gen) {
int _x_audio_decoder_init (xine_stream_t *stream) {
pthread_attr_t pth_attrs;
@@ -11,7 +11,7 @@ $OpenBSD: patch-src_xine-engine_audio_de
int err;
if (stream->audio_out == NULL) {
-@@ -501,10 +503,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
+@@ -499,10 +501,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:
/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_xine-engine_audio_out_c
--- patches/patch-src_xine-engine_audio_out_c 31 Oct 2007 10:55:37 -0000
1.5
+++ patches/patch-src_xine-engine_audio_out_c 9 Jan 2008 07:05:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.5 2007/10/31 10:55:37 jakemsr
Exp $
---- src/xine-engine/audio_out.c.orig Sat Aug 18 19:36:59 2007
-+++ src/xine-engine/audio_out.c Wed Oct 17 20:29:25 2007
-@@ -1072,7 +1072,7 @@ static void *ao_loop (void *this_gen) {
+--- src/xine-engine/audio_out.c.orig Tue Jan 1 08:30:09 2008
++++ src/xine-engine/audio_out.c Wed Jan 9 01:50:22 2008
+@@ -1083,7 +1083,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0 ) {
in_buf->stream->emergency_brake = 1;
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_xine-engine_audio_ou
}
}
}
-@@ -1103,7 +1103,7 @@ static void *ao_loop (void *this_gen) {
+@@ -1114,7 +1114,7 @@ static void *ao_loop (void *this_gen) {
stream = xine_list_get_value (this->streams, ite);
if( !stream->emergency_brake ) {
stream->emergency_brake = 1;
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_xine-engine_audio_ou
}
}
pthread_mutex_unlock(&this->streams_lock);
-@@ -1485,7 +1485,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
+@@ -1498,7 +1498,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
if( !ret ) {
stream->emergency_brake = 1;
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_xine-engine_audio_ou
return 0;
}
} else {
-@@ -2229,7 +2229,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
+@@ -2247,7 +2247,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:
/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_input_rip_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_xine-engine_input_rip_c
--- patches/patch-src_xine-engine_input_rip_c 13 Jun 2007 10:58:29 -0000
1.1
+++ patches/patch-src_xine-engine_input_rip_c 9 Jan 2008 07:05:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_input_rip_c,v 1.1 2007/06/13 10:58:29 jakemsr
Exp $
---- 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
+--- src/xine-engine/input_rip.c.orig Tue Jan 1 08:30:09 2008
++++ src/xine-engine/input_rip.c Wed Jan 9 01:50:22 2008
+@@ -566,7 +566,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,
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_xine-engine_input_ri
return NULL;
}
-@@ -577,7 +577,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
+@@ -575,7 +575,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,
Index: patches/patch-src_xine-engine_video_decoder_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_video_decoder_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_xine-engine_video_decoder_c
--- patches/patch-src_xine-engine_video_decoder_c 13 Jun 2007 10:58:29
-0000 1.4
+++ patches/patch-src_xine-engine_video_decoder_c 9 Jan 2008 07:05:08
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.4 2007/06/13 10:58:29
jakemsr Exp $
---- 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 @@
+--- src/xine-engine/video_decoder.c.orig Tue Jan 1 10:36:02 2008
++++ src/xine-engine/video_decoder.c Wed Jan 9 01:50:22 2008
+@@ -41,6 +41,9 @@
#define SPU_SLEEP_INTERVAL (90000/2)
@@ -11,7 +11,7 @@ $OpenBSD: patch-src_xine-engine_video_de
static void update_spu_decoder (xine_stream_t *stream, int type) {
-@@ -479,7 +482,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
+@@ -486,7 +489,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
} else {
pthread_attr_t pth_attrs;
@@ -21,7 +21,7 @@ $OpenBSD: patch-src_xine-engine_video_de
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
-@@ -508,10 +513,12 @@ int _x_video_decoder_init (xine_stream_t *stream) {
+@@ -515,10 +520,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:
/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_video_out_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_xine-engine_video_out_c
--- patches/patch-src_xine-engine_video_out_c 13 Jun 2007 10:58:29 -0000
1.4
+++ patches/patch-src_xine-engine_video_out_c 9 Jan 2008 07:05:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_video_out_c,v 1.4 2007/06/13 10:58:29 jakemsr
Exp $
---- 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
+--- src/xine-engine/video_out.c.orig Tue Jan 1 10:36:02 2008
++++ src/xine-engine/video_out.c Wed Jan 9 01:50:22 2008
+@@ -1905,7 +1905,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: /cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_xine-engine_xine_c
--- patches/patch-src_xine-engine_xine_c 31 Oct 2007 10:55:37 -0000
1.2
+++ patches/patch-src_xine-engine_xine_c 9 Jan 2008 07:05:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_xine_c,v 1.2 2007/10/31 10:55:37 jakemsr Exp $
---- src/xine-engine/xine.c.orig Sat Aug 18 19:37:00 2007
-+++ src/xine-engine/xine.c Wed Oct 17 20:29:26 2007
-@@ -1611,7 +1611,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
+--- src/xine-engine/xine.c.orig Tue Jan 1 10:36:02 2008
++++ src/xine-engine/xine.c Wed Jan 9 01:50:22 2008
+@@ -1614,7 +1614,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);
Index: patches/patch-src_xine-utils_utils_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_xine-utils_utils_c
--- patches/patch-src_xine-utils_utils_c 13 Jun 2007 10:58:29 -0000
1.3
+++ patches/patch-src_xine-utils_utils_c 9 Jan 2008 07:05:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-utils_utils_c,v 1.3 2007/06/13 10:58:29 jakemsr Exp $
---- 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 @@
+--- src/xine-utils/utils.c.orig Tue Jan 1 08:30:09 2008
++++ src/xine-utils/utils.c Wed Jan 9 01:50:22 2008
+@@ -49,6 +49,7 @@
#ifdef HAVE_NL_LANGINFO
#include <langinfo.h>
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 25 Nov 2007 14:22:36 -0000 1.2
+++ pkg/PLIST-main 9 Jan 2008 07:16:25 -0000
@@ -156,6 +156,7 @@ share/locale/it/LC_MESSAGES/libxine1.mo
share/locale/pl/LC_MESSAGES/libxine1.mo
share/locale/pt_BR/LC_MESSAGES/libxine1.mo
share/locale/sk/LC_MESSAGES/libxine1.mo
+share/locale/tr/LC_MESSAGES/libxine1.mo
share/xine/
share/xine/libxine1/
share/xine/libxine1/fonts/
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
