diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-06-30 16:36:51 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-06-30 16:36:51 +0000 |
| commit | 835375b87a6086c19a2428c607b9eac4356161c2 (patch) | |
| tree | 5e091d127d03a7e6216cb6f7e519549d8c5e1255 /media-plugins/vdr-cinebars | |
| parent | app-shells/sash: Fix for recent linux-headers, #423655 (diff) | |
| download | gentoo-2-835375b87a6086c19a2428c607b9eac4356161c2.tar.gz gentoo-2-835375b87a6086c19a2428c607b9eac4356161c2.tar.bz2 gentoo-2-835375b87a6086c19a2428c607b9eac4356161c2.zip | |
fixed patch failure, bug 423451; vdr-plugin-2.eclass
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-cinebars')
4 files changed, 17 insertions, 36 deletions
diff --git a/media-plugins/vdr-cinebars/ChangeLog b/media-plugins/vdr-cinebars/ChangeLog index 40591b06deee..123a28928b4c 100644 --- a/media-plugins/vdr-cinebars/ChangeLog +++ b/media-plugins/vdr-cinebars/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-cinebars # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/ChangeLog,v 1.6 2012/02/07 22:09:17 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/ChangeLog,v 1.7 2012/06/30 16:36:51 hd_brummy Exp $ + + 30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-cinebars-0.0.3a.ebuild, vdr-cinebars-0.0.5.ebuild, + files/vdr-cinebars-0.0.5_makefile.diff: + fixed patch failure, bug 423451; vdr-plugin-2.eclass 07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-cinebars-0.0.5.ebuild, +files/vdr-cinebars-0.0.5_makefile.diff: diff --git a/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff b/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff index d01c2fe85eab..75e2870f8149 100644 --- a/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff +++ b/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff @@ -1,25 +1,21 @@ -Joerg Bornkessel <hd_brummy@gentoo.org> 2012.01.07 -Fix Makefile for compile on multicore CPU - diff -Naur cinebars-0.0.5.orig/Makefile cinebars-0.0.5/Makefile ---- cinebars-0.0.5.orig/Makefile 2012-02-07 23:19:00.000000000 +0100 -+++ cinebars-0.0.5/Makefile 2012-02-07 23:19:31.000000000 +0100 +--- cinebars-0.0.5.orig/Makefile 2012-06-30 18:27:52.000000000 +0200 ++++ cinebars-0.0.5/Makefile 2012-06-30 18:29:25.000000000 +0200 @@ -49,13 +49,13 @@ ### The object files (add further files here): OBJS = $(PLUGIN).o -ifneq ($(VERS157),1) -+#ifneq ($(VERS157),1) - OBJS += i18n.o +-OBJS += i18n.o -endif ++#ifneq ($(VERS157),1) ++#OBJS += i18n.o +#endif ### The main target: --all: libvdr-$(PLUGIN).so -- if [ $(VERS157) = 1 ]; then make i18n; fi -+all: libvdr-$(PLUGIN).so i18n -+# if [ $(VERS157) = 1 ]; then make i18n; fi + all: libvdr-$(PLUGIN).so +- if [ $(VERS157) = 1 ]; then make i18n; fi ++# if [ $(VERS157) = 1 ]; then make i18n; fi ### Implicit rules: %.o: %.c - diff --git a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild deleted file mode 100644 index 1ea7454204f1..000000000000 --- a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild,v 1.4 2011/01/28 21:21:24 mr_bones_ Exp $ - -EAPI="3" - -inherit vdr-plugin - -IUSE="" -SLOT="0" - -DESCRIPTION="vdr Plugin: Show black bars to hide station logo" -HOMEPAGE="http://www.egal-vdr.de/plugins/" -SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz" -LICENSE="GPL-2" - -KEYWORDS="x86" - -DEPEND=">=media-video/vdr-1.3.32" -RDEPEND="${DEPEND}" diff --git a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild index 401e8727bb61..fa8512f7294b 100644 --- a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild +++ b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild,v 1.4 2012/02/07 22:09:17 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild,v 1.5 2012/06/30 16:36:51 hd_brummy Exp $ EAPI="4" -inherit vdr-plugin +inherit vdr-plugin-2 DESCRIPTION="VDR Plugin: Show black bars to hide station logo" HOMEPAGE="http://www.egal-vdr.de/plugins/" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND=">=media-video/vdr-1.3.32" +DEPEND=">=media-video/vdr-1.6.0" RDEPEND="${DEPEND}" PATCHES=("${FILESDIR}/${P}_makefile.diff") |