Version bumped - seems to no longer crash X11.

Package-Manager: portage-2.1.2_pre2-r8

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index bb4c423b61e5651cf72b309177a4384c7e1f2b67..1f1b525e77fc667b43db68f285051266412360d2 100644 (file)
--- 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/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 388ed1032d2dfa2d119828b00757297263dfe426..229d3998e1d8d6a6f84ca3bdc851327ee67f1322 100644 (file)
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST vdr-xineliboutput-1.0.0pre3.tgz 201048 RMD160 92dbef06aebb6a58b7efd40d344a39b8223e43e3 SHA1 1a769b8d803fcc919dc2a4ba540e772e0ba96c03 SHA256 84f1531d651d1f73faf8b16aea89e00a2f796963bc46e52959c29d06c57685fa
 DIST vdr-xineliboutput-1.0.0pre4.tgz 206483 RMD160 ed985c51aa53a3c798efdc4e43f3983ceda4536b SHA1 a02eaa34c187b5160a21116801f5b136828550bf SHA256 21c9ec2e8205f00138990e14663cc3fe2ae7d0540cf0aa62fbd0183e44e9abf0
+DIST vdr-xineliboutput-1.0.0pre5.tgz 212468 RMD160 36ad4a5bb08e5a81065f100ca8620f0908637caf SHA1 de0825b9df0fc07324a6b4d4cb9968ee36ea7b35 SHA256 56801fa7d91a641864f5209d5a10b2baca7270b045cd595ecd1652d6166031e8
 EBUILD vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790 RMD160 19d84ae8052635d5c0c186022be6a0de3ccf1a52 SHA1 1bd84f5f86e0efe66373ab7de62b5e0381aacb5d SHA256 17f8bcf8db261edc6121406ca12c6b8eeefe38e13fb296ddac1c2adad89a19fa
 MD5 626cc57e1076a231120f1211eee7f863 vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790
 RMD160 19d84ae8052635d5c0c186022be6a0de3ccf1a52 vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790
@@ -15,10 +16,14 @@ EBUILD vdr-xineliboutput-1.0.0_pre4.ebuild 1787 RMD160 1e6428dde8406b27718996835
 MD5 dac76463f01c32187caee2e302b60058 vdr-xineliboutput-1.0.0_pre4.ebuild 1787
 RMD160 1e6428dde8406b27718996835957af4ce590114e vdr-xineliboutput-1.0.0_pre4.ebuild 1787
 SHA256 86b6cce6c2126de53c46f9267831d138f75dcbf2307683dffd15e6a4650d8fa3 vdr-xineliboutput-1.0.0_pre4.ebuild 1787
-MISC ChangeLog 2703 RMD160 b22af3daedf1fbc9108a1d696d291e2dbfbdb515 SHA1 02928e4253b59e9cf9f6fe49b7234ddfd8bbf422 SHA256 1b12b39d22a8ad36a66bf4c0eb9ef0f2c4b981ac07ccb8d5f815312e68f99a64
-MD5 a94018958a02631570ba998ef472263c ChangeLog 2703
-RMD160 b22af3daedf1fbc9108a1d696d291e2dbfbdb515 ChangeLog 2703
-SHA256 1b12b39d22a8ad36a66bf4c0eb9ef0f2c4b981ac07ccb8d5f815312e68f99a64 ChangeLog 2703
+EBUILD vdr-xineliboutput-1.0.0_pre5.ebuild 1787 RMD160 1c5d28cb576b9bbe77225c54c2ac9a37eadba355 SHA1 0c72481dfc48ca7ea495285ab90b60bb3212a240 SHA256 f0a0fb90991645b282d2ca4c9773111764068b1823250d338d083d33dd4e9c36
+MD5 85836c65c93d368e5cd9bed2ee29ee4f vdr-xineliboutput-1.0.0_pre5.ebuild 1787
+RMD160 1c5d28cb576b9bbe77225c54c2ac9a37eadba355 vdr-xineliboutput-1.0.0_pre5.ebuild 1787
+SHA256 f0a0fb90991645b282d2ca4c9773111764068b1823250d338d083d33dd4e9c36 vdr-xineliboutput-1.0.0_pre5.ebuild 1787
+MISC ChangeLog 2892 RMD160 d7f0f81b4ee6f98b5817a871829b3394bbb7e816 SHA1 883ace3c78f9e245464116d08910872b4dfb787e SHA256 d5ca3310d6269446f1f185a765da6c9cac28f692e7cb3a96758c089e9f34007f
+MD5 f813d7009763e5786ff768850a779298 ChangeLog 2892
+RMD160 d7f0f81b4ee6f98b5817a871829b3394bbb7e816 ChangeLog 2892
+SHA256 d5ca3310d6269446f1f185a765da6c9cac28f692e7cb3a96758c089e9f34007f ChangeLog 2892
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -32,10 +37,13 @@ SHA256 b1c82a3033c74dc6410e5a87ca7d90002d61ccd54d020271dec55896666cb845 files/di
 MD5 a071c62537c03c1b254e914bb25255f2 files/digest-vdr-xineliboutput-1.0.0_pre4 274
 RMD160 fb87af3549e3e8a78069c711655d7951b73518b3 files/digest-vdr-xineliboutput-1.0.0_pre4 274
 SHA256 2cb492889a004ab4470f35445d08ae1992f5d3970695f76329f4bb5198309993 files/digest-vdr-xineliboutput-1.0.0_pre4 274
+MD5 567947a1da50f93247d40c847bdf733c files/digest-vdr-xineliboutput-1.0.0_pre5 274
+RMD160 81769e253695d47a53aac3a5eee287978210fa67 files/digest-vdr-xineliboutput-1.0.0_pre5 274
+SHA256 70c3d7230e3c11dea1ccc131310c05f4a25278d01a0e3dd405aa72d846439257 files/digest-vdr-xineliboutput-1.0.0_pre5 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAZB9t2vP6XvVdOcRAvSUAKDgN9rNArVI01GupvaOlZRNReBF5ACcCd2t
-Y0uwGQ91f0Cv34uwqebBuHc=
-=FiBx
+iD8DBQFFLMN4t2vP6XvVdOcRAl50AKCRfutNhEvpadD1iLgMjTK++SSi8wCglVHX
+ib2ZlTek1WYzOryUmLL+X+I=
+=PGLj
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..8b7be46
--- /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 (file)
index 0000000..84cef9d
--- /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
+}