diff options
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
8 files changed, 235 insertions, 139 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index 7260ac9e642e..7c7354134ca6 100644 --- a/media-plugins/vdr-xineliboutput/ChangeLog +++ b/media-plugins/vdr-xineliboutput/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-plugins/vdr-xineliboutput # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.79 2015/01/15 18:52:25 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.80 2015/02/12 10:11:33 hd_brummy Exp $ + +*vdr-xineliboutput-2.0.0_p20130821 (12 Feb 2015) + + 12 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> + +vdr-xineliboutput-2.0.0_p20130821.ebuild, vdr-xineliboutput-9999.ebuild, + -files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff, + -files/vdr-xineliboutput-1.0.5-ldflags.patch, +files/confd-2.0.0, + -files/vdr-xineliboutput-9999-build-system.patch, +files/vdr-frontend: + new snapshot 20130821; compile fix vdr-2.1.10; cleanup; initsciptvdr-fronted + to start sxfb 15 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild: diff --git a/media-plugins/vdr-xineliboutput/files/confd-2.0.0 b/media-plugins/vdr-xineliboutput/files/confd-2.0.0 new file mode 100644 index 000000000000..c85cabcdf610 --- /dev/null +++ b/media-plugins/vdr-xineliboutput/files/confd-2.0.0 @@ -0,0 +1,50 @@ +# +# Usage examples (VDR plugin) +# +# If no arguments are given, both X11 and framebuffer frontends are tried. +# First working frontend is used with best available video driver. +# Complete list of available command-line arguments can be obtained +# with "vdr --help". +# +# Only local frontend, X11/Xv video, alsa audio: +# _EXTRAOPTS="--local=sxfe --video=xv --audio=alsa --noremote" +# +# Only local frontend, (slow) X11 video, oss audio: +# _EXTRAOPTS="--local=sxfe --video=x11 --audio=oss --noremote" +# +# Only local frontend, DirectFB: +# _EXTRAOPTS="--local=fbfe --video=DirectFB --noremote" +# +# Only remote frontend(s): +# _EXTRAOPTS="--local=none --remote=37890" +# +# Local and remote frontends: +# _EXTRAOPTS="--local=sxfe --remote=37890" +# or +# _EXTRAOPTS="--local=fbfe --remote=37890" +# +# +_EXTRAOPTS="--local=none --remote=37890" + +################################################### +# start sxfe remote frontend # +################################################### +# +# We do not add any start up paramaters by default +# Please refer for detailed info to +# media-plugins/vdr-xineliboutput README +# --> Using remote frontends +# +# Example: +# --display=:1.0 --silent --fullscreen --syslog --reconnect xvdr://localhost &>/dev/null +# +# init script --> vdr-frontend +# +# DEBUG: do we need sxfb support? feedback please! +# +# sxfb start parameter +# allowed values: see README +# default: no paramters given +# +#REMOTE_FRONTEND="" + diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend b/media-plugins/vdr-xineliboutput/files/vdr-frontend new file mode 100644 index 000000000000..56be30e87d8c --- /dev/null +++ b/media-plugins/vdr-xineliboutput/files/vdr-frontend @@ -0,0 +1,13 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-frontend,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $ + +description="Start xineliboutput sxfe/fbfe remote frontend" + +source /etc/conf.d/vdr.xineliboutput + +command="/usr/bin/vdr-sxfe" +command_args="${REMOTE_FRONTEND}" +pidfile="/var/run/vdr-frontend.pid" +start_stop_daemon_args="--user vdr --group vdr --make-pidfile --background" diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff deleted file mode 100644 index 6c94b390fdf6..000000000000 --- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff +++ /dev/null @@ -1,77 +0,0 @@ -diff -ru xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c xineliboutput-cvs-20090810/xine_fbfe_frontend.c ---- xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c 2009-08-10 13:17:33.000000000 +0200 -+++ xineliboutput-cvs-20090810/xine_fbfe_frontend.c 2009-08-10 13:55:13.996629416 +0200 -@@ -139,9 +139,10 @@ - int xpos, int ypos, - int width, int height, int fullscreen, int hud, - int modeswitch, const char *modeline, int aspect, -- fe_keypress_f keyfunc, int no_x_kbd, -+ fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys, - const char *video_port, -- int scale_video, int field_order) -+ int scale_video, int field_order, -+ const char *aspect_controller, int window_id) - { - fe_t *this = (fe_t*)this_gen; - -@@ -207,7 +208,7 @@ - * - * configure windows - */ --static int fbfe_display_config(frontend_t *this_gen, int width, int height, int fullscreen, -+static int fbfe_display_config(frontend_t *this_gen, int xpos, int ypos, int width, int height, int fullscreen, - int modeswitch, const char *modeline, int aspect, - int scale_video, int field_order) - { -diff -ru xineliboutput-cvs-20090810-orig/xine_frontend_main.c xineliboutput-cvs-20090810/xine_frontend_main.c ---- xineliboutput-cvs-20090810-orig/xine_frontend_main.c 2009-08-10 13:17:34.000000000 +0200 -+++ xineliboutput-cvs-20090810/xine_frontend_main.c 2009-08-10 13:59:13.453270355 +0200 -@@ -632,7 +632,14 @@ - - /* Initialize display */ - if(!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, 0, -- "", aspect, NULL, noxkbd, video_port, scale_video, 0)) { -+ "", aspect, NULL, noxkbd, 0, video_port, scale_video, 0, -+ aspect_controller, -+#ifndef IS_FBFE -+ window_id -+#else -+ 0 -+#endif -+ )) { - fprintf(stderr, "Error opening display\n"); - fe->fe_free(fe); - return -4; -diff -ru xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c xineliboutput-cvs-20090810/xine_sxfe_frontend.c ---- xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c 2009-08-10 13:17:34.000000000 +0200 -+++ xineliboutput-cvs-20090810/xine_sxfe_frontend.c 2009-08-10 13:55:13.999963596 +0200 -@@ -903,8 +903,10 @@ - int xpos, int ypos, - int width, int height, int fullscreen, int hud, - int modeswitch, const char *modeline, int aspect, -- fe_keypress_f keyfunc, int no_x_kbd, const char *video_port, -- int scale_video, int field_order) -+ fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys, -+ const char *video_port, -+ int scale_video, int field_order, -+ const char *aspect_controller, int window_id) - { - sxfe_t *this = (sxfe_t*)this_gen; - -@@ -1156,6 +1158,7 @@ - * configure windows - */ - static int sxfe_display_config(frontend_t *this_gen, -+ int xpos, int ypos, - int width, int height, int fullscreen, - int modeswitch, const char *modeline, - int aspect, int scale_video, -@@ -1250,7 +1253,7 @@ - this->ypos = this->origypos; - } - -- this->fe.fe_display_config((frontend_t*)this, this->origwidth, this->origheight, -+ this->fe.fe_display_config((frontend_t*)this, -1, -1, this->origwidth, this->origheight, - this->fullscreen ? 0 : 1, - this->vmode_switch, this->modeline, - this->aspect, this->scale_video, this->field_order); diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch deleted file mode 100644 index 64417a912b12..000000000000 --- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- xineliboutput-1.0.5/Makefile.orig 2010-10-05 15:26:49.000000000 +0200 -+++ xineliboutput-1.0.5/Makefile 2010-10-05 15:29:49.000000000 +0200 -@@ -111,11 +111,11 @@ - ifeq ($(APPLE_DARWIN), 1) - CXXFLAGS ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress - CFLAGS ?= -O3 -pipe -Wall -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress -- LDFLAGS_SO ?= -fvisibility=hidden -+ LDFLAGS_SO ?= $(LDFLAGS) -fvisibility=hidden - else - CXXFLAGS ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g - CFLAGS ?= -O3 -pipe -Wall -fPIC -g -- LDFLAGS_SO ?= -shared -fvisibility=hidden -+ LDFLAGS_SO ?= $(LDFLAGS) -shared -fvisibility=hidden - endif - LIBS_VDR ?= - -@@ -482,7 +482,7 @@ - @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION) - @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION) - $(VDRSXFE): $(OBJS_SXFE) -- $(CC) -g $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@ -+ $(CC) -g $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@ - endif - - ifeq ($(XINELIBOUTPUT_FB), 1) -@@ -491,7 +491,7 @@ - @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION) - @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION) - $(VDRFBFE): $(OBJS_FBFE) -- $(CC) -g $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@ -+ $(CC) -g $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@ - endif - - ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1) diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch deleted file mode 100644 index 9e4569347771..000000000000 --- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: Makefile -=================================================================== -RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v -retrieving revision 1.106 -diff -u -b -B -r1.106 Makefile ---- Makefile 23 Jan 2011 19:42:08 -0000 1.106 -+++ Makefile 28 Feb 2011 21:16:10 -0000 -@@ -323,7 +323,7 @@ - install : XINELIBOUTPUT_INSTALL_MSG = - - .PHONY: all --all: config $(TARGETS_VDR) frontends i18n -+all: config $(TARGETS_VDR) frontends - - frontends: config $(TARGETS_FE) $(TARGETS_XINE) - $(XINELIBOUTPUT_INSTALL_MSG) -@@ -389,7 +389,7 @@ - # install - # - --install: all -+install: all i18n - ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) - @mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post - @echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR) diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild new file mode 100644 index 000000000000..5d146436a235 --- /dev/null +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $ + +EAPI=5 + +inherit vdr-plugin-2 + +GENTOO_VDR_CONDITIONAL=yes + +DESCRIPTION="VDR Plugin: Xinelib PlugIn" +HOMEPAGE="http://sourceforge.net/projects/xineliboutput/" +SRC_URI="http://vdr.websitec.de/download/${PN}/xineliboutput-2.0.0_p20130821.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama" + +COMMON_DEPEND=" + vdr? ( + >=media-video/vdr-1.6.0 + libextractor? ( >=media-libs/libextractor-0.5.20 ) + caps? ( sys-libs/libcap ) + ) + + xine? ( + ( >=media-libs/xine-lib-1.2 + virtual/ffmpeg ) + fbcon? ( jpeg? ( virtual/jpeg ) ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) + vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) + jpeg? ( virtual/jpeg ) + bluray? ( media-libs/libbluray ) + opengl? ( virtual/opengl ) + ) + )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + sys-kernel/linux-headers + nls? ( sys-devel/gettext ) + xine? ( + X? ( + x11-proto/xproto + x11-libs/libXxf86vm + ) + )" +RDEPEND="${COMMON_DEPEND}" + +REQUIRED_USE=" || ( vdr xine )" + +VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0" + +pkg_setup() { + vdr-plugin-2_pkg_setup + + if use xine; then + XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine) + [ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir" + fi +} + +src_prepare() { + vdr-plugin-2_src_prepare + + if has_version ">=media-video/vdr-2.1.10"; then + sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()):"\ + -e "s:delete pm;:DestroyPixmap(pm);:"\ + -i osd.c + fi +} + +src_configure() { + local myconf + + if has_version ">=media-libs/xine-lib-1.2"; then + myconf="${myconf} --enable-libavutil" + else + myconf="${myconf} --disable-libavutil" + fi + + # No autotools based configure script + ./configure \ + --cc=$(tc-getCC) \ + --cxx=$(tc-getCXX) \ + $(use_enable X x11) \ + $(use_enable X xshm) \ + $(use_enable X xdpms) \ + $(use_enable X xshape) \ + $(use_enable X xrender) \ + $(use_enable fbcon fb) \ + $(use_enable vdr) \ + $(use_enable xine libxine) \ + $(use_enable libextractor) \ + $(use_enable caps libcap) \ + $(use_enable jpeg libjpeg) \ + $(use_enable xinerama) \ + $(use_enable vdpau) \ + $(use_enable dbus dbus-glib-1) \ + $(use_enable nls i18n) \ + $(use_enable bluray libbluray) \ + $(use_enable opengl) \ + ${myconf} \ + || die + + # UINT64_C is needed by ffmpeg headers + append-cxxflags -D__STDC_CONSTANT_MACROS +} + +src_install() { + if use vdr; then + vdr-plugin-2_src_install + + # bug 346989 + insinto /etc/vdr/plugins/xineliboutput/ + doins examples/allowed_hosts.conf + fowners -R vdr:vdr /etc/vdr/ + + if use nls; then + emake DESTDIR="${D}" i18n + fi + + if use xine; then + doinit "${FILESDIR}"/vdr-frontend + + insinto $XINE_PLUGIN_DIR + doins xineplug_inp_xvdr.so + + insinto $XINE_PLUGIN_DIR/post + doins xineplug_post_*.so + + if use fbcon; then + dobin vdr-fbfe + + insinto $VDR_PLUGIN_DIR + doins libxineliboutput-fbfe.so.* + fi + + if use X; then + dobin vdr-sxfe + + insinto $VDR_PLUGIN_DIR + doins libxineliboutput-sxfe.so.* + fi + fi + else + emake DESTDIR="${D}" install + + dodoc HISTORY README + fi +} diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild index ca10952639d1..afcb0ce148c8 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.18 2015/01/15 18:52:25 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.19 2015/02/12 10:11:33 hd_brummy Exp $ EAPI=5 GENTOO_VDR_CONDITIONAL=yes @@ -57,7 +57,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}" S=${WORKDIR}/${PN} -VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6" +VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0" pkg_setup() { if ! use vdr && ! use xine; then @@ -131,6 +131,8 @@ src_install() { fi if use xine; then + doinit "${FILESDIR}"/vdr-frontend + insinto $XINE_PLUGIN_DIR doins xineplug_inp_xvdr.so |