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

Update to xine-lib 1.1.17 and disable win32 codecs. From Brad.

Browse Source
This commit is contained in:
sthen 2010-01-05 11:48:51 +00:00
parent 94fb8251e1
commit ef99599f5b
23 changed files with 139 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
multimedia/xine-lib/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.58 2009/08/11 21:30:58 sthen Exp $
# $OpenBSD: Makefile,v 1.59 2010/01/05 11:48:51 sthen Exp $
SHARED_ONLY= Yes
COMMENT= multimedia decoding library
V= 1.1.16.3
V= 1.1.17
DISTNAME= xine-lib-${V}
PKGNAME= ${DISTNAME}p5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= xine 25.0
SHARED_LIBS= xine 26.0
HOMEPAGE= http://www.xine-project.org/
@ -26,7 +25,7 @@ WANTLIB= X11 Xau Xdmcp Xext Xinerama Xrandr Xrender Xv XvMCW c \
dvdread expat fontconfig freetype jpeg lcms m pthread-stubs \
pthread sndio usbhid xcb-shape xcb-shm xcb-xv xcb z
XINEAPI_REV= 1.26
XINEAPI_REV= 1.27
SUBST_VARS+= XINEAPI_REV
MODULES= devel/gettext
@ -59,7 +58,8 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
# Should be 2.64
AUTOCONF_VERSION= 2.62
CONFIGURE_ARGS+=--disable-aalib \
--disable-dxr3 \
--disable-fb \
@ -68,10 +68,12 @@ CONFIGURE_ARGS+=--disable-aalib \
--disable-opengl \
--disable-optimizations \
--disable-oss \
--disable-real-codecs \
--disable-samba \
--disable-v4l \
--disable-vcd \
--disable-vidix \
--disable-w32dll \
--with-external-a52dec=yes \
--with-external-dvdnav=yes \
--with-external-libdts=yes \
@ -80,7 +82,6 @@ CONFIGURE_ARGS+=--disable-aalib \
--with-external-libmpcdec=yes \
--with-fontconfig \
--with-freetype \
--with-libflac \
--with-wavpack \
--without-alsa \
--without-caca \
@ -101,10 +102,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
NO_REGRESS= Yes
post-extract:
@cp ${FILESDIR}/audio_sndio_out.c ${WRKSRC}/src/audio_out
.if ${MACHINE_ARCH} == "i386"
@cp ${FILESDIR}/i386_set_ldt.c ${WRKSRC}/src/libw32dll/wine
.endif
.include <bsd.port.mk>

10
multimedia/xine-lib/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-lib-1.1.16.3.tar.bz2) = T1CKvwiM9CenMfhWNMgmDQ==
RMD160 (xine-lib-1.1.16.3.tar.bz2) = J5MEpOmYRysrXnmIflTEd2UETsY=
SHA1 (xine-lib-1.1.16.3.tar.bz2) = ZMV8X1X/NwI8xMPZPU3zwGlQ0jU=
SHA256 (xine-lib-1.1.16.3.tar.bz2) = 0lokHvpV3H2PSCM276i7e5u51ptt+KijfyZglI/We1I=
SIZE (xine-lib-1.1.16.3.tar.bz2) = 7468182
MD5 (xine-lib-1.1.17.tar.bz2) = Ja6jyufY4vsJGUFFT8+rVA==
RMD160 (xine-lib-1.1.17.tar.bz2) = 7KwHEUMalMdO2vjwDmlq3l7Qtu4=
SHA1 (xine-lib-1.1.17.tar.bz2) = JDjma7VxyKTJgVgRiDdmh8QrcsQ=
SHA256 (xine-lib-1.1.17.tar.bz2) = FOF+FmXAqpD5WCBFcAYKOuve0rkweMX64UyoqSwOec8=
SIZE (xine-lib-1.1.17.tar.bz2) = 7528937

75
multimedia/xine-lib/patches/patch-configure_ac
View File

