cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Xine-lib 1.1.13

Browse Source 
This release contains a security fix (buffer overflow in the NSF demuxer,
CVE-2008-1878). There are also a few bug fixes, and a new JACK output
plugin.

ok jakemsr@
This commit is contained in:
brad 2008-06-18 01:26:40 +00:00
parent d83ee4f03d
commit 53a59191f0
21 changed files with 111 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
multimedia/xine-lib/Makefile
View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.34 2008/06/01 08:21:15 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2008/06/18 01:26:40 brad Exp $
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output module for xine-lib
COMMENT-jack= jackd audio output module for xine-lib
V= 1.1.12
V= 1.1.13
DISTNAME= xine-lib-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-esd= xine-lib-esd-${V}p0
PKGNAME-arts= xine-lib-arts-${V}p0
PKGNAME-jack= xine-lib-jack-${V}p0
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
PKGNAME-jack= xine-lib-jack-${V}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= multimedia
SHARED_LIBS= xine 20.2
SHARED_LIBS= xine 21.0
HOMEPAGE= http://xinehq.de/
@ -77,7 +77,7 @@ USE_LIBTOOL= Yes
USE_GMAKE= Yes
LIBTOOL_FLAGS+= --tag=disable-static
XINEAPI_REV= 1.21
XINEAPI_REV= 1.22
SUBST_VARS+= XINEAPI_REV
.if ${MACHINE_ARCH} == "i386"

10
multimedia/xine-lib/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-lib-1.1.12.tar.bz2) = tyVGFMeMiw8WUrjcBvgLOg==
RMD160 (xine-lib-1.1.12.tar.bz2) = MFwbN4ekGRCDuXkygc4/MEPWX8s=
SHA1 (xine-lib-1.1.12.tar.bz2) = onhypCkuLObDUBihy796iO7NqM0=
SHA256 (xine-lib-1.1.12.tar.bz2) = SQiGNcKaOFJ72FkBOWkZUXg8XBx/22kaijqZVAl9TdA=
SIZE (xine-lib-1.1.12.tar.bz2) = 7431443
MD5 (xine-lib-1.1.13.tar.bz2) = uUUSCY3eKNwjD1okA30uGA==
RMD160 (xine-lib-1.1.13.tar.bz2) = ov/LQ4kOxSURXmL3lt7G6DXOtNU=
SHA1 (xine-lib-1.1.13.tar.bz2) = 0fTPBREGelVNviQ0aDEevrO73OQ=
SHA256 (xine-lib-1.1.13.tar.bz2) = rYxboHFcAjZ2qL/5NVhllJpjqFBeNW5vIfv/CZlomRo=
SIZE (xine-lib-1.1.13.tar.bz2) = 7444294

26
multimedia/xine-lib/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
--- configure.orig Mon Apr 14 16:55:48 2008
+++ configure Mon Apr 14 20:28:43 2008
@@ -24746,6 +24746,9 @@ _ACEOF
$OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
--- configure.orig Sat Jun 14 19:16:03 2008
+++ configure Mon Jun 16 02:30:50 2008
@@ -24350,6 +24350,9 @@ _ACEOF
fi
done
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
@@ -31072,13 +31075,13 @@ t q
@@ -30687,13 +30690,13 @@ t q
b
:q
q"
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
@@ -37926,7 +37929,7 @@ fi
@@ -37541,7 +37544,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
@@ -38175,7 +38178,7 @@ elif test "x$external_a52dec" = "xyes"; then
@@ -37790,7 +37793,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -38314,7 +38317,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
@@ -37929,7 +37932,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.15 2008/04/15 11:24:14 jakemsr Exp $
else
have_a52="no"
@@ -38880,7 +38883,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
@@ -38495,7 +38498,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.15 2008/04/15 11:24:14 jakemsr Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -39063,7 +39066,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
@@ -38678,7 +38681,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.15 2008/04/15 11:24:14 jakemsr Exp $
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; }
@@ -49849,7 +49852,7 @@ cat >>confdefs.h <<_ACEOF
@@ -49976,7 +49979,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -faltivec -maltivec"
@ -81,7 +81,7 @@ $OpenBSD: patch-configure,v 1.15 2008/04/15 11:24:14 jakemsr Exp $
fi
;;
ppc-*-linux* | powerpc-*)
@@ -50347,7 +50350,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
@@ -50484,7 +50487,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/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.15 2008/04/15 11:24:14 jakemsr Exp $
@@ -51168,7 +51171,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
@@ -51365,7 +51368,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

