summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-14 11:54:46 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-14 11:54:46 +0000
commit71d8a4c1cbf7c33e5cb4a5d87943d55f7dce9612 (patch)
treed16fef8eb24ebdf98411b1a083b31c276dc2b246 /media-video/alevt
parentDo not use bashism to reload ufdbGuard; use the new extra_started_commands va... (diff)
downloadgentoo-2-71d8a4c1cbf7c33e5cb4a5d87943d55f7dce9612.tar.gz
gentoo-2-71d8a4c1cbf7c33e5cb4a5d87943d55f7dce9612.tar.bz2
gentoo-2-71d8a4c1cbf7c33e5cb4a5d87943d55f7dce9612.zip
Fix building with libpng15 (missing zlib.h include) wrt #378503 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-video/alevt')
-rw-r--r--media-video/alevt/ChangeLog9
-rw-r--r--media-video/alevt/alevt-1.6.2.ebuild23
-rw-r--r--media-video/alevt/files/alevt-1.6.2-libpng15.patch11
3 files changed, 31 insertions, 12 deletions
diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index fd27cfcf3b06..ce7e49d5ff89 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/alevt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.30 2009/05/14 08:35:13 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.31 2011/09/14 11:54:46 ssuominen Exp $
+
+ 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> alevt-1.6.2.ebuild,
+ +files/alevt-1.6.2-libpng15.patch:
+ Fix building with libpng15 (missing zlib.h include) wrt #378503 by Diego Elio
+ Pettenò
14 May 2009; Jeroen Roovers <jer@gentoo.org> alevt-1.6.2.ebuild,
+files/alevt-1.6.2-respectflags.patch:
diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index a0f2fbcdd2ec..5d3170e6958d 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.2.ebuild,v 1.2 2009/05/14 08:35:13 jer Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.2.ebuild,v 1.3 2011/09/14 11:54:46 ssuominen Exp $
+EAPI=4
inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="Teletext viewer for X11"
HOMEPAGE="http://www.goron.de/~froese/"
SRC_URI="http://www.goron.de/~froese/alevt/${P}.tar.gz"
-RESTRICT="strip"
-IUSE=""
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
RDEPEND="x11-libs/libX11
- >=media-libs/libpng-1.0.12"
-
+ >=media-libs/libpng-1.4"
DEPEND="${RDEPEND}
x11-proto/xproto"
+RESTRICT="strip"
+
src_prepare() {
cp -va Makefile{,.orig}
- epatch "${FILESDIR}"/${P}-respectflags.patch
+
+ epatch \
+ "${FILESDIR}"/${P}-respectflags.patch \
+ "${FILESDIR}"/${P}-libpng15.patch
}
src_compile() {
append-flags -fno-strict-aliasing
- emake CC="$(tc-getCC)" || die
+ emake CC="$(tc-getCC)"
}
src_install() {
diff --git a/media-video/alevt/files/alevt-1.6.2-libpng15.patch b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
new file mode 100644
index 000000000000..337a6f7c709f
--- /dev/null
+++ b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- exp-gfx.c
++++ exp-gfx.c
+@@ -4,6 +4,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
++
+ #include "lang.h"
+ #include "export.h"
+