update xine-lib to 1.1.19 and switch to new-style LIB_DEPENDS/WANTLIB
from Brad, thanks landry@ for testing in bulk build
This commit is contained in:
parent
daa8f53dc6
commit
0c0d6dd0d0
@ -1,17 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.64 2010/08/25 23:27:21 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.65 2010/09/13 20:12:16 sthen Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= multimedia decoding library
|
||||
|
||||
V= 1.1.18.1
|
||||
DISTNAME= xine-lib-${V}
|
||||
REVISION= 2
|
||||
DISTNAME= xine-lib-1.1.19
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
SHARED_LIBS= xine 27.0
|
||||
SHARED_LIBS= xine 28.0
|
||||
|
||||
HOMEPAGE= http://www.xine-project.org/
|
||||
|
||||
@ -22,31 +20,35 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= GL GLU X11 Xau Xdmcp Xext Xinerama Xv \
|
||||
XvMCW c dvdread expat faac fontconfig freetype gsm jpeg \
|
||||
lcms m mp3lame orc-0.4 pthread-stubs pthread \
|
||||
schroedinger-1.0 sndio usbhid x264 xcb-shape xcb-shm \
|
||||
xcb-xv xcb z
|
||||
WANTLIB= FLAC.>=5 GL GLU SDL.>=3 X11 Xau Xdmcp Xext Xinerama Xv \
|
||||
XvMCW a52 avcodec.>=7 avutil.>=6 c cdio dca dvdnav.>=6 \
|
||||
dvdread expat faac faad.>=2 fontconfig freetype gsm iso9660 \
|
||||
jpeg lcms m mad.>=2 mpcdec mng.>=3 mp3lame ogg.>=5 orc-0.4 \
|
||||
postproc.>=7 pthread-stubs pthread schroedinger-1.0 sndio \
|
||||
speex.>=3 theora.>=1 usbhid vcdinfo vorbis.>=4 vorbisenc.>=3 \
|
||||
wavpack x264 xcb-shape xcb-shm xcb-xv xcb z
|
||||
|
||||
XINEAPI_REV= 1.28
|
||||
XINEAPI_REV= 1.29
|
||||
SUBST_VARS+= XINEAPI_REV
|
||||
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= FLAC.>=5::audio/flac \
|
||||
SDL.>=3::devel/sdl \
|
||||
a52::audio/liba52 \
|
||||
avcodec.>=7,avutil.>=6,postproc.>=7::graphics/ffmpeg \
|
||||
dvdnav.>=6::multimedia/libdvdnav \
|
||||
faad.>=2::audio/faad \
|
||||
mad.>=2::audio/libmad \
|
||||
mng.>=3::graphics/libmng \
|
||||
ogg.>=5::audio/libogg \
|
||||
vorbis.>=4,vorbisenc.>=3::audio/libvorbis \
|
||||
speex.>=3::audio/speex \
|
||||
theora.>=1::multimedia/libtheora \
|
||||
wavpack::audio/wavpack \
|
||||
dca::audio/libdca \
|
||||
mpcdec::audio/libmpcdec
|
||||
LIB_DEPENDS= ::audio/faad \
|
||||
::audio/flac \
|
||||
::audio/liba52 \
|
||||
::audio/libcdio \
|
||||
::audio/libdca \
|
||||
::audio/libmad \
|
||||
::audio/libmpcdec \
|
||||
::audio/libogg \
|
||||
::audio/libvorbis \
|
||||
::audio/speex \
|
||||
::audio/wavpack \
|
||||
::devel/sdl \
|
||||
::multimedia/libdvdnav \
|
||||
::multimedia/libtheora \
|
||||
::graphics/ffmpeg \
|
||||
::graphics/libmng \
|
||||
::graphics/vcdimager
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
MAKE_FLAGS+= TOMSMOCOMP_LINKS=
|
||||
@ -74,7 +76,6 @@ CONFIGURE_ARGS+=--disable-aalib \
|
||||
--disable-real-codecs \
|
||||
--disable-samba \
|
||||
--disable-sunaudio \
|
||||
--disable-vcd \
|
||||
--disable-vidix \
|
||||
--disable-w32dll \
|
||||
--with-external-a52dec \
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (xine-lib-1.1.18.1.tar.bz2) = PvrVUfL4qcVzSFWmY5aU7w==
|
||||
RMD160 (xine-lib-1.1.18.1.tar.bz2) = yqBfFqWLtbpDi2vUYFzcLtkccgE=
|
||||
SHA1 (xine-lib-1.1.18.1.tar.bz2) = eDIyttbiOFCnrJe/U7KovC50MnA=
|
||||
SHA256 (xine-lib-1.1.18.1.tar.bz2) = apr4uSjnplcy/CVsbAkuSnTFVNGcl3co8GuqG9o1gxE=
|
||||
SIZE (xine-lib-1.1.18.1.tar.bz2) = 7530681
|
||||
MD5 (xine-lib-1.1.19.tar.bz2) = pBCg8GF+HWMJ8MvpB/c/ig==
|
||||
RMD160 (xine-lib-1.1.19.tar.bz2) = hJmcQ9PMEVw72ksuBgidyCfGRsw=
|
||||
SHA1 (xine-lib-1.1.19.tar.bz2) = WvzCjFzyvaq5nZUZYPZYd5fh5aA=
|
||||
SHA256 (xine-lib-1.1.19.tar.bz2) = YnfGxTQ61FAnSS0LNDfxiUs9NP2bKSY42iv0rnSdh3Q=
|
||||
SIZE (xine-lib-1.1.19.tar.bz2) = 7531642
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.6 2010/03/21 01:41:15 sthen Exp $
|
||||
--- configure.ac.orig Sat Mar 6 14:31:25 2010
|
||||
+++ configure.ac Fri Mar 12 19:26:43 2010
|
||||
@@ -564,9 +564,9 @@ t q
|
||||
$OpenBSD: patch-configure_ac,v 1.7 2010/09/13 20:12:16 sthen Exp $
|
||||
--- configure.ac.orig Sun Jul 25 10:37:30 2010
|
||||
+++ configure.ac Wed Aug 25 11:21:06 2010
|
||||
@@ -565,9 +565,9 @@ t q
|
||||
b
|
||||
:q
|
||||
q"
|
||||
@ -13,16 +13,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/21 01:41:15 sthen Exp $
|
||||
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()])
|
||||
|
||||
|
||||
@@ -698,7 +698,7 @@ dnl ----------------------------------------------
|
||||
AC_ARG_ENABLE([libv4l],
|
||||
AS_HELP_STRING([--disable-libv4l], [do not build with libv4l support]))
|
||||
|
||||
-if test "x$have_v4l2" = xyes; then
|
||||
+if test "x$have_v4l2" = xyes && test "x$enable_libv4l" != xno; then
|
||||
have_libv4l=no
|
||||
PKG_CHECK_MODULES([V4L2], [libv4l2],
|
||||
[have_libv4l=yes
|
||||
@@ -1308,7 +1308,7 @@ if test "x$enable_a52dec" = "xno"; then
|
||||
@@ -1309,7 +1309,7 @@ if test "x$enable_a52dec" = "xno"; then
|
||||
AC_MSG_RESULT([a52dec support disabled])
|
||||
elif test "x$external_a52dec" = "xyes"; then
|
||||
have_a52="yes"
|
||||
@ -31,7 +22,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/21 01:41:15 sthen Exp $
|
||||
[
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
@@ -1401,9 +1401,10 @@ if test "x$with_mng" = "xyes"; then
|
||||
@@ -1402,9 +1402,10 @@ if test "x$with_mng" = "xyes"; then
|
||||
AC_CHECK_LIB(mng, mng_initialize,
|
||||
[ AC_CHECK_HEADER(libmng.h,
|
||||
[ have_libmng=yes
|
||||
@ -44,13 +35,12 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/21 01:41:15 sthen Exp $
|
||||
AC_SUBST(MNG_LIBS)
|
||||
else
|
||||
have_libmng=no
|
||||
@@ -2909,6 +2910,9 @@ if test "x$no_gnome_vfs" = "xno"; then
|
||||
fi
|
||||
if test "x$have_v4l" = "xyes"; then
|
||||
echo " - v4l"
|
||||
+fi
|
||||
+if test "x$have_v4l2" = "xyes"; then
|
||||
+ echo " - v4l2"
|
||||
fi
|
||||
if test "x$have_libsmbclient" = "xyes"; then
|
||||
echo " - smbclient"
|
||||
@@ -2708,6 +2709,8 @@ CC_CHECK_CFLAGS_APPEND([-Wformat=2 -Wformat],
|
||||
[CC_CHECK_CFLAGS_APPEND([-Wno-format-zero-length])
|
||||
break;
|
||||
])
|
||||
+
|
||||
+CC_CHECK_CFLAGS_APPEND([-Wformat-security])
|
||||
|
||||
dnl check for strict aliasing problem, get the highest between =2 and
|
||||
dnl normal.
|
||||
|
@ -1,13 +1,38 @@
|
||||
$OpenBSD: patch-m4_dvdnav_m4,v 1.1 2009/07/30 19:12:44 jakemsr Exp $
|
||||
--- m4/dvdnav.m4.orig Thu Apr 17 09:54:27 2008
|
||||
+++ m4/dvdnav.m4 Mon Jul 13 17:16:35 2009
|
||||
@@ -84,7 +84,8 @@ dnl checks the results of dvdnav-config to some extent
|
||||
$OpenBSD: patch-m4_dvdnav_m4,v 1.2 2010/09/13 20:12:16 sthen Exp $
|
||||
--- m4/dvdnav.m4.orig Wed Mar 10 15:46:05 2010
|
||||
+++ m4/dvdnav.m4 Sun Jul 25 15:33:46 2010
|
||||
@@ -84,6 +84,7 @@ dnl checks the results of dvdnav-config to some extent
|
||||
dnl
|
||||
rm -f conf.dvdnavtest
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
-#include <dvdnav.h>
|
||||
+#include <stdint.h>
|
||||
+#include <dvdnav/dvdnav.h>
|
||||
#include <dvdnav/dvdnav.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -129,6 +130,7 @@ main ()
|
||||
]])],[],[no_dvdnav=yes],[no_dvdnav=cc])
|
||||
if test "x$no_dvdnav" = xcc; then
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
+#include <stdint.h>
|
||||
#include <dvdnav/dvdnav.h>
|
||||
#include <stdio.h>
|
||||
]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes])
|
||||
@@ -141,7 +143,9 @@ main ()
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
dnl nav_*.h seem to have been moved from dvdnav at some point?
|
||||
- AC_CHECK_HEADERS([dvdread/nav_types.h])
|
||||
+ AC_CHECK_HEADERS([dvdread/nav_types.h],,,
|
||||
+[#include <stdint.h>
|
||||
+])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$DVDNAV_CONFIG" = "no" ; then
|
||||
@@ -157,6 +161,7 @@ main ()
|
||||
CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
|
||||
LIBS="$LIBS $DVDNAV_LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
+#include <stdint.h>
|
||||
#include <dvdnav/dvdnav.h>
|
||||
#include <stdio.h>
|
||||
]], [[ return 0; ]])],
|
||||
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-src_combined_ffmpeg_ff_video_decoder_c,v 1.2 2010/03/21 01:41:15 sthen Exp $
|
||||
--- src/combined/ffmpeg/ff_video_decoder.c.orig Fri Mar 12 19:28:57 2010
|
||||
+++ src/combined/ffmpeg/ff_video_decoder.c Fri Mar 12 19:30:34 2010
|
||||
@@ -309,11 +309,6 @@ static void init_video_codec (ff_video_decoder_t *this
|
||||
|
||||
lprintf("lavc decoder found\n");
|
||||
|
||||
- /* force (width % 8 == 0), otherwise there will be
|
||||
- * display problems with Xv.
|
||||
- */
|
||||
- this->bih.biWidth = (this->bih.biWidth + 1) & (~1);
|
||||
-
|
||||
this->context->width = this->bih.biWidth;
|
||||
this->context->height = this->bih.biHeight;
|
||||
this->context->stream_codec_tag = this->context->codec_tag =
|
||||
@@ -1389,7 +1384,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this
|
||||
(this->context->pix_fmt == PIX_FMT_RGB24) ||
|
||||
(this->context->pix_fmt == PIX_FMT_PAL8)) {
|
||||
this->output_format = XINE_IMGFMT_YUY2;
|
||||
- init_yuv_planes(&this->yuv, this->bih.biWidth, this->bih.biHeight);
|
||||
+ init_yuv_planes(&this->yuv, (this->bih.biWidth + 15) & ~15, this->bih.biHeight);
|
||||
this->yuv_init = 1;
|
||||
}
|
||||
this->cs_convert_init = 1;
|
@ -1,15 +1,7 @@
|
||||
$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>
|
||||
-# include <dvdnav/nav_read.h>
|
||||
#else
|
||||
# define DVDNAV_COMPILE
|
||||
# include "dvdnav.h"
|
||||
@@ -608,7 +607,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
|
||||
$OpenBSD: patch-src_input_input_dvd_c,v 1.10 2010/09/13 20:12:16 sthen Exp $
|
||||
--- src/input/input_dvd.c.orig Sat Jul 24 18:09:09 2010
|
||||
+++ src/input/input_dvd.c Sun Jul 25 14:34:53 2010
|
||||
@@ -614,7 +614,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 +10,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
|
||||
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
|
||||
buf->free_buffer(buf);
|
||||
return NULL;
|
||||
@@ -1499,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
|
||||
@@ -1505,7 +1505,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() */
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-src_libspudec_spu_c,v 1.1 2009/07/30 19:12:44 jakemsr Exp $
|
||||
--- src/libspudec/spu.c.orig Mon Jul 13 17:30:01 2009
|
||||
+++ src/libspudec/spu.c Mon Jul 13 17:35:01 2009
|
||||
@@ -57,8 +57,8 @@
|
||||
#include "buffer.h"
|
||||
#include "xine-engine/bswap.h"
|
||||
#ifdef HAVE_DVDNAV
|
||||
-# include <dvdnav/nav_read.h>
|
||||
-# include <dvdnav/nav_print.h>
|
||||
+# include <dvdread/nav_read.h>
|
||||
+# include <dvdread/nav_print.h>
|
||||
#else
|
||||
# include "nav_read.h"
|
||||
# include "nav_print.h"
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_libspudec_spu_h,v 1.1 2009/07/30 19:12:44 jakemsr Exp $
|
||||
--- src/libspudec/spu.h.orig Mon Jul 13 17:30:45 2009
|
||||
+++ src/libspudec/spu.h Mon Jul 13 17:34:38 2009
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "video_out.h"
|
||||
#include "video_overlay.h"
|
||||
#ifdef HAVE_DVDNAV
|
||||
-# include <dvdnav/nav_types.h>
|
||||
+# include <dvdread/nav_types.h>
|
||||
#else
|
||||
# include "nav_types.h"
|
||||
#endif
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-src_libspudec_xine_spu_decoder_c,v 1.1 2009/07/30 19:12:44 jakemsr Exp $
|
||||
--- src/libspudec/xine_spu_decoder.c.orig Mon Jul 13 17:36:00 2009
|
||||
+++ src/libspudec/xine_spu_decoder.c Mon Jul 13 17:35:38 2009
|
||||
@@ -39,8 +39,8 @@
|
||||
#include "xineutils.h"
|
||||
#include "spu.h"
|
||||
#ifdef HAVE_DVDNAV
|
||||
-# include <dvdnav/nav_read.h>
|
||||
-# include <dvdnav/nav_types.h>
|
||||
+# include <dvdread/nav_read.h>
|
||||
+# include <dvdread/nav_types.h>
|
||||
#else
|
||||
# include "nav_read.h"
|
||||
# include "nav_types.h"
|
@ -1,26 +1,13 @@
|
||||
$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) {
|
||||
|
||||
pthread_attr_t pth_attrs;
|
||||
+#if !defined(__OpenBSD__)
|
||||
struct sched_param pth_params;
|
||||
+#endif
|
||||
int err;
|
||||
|
||||
if (stream->audio_out == NULL) {
|
||||
@@ -501,10 +503,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
|
||||
*/
|
||||
|
||||
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.9 2010/09/13 20:12:16 sthen Exp $
|
||||
--- src/xine-engine/audio_decoder.c.orig Wed Jul 21 13:43:52 2010
|
||||
+++ src/xine-engine/audio_decoder.c Tue Jul 27 16:54:36 2010
|
||||
@@ -505,7 +505,9 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
|
||||
pthread_attr_init(&pth_attrs);
|
||||
+#if !defined(__OpenBSD__)
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
pthread_attr_getschedparam(&pth_attrs, &pth_params);
|
||||
+#ifndef __OpenBSD__
|
||||
pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
|
||||
+#endif
|
||||
pthread_attr_setschedparam(&pth_attrs, &pth_params);
|
||||
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
|
||||
+#endif
|
||||
|
||||
stream->audio_thread_created = 1;
|
||||
if ((err = pthread_create (&stream->audio_thread,
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.11 2010/03/21 01:41:15 sthen Exp $
|
||||
--- src/xine-engine/audio_out.c.orig Tue Feb 23 16:59:05 2010
|
||||
+++ src/xine-engine/audio_out.c Tue Feb 23 19:29:39 2010
|
||||
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.12 2010/09/13 20:12:16 sthen Exp $
|
||||
--- src/xine-engine/audio_out.c.orig Wed Jul 21 13:43:52 2010
|
||||
+++ src/xine-engine/audio_out.c Sun Jul 25 14:37:08 2010
|
||||
@@ -1089,7 +1089,7 @@ static void *ao_loop (void *this_gen) {
|
||||
in_buf->format.rate,
|
||||
in_buf->format.mode) == 0 ) {
|
||||
@ -46,13 +46,3 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.11 2010/03/21 01:41:15 sthen Exp
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@@ -2284,7 +2284,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
|
||||
this->audio_loop_running = 1;
|
||||
|
||||
pthread_attr_init(&pth_attrs);
|
||||
+#if !defined(__OpenBSD__)
|
||||
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
|
||||
+#endif
|
||||
|
||||
this->audio_thread_created = 1;
|
||||
if ((err = pthread_create (&this->audio_thread,
|
||||
|
@ -1,26 +1,13 @@
|
||||
$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.7 2010/04/20 11:32:14 sthen Exp $
|
||||
--- src/xine-engine/video_decoder.c.orig Tue Feb 23 17:27:15 2010
|
||||
+++ src/xine-engine/video_decoder.c Sun Apr 18 13:01:34 2010
|
||||
@@ -486,7 +486,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
|
||||
} else {
|
||||
|
||||
pthread_attr_t pth_attrs;
|
||||
+#if !defined(__OpenBSD__)
|
||||
struct sched_param pth_params;
|
||||
+#endif
|
||||
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
|
||||
@@ -515,10 +517,12 @@ int _x_video_decoder_init (xine_stream_t *stream) {
|
||||
stream->spu_track_map_entries = 0;
|
||||
|
||||
$OpenBSD: patch-src_xine-engine_video_decoder_c,v 1.8 2010/09/13 20:12:16 sthen Exp $
|
||||
--- src/xine-engine/video_decoder.c.orig Wed Jul 21 13:43:52 2010
|
||||
+++ src/xine-engine/video_decoder.c Tue Jul 27 16:54:58 2010
|
||||
@@ -523,7 +523,9 @@ int _x_video_decoder_init (xine_stream_t *stream) {
|
||||
pthread_attr_init(&pth_attrs);
|
||||
+#if !defined(__OpenBSD__)
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
pthread_attr_getschedparam(&pth_attrs, &pth_params);
|
||||
+#ifndef __OpenBSD__
|
||||
pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
|
||||
+#endif
|
||||
pthread_attr_setschedparam(&pth_attrs, &pth_params);
|
||||
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
|
||||
+#endif
|
||||
|
||||
stream->video_thread_created = 1;
|
||||
if ((err = pthread_create (&stream->video_thread,
|
||||
#endif
|
||||
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_xine-engine_video_out_c,v 1.7 2010/03/21 01:41:15 sthen Exp $
|
||||
--- src/xine-engine/video_out.c.orig Tue Feb 23 16:57:24 2010
|
||||
+++ src/xine-engine/video_out.c Tue Feb 23 19:29:39 2010
|
||||
@@ -1908,7 +1908,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) {
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2010/03/21 21:31:52 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2010/09/13 20:12:16 sthen Exp $
|
||||
@conflict xine-lib-arts-*
|
||||
@conflict xine-lib-esd-*
|
||||
@conflict xine-lib-jack-*
|
||||
@ -127,6 +127,8 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_rtp.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_rtsp.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_stdin_fifo.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_v4l2.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_vcd.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_vcdo.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_none.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_opengl.so
|
||||
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_raw.so
|
||||
|
Loading…
Reference in New Issue
Block a user