8
multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.8 2008/04/15 11:24:14 jakemsr Exp $
--- src/audio_out/Makefile.in.orig Mon Apr 14 16:55:33 2008
+++ src/audio_out/Makefile.in Mon Apr 14 20:28:43 2008
@@ -623,7 +623,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.9 2008/06/18 01:26:41 brad Exp $
--- src/audio_out/Makefile.in.orig Sat Jun 14 19:15:47 2008
+++ src/audio_out/Makefile.in Mon Jun 16 02:30:50 2008
@@ -626,7 +626,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

8
multimedia/xine-lib/patches/patch-src_demuxers_demux_mpeg_pes_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_pes_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_demuxers_demux_mpeg_pes_c,v 1.3 2008/06/18 01:26:41 brad Exp $
--- src/demuxers/demux_mpeg_pes.c.orig Sat Jun 14 19:15:00 2008
+++ src/demuxers/demux_mpeg_pes.c Mon Jun 16 02:30:50 2008
@@ -815,7 +815,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,

8
multimedia/xine-lib/patches/patch-src_demuxers_demux_qt_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.5 2008/04/15 11:24:14 jakemsr Exp $
--- src/demuxers/demux_qt.c.orig Mon Apr 14 16:27:20 2008
+++ src/demuxers/demux_qt.c Mon Apr 14 20:28:43 2008
@@ -3023,7 +3023,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.6 2008/06/18 01:26:41 brad Exp $
--- src/demuxers/demux_qt.c.orig Sat Jun 14 19:15:00 2008
+++ src/demuxers/demux_qt.c Mon Jun 16 02:30:50 2008
@@ -3022,7 +3022,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,

8
multimedia/xine-lib/patches/patch-src_input_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_Makefile_in,v 1.10 2008/04/15 11:24:14 jakemsr Exp $
--- src/input/Makefile.in.orig Mon Apr 14 16:55:34 2008
+++ src/input/Makefile.in Mon Apr 14 20:28:43 2008
@@ -586,7 +586,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
$OpenBSD: patch-src_input_Makefile_in,v 1.11 2008/06/18 01:26:41 brad Exp $
--- src/input/Makefile.in.orig Sat Jun 14 19:15:49 2008
+++ src/input/Makefile.in Mon Jun 16 02:30:50 2008
@@ -589,7 +589,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_"
#

20
multimedia/xine-lib/patches/patch-src_input_input_cdda_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
--- src/input/input_cdda.c.orig Sat Jun 14 19:15:00 2008
+++ src/input/input_cdda.c Mon Jun 16 02:30:50 2008
@@ -71,7 +71,7 @@
#elif defined(WIN32)
#define DEFAULT_CDDA_DEVICE "d:\\"
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
#endif
#define CDDB_SERVER "freedb.freedb.org"
@@ -612,7 +612,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
@@ -610,7 +610,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
return 0;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
#include <sys/cdio.h>
@@ -625,7 +625,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -623,7 +623,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
struct ioc_toc_header tochdr;
#if defined(__FreeBSD_kernel__)
struct ioc_read_toc_single_entry tocentry;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
struct ioc_read_toc_entry tocentry;
struct cd_toc_entry data;
#endif
@@ -661,7 +661,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -658,7 +658,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -682,7 +682,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -679,7 +679,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
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;
@@ -704,7 +704,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -701,7 +701,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -725,7 +725,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -722,7 +722,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
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;
@@ -763,7 +763,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
@@ -760,7 +760,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
perror("CDIOCREADAUDIO");
return -1;
}

