summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog12
-rw-r--r--media-plugins/vdr-xineliboutput/files/confd-2.0.02
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-frontend4
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild6
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild6
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild147
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild6
7 files changed, 169 insertions, 14 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index df67400d0458..a26082ead6d2 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,14 @@
# 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.81 2015/02/12 10:13:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.82 2015/02/21 02:14:47 hd_brummy Exp $
+
+*vdr-xineliboutput-2.0.0_p20150220 (21 Feb 2015)
+
+ 21 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+ vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-2.0.0_p20130821.ebuild,
+ +vdr-xineliboutput-2.0.0_p20150220.ebuild, vdr-xineliboutput-9999.ebuild,
+ files/confd-2.0.0, files/vdr-frontend:
+ new snapshot 2015/02/20; typo; virtual/jpeg slot operator fixed
12 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> files/confd-2.0.0:
typo docu conffile
@@ -13,7 +21,7 @@
-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
+ to start sxfe
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
index 3de3a4dac7b0..07da46ff5d21 100644
--- a/media-plugins/vdr-xineliboutput/files/confd-2.0.0
+++ b/media-plugins/vdr-xineliboutput/files/confd-2.0.0
@@ -40,7 +40,7 @@ _EXTRAOPTS="--local=none --remote=37890"
#
# init script --> vdr-frontend
#
-# DEBUG: do we need sxfb support? feedback please!
+# DEBUG REQUEST: do we need sxfb support? feedback please!
#
# sxfe start parameter
# allowed values: see README
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend b/media-plugins/vdr-xineliboutput/files/vdr-frontend
index 56be30e87d8c..bcbfb73ad0a5 100644
--- a/media-plugins/vdr-xineliboutput/files/vdr-frontend
+++ b/media-plugins/vdr-xineliboutput/files/vdr-frontend
@@ -1,9 +1,9 @@
#!/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 $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-frontend,v 1.2 2015/02/21 02:14:47 hd_brummy Exp $
-description="Start xineliboutput sxfe/fbfe remote frontend"
+description="Start xineliboutput sxfe/sxfb remote frontend"
source /etc/conf.d/vdr.xineliboutput
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
index 4601c8dd5df0..3505d90d297a 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.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-1.1.0.ebuild,v 1.6 2015/01/15 18:52:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v 1.7 2015/02/21 02:14:47 hd_brummy Exp $
EAPI=5
@@ -27,7 +27,7 @@ COMMON_DEPEND="
xine? (
( >=media-libs/xine-lib-1.2
virtual/ffmpeg )
- fbcon? ( jpeg? ( virtual/jpeg ) )
+ fbcon? ( jpeg? ( virtual/jpeg:* ) )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
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 )
+ jpeg? ( virtual/jpeg:* )
bluray? ( media-libs/libbluray )
opengl? ( virtual/opengl )
)
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
index 5d146436a235..f9364dc7c5d8 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.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-2.0.0_p20130821.ebuild,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild,v 1.2 2015/02/21 02:14:47 hd_brummy Exp $
EAPI=5
@@ -27,7 +27,7 @@ COMMON_DEPEND="
xine? (
( >=media-libs/xine-lib-1.2
virtual/ffmpeg )
- fbcon? ( jpeg? ( virtual/jpeg ) )
+ fbcon? ( jpeg? ( virtual/jpeg:* ) )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
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 )
+ jpeg? ( virtual/jpeg:* )
bluray? ( media-libs/libbluray )
opengl? ( virtual/opengl )
)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
new file mode 100644
index 000000000000..99f11f6e5a9e
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
@@ -0,0 +1,147 @@
+# 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_p20150220.ebuild,v 1.1 2015/02/21 02:14:47 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}/${P}.tar.xz"
+
+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_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 afcb0ce148c8..56374556be17 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.19 2015/02/12 10:11:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.20 2015/02/21 02:14:47 hd_brummy Exp $
EAPI=5
GENTOO_VDR_CONDITIONAL=yes
@@ -28,7 +28,7 @@ COMMON_DEPEND="
xine? (
( >=media-libs/xine-lib-1.2
virtual/ffmpeg )
- fbcon? ( jpeg? ( virtual/jpeg ) )
+ fbcon? ( jpeg? ( virtual/jpeg:* ) )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -36,7 +36,7 @@ COMMON_DEPEND="
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 )
+ jpeg? ( virtual/jpeg:* )
bluray? ( media-libs/libbluray )
opengl? ( virtual/opengl )
)