diff options
Diffstat (limited to 'multimedia/vdr-plugin-xineliboutput')
6 files changed, 10 insertions, 69 deletions
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 820dae27dffd..efb880565331 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr-plugin-xineliboutput -PORTVERSION= 1.0.90s20111129.1002 -PORTREVISION= 3 +PORTVERSION= 1.0.90s20120403.2257 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot @@ -50,7 +49,7 @@ CONFIGURE_OPTS+= --disable-libextractor .if defined(WITH_LIBBLURAY) CONFIGURE_OPTS+= --enable-libbluray -LIB_DEPENDS+= bluray.2:${PORTSDIR}/multimedia/libbluray +LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray .else CONFIGURE_OPTS+= --disable-libbluray .endif diff --git a/multimedia/vdr-plugin-xineliboutput/distinfo b/multimedia/vdr-plugin-xineliboutput/distinfo index ea111ecd8b79..57443c3e73f4 100644 --- a/multimedia/vdr-plugin-xineliboutput/distinfo +++ b/multimedia/vdr-plugin-xineliboutput/distinfo @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = ce659755ef526f333b565dde70b261c22ad604d59303d5a0c54666101b014d4c -SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = 371781 +SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20120403.2257.tar.bz2) = 585d093bc12963d42322be29ccb6800a68f818569311a1f3198f7a0c20a296d3 +SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20120403.2257.tar.bz2) = 376634 diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-configure b/multimedia/vdr-plugin-xineliboutput/files/patch-configure index 5cd53664b9b4..a3be2592e1d6 100644 --- a/multimedia/vdr-plugin-xineliboutput/files/patch-configure +++ b/multimedia/vdr-plugin-xineliboutput/files/patch-configure @@ -1,6 +1,6 @@ --- a/configure +++ a/configure -@@ -350,11 +350,14 @@ test_pkgconfig +@@ -349,11 +349,14 @@ test_pkgconfig [ $debug = yes ] && \ test_library X11 do_error "none.h" "-lnolib" @@ -20,7 +20,7 @@ if enabled libxine; then -@@ -366,24 +369,40 @@ if enabled libxine; then +@@ -365,24 +368,40 @@ if enabled libxine; then fi log " $XINEPLUGINDIR" @@ -41,7 +41,7 @@ - test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)" - test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)" - test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" -- test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" +- test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)" - test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" +# test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" + test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" @@ -55,8 +55,8 @@ + test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" + test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" -+# test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" -+ test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++# test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)" ++ test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" + test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 dbus-glib-1 \ diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c b/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c deleted file mode 100644 index bc1410a041ac..000000000000 --- a/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xine_input_vdr.c -+++ b/xine_input_vdr.c -@@ -5526,7 +5526,7 @@ static int connect_tcp_data_stream(vdr_i - LOGERR("Data stream write error (TCP)"); - } else if( XIO_READY != io_select_rd(fd_data)) { - LOGERR("Data stream poll failed (TCP)"); -- } else if((n=read(fd_data, tmpbuf, sizeof(tmpbuf))) <= 0) { -+ } else if((n=read(fd_data, tmpbuf, sizeof("DATA\r\n") - 1)) <= 0) { - LOGERR("Data stream read failed (TCP)"); - } else if(n<6 || strncmp(tmpbuf, "DATA\r\n", 6)) { - tmpbuf[n] = 0; diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-xine_post_audiochannel.c b/multimedia/vdr-plugin-xineliboutput/files/patch-xine_post_audiochannel.c deleted file mode 100644 index 5dd2611910bc..000000000000 --- a/multimedia/vdr-plugin-xineliboutput/files/patch-xine_post_audiochannel.c +++ /dev/null @@ -1,47 +0,0 @@ ---- vdr-xineliboutput/xine_post_audiochannel.c.orig -+++ vdr-xineliboutput/xine_post_audiochannel.c -@@ -72,7 +72,7 @@ typedef struct audioch_post_plugin_s - /* - * Port functions - */ --#if XINE_VERSION_CODE < 10200 -+#if 1 // XINE_VERSION_CODE < 10200 - static int audioch_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, - uint32_t bits, uint32_t rate, int mode) - #else -@@ -87,7 +87,7 @@ static int audioch_port_open(xine_audio_ - _x_post_inc_usage(port); - - port->stream = stream; --#if XINE_VERSION_CODE < 10200 -+#if 1 // XINE_VERSION_CODE < 10200 - port->bits = bits; - port->rate = rate; - port->mode = mode; -@@ -114,7 +114,7 @@ static void audioch_port_put_buffer (xin - int i; - - if(this->channels == 2) { --#if XINE_VERSION_CODE < 10200 -+#if 1 // XINE_VERSION_CODE < 10200 - int step = buf->format.bits / 8; - #else - int step = sample_bytes_table[buf->format.sample_format]; -@@ -124,7 +124,7 @@ static void audioch_port_put_buffer (xin - newbuf->vpts = buf->vpts; - newbuf->frame_header_count = buf->frame_header_count; - newbuf->first_access_unit = buf->first_access_unit; --#if XINE_VERSION_CODE < 10200 -+#if 1 // XINE_VERSION_CODE < 10200 - newbuf->format.bits = buf->format.bits; - newbuf->format.rate = buf->format.rate; - newbuf->format.mode = buf->format.mode; -@@ -258,7 +258,7 @@ static post_plugin_t *audioch_open_plugi - input_param->name = "parameters"; - input_param->type = XINE_POST_DATA_PARAMETERS; - input_param->data = &post_api; --#if XINE_VERSION_CODE >= 10102 -+#if 1 // XINE_VERSION_CODE >= 10102 - xine_list_push_back(this->post_plugin.input, input_param); - #else - xine_list_append_content(this->post_plugin.input, input_param); diff --git a/multimedia/vdr-plugin-xineliboutput/pkg-plist b/multimedia/vdr-plugin-xineliboutput/pkg-plist index 8d32ab7403df..95844e6b909b 100644 --- a/multimedia/vdr-plugin-xineliboutput/pkg-plist +++ b/multimedia/vdr-plugin-xineliboutput/pkg-plist @@ -4,7 +4,7 @@ lib/xine/plugins/2.1/xineplug_inp_xvdr.so lib/xine/plugins/2.1/post/xineplug_post_autocrop.so lib/xine/plugins/2.1/post/xineplug_post_swscale.so lib/xine/plugins/2.1/post/xineplug_post_audiochannel.so -lib/vdr/libvdr-xineliboutput.so.1.7.22 +lib/vdr/libvdr-xineliboutput.so.%%APIVERSION%% lib/vdr/libxineliboutput-sxfe.so.1.0.90-cvs @unexec if cmp -s %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf.sample %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; fi etc/vdr/plugins/xineliboutput/allowed_hosts.conf.sample |