10
multimedia/xine-lib/patches/patch-src_input_input_dvb_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_dvb_c,v 1.5 2007/10/31 10:55:37 jakemsr Exp $
--- src/input/input_dvb.c.orig Sat Aug 18 19:36:45 2007
+++ src/input/input_dvb.c Wed Oct 17 20:29:24 2007
@@ -894,7 +894,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
$OpenBSD: patch-src_input_input_dvb_c,v 1.6 2008/06/18 01:26:41 brad Exp $
--- src/input/input_dvb.c.orig Sat Jun 14 19:15:10 2008
+++ src/input/input_dvb.c Mon Jun 16 02:30:50 2008
@@ -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)
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_dvb_c,v 1.5 2007/10/31 10:55:37 jakemsr Exp $
return NULL;
}
if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) {
@@ -2578,7 +2578,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
@@ -2568,7 +2568,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
/* no data for several seconds - tell the user a possible reason */
if(this->read_failcount==5){

10
multimedia/xine-lib/patches/patch-src_input_input_dvd_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.4 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_input_input_dvd_c,v 1.5 2008/06/18 01:26:41 brad Exp $
--- src/input/input_dvd.c.orig Sat Jun 14 19:15:00 2008
+++ src/input/input_dvd.c Mon Jun 16 02:30:50 2008
@@ -116,8 +116,8 @@
#define DVD_PATH "d:\\"
#define RDVD_PATH "d:\\"
@ -12,7 +12,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.4 2008/01/15 00:36:46 jakemsr Exp $
#endif
/* Some misc. defines */
@@ -606,7 +606,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
@@ -603,7 +603,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 1.4 2008/01/15 00:36:46 jakemsr Exp $
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
buf->free_buffer(buf);
return NULL;
@@ -1497,7 +1497,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
@@ -1491,7 +1491,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() */

28
multimedia/xine-lib/patches/patch-src_input_input_http_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_http_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
--- src/input/input_http.c.orig Sat Jun 14 19:15:00 2008
+++ src/input/input_http.c Mon Jun 16 02:30:50 2008
@@ -407,7 +407,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
return read_bytes;
}
@@ -673,7 +673,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -663,7 +663,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
return 0;
}
}
@@ -682,7 +682,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -672,7 +672,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
return 0;
}
use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
@@ -692,7 +692,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 (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 1.3 2008/01/15 00:36:46 jakemsr Exp $
return -1;
}
}
@@ -746,7 +746,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -736,7 +736,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} while ((res == XIO_TIMEOUT) && (progress <= 100000));
if (res != XIO_READY) {
@ -46,16 +46,16 @@ $OpenBSD: patch-src_input_input_http_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
return -3;
}
}
@@ -791,7 +791,7 @@ static int http_plugin_open (input_plugin_t *this_gen
VERSION);
buflen = strlen(this->buf);
@@ -776,7 +776,7 @@ static int http_plugin_open (input_plugin_t *this_gen
"\015\012",
VERSION);
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;
}
@@ -835,7 +835,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -820,7 +820,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: invalid http answer\n"));
return -6;
@@ -846,20 +846,20 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -831,20 +831,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 1.3 2008/01/15 00:36:46 jakemsr Exp $
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
@@ -952,7 +952,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -940,7 +940,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} else
len ++;
if ( len >= BUFSIZE ) {

14
multimedia/xine-lib/patches/patch-src_input_libreal_real_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_input_libreal_real_c,v 1.8 2008/01/15 00:36:46 jakemsr Exp $
--- 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)
+#ifndef MAX
#define MAX(x,y) ((x>y) ? x : y)
-
+#endif
static void hash(char *field, char *param) {

8
multimedia/xine-lib/patches/patch-src_input_mms_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_mms_c,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
--- src/input/mms.c.orig Tue Jan 1 08:30:08 2008
+++ src/input/mms.c Wed Jan 9 01:50:22 2008
$OpenBSD: patch-src_input_mms_c,v 1.6 2008/06/18 01:26:41 brad Exp $
--- src/input/mms.c.orig Sat Jun 14 19:15:00 2008
+++ src/input/mms.c Mon Jun 16 02:30:50 2008
@@ -48,6 +48,7 @@
#include <iconv.h>
#include <locale.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-src_input_mms_c,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
#endif
/********** logging **********/
@@ -288,7 +289,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() {

8
multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.7 2008/04/15 11:24:14 jakemsr Exp $
--- src/libfaad/Makefile.in.orig Mon Apr 14 16:55:37 2008
+++ src/libfaad/Makefile.in Mon Apr 14 20:28:43 2008
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.8 2008/06/18 01:26:41 brad Exp $
--- src/libfaad/Makefile.in.orig Sat Jun 14 19:15:51 2008
+++ src/libfaad/Makefile.in Mon Jun 16 02:30:50 2008
@@ -68,43 +68,7 @@ LTLIBRARIES = $(xineplug_LTLIBRARIES)
am__DEPENDENCIES_1 =
xineplug_decode_faad_la_DEPENDENCIES = $(XINE_LIB) \
@ -46,7 +46,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,v 1.7 2008/04/15 11:24:14 jakemsr Exp $
xineplug_decode_faad_la-xine_faad_decoder.lo
xineplug_decode_faad_la_OBJECTS = \
$(am_xineplug_decode_faad_la_OBJECTS)
@@ -452,97 +416,11 @@ SUBDIRS = codebook
@@ -455,97 +419,11 @@ SUBDIRS = codebook
xineplug_LTLIBRARIES = $(faad_module)
xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_faad_la_SOURCES = \

10
multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.9 2008/04/15 11:24:14 jakemsr Exp $
--- src/libw32dll/wine/Makefile.in.orig Mon Apr 14 16:55:41 2008
+++ src/libw32dll/wine/Makefile.in Mon Apr 14 20:28:43 2008
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.10 2008/06/18 01:26:41 brad Exp $
--- src/libw32dll/wine/Makefile.in.orig Sat Jun 14 19:15:56 2008
+++ src/libw32dll/wine/Makefile.in Mon Jun 16 02:30:50 2008
@@ -61,7 +61,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.9 2008/04/15 11:24:14 jakemsr
libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
@HAVE_W32DLL_TRUE@am_libwine_la_rpath =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
@@ -420,6 +420,7 @@ libwine_la_SOURCES = \
@@ -423,6 +423,7 @@ libwine_la_SOURCES = \
registry.c \
vfl.c \
win32.c \
@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.9 2008/04/15 11:24:14 jakemsr
stubs.s \
wrapper.S
@@ -525,6 +526,7 @@ distclean-compile:
@@ -528,6 +529,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Plo@am__quote@

8
multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.2 2008/04/15 11:24:14 jakemsr Exp $
--- src/post/deinterlace/Makefile.in.orig Mon Apr 14 16:55:43 2008
+++ src/post/deinterlace/Makefile.in Mon Apr 14 20:28:44 2008
@@ -416,7 +416,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.3 2008/06/18 01:26:41 brad Exp $
--- src/post/deinterlace/Makefile.in.orig Sat Jun 14 19:15:57 2008
+++ src/post/deinterlace/Makefile.in Mon Jun 16 02:30:50 2008
@@ -419,7 +419,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
SUBDIRS = plugins
EXTRA_DIST =

8
multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.2 2008/04/15 11:24:14 jakemsr Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Mon Apr 14 16:55:43 2008
+++ src/post/deinterlace/plugins/Makefile.in Mon Apr 14 20:28:44 2008
@@ -848,7 +848,7 @@ maintainer-clean-generic:
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.3 2008/06/18 01:26:41 brad Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Sat Jun 14 19:15:57 2008
+++ src/post/deinterlace/plugins/Makefile.in Mon Jun 16 02:30:50 2008
@@ -851,7 +851,7 @@ maintainer-clean-generic:
-rm -f Makefile.in
# Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)

8
multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.5 2008/04/15 11:24:14 jakemsr Exp $
--- src/xine-engine/Makefile.in.orig Mon Apr 14 16:55:46 2008
+++ src/xine-engine/Makefile.in Mon Apr 14 20:28:44 2008
@@ -425,7 +425,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.6 2008/06/18 01:26:41 brad Exp $
--- src/xine-engine/Makefile.in.orig Sat Jun 14 19:16:00 2008
+++ src/xine-engine/Makefile.in Mon Jun 16 02:30:50 2008
@@ -428,7 +428,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
-lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \

10
multimedia/xine-lib/patches/patch-src_xine-engine_input_rip_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_input_rip_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_xine-engine_input_rip_c,v 1.3 2008/06/18 01:26:41 brad Exp $
--- src/xine-engine/input_rip.c.orig Sat Jun 14 19:15:00 2008
+++ src/xine-engine/input_rip.c Mon Jun 16 02:30:51 2008
@@ -565,7 +565,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_rip_c,v 1.2 2008/01/15 00:36:46 jakemsr Ex
return NULL;
}
@@ -575,7 +575,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
@@ -574,7 +574,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,

8
multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_xine_c,v 1.5 2008/03/24 03:26:34 jakemsr Exp $
--- src/xine-engine/xine.c.orig Fri Mar 14 17:06:32 2008
+++ src/xine-engine/xine.c Fri Mar 21 13:00:22 2008
@@ -1649,7 +1649,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
$OpenBSD: patch-src_xine-engine_xine_c,v 1.6 2008/06/18 01:26:41 brad Exp $
--- src/xine-engine/xine.c.orig Sat Jun 14 19:15:00 2008
+++ src/xine-engine/xine.c Mon Jun 16 02:30:51 2008
@@ -1648,7 +1648,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);

4
multimedia/xine-lib/pkg/PLIST-main
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.7 2008/04/15 11:24:14 jakemsr Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2008/06/18 01:26:41 brad Exp $
@pkgpath multimedia/xine-lib
%%i386%%
bin/xine-config
bin/xine-list-1.1
@bin bin/xine-list-1.1
include/xine/
include/xine.h
include/xine/alphablend.h