diff options
author | drochner <drochner> | 2009-12-09 10:13:03 +0000 |
---|---|---|
committer | drochner <drochner> | 2009-12-09 10:13:03 +0000 |
commit | a7d2a61970a999386ba7900709158d3ec35f8775 (patch) | |
tree | d9d13f9342396d6fa740db57c79803b02653fafe /multimedia | |
parent | 81165905359ec062bde984764f18fbaef0ee4942 (diff) | |
download | pkgsrc-a7d2a61970a999386ba7900709158d3ec35f8775.tar.gz |
update to 1.1.17
changes:
-improved Matroska support
-UTF-16 fixes
-hack for Apple film trailers
-improved BluRay support
-OpenBSD sndio support
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/xine-lib/Makefile | 3 | ||||
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST.common | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 38 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-aa | 14 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ab | 12 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ae | 12 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 24 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ah | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ai | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ak | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ao | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ap | 12 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-aw | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-az | 21 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bg | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-cb | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-fb | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ga | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-gb | 15 |
20 files changed, 120 insertions, 125 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index ad8c622bda7..f4f2e373989 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.73 2009/10/31 14:46:51 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2009/12/09 10:13:03 drochner Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGREVISION= 3 COMMENT= Multimedia player library BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 67813497214..51c8dc35045 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.61 2009/04/17 16:35:40 drochner Exp $ +# $NetBSD: Makefile.common,v 1.62 2009/12/09 10:13:03 drochner Exp $ # # used by audio/xine-arts/Makefile # used by audio/xine-esound/Makefile # used by audio/xine-pulse/Makefile -DISTNAME= xine-lib-1.1.16.3 -XINE_PKGNAME= xine-lib-1.1.16.3 +DISTNAME= xine-lib-1.1.17 +XINE_PKGNAME= xine-lib-1.1.17 PKGNAME?= ${XINE_PKGNAME} CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} @@ -16,7 +16,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xinehq.de/ XINE_LIB_VER= 1.1.16 -XINE_MOD_DIR_VER= 1.26 +XINE_MOD_DIR_VER= 1.27 PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 9cf9fd65f72..b406e495358 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.28 2009/02/19 12:58:03 drochner Exp $ +@comment $NetBSD: PLIST.common,v 1.29 2009/12/09 10:13:03 drochner Exp $ bin/xine-config bin/xine-list-1.1 include/xine.h @@ -101,6 +101,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucmml.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucmml.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.so +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.a +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_sputext.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_sputext.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_theora.a diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 016a37e7fdf..5c594a4d46b 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,32 +1,32 @@ -$NetBSD: distinfo,v 1.64 2009/04/17 16:35:40 drochner Exp $ +$NetBSD: distinfo,v 1.65 2009/12/09 10:13:03 drochner Exp $ -SHA1 (xine-lib-1.1.16.3.tar.bz2) = 64c57c5f55ff37023cc4c3d93d4df3c06950d235 -RMD160 (xine-lib-1.1.16.3.tar.bz2) = 279304a4e998472b2b5e79887e54c47765044ec6 -Size (xine-lib-1.1.16.3.tar.bz2) = 7468182 bytes -SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc -SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 +SHA1 (xine-lib-1.1.17.tar.bz2) = 2438e66bb571c8a4c981581188376687c42b72c4 +RMD160 (xine-lib-1.1.17.tar.bz2) = ecac0711431a94c74edaf8f00e696ade5ed0b6ee +Size (xine-lib-1.1.17.tar.bz2) = 7528937 bytes +SHA1 (patch-aa) = 740b3132bcf27886632a6cfe126c3ca493d38c5b +SHA1 (patch-ab) = eb58985011ed97d61dc18ef648c97477558f2ad8 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 -SHA1 (patch-ae) = d92ea30b4f48e6181c28b69d1270a7d7348109f9 -SHA1 (patch-ag) = 066cc1f94d4d0ae6a24c4b6104ba05950db11972 -SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f -SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc +SHA1 (patch-ae) = 0c101fd7360ba6abfe9003b8fd6eae4028a3cd2d +SHA1 (patch-ag) = 6dee1af3eba997df95d833a2d46331a9e4c46d36 +SHA1 (patch-ah) = 56a0cbb1b5b3c9d1a0e55694ebb82307f82d3198 +SHA1 (patch-ai) = 4644746f1a5105cdc1e0d20612fc7be467852140 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b -SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe +SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a -SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133 -SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100 +SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa +SHA1 (patch-ap) = 36f2bab3aa8c7d772960311d7ed71c95df68bf3f SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 -SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc -SHA1 (patch-az) = 11ecf590838afb46cb28523ec7175909ab4ba136 +SHA1 (patch-aw) = 52520d47bd9b5af313fab9a38e79f24f5c58d37c SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633 -SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b -SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 +SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1 +SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c -SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 -SHA1 (patch-ga) = 73b5aa8acbbdf27e0dea29722e6c4e2bfa3cf6fc +SHA1 (patch-fb) = fe4913041758b6e42f32cd810534199129d61351 +SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68 +SHA1 (patch-gb) = 1ebf174f34305ad890eb88133587339134d986a2 diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa index cadd4780abe..5416f60e516 100644 --- a/multimedia/xine-lib/patches/patch-aa +++ b/multimedia/xine-lib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-aa,v 1.6 2009/12/09 10:13:03 drochner Exp $ ---- src/xine-engine/video_decoder.c.orig 2006-12-03 19:28:13.000000000 +0000 +--- src/xine-engine/video_decoder.c.orig 2009-11-30 21:55:51.000000000 +0100 +++ src/xine-engine/video_decoder.c -@@ -43,6 +43,10 @@ +@@ -41,6 +41,10 @@ #define SPU_SLEEP_INTERVAL (90000/2) @@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.5 2006/12/08 09:24:26 abs Exp $ static void update_spu_decoder (xine_stream_t *stream, int type) { -@@ -479,7 +483,9 @@ int _x_video_decoder_init (xine_stream_t +@@ -486,7 +490,9 @@ int _x_video_decoder_init (xine_stream_t } else { - + pthread_attr_t pth_attrs; +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING struct sched_param pth_params; @@ -23,9 +23,9 @@ $NetBSD: patch-aa,v 1.5 2006/12/08 09:24:26 abs Exp $ 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 +514,12 @@ int _x_video_decoder_init (xine_stream_t +@@ -515,10 +521,12 @@ int _x_video_decoder_init (xine_stream_t stream->spu_track_map_entries = 0; - + pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_getschedparam(&pth_attrs, &pth_params); diff --git a/multimedia/xine-lib/patches/patch-ab b/multimedia/xine-lib/patches/patch-ab index 80e8dbeea10..d93d07fc8c0 100644 --- a/multimedia/xine-lib/patches/patch-ab +++ b/multimedia/xine-lib/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ab,v 1.5 2009/12/09 10:13:03 drochner Exp $ ---- src/xine-engine/audio_decoder.c.orig 2006-09-08 22:11:29.000000000 +0100 +--- src/xine-engine/audio_decoder.c.orig 2009-11-30 21:55:52.000000000 +0100 +++ src/xine-engine/audio_decoder.c -@@ -462,7 +462,9 @@ static void *audio_decoder_loop (void *s +@@ -463,7 +463,9 @@ static void *audio_decoder_loop (void *s int _x_audio_decoder_init (xine_stream_t *stream) { pthread_attr_t pth_attrs; @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.4 2006/12/08 09:24:26 abs Exp $ int err; if (stream->audio_out == NULL) { -@@ -500,10 +502,12 @@ int _x_audio_decoder_init (xine_stream_t +@@ -501,10 +503,12 @@ int _x_audio_decoder_init (xine_stream_t */ pthread_attr_init(&pth_attrs); @@ -22,6 +22,6 @@ $NetBSD: patch-ab,v 1.4 2006/12/08 09:24:26 abs Exp $ 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, diff --git a/multimedia/xine-lib/patches/patch-ae b/multimedia/xine-lib/patches/patch-ae index a1fe677e9ab..c9a80b796dc 100644 --- a/multimedia/xine-lib/patches/patch-ae +++ b/multimedia/xine-lib/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.6 2009/04/17 16:35:40 drochner Exp $ +$NetBSD: patch-ae,v 1.7 2009/12/09 10:13:03 drochner Exp $ ---- src/input/input_vcd.c.orig 2009-02-17 03:55:21.000000000 +0100 +--- src/input/input_vcd.c.orig 2009-11-30 21:55:44.000000000 +0100 +++ src/input/input_vcd.c @@ -29,6 +29,7 @@ #include <errno.h> @@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.6 2009/04/17 16:35:40 drochner Exp $ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) - static off_t vcd_plugin_read (input_plugin_t *this_gen, + 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; @@ -531,7 +532,7 @@ static buf_element_t *vcd_plugin_read_bl @@ -52,16 +52,16 @@ $NetBSD: patch-ae,v 1.6 2009/04/17 16:35:40 drochner Exp $ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) - static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, + static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { - + @@ -690,7 +691,7 @@ static off_t vcd_plugin_seek (input_plug return offset ; /* FIXME */ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) - static off_t vcd_plugin_seek (input_plugin_t *this_gen, + static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { @@ -764,7 +765,7 @@ static off_t vcd_plugin_get_length (inpu diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index edc9d3757c4..7863dbe65c8 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ +$NetBSD: patch-ag,v 1.20 2009/12/09 10:13:03 drochner Exp $ ---- configure.ac.orig 2009-01-12 00:58:58.000000000 +0100 +--- configure.ac.orig 2009-12-01 02:52:45.000000000 +0100 +++ configure.ac @@ -109,7 +109,7 @@ dnl ------------------------------------ AC_CANONICAL_HOST @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ AC_CONFIG_HEADERS([include/configure.h]) -@@ -555,6 +555,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -580,6 +580,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -745,7 +748,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub" +@@ -770,7 +773,7 @@ XXMC_LIBS="${xxmc_path:+-L}$xxmc_path -l AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) AC_MSG_RESULT() dnl Check if vld "extended" XvMC is available @@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -775,7 +778,7 @@ if test "x$ac_have_xxmc" = "xyes"; then +@@ -800,7 +803,7 @@ if test "x$ac_have_xxmc" = "xyes"; then fi dnl Try fallback to standard XvMC if vld failed if test "x$ac_have_xxmc" = "xno"; then @@ -39,8 +39,8 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -829,7 +832,7 @@ saved_libs="$LIBS" - XVMC_LIBS="-L$xvmc_path -l$xvmc_stub" +@@ -854,7 +857,7 @@ saved_libs="$LIBS" + XVMC_LIBS="${xvmc_path:+-L}$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() -if test "x$xvmc_stub" == "xXvMCW"; then @@ -48,7 +48,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", [ac_have_xvmc="no" -@@ -920,7 +923,6 @@ if test "x$enable_xinerama" != "xno"; th +@@ -945,7 +948,6 @@ if test "x$enable_xinerama" != "xno"; th ]) if test "x$ac_have_xinerama" = "xyes"; then AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) @@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ fi else ac_have_xinerama=no -@@ -1427,8 +1429,21 @@ AC_ARG_ENABLE([oss], +@@ -1457,8 +1459,21 @@ AC_ARG_ENABLE([oss], AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support])) if test "x$enable_oss" != "xno"; then @@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ #ifdef HAVE_SYS_SOUNDCARD_H # include <sys/soundcard.h> #endif -@@ -1446,6 +1461,7 @@ if test "x$enable_oss" != "xno"; then +@@ -1476,6 +1491,7 @@ if test "x$enable_oss" != "xno"; then fi AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes") @@ -86,7 +86,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ dnl --------------------------------------------- -@@ -1555,9 +1571,10 @@ AC_ARG_ENABLE([gnomevfs], +@@ -1607,9 +1623,10 @@ AC_ARG_ENABLE([gnomevfs], [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) if test "x$with_gnome_vfs" = "xyes"; then @@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $ AC_SUBST(GNOME_VFS_CFLAGS) AC_SUBST(GNOME_VFS_LIBS) if test "x$no_gnome_vfs" != "xyes"; then -@@ -1892,7 +1909,7 @@ int has_timeout=sizeof(test.timeout);]]) +@@ -1944,7 +1961,7 @@ int has_timeout=sizeof(test.timeout);]]) AC_DEFINE([HAVE_WIN32_CDROM], [1], [Define 1 if you have MinGW CD-ROM support]) ;; diff --git a/multimedia/xine-lib/patches/patch-ah b/multimedia/xine-lib/patches/patch-ah index cbba2c1ef56..8c0fe983241 100644 --- a/multimedia/xine-lib/patches/patch-ah +++ b/multimedia/xine-lib/patches/patch-ah @@ -1,14 +1,14 @@ -$NetBSD: patch-ah,v 1.3 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ah,v 1.4 2009/12/09 10:13:03 drochner Exp $ ---- src/xine-engine/video_out.c.orig 2006-03-25 01:26:34.000000000 +0000 +--- src/xine-engine/video_out.c.orig 2009-12-01 02:33:30.000000000 +0100 +++ src/xine-engine/video_out.c -@@ -1848,7 +1848,9 @@ xine_video_port_t *_x_vo_new_port (xine_ +@@ -1905,7 +1905,9 @@ xine_video_port_t *_x_vo_new_port (xine_ this->grab_only = 0; - + pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); +#endif - + if ((err = pthread_create (&this->video_thread, &pth_attrs, video_out_loop, this)) != 0) { diff --git a/multimedia/xine-lib/patches/patch-ai b/multimedia/xine-lib/patches/patch-ai index ce6987f9902..aef50a8b4df 100644 --- a/multimedia/xine-lib/patches/patch-ai +++ b/multimedia/xine-lib/patches/patch-ai @@ -1,10 +1,10 @@ -$NetBSD: patch-ai,v 1.3 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ai,v 1.4 2009/12/09 10:13:03 drochner Exp $ ---- src/xine-engine/audio_out.c.orig 2006-11-04 23:30:14.000000000 +0000 +--- src/xine-engine/audio_out.c.orig 2009-12-01 02:33:30.000000000 +0100 +++ src/xine-engine/audio_out.c -@@ -2180,7 +2180,9 @@ xine_audio_port_t *_x_ao_new_port (xine_ - this->audio_loop_running = 1; - +@@ -2279,7 +2279,9 @@ xine_audio_port_t *_x_ao_new_port (xine_ + this->audio_loop_running = 1; + pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak index 3a9f4c434b2..7acadba1a5d 100644 --- a/multimedia/xine-lib/patches/patch-ak +++ b/multimedia/xine-lib/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.8 2006/08/06 10:36:50 wiz Exp $ +$NetBSD: patch-ak,v 1.9 2009/12/09 10:13:03 drochner Exp $ ---- src/video_out/video_out_opengl.c.orig 2005-07-17 17:50:07.000000000 -0400 +--- src/video_out/video_out_opengl.c.orig 2009-11-30 21:55:52.000000000 +0100 +++ src/video_out/video_out_opengl.c -@@ -710,9 +710,7 @@ static void *getdladdr (const GLubyte *_ +@@ -706,9 +706,7 @@ static void *getdladdr (const GLubyte *_ #elif defined (__sun) || defined (__sgi) static void *handle = NULL; @@ -11,5 +11,5 @@ $NetBSD: patch-ak,v 1.8 2006/08/06 10:36:50 wiz Exp $ - } + handle = dlopen (NULL, RTLD_LAZY); return dlsym (handle, funcName); - + #else /* all other Un*xes */ diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index c56cfbf0c4f..199bcab6f55 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,17 +1,17 @@ -$NetBSD: patch-ao,v 1.15 2008/04/10 11:48:58 drochner Exp $ +$NetBSD: patch-ao,v 1.16 2009/12/09 10:13:03 drochner Exp $ ---- src/libw32dll/wine/Makefile.in.orig 2008-03-19 14:15:55.000000000 +0100 +--- src/libw32dll/wine/Makefile.in.orig 2009-12-01 02:53:38.000000000 +0100 +++ src/libw32dll/wine/Makefile.in -@@ -58,7 +58,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m - CONFIG_HEADER = $(top_builddir)/include/configure.h +@@ -64,7 +64,7 @@ CONFIG_HEADER = $(top_builddir)/include/ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libwine_la_LIBADD = +libwine_la_LIBADD = ${WINE_LIBS} am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \ ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \ registry.lo vfl.lo win32.lo stubs.lo wrapper.lo -@@ -293,6 +293,7 @@ WAND_LIBS = @WAND_LIBS@ +@@ -315,6 +315,7 @@ WAND_LIBS = @WAND_LIBS@ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@ WAVPACK_LIBS = @WAVPACK_LIBS@ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap index 6b7bf720726..edea0acb513 100644 --- a/multimedia/xine-lib/patches/patch-ap +++ b/multimedia/xine-lib/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.7 2008/01/11 16:05:27 drochner Exp $ +$NetBSD: patch-ap,v 1.8 2009/12/09 10:13:03 drochner Exp $ ---- src/dxr3/Makefile.am.orig 2008-01-01 18:07:56.000000000 +0100 +--- src/dxr3/Makefile.am.orig 2009-11-30 22:12:44.000000000 +0100 +++ src/dxr3/Makefile.am -@@ -16,6 +16,9 @@ endif +@@ -17,6 +17,9 @@ endif if HAVE_LIBRTE link_rte = -lrte endif @@ -10,11 +10,11 @@ $NetBSD: patch-ap,v 1.7 2008/01/11 16:05:27 drochner Exp $ +link_xinerama = -lXinerama +endif - xineplug_LTLIBRARIES = $(dxr3_modules) + xineplug_LTLIBRARIES = $(dxr3_modules) -@@ -42,7 +45,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \ +@@ -43,7 +46,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \ dxr3_scr.c \ - video_out_dxr3.c + video_out_dxr3.c -xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm +xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm diff --git a/multimedia/xine-lib/patches/patch-aw b/multimedia/xine-lib/patches/patch-aw index 2a3a3e64375..9605dc1fe2b 100644 --- a/multimedia/xine-lib/patches/patch-aw +++ b/multimedia/xine-lib/patches/patch-aw @@ -1,13 +1,13 @@ -$NetBSD: patch-aw,v 1.3 2006/05/03 12:32:10 drochner Exp $ +$NetBSD: patch-aw,v 1.4 2009/12/09 10:13:03 drochner Exp $ ---- src/post/audio/upmix.c.orig 2006-05-03 14:21:23.000000000 +0200 +--- src/post/audio/upmix.c.orig 2009-11-30 21:55:58.000000000 +0100 +++ src/post/audio/upmix.c -@@ -395,6 +395,8 @@ static post_plugin_t *upmix_open_plugin( - +@@ -396,6 +396,8 @@ static post_plugin_t *upmix_open_plugin( + _x_post_init(&this->post, 1, 0); + pthread_mutex_init(&this->lock, 0); + this->params.cut_off_freq = 100; - + port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output); diff --git a/multimedia/xine-lib/patches/patch-az b/multimedia/xine-lib/patches/patch-az deleted file mode 100644 index eaa500a3ced..00000000000 --- a/multimedia/xine-lib/patches/patch-az +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-az,v 1.6 2009/04/17 16:35:40 drochner Exp $ - ---- src/demuxers/demux_mod.c.orig 2009-04-05 15:19:38.000000000 +0200 -+++ src/demuxers/demux_mod.c -@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_ - "audio/x-s3m: s3m: ScreamTracker 3 Module;" - "audio/s3m: s3m: ScreamTracker 3 Module;" - "application/playerpro: 669: 669 Tracker Module;" -- "application/adrift; amf: ADRIFT Module File;" -- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" -- "audio/x-amf; amf: ADRIFT Module File;" -- "audio/x-xm; xm: FastTracker II Audio;" -- "audio/xm; xm: FastTracker II Audio;"; -+ "application/adrift: amf: ADRIFT Module File;" -+ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;" -+ "audio/x-amf: amf: ADRIFT Module File;" -+ "audio/x-xm: xm: FastTracker II Audio;" -+ "audio/xm: xm: FastTracker II Audio;"; - } - - static void class_dispose (demux_class_t *this_gen) { diff --git a/multimedia/xine-lib/patches/patch-bg b/multimedia/xine-lib/patches/patch-bg index 6d024550c42..763fedf3393 100644 --- a/multimedia/xine-lib/patches/patch-bg +++ b/multimedia/xine-lib/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.4 2007/11/22 20:20:24 drochner Exp $ +$NetBSD: patch-bg,v 1.5 2009/12/09 10:13:03 drochner Exp $ ---- include/Makefile.in.orig 2007-08-27 20:27:54.000000000 +0200 +--- include/Makefile.in.orig 2009-12-01 02:53:28.000000000 +0100 +++ include/Makefile.in -@@ -778,7 +778,8 @@ maintainer-clean-generic: +@@ -696,7 +696,8 @@ maintainer-clean-generic: -rm -f Makefile.in configure.h.in install-data-local: install-includeHEADERS @@ -10,5 +10,5 @@ $NetBSD: patch-bg,v 1.4 2007/11/22 20:20:24 drochner Exp $ + sed -e '/^\/\*_x_/d' xine.h > installed-xine.h + $(INSTALL_HEADER) installed-xine.h $(DESTDIR)$(includedir)/xine.h @GENERATED_INTTYPES_H_TRUE@ $(INSTALL) inttypes.h $(DESTDIR)$(includedir) + # 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. diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb index ad7af6bd923..aff8000357c 100644 --- a/multimedia/xine-lib/patches/patch-cb +++ b/multimedia/xine-lib/patches/patch-cb @@ -1,16 +1,16 @@ -$NetBSD: patch-cb,v 1.2 2006/08/06 10:36:50 wiz Exp $ +$NetBSD: patch-cb,v 1.3 2009/12/09 10:13:03 drochner Exp $ ---- src/libw32dll/common.c.orig 2006-06-12 00:09:47.000000000 +0900 +--- src/libw32dll/common.c.orig 2009-11-30 21:55:55.000000000 +0100 +++ src/libw32dll/common.c @@ -6,10 +6,7 @@ static char *get_win32_codecs_path(confi DIR *dir; char *path, *cfgpath; char *listpath[] = { "", -- "/usr/lib/codecs", +- "/usr/lib/codecs", - "/usr/local/lib/codecs", - "/usr/lib/win32", - "/usr/local/lib/win32", -+ "@W32PATH@", ++ "@W32PATH@", NULL }; int i = 0; diff --git a/multimedia/xine-lib/patches/patch-fb b/multimedia/xine-lib/patches/patch-fb index 79c294610ac..ea0c1dca78f 100644 --- a/multimedia/xine-lib/patches/patch-fb +++ b/multimedia/xine-lib/patches/patch-fb @@ -1,8 +1,8 @@ -$NetBSD: patch-fb,v 1.1 2008/05/26 12:35:10 drochner Exp $ +$NetBSD: patch-fb,v 1.2 2009/12/09 10:13:03 drochner Exp $ ---- ./src/xine-engine/demux.c.orig 2008-05-22 17:14:15.000000000 +0200 +--- ./src/xine-engine/demux.c.orig 2009-11-30 21:55:52.000000000 +0100 +++ ./src/xine-engine/demux.c -@@ -291,6 +291,10 @@ static void *demux_loop (void *stream_ge +@@ -349,6 +349,10 @@ static void *demux_loop (void *stream_ge gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; ts.tv_nsec = (tv.tv_usec + 100000) * 1000; @@ -10,6 +10,6 @@ $NetBSD: patch-fb,v 1.1 2008/05/26 12:35:10 drochner Exp $ + ts.tv_nsec -= 1000000000; + ts.tv_sec += 1; + } - + pthread_cond_timedwait (&stream->demux_resume, &stream->demux_lock, &ts); } diff --git a/multimedia/xine-lib/patches/patch-ga b/multimedia/xine-lib/patches/patch-ga index 025f0d5c0f7..345e7185a02 100644 --- a/multimedia/xine-lib/patches/patch-ga +++ b/multimedia/xine-lib/patches/patch-ga @@ -1,15 +1,15 @@ -$NetBSD: patch-ga,v 1.5 2009/02/19 12:58:03 drochner Exp $ +$NetBSD: patch-ga,v 1.6 2009/12/09 10:13:03 drochner Exp $ ---- Makefile.in.orig 2009-02-17 15:37:58.000000000 +0100 +--- Makefile.in.orig 2009-12-01 02:53:42.000000000 +0100 +++ Makefile.in -@@ -951,8 +951,8 @@ maintainer-clean-generic: - maintainer-clean-generic-hook: +@@ -1049,8 +1049,8 @@ maintainer-clean-generic: + maintainer-clean-generic-hook: rm -f config.status -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@ +#$(top_srcdir)/configure: $(am__configure_deps) +# cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@ + # 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: diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb new file mode 100644 index 00000000000..31ffc9820cb --- /dev/null +++ b/multimedia/xine-lib/patches/patch-gb @@ -0,0 +1,15 @@ +$NetBSD: patch-gb,v 1.7 2009/12/09 10:13:03 drochner Exp $ + +--- src/combined/ffmpeg/ff_video_decoder.c.orig 2009-12-02 17:53:56.000000000 +0100 ++++ src/combined/ffmpeg/ff_video_decoder.c +@@ -1235,8 +1235,10 @@ static void ff_handle_buffer (ff_video_d + if (this->decoder_init_mode) { + int codec_type = buf->type & 0xFFFF0000; + ++#ifdef AVCODEC_HAS_REORDERED_OPAQUE + if (!ff_check_extradata(this, codec_type, buf)) + return; ++#endif + + /* init ffmpeg decoder */ + init_video_codec(this, codec_type); |