@ -1,18 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.4 2009/04/04 00:28:56 sthen Exp $
--- configure.ac.orig Thu Apr 2 14:44:45 2009
+++ configure.ac Fri Apr 3 14:42:42 2009
@@ -212,6 +212,10 @@ AC_PROG_GMSGFMT_PLURAL
AC_CHECK_FUNCS([nl_langinfo])
+LIBICONV=$LTLIBICONV
+LIBINTL=$LTLIBINTL
+INTLLIBS=$LTLIBINTL
+
dnl ---------------------------------------------
dnl Checks for typedefs, structures, and compiler characteristics.
dnl ---------------------------------------------
@@ -553,9 +557,9 @@ t q
$OpenBSD: patch-configure_ac,v 1.5 2010/01/05 11:48:51 sthen Exp $
--- configure.ac.orig Mon Nov 30 20:52:45 2009
+++ configure.ac Fri Dec 4 18:57:27 2009
@@ -564,9 +564,9 @@ t q
b
:q
q"
@ -24,7 +13,20 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/04/04 00:28:56 sthen Exp $
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()])
@@ -1275,7 +1279,7 @@ if test "x$enable_a52dec" = "xno"; then
@@ -1262,10 +1262,10 @@ dnl check for libFLAC
dnl ---------------------------------------------
AC_ARG_WITH([libflac],
- AS_HELP_STRING([--with-libflac], [build libFLAC-based decoder and demuxer]))
+ AS_HELP_STRING([--without-libflac], [don't build libFLAC-based decoder and demuxer]))
have_libflac="no"
-if test "x$with_libflac" = "xyes"; then
+if test "x$with_libflac" != "xno"; then
AM_PATH_LIBFLAC([have_libflac="yes"])
fi
@@ -1286,7 +1286,7 @@ if test "x$enable_a52dec" = "xno"; then
AC_MSG_RESULT([a52dec support disabled])
elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@ -33,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/04/04 00:28:56 sthen Exp $
[
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -1366,9 +1370,10 @@ if test "x$with_mng" = "xyes"; then
@@ -1379,9 +1379,10 @@ if test "x$with_mng" = "xyes"; then
AC_CHECK_LIB(mng, mng_initialize,
[ AC_CHECK_HEADER(libmng.h,
[ have_libmng=yes
@ -46,42 +48,3 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/04/04 00:28:56 sthen Exp $
AC_SUBST(MNG_LIBS)
else
have_libmng=no
@@ -1564,6 +1569,28 @@ AM_CONDITIONAL([HAVE_JACK], [test "x$have_jack" = "xye
dnl ---------------------------------------------
+dnl sndio support
+dnl ---------------------------------------------
+
+AC_ARG_WITH([sndio],
+ AS_HELP_STRING([--without-sndio], [Build without sndio support]))
+
+if test "x$with_sndio" != "xno"; then
+ AC_CHECK_LIB(sndio, sio_open, [SNDIO_LIBS=-lsndio; have_sndio=yes],
+ [have_sndio=no])
+
+ if test "x$with_sndio" = "xyes" && test "x$have_sndio" = "xno"; then
+ AC_MSG_ERROR([sndio support requested, but sndio not found])
+ fi
+fi
+
+AM_CONDITIONAL([HAVE_SNDIO], [test "x$have_sndio" = "xyes"])
+
+AC_SUBST([SNDIO_CFLAGS])
+AC_SUBST([SNDIO_LIBS])
+
+
+dnl ---------------------------------------------
dnl gnome-vfs support
dnl ---------------------------------------------
@@ -3170,6 +3197,9 @@ if test "x$have_pulseaudio" = "xyes"; then
fi
if test "x$have_jack" = "xyes"; then
echo " - Jack"
+fi
+if test "x$have_sndio" = "xyes"; then
+ echo " - sndio"
fi
echo "---"

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_block_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_demuxers_demux_mpeg_block_c,v 1.3 2010/01/05 11:48:51 sthen Exp $
--- src/demuxers/demux_mpeg_block.c.orig Mon Nov 30 15:55:56 2009
+++ src/demuxers/demux_mpeg_block.c Wed Dec 2 19:15:35 2009
@@ -644,7 +644,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,

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.8 2009/04/04 00:28:56 sthen Exp $
--- src/demuxers/demux_qt.c.orig Thu Apr 2 14:44:44 2009
+++ src/demuxers/demux_qt.c Fri Apr 3 14:42:42 2009
@@ -3055,7 +3055,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
--- src/demuxers/demux_qt.c.orig Mon Nov 30 15:55:56 2009
+++ src/demuxers/demux_qt.c Wed Dec 2 19:15:35 2009
@@ -3060,7 +3060,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.15 2009/04/04 00:28:56 sthen Exp $
--- src/input/Makefile.in.orig Thu Apr 2 14:45:53 2009
+++ src/input/Makefile.in Fri Apr 3 14:42:42 2009
@@ -599,7 +599,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
$OpenBSD: patch-src_input_Makefile_in,v 1.16 2010/01/05 11:48:51 sthen Exp $
--- src/input/Makefile.in.orig Mon Nov 30 20:53:30 2009
+++ src/input/Makefile.in Wed Dec 2 19:15:35 2009
@@ -649,7 +649,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_"
#

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

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_input_dvb_c,v 1.8 2008/08/20 01:54:01 brad Exp $
--- src/input/input_dvb.c.orig Thu Aug 7 13:52:41 2008
+++ src/input/input_dvb.c Thu Aug 14 18:48:39 2008
$OpenBSD: patch-src_input_input_dvb_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_dvb.c.orig Mon Nov 30 15:55:45 2009
+++ src/input/input_dvb.c Wed Dec 2 20:34:56 2009
@@ -903,7 +903,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));
@ -14,8 +14,8 @@ $OpenBSD: patch-src_input_input_dvb_c,v 1.8 2008/08/20 01:54:01 brad Exp $
/* no data for several seconds - tell the user a possible reason */
if(this->read_failcount==5){
- _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", NULL);
+ _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", (char *)NULL);
- _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", NULL);
+ _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", (char *)NULL);
}
#ifdef DVB_NO_BUFFERING
if(this->newchannel){

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.8 2009/07/30 19:12:44 jakemsr Exp $
--- src/input/input_dvd.c.orig Wed Feb 18 03:37:42 2009
+++ src/input/input_dvd.c Mon Jul 13 17:23:57 2009
@@ -77,7 +77,6 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_dvd.c.orig Mon Nov 30 15:55:45 2009
+++ src/input/input_dvd.c Wed Dec 2 19:15:35 2009
@@ -79,7 +79,6 @@
/* DVDNAV includes */
#ifdef HAVE_DVDNAV
# include <dvdnav/dvdnav.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.8 2009/07/30 19:12:44 jakemsr Exp $
#else
# define DVDNAV_COMPILE
# include "dvdnav.h"
@@ -606,7 +605,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
@@ -608,7 +607,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,
@ -18,7 +18,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.8 2009/07/30 19:12:44 jakemsr Exp $
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
buf->free_buffer(buf);
return NULL;
@@ -1497,7 +1496,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
@@ -1499,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
_x_message(this->stream, XINE_MSG_READ_ERROR,
/* FIXME: see FIXME in dvd_parse_try_open() */

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

@ -1,16 +1,16 @@
$OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
--- src/input/input_http.c.orig Tue Feb 10 12:32:23 2009
+++ src/input/input_http.c Wed Feb 11 00:55:26 2009
@@ -409,7 +409,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
$OpenBSD: patch-src_input_input_http_c,v 1.8 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_http.c.orig Mon Nov 30 15:55:44 2009
+++ src/input/input_http.c Wed Dec 2 20:36:12 2009
@@ -411,7 +411,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
error:
if (!_x_action_pending(this->stream))
if (!_x_action_pending(this->stream))
- _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
+ _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
return read_bytes;
}
@@ -681,7 +681,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -683,7 +683,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,17 +19,17 @@ $OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
return 0;
}
}
@@ -690,7 +690,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -693,7 +693,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)) {
&this->user, &this->password, &this->uri,
&this->user_agent)) {
- _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", NULL);
+ _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", (char *)NULL);
return 0;
}
use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
@@ -700,7 +700,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -703,7 +703,7 @@ static int http_plugin_open (input_plugin_t *this_gen
if (this->user && strlen(this->user)) {
if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
return -1;
}
}
@@ -754,7 +754,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -757,7 +757,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} while ((res == XIO_TIMEOUT) && (progress <= 100000));
if (res != XIO_READY) {
@ -46,8 +46,8 @@ $OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
return -3;
}
}
@@ -794,7 +794,7 @@ static int http_plugin_open (input_plugin_t *this_gen
"\015\012",
@@ -799,7 +799,7 @@ static int http_plugin_open (input_plugin_t *this_gen
this->user_agent ? " " : "",
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);
@ -55,16 +55,16 @@ $OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't send request\n");
return -4;
}
@@ -838,7 +838,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -843,7 +843,7 @@ static int http_plugin_open (input_plugin_t *this_gen
(sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
&httpcode, httpstatus) != 2)
) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG,
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: invalid http answer\n"));
return -6;
@@ -849,20 +849,20 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -854,20 +854,20 @@ static int http_plugin_open (input_plugin_t *this_gen
_("input_http: 3xx redirection: >%d %s<\n"),
httpcode, httpstatus);
} else if (httpcode == 404) {
@ -85,10 +85,10 @@ $OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
_x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ",
- httpstatus, NULL);
+ httpstatus, (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG,
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
@@ -959,7 +959,7 @@ static int http_plugin_open (input_plugin_t *this_gen
@@ -964,7 +964,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} else
len ++;
if ( len >= BUFSIZE ) {

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

@ -1,9 +1,9 @@
$OpenBSD: patch-src_input_input_net_c,v 1.3 2009/02/02 22:00:42 sthen Exp $
--- src/input/input_net.c.orig Wed Jan 7 11:14:32 2009
+++ src/input/input_net.c Thu Jan 8 01:02:35 2009
$OpenBSD: patch-src_input_input_net_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_net.c.orig Mon Nov 30 15:55:45 2009
+++ src/input/input_net.c Wed Dec 2 19:15:35 2009
@@ -275,7 +275,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len);
if (n < 0) {
- _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
+ _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, (char *)NULL);

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

@ -1,9 +1,9 @@
$OpenBSD: patch-src_input_input_stdin_fifo_c,v 1.3 2009/02/02 22:00:42 sthen Exp $
--- src/input/input_stdin_fifo.c.orig Wed Jan 7 11:14:32 2009
+++ src/input/input_stdin_fifo.c Thu Jan 8 01:02:35 2009
$OpenBSD: patch-src_input_input_stdin_fifo_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_stdin_fifo.c.orig Mon Nov 30 15:55:44 2009
+++ src/input/input_stdin_fifo.c Wed Dec 2 19:15:35 2009
@@ -106,7 +106,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_g
lprintf ("got %"PRId64" bytes (%"PRId64"/%"PRId64" bytes read)\n", n,total,len);
if (n < 0) {
- _x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
+ _x_message(this->stream, XINE_MSG_READ_ERROR, (char *)NULL);

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

@ -1,12 +1,12 @@
$OpenBSD: patch-src_libreal_real_common_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_libreal_real_common_c,v 1.3 2010/01/05 11:48:51 sthen Exp $
--- src/libreal/real_common.c.orig Mon Nov 30 15:55:53 2009
+++ src/libreal/real_common.c Wed Dec 2 20:39:44 2009
@@ -177,7 +177,7 @@ void *_x_real_codec_open(xine_stream_t *const stream,
LOG_MODULE ": error loading %s: %s\n", codecpath, dlerror());
}
- _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL);
+ _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, (char *)NULL);
return NULL;
}

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

