Version bumped - seems to no longer crash X11.

(Portage version: 2.1.2_pre2-r8)

3 files changed, 93 insertions, 1 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index bb4c423b61e5..1f1b525e77fc 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.9 2006/09/08 15:47:02 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.10 2006/10/11 10:10:55 zzam Exp $
+
+*vdr-xineliboutput-1.0.0_pre5 (11 Oct 2006)
+
+  11 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-xineliboutput-1.0.0_pre5.ebuild:
+  Version bumped - seems to no longer crash X11.
 
 *vdr-xineliboutput-1.0.0_pre3-r1 (08 Sep 2006)
 
diff --git a/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre5 b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre5
new file mode 100644
index 000000000000..8b7be46c8b1b
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre5
@@ -0,0 +1,3 @@
+MD5 e653256868ab52ed63525185f564c400 vdr-xineliboutput-1.0.0pre5.tgz 212468
+RMD160 36ad4a5bb08e5a81065f100ca8620f0908637caf vdr-xineliboutput-1.0.0pre5.tgz 212468
+SHA256 56801fa7d91a641864f5209d5a10b2baca7270b045cd595ecd1652d6166031e8 vdr-xineliboutput-1.0.0pre5.tgz 212468
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre5.ebuild
new file mode 100644
index 000000000000..84cef9d2730d
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 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.0.0_pre5.ebuild,v 1.1 2006/10/11 10:10:55 zzam Exp $
+
+inherit vdr-plugin eutils multilib
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://users.tkk.fi/~phintuka/vdr/vdr-xineliboutput/"
+SRC_URI="http://users.tkk.fi/~phintuka/vdr/${PN}/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="fbcon X"
+
+RDEPEND=">=media-video/vdr-1.3.42
+		>=media-libs/xine-lib-1.1.1
+		media-libs/jpeg
+		X? (
+			|| ( (
+					x11-proto/xextproto
+					x11-proto/xf86vidmodeproto
+					x11-proto/xproto
+				)
+				virtual/x11
+			)
+		)"
+
+DEPEND="${RDEPEND}
+		sys-kernel/linux-headers
+		X? (
+			|| ( (
+					x11-libs/libX11
+					x11-libs/libXv
+					x11-libs/libXext
+				)
+				virtual/x11
+			)
+		)"
+
+S=${WORKDIR}/xineliboutput-${MY_PV}
+
+enable_in_makefile() {
+	local opt
+	for opt; do
+		sed -i "/^#${opt}.*= 1/s-^#--" Makefile
+	done
+}
+
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	cd ${S}
+
+	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
+
+	enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
+	use fbcon && enable_in_makefile XINELIBOUTPUT_FB
+	use X && enable_in_makefile XINELIBOUTPUT_X11
+
+	# patching makefile to work with this
+	# $ rm ${outdir}/file; cp file ${outdir}/file
+	# work in the sandbox
+	sed -i Makefile \
+		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:"
+	mkdir -p ${WORKDIR}/lib
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	dobin vdr-fbfe vdr-sxfe
+
+	insinto ${VDR_PLUGIN_DIR}
+	doins *.so.${MY_PV}
+
+	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
+	doins xineplug_inp_xvdr.so
+}