Here is an update to Xine-lib 1.1.8.
Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 3 Oct 2007 06:36:43 -0000 1.19 +++ Makefile 18 Oct 2007 00:25:17 -0000 @@ -2,12 +2,10 @@ COMMENT= multimedia decoding library -V= 1.1.7 +V= 1.1.8 DISTNAME= xine-lib-${V} -PKGNAME= ${DISTNAME}p2 -EXTRACT_SUFX= .tar.bz2 CATEGORIES= multimedia -SHARED_LIBS= xine 18.1 +SHARED_LIBS= xine 19.0 HOMEPAGE= http://xinehq.de/ Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 13 Jun 2007 10:58:28 -0000 1.4 +++ distinfo 18 Oct 2007 00:26:25 -0000 @@ -1,5 +1,5 @@ -MD5 (xine-lib-1.1.7.tar.bz2) = Y3Nb4gD5fXhO0CshI9p8rw== -RMD160 (xine-lib-1.1.7.tar.bz2) = fLP30cLspt16UhlzBaH/103ErK4= -SHA1 (xine-lib-1.1.7.tar.bz2) = rL1UW4GPDrEgvmDhEWFSAAVEAg8= -SHA256 (xine-lib-1.1.7.tar.bz2) = b2/OL3Xfl4ktZT4I/Ccu0BLrO3tTF45rWeuVhDeszKs= -SIZE (xine-lib-1.1.7.tar.bz2) = 7295585 +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 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure,v retrieving revision 1.9 diff -u -p -r1.9 patch-configure --- patches/patch-configure 18 Sep 2007 18:26:52 -0000 1.9 +++ patches/patch-configure 18 Oct 2007 00:38:39 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure,v 1.9 2007/09/18 18:26:52 naddy Exp $ ---- configure.orig Wed Jun 6 15:41:05 2007 -+++ configure Tue Sep 11 21:22:31 2007 +--- configure.orig Mon Aug 27 14:28:18 2007 ++++ configure Wed Oct 17 20:29:23 2007 @@ -24480,6 +24480,9 @@ _ACEOF fi done @@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.9 2007/09/ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -@@ -30535,13 +30538,13 @@ t q +@@ -30589,13 +30592,13 @@ t q b :q q" @@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.9 2007/09/ cat >>confdefs.h <<_ACEOF #define LIBXV_SO "${x_lib_location:-libXv.so}" -@@ -37430,7 +37433,7 @@ fi +@@ -37484,7 +37487,7 @@ fi LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME" fi @@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.9 2007/09/ if test "x$libFLAC_includes" != "x" ; then LIBFLAC_CFLAGS="-I$libFLAC_includes" -@@ -37681,7 +37684,7 @@ elif test "x$external_a52dec" = "xyes"; then +@@ -37735,7 +37738,7 @@ elif test "x$external_a52dec" = "xyes"; then have_a52="yes" @@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.9 2007/09/ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -37820,7 +37823,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then +@@ -37874,7 +37877,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.9 2007/09/ else have_a52="no" -@@ -38398,7 +38401,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t +@@ -38452,7 +38455,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.9 2007/09/ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -38581,7 +38584,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; } +@@ -38635,7 +38638,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.9 2007/09/ 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; } -@@ -49392,7 +49395,7 @@ cat >>confdefs.h <<_ACEOF +@@ -49444,7 +49447,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF CFLAGS="$CFLAGS -faltivec -maltivec" @@ -81,7 +81,7 @@ $OpenBSD: patch-configure,v 1.9 2007/09/ fi ;; ppc-*-linux* | powerpc-*) -@@ -49860,7 +49863,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts" +@@ -49912,7 +49915,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.9 2007/09/ -@@ -50692,7 +50695,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i +@@ -50744,7 +50747,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_input_Makefile_in =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_input_Makefile_in --- patches/patch-src_input_Makefile_in 13 Jun 2007 10:58:29 -0000 1.4 +++ patches/patch-src_input_Makefile_in 18 Oct 2007 00:38:36 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_input_Makefile_in,v 1.4 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/Makefile.in.orig Tue Apr 17 15:17:43 2007 -+++ src/input/Makefile.in Sun May 20 22:40:02 2007 -@@ -667,7 +667,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c +--- 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 # --------- # All of xine input plugins should be named like the scheme "xineplug_inp_" # Index: patches/patch-src_input_input_dvb_c =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_input_input_dvb_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_input_input_dvb_c --- patches/patch-src_input_input_dvb_c 13 Jun 2007 10:58:29 -0000 1.4 +++ patches/patch-src_input_input_dvb_c 18 Oct 2007 00:38:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_input_input_dvb_c,v 1.4 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/input_dvb.c.orig Wed May 16 15:40:49 2007 -+++ src/input/input_dvb.c Fri Jun 8 17:27:46 2007 +--- 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 if (!f) { xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s': %s\n"), filename, strerror (errno)); @@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_dvb_c,v return NULL; } if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) { -@@ -2550,7 +2550,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen +@@ -2578,7 +2578,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){ 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.2 diff -u -p -r1.2 patch-src_input_input_dvd_c --- patches/patch-src_input_input_dvd_c 13 Jun 2007 10:58:29 -0000 1.2 +++ patches/patch-src_input_input_dvd_c 18 Oct 2007 00:38:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.2 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/input_dvd.c.orig Mon Apr 16 18:00:50 2007 -+++ src/input/input_dvd.c Sun May 20 22:40:02 2007 +--- 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 @@ #define DVD_PATH "d:\\" #define RDVD_PATH "d:\\" @@ -21,12 +21,12 @@ $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; -@@ -1498,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) +@@ -1500,7 +1500,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n")); _x_message(this->stream, XINE_MSG_READ_ERROR, /* FIXME: see FIXME in dvd_parse_try_open() */ - (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL); + (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL); + free (locator_orig); return 0; } - 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.1 diff -u -p -r1.1 patch-src_input_input_file_c --- patches/patch-src_input_input_file_c 13 Jun 2007 10:58:29 -0000 1.1 +++ patches/patch-src_input_input_file_c 18 Oct 2007 00:38:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_input_input_file_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/input_file.c.orig Sat Jun 2 18:50:47 2007 -+++ src/input/input_file.c Fri Jun 8 17:27:46 2007 +--- 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 xine_log (this->stream->xine, XINE_LOG_MSG, _("input_file: read error (%s)\n"), strerror(errno)); @@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_file_c,v } buf->free_buffer (buf); buf = NULL; -@@ -398,12 +398,12 @@ static int file_plugin_open (input_plugin_t *this_gen +@@ -375,12 +375,12 @@ static int file_plugin_open (input_plugin_t *this_gen if (this->fh == -1) { if (errno == EACCES) { @@ -25,7 +25,7 @@ $OpenBSD: patch-src_input_input_file_c,v xine_log (this->stream->xine, XINE_LOG_MSG, _("input_file: File not found: >%s<\n"), this->mrl); } -@@ -438,7 +438,7 @@ static int file_plugin_open (input_plugin_t *this_gen +@@ -415,7 +415,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.1 diff -u -p -r1.1 patch-src_input_input_http_c --- patches/patch-src_input_input_http_c 13 Jun 2007 10:58:29 -0000 1.1 +++ patches/patch-src_input_input_http_c 18 Oct 2007 00:38:36 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/input_http.c.orig Fri May 11 14:33:21 2007 -+++ src/input/input_http.c Fri Jun 8 17:30:34 2007 -@@ -396,7 +396,7 @@ static off_t http_plugin_read_int (http_input_plugin_t +--- 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 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; } -@@ -651,7 +651,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -675,7 +675,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; } } -@@ -660,7 +660,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -684,7 +684,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); -@@ -670,7 +670,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -694,7 +694,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; } } -@@ -724,7 +724,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -748,7 +748,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; } } -@@ -769,7 +769,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -793,7 +793,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; } -@@ -813,7 +813,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -837,7 +837,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; -@@ -824,20 +824,20 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -848,20 +848,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); -@@ -916,7 +916,7 @@ static int http_plugin_open (input_plugin_t *this_gen +@@ -954,7 +954,7 @@ static int http_plugin_open (input_plugin_t *this_gen } else len ++; if ( len >= BUFSIZE ) { 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.6 diff -u -p -r1.6 patch-src_input_libreal_real_c --- patches/patch-src_input_libreal_real_c 13 Jun 2007 10:58:29 -0000 1.6 +++ patches/patch-src_input_libreal_real_c 18 Oct 2007 00:38:36 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-src_input_libreal_real_c,v 1.6 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/libreal/real.c.orig Sun Apr 15 10:42:16 2007 -+++ src/input/libreal/real.c Sun May 20 22:40:02 2007 +--- 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[] = { - #define BE_32C(x,y) do { *(uint32_t *)(x) = be2me_32((y)); } while(0) - #define LE_32C(x,y) do { *(uint32_t *)(x) = le2me_32((y)); } while(0) + #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) Index: patches/patch-src_libfaad_Makefile_in =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_libfaad_Makefile_in --- patches/patch-src_libfaad_Makefile_in 4 Sep 2007 00:44:26 -0000 1.1 +++ patches/patch-src_libfaad_Makefile_in 18 Oct 2007 00:38:42 -0000 @@ -1,10 +1,10 @@ $OpenBSD: patch-src_libfaad_Makefile_in,v 1.1 2007/09/04 00:44:26 jakemsr Exp $ ---- src/libfaad/Makefile.in.orig Fri Aug 31 22:17:16 2007 -+++ src/libfaad/Makefile.in Fri Aug 31 22:21:26 2007 -@@ -71,43 +71,7 @@ xineplugLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(xineplug_LTLIBRARIES) - am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la - xineplug_decode_faad_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +--- src/libfaad/Makefile.in.orig Mon Aug 27 14:28:01 2007 ++++ src/libfaad/Makefile.in Wed Oct 17 20:38:25 2007 +@@ -73,43 +73,7 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/l + am__DEPENDENCIES_2 = + xineplug_decode_faad_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) -am_xineplug_decode_faad_la_OBJECTS = xineplug_decode_faad_la-bits.lo \ - xineplug_decode_faad_la-cfft.lo \ - xineplug_decode_faad_la-common.lo \ @@ -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) -@@ -592,97 +556,11 @@ SUBDIRS = codebook +@@ -594,97 +558,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,9 +91,8 @@ $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) -+xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) -lfaad - noinst_HEADERS = \ +-xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) $(LTLIBINTL) +-noinst_HEADERS = \ - analysis.h \ - bits.h \ - cfft.h \ @@ -142,6 +141,8 @@ $OpenBSD: patch-src_libfaad_Makefile_in, - structs.h \ - syntax.h \ - tns.h ++xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) -lfaad $(LTLIBINTL) ++noinst_HEADERS = all: all-recursive 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.3 diff -u -p -r1.3 patch-src_libw32dll_wine_Makefile_in --- patches/patch-src_libw32dll_wine_Makefile_in 13 Jun 2007 10:58:29 -0000 1.3 +++ patches/patch-src_libw32dll_wine_Makefile_in 18 Oct 2007 00:38:37 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.3 2007/06/13 10:58:29 jakemsr Exp $ ---- src/libw32dll/wine/Makefile.in.orig Tue Apr 17 15:17:58 2007 -+++ src/libw32dll/wine/Makefile.in Sun May 20 22:40:13 2007 +--- 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 @@ -65,7 +65,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libwine_la_LIBADD = am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \ @@ -9,7 +9,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makef + registry.lo vfl.lo win32.lo stubs.lo wrapper.lo i386_set_ldt.lo libwine_la_OBJECTS = $(am_libwine_la_OBJECTS) @[EMAIL PROTECTED] = - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include @@ -562,6 +562,7 @@ libwine_la_SOURCES = \ registry.c \ vfl.c \ 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.4 diff -u -p -r1.4 patch-src_xine-engine_audio_decoder_c --- patches/patch-src_xine-engine_audio_decoder_c 13 Jun 2007 10:58:29 -0000 1.4 +++ patches/patch-src_xine-engine_audio_decoder_c 18 Oct 2007 00:38:37 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.4 2007/06/13 10:58:29 jakemsr Exp $ ---- src/xine-engine/audio_decoder.c.orig Sun Apr 15 10:42:17 2007 -+++ src/xine-engine/audio_decoder.c Sun May 20 22:40:14 2007 -@@ -462,7 +462,9 @@ static void *audio_decoder_loop (void *stream_gen) { +--- 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) { 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) { -@@ -500,10 +502,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) { +@@ -501,10 +503,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.4 diff -u -p -r1.4 patch-src_xine-engine_audio_out_c --- patches/patch-src_xine-engine_audio_out_c 13 Jun 2007 10:58:29 -0000 1.4 +++ patches/patch-src_xine-engine_audio_out_c 18 Oct 2007 00:38:37 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.4 2007/06/13 10:58:29 jakemsr Exp $ ---- src/xine-engine/audio_out.c.orig Mon Jun 4 14:37:38 2007 -+++ src/xine-engine/audio_out.c Fri Jun 8 17:27:47 2007 -@@ -1052,7 +1052,7 @@ static void *ao_loop (void *this_gen) { +--- 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) { 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 } } } -@@ -1083,7 +1083,7 @@ static void *ao_loop (void *this_gen) { +@@ -1103,7 +1103,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); -@@ -1465,7 +1465,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s +@@ -1485,7 +1485,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 { -@@ -2207,7 +2207,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr +@@ -2229,7 +2229,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_xine_c =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_xine-engine_xine_c --- patches/patch-src_xine-engine_xine_c 13 Jun 2007 10:58:29 -0000 1.1 +++ patches/patch-src_xine-engine_xine_c 18 Oct 2007 00:38:38 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_xine-engine_xine_c,v 1.1 2007/06/13 10:58:29 jakemsr Exp $ ---- src/xine-engine/xine.c.orig Sun May 6 07:20:54 2007 -+++ src/xine-engine/xine.c Fri Jun 8 17:27:47 2007 -@@ -1554,7 +1554,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e +--- 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 pthread_mutex_lock(&this->streams_lock); if ( (ite = xine_list_front(this->streams)) ) { stream = xine_list_get_value(this->streams, ite);