@ -1,12 +1,12 @@
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.7 2009/04/04 00:28:56 sthen Exp $
--- src/post/deinterlace/Makefile.in.orig Thu Apr 2 14:46:02 2009
+++ src/post/deinterlace/Makefile.in Fri Apr 3 14:42:43 2009
@@ -429,7 +429,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.8 2010/01/05 11:48:51 sthen Exp $
--- src/post/deinterlace/Makefile.in.orig Mon Nov 30 20:53:39 2009
+++ src/post/deinterlace/Makefile.in Wed Dec 2 19:15:36 2009
@@ -480,7 +480,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
SUBDIRS = plugins
EXTRA_DIST =
-xinepost_LTLIBRARIES = xineplug_post_tvtime.la
+${TOMSMOCOMP_LINKS}xinepost_LTLIBRARIES = xineplug_post_tvtime.la
xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
deinterlace.c pulldown.c speedy.c tvtime.c
deinterlace.c pulldown.c speedy.c tvtime.c

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

@ -1,12 +1,12 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.7 2009/04/04 00:28:56 sthen Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Thu Apr 2 14:46:02 2009
+++ src/post/deinterlace/plugins/Makefile.in Fri Apr 3 14:42:43 2009
@@ -861,7 +861,7 @@ maintainer-clean-generic:
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.8 2010/01/05 11:48:51 sthen Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Mon Nov 30 20:53:39 2009
+++ src/post/deinterlace/plugins/Makefile.in Wed Dec 2 20:43:00 2009
@@ -891,7 +891,7 @@ maintainer-clean-generic:
-rm -f Makefile.in
# Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)
-libdeinterlaceplugins_la-kdetv_greedyh.o libdeinterlaceplugins_la-kdetv_greedyh.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/$$/ -O1/')
+# libdeinterlaceplugins_la-kdetv_greedyh.o libdeinterlaceplugins_la-kdetv_greedyh.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/$$/ -O1/')
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

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.10 2009/04/04 00:28:56 sthen Exp $
--- src/xine-engine/Makefile.in.orig Thu Apr 2 14:46:05 2009
+++ src/xine-engine/Makefile.in Fri Apr 3 14:42:43 2009
@@ -438,7 +438,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.11 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/Makefile.in.orig Mon Nov 30 20:53:42 2009
+++ src/xine-engine/Makefile.in Wed Dec 2 19:15:36 2009
@@ -460,7 +460,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_audio_decoder_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
--- src/xine-engine/audio_decoder.c.orig Tue Feb 10 12:32:23 2009
+++ src/xine-engine/audio_decoder.c Wed Feb 11 00:55:26 2009
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.8 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/audio_decoder.c.orig Mon Nov 30 15:55:52 2009
+++ src/xine-engine/audio_decoder.c Wed Dec 2 20:38:44 2009
@@ -463,7 +463,9 @@ static void *audio_decoder_loop (void *stream_gen) {
int _x_audio_decoder_init (xine_stream_t *stream) {
@ -21,6 +21,6 @@ $OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.7 2009/02/16 01:24:24 sthen
pthread_attr_setschedparam(&pth_attrs, &pth_params);
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
+#endif
stream->audio_thread_created = 1;
stream->audio_thread_created = 1;
if ((err = pthread_create (&stream->audio_thread,

12
multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.9 2009/04/04 00:28:56 sthen Exp $
--- src/xine-engine/audio_out.c.orig Sun Mar 15 16:52:55 2009
+++ src/xine-engine/audio_out.c Fri Apr 3 14:42:43 2009
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.10 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/audio_out.c.orig Mon Nov 30 20:33:30 2009
+++ src/xine-engine/audio_out.c Wed Dec 2 19:15:36 2009
@@ -1089,7 +1089,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0 ) {
@ -38,7 +38,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.9 2009/04/04 00:28:56 sthen Exp
}
pthread_mutex_unlock( &this->driver_lock );
@@ -1514,7 +1514,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
if( !ret ) {
stream->emergency_brake = 1;
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
@ -47,8 +47,8 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.9 2009/04/04 00:28:56 sthen Exp
}
} else {
@@ -2279,7 +2279,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
this->audio_loop_running = 1;
this->audio_loop_running = 1;
pthread_attr_init(&pth_attrs);
+#if !defined(__OpenBSD__)
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_xine-engine_input_rip_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/input_rip.c.orig Mon Nov 30 15:55:52 2009
+++ src/xine-engine/input_rip.c Wed Dec 2 19:15:36 2009
@@ -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"));
@ -11,7 +11,7 @@ $OpenBSD: patch-src_xine-engine_input_rip_c,v 1.3 2008/06/18 01:26:41 brad Exp $
}
@@ -574,7 +574,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
xine_log(stream->xine, XINE_LOG_MSG,
xine_log(stream->xine, XINE_LOG_MSG,
_("input_rip: ripping/caching of this source is not permitted!\n"));
_x_message(stream, XINE_MSG_SECURITY,
- _("xine is not allowed to save from this source. (possibly copyrighted material?)"), NULL);

20
multimedia/xine-lib/patches/patch-src_xine-engine_io_helper_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_xine-engine_io_helper_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $
--- src/xine-engine/io_helper.c.orig Sun Apr 15 10:42:17 2007
+++ src/xine-engine/io_helper.c Sun May 20 22:40:14 2007
$OpenBSD: patch-src_xine-engine_io_helper_c,v 1.2 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/io_helper.c.orig Mon Nov 30 15:55:52 2009
+++ src/xine-engine/io_helper.c Wed Dec 2 20:37:52 2009
@@ -56,19 +56,19 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
h = gethostbyname(host);
if (h == NULL) {
- _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_xine-engine_io_helper_c,v 1.1 2007/06/13 10:58:29 jakemsr Ex
return -1;
}
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), (char *)NULL);
@ -45,16 +45,16 @@ $OpenBSD: patch-src_xine-engine_io_helper_c,v 1.1 2007/06/13 10:58:29 jakemsr Ex
@@ -136,7 +136,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
if (error) {
_x_message(stream, XINE_MSG_UNKNOWN_HOST,
_x_message(stream, XINE_MSG_UNKNOWN_HOST,
- "unable to resolve", host, NULL);
+ "unable to resolve", host, (char *)NULL);
return -1;
}
@@ -147,7 +147,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);
s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
_x_message(stream, XINE_MSG_CONNECTION_REFUSED,
_x_message(stream, XINE_MSG_CONNECTION_REFUSED,
- "failed to create socket", strerror(errno), NULL);
+ "failed to create socket", strerror(errno), (char *)NULL);
tmpaddr = tmpaddr->ai_next;
@ -84,12 +84,12 @@ $OpenBSD: patch-src_xine-engine_io_helper_c,v 1.1 2007/06/13 10:58:29 jakemsr Ex
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), (char *)NULL);
return -1;
#endif
@@ -311,11 +311,11 @@ int _x_io_tcp_connect_finish(xine_stream_t *stream, in
int err;
if ((getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len)) == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), (char *)NULL);

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

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.6 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/video_decoder.c.orig Mon Nov 30 15:55:51 2009
+++ src/xine-engine/video_decoder.c Wed Dec 2 19:15:36 2009
@@ -41,6 +41,9 @@
#define SPU_SLEEP_INTERVAL (90000/2)
@ -13,7 +13,7 @@ $OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.5 2008/01/15 00:36:46 jakems
@@ -486,7 +489,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
} else {
pthread_attr_t pth_attrs;
+#if !defined(__OpenBSD__)
struct sched_param pth_params;
@ -23,7 +23,7 @@ $OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.5 2008/01/15 00:36:46 jakems
* with 2k of data. With 500 buffers and a typical video data rate
@@ -515,10 +520,12 @@ int _x_video_decoder_init (xine_stream_t *stream) {
stream->spu_track_map_entries = 0;
pthread_attr_init(&pth_attrs);
+#if !defined(__OpenBSD__)
pthread_attr_getschedparam(&pth_attrs, &pth_params);

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

@ -1,13 +1,13 @@
$OpenBSD: patch-src_xine-engine_video_out_c,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
--- 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
$OpenBSD: patch-src_xine-engine_video_out_c,v 1.6 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/video_out.c.orig Mon Nov 30 20:33:30 2009
+++ src/xine-engine/video_out.c Wed Dec 2 20:39:23 2009
@@ -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);
+#if !defined(__OpenBSD__)
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
+#endif
if ((err = pthread_create (&this->video_thread,
&pth_attrs, video_out_loop, this)) != 0) {

4
multimedia/xine-lib/pkg/PFRAG.i386
View File

@ -1,4 +1,2 @@
@comment $OpenBSD: PFRAG.i386,v 1.3 2009/02/02 22:00:42 sthen Exp $
@comment $OpenBSD: PFRAG.i386,v 1.4 2010/01/05 11:48:51 sthen Exp $
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_tvtime.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_qt.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_w32dll.so

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2009/08/07 22:11:08 sthen Exp $
@comment $OpenBSD: PLIST,v 1.9 2010/01/05 11:48:51 sthen Exp $
@conflict xine-lib-arts-*
@conflict xine-lib-esd-*
@conflict xine-lib-jack-*
@ -80,13 +80,13 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_mad.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_mpc.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_mpeg2.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_nsf.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_real.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_rgb.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_speex.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spu.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spucc.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spucmml.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spudvb.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spuhdmv.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_sputext.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_theora.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_vorbis.so