| 1 |
zzam 08/05/06 20:35:15 |
| 2 |
|
| 3 |
Modified: vdr-text2skin-1.0.20070506.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix compile by removing old include path from Makefile to stop eclass destroying it. Find imagemagick via pkgconfig. Fixed quoting. |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: vdr-text2skin-1.0.20070506.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- vdr-text2skin-1.0.20070506.ebuild 19 Aug 2007 12:13:11 -0000 1.4 |
| 22 |
+++ vdr-text2skin-1.0.20070506.ebuild 6 May 2008 20:35:14 -0000 1.5 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.4 2007/08/19 12:13:11 zzam Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.5 2008/05/06 20:35:14 zzam Exp $ |
| 29 |
|
| 30 |
inherit vdr-plugin versionator |
| 31 |
|
| 32 |
@@ -17,18 +17,22 @@ |
| 33 |
KEYWORDS="~x86" |
| 34 |
IUSE="truetype direct_blit" |
| 35 |
|
| 36 |
-DEPEND=">=media-video/vdr-1.3.18 |
| 37 |
+COMMON_DEPEND=">=media-video/vdr-1.3.18 |
| 38 |
media-gfx/imagemagick |
| 39 |
truetype? ( media-libs/freetype ) |
| 40 |
!media-plugins/vdr-text2skin-cvs" |
| 41 |
|
| 42 |
-PATCHES=" |
| 43 |
- ${FILESDIR}/${MY_PV}/01_gcc-4.diff |
| 44 |
- ${FILESDIR}/${MY_PV}/02_uint64.diff |
| 45 |
- ${FILESDIR}/${MY_PV}/03_gentoo.diff |
| 46 |
- ${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff |
| 47 |
- ${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff |
| 48 |
- " |
| 49 |
+DEPEND="${COMMON_DEPEND} |
| 50 |
+ dev-util/pkgconfig" |
| 51 |
+ |
| 52 |
+RDEPEND="${COMMON_DEPEND}" |
| 53 |
+ |
| 54 |
+PATCHES=("${FILESDIR}/${MY_PV}/01_gcc-4.diff" |
| 55 |
+ "${FILESDIR}/${MY_PV}/02_uint64.diff" |
| 56 |
+ "${FILESDIR}/${MY_PV}/03_gentoo.diff" |
| 57 |
+ "${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff" |
| 58 |
+ "${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff" |
| 59 |
+ "${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff") |
| 60 |
|
| 61 |
S="${WORKDIR}/${MY_BASE}" |
| 62 |
|
| 63 |
@@ -36,14 +40,17 @@ |
| 64 |
ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN} |
| 65 |
|
| 66 |
src_unpack() { |
| 67 |
- vdr-plugin_src_unpack |
| 68 |
+ vdr-plugin_src_unpack unpack |
| 69 |
|
| 70 |
cd "${S}" |
| 71 |
use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/' |
| 72 |
+ sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::' |
| 73 |
|
| 74 |
if ! use direct_blit; then |
| 75 |
epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff" |
| 76 |
fi |
| 77 |
+ |
| 78 |
+ vdr-plugin_src_unpack all_but_unpack |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
| 82 |
@@ -52,8 +59,8 @@ |
| 83 |
keepdir "${SKINDIR}" |
| 84 |
|
| 85 |
exeinto "${SKINDIR}/contrib" |
| 86 |
- doexe ${S}/contrib/skin_to_*.pl |
| 87 |
- doexe ${S}/contrib/transform.pl |
| 88 |
+ doexe "${S}"/contrib/skin_to_*.pl |
| 89 |
+ doexe "${S}"/contrib/transform.pl |
| 90 |
|
| 91 |
- dodoc ${S}/Docs/*.txt |
| 92 |
+ dodoc "${S}"/Docs/*.txt |
| 93 |
} |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.3 media-plugins/vdr-text2skin/ChangeLog |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog?rev=1.3&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog?rev=1.3&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog?r1=1.2&r2=1.3 |
| 102 |
|
| 103 |
Index: ChangeLog |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v |
| 106 |
retrieving revision 1.2 |
| 107 |
retrieving revision 1.3 |
| 108 |
diff -u -r1.2 -r1.3 |
| 109 |
--- ChangeLog 19 Aug 2007 12:13:11 -0000 1.2 |
| 110 |
+++ ChangeLog 6 May 2008 20:35:14 -0000 1.3 |
| 111 |
@@ -1,6 +1,12 @@ |
| 112 |
# ChangeLog for media-plugins/vdr-text2skin |
| 113 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.2 2007/08/19 12:13:11 zzam Exp $ |
| 115 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.3 2008/05/06 20:35:14 zzam Exp $ |
| 117 |
+ |
| 118 |
+ 06 May 2008; Matthias Schwarzott <zzam@g.o> |
| 119 |
+ +files/20070506/07_pkgconfig_magick.diff, files/20070506/series, |
| 120 |
+ vdr-text2skin-1.0.20070506.ebuild: |
| 121 |
+ Fix compile by removing old include path from Makefile to stop eclass |
| 122 |
+ destroying it. Find imagemagick via pkgconfig. Fixed quoting. |
| 123 |
|
| 124 |
19 Aug 2007; Matthias Schwarzott <zzam@g.o> |
| 125 |
+files/20070506/05_vdr-1.5.4.diff, +files/20070506/06_vdr-1.5.7.diff, |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
-- |
| 130 |
gentoo-commits@l.g.o mailing list |
Archives