diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2008-05-06 20:35:15 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-05-06 20:35:15 +0000 |
| commit | d382a53fb68da567439b08c053d1b4777aa8340a (patch) | |
| tree | 867dd7453d2dfdcbd5fd236ed03f865ff7ed8385 /media-plugins | |
| parent | remove myself from metadata.xml for dev-dotnet/xsp (diff) | |
| download | gentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.tar.gz gentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.tar.bz2 gentoo-2-d382a53fb68da567439b08c053d1b4777aa8340a.zip | |
Fix compile by removing old include path from Makefile to stop eclass destroying it. Find imagemagick via pkgconfig. Fixed quoting.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'media-plugins')
4 files changed, 42 insertions, 16 deletions
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog index d72fdbbe7b85..eb1f62509a52 100644 --- a/media-plugins/vdr-text2skin/ChangeLog +++ b/media-plugins/vdr-text2skin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-text2skin -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.2 2007/08/19 12:13:11 zzam Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.3 2008/05/06 20:35:14 zzam Exp $ + + 06 May 2008; Matthias Schwarzott <zzam@gentoo.org> + +files/20070506/07_pkgconfig_magick.diff, files/20070506/series, + vdr-text2skin-1.0.20070506.ebuild: + Fix compile by removing old include path from Makefile to stop eclass + destroying it. Find imagemagick via pkgconfig. Fixed quoting. 19 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> +files/20070506/05_vdr-1.5.4.diff, +files/20070506/06_vdr-1.5.7.diff, diff --git a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff new file mode 100644 index 000000000000..0466fe2fc38b --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff @@ -0,0 +1,12 @@ +--- text2skin-1.1-cvs_ext-0.10/Makefile.orig 2008-05-06 22:27:03.133654132 +0200 ++++ text2skin-1.1-cvs_ext-0.10/Makefile 2008-05-06 22:28:19.793658721 +0200 +@@ -80,7 +80,8 @@ + + ifdef HAVE_IMAGEMAGICK + DEFINES += -DHAVE_IMAGEMAGICK +- LIBS += -lMagick -lMagick++ ++ INCLUDES += $(shell pkg-config --cflags ImageMagick++) ++ LIBS += $(shell pkg-config --libs ImageMagick++) + # LIBS += $(shell Magick++-config --ldflags --libs) + endif + diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series index d163a73f63ab..6c4b49da5bda 100644 --- a/media-plugins/vdr-text2skin/files/20070506/series +++ b/media-plugins/vdr-text2skin/files/20070506/series @@ -4,3 +4,4 @@ 04_no_direct_blit.diff 05_vdr-1.5.4.diff 06_vdr-1.5.7.diff +07_pkgconfig_magick.diff diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild index 8e67634b6915..1c2eb4853121 100644 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild +++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ inherit vdr-plugin versionator @@ -17,18 +17,22 @@ LICENSE="GPL-2" KEYWORDS="~x86" IUSE="truetype direct_blit" -DEPEND=">=media-video/vdr-1.3.18 +COMMON_DEPEND=">=media-video/vdr-1.3.18 media-gfx/imagemagick truetype? ( media-libs/freetype ) !media-plugins/vdr-text2skin-cvs" -PATCHES=" - ${FILESDIR}/${MY_PV}/01_gcc-4.diff - ${FILESDIR}/${MY_PV}/02_uint64.diff - ${FILESDIR}/${MY_PV}/03_gentoo.diff - ${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff - ${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff - " +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +RDEPEND="${COMMON_DEPEND}" + +PATCHES=("${FILESDIR}/${MY_PV}/01_gcc-4.diff" + "${FILESDIR}/${MY_PV}/02_uint64.diff" + "${FILESDIR}/${MY_PV}/03_gentoo.diff" + "${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff" + "${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff" + "${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff") S="${WORKDIR}/${MY_BASE}" @@ -36,14 +40,17 @@ SKINDIR=/usr/share/vdr/${VDRPLUGIN} ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN} src_unpack() { - vdr-plugin_src_unpack + vdr-plugin_src_unpack unpack cd "${S}" use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/' + sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::' if ! use direct_blit; then epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff" fi + + vdr-plugin_src_unpack all_but_unpack } src_install() { @@ -52,8 +59,8 @@ src_install() { keepdir "${SKINDIR}" exeinto "${SKINDIR}/contrib" - doexe ${S}/contrib/skin_to_*.pl - doexe ${S}/contrib/transform.pl + doexe "${S}"/contrib/skin_to_*.pl + doexe "${S}"/contrib/transform.pl - dodoc ${S}/Docs/*.txt + dodoc "${S}"/Docs/*.txt } |