Fix building with libpng15 (missing zlib.h include) wrt #378503 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index fd27cfcf3b06c0a40f6178e6bf4bb42ad10edf33..ce7e49d5ff89e5a94d03dee02e19b002b86e3fd5 100644 (file)
--- 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/Manifest b/media-video/alevt/Manifest
index af84b9a068455b7f49d4510600db2641afcf2415..f81dd001c84bca1af33c3ca13c31e28444aba998 100644 (file)
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX alevt-1.6.1-gcc4.patch 658 RMD160 c642d3c9282fe94854ad33d8f261c892ab2fb1f4 SHA1 c8767d575a6b0cc8513dcdcefb774231a7d8b1f9 SHA256 32cda1f82cc7e844842bf1803b2f79a03dc8ba0d2ef4a929f59dc3aaa186e175
 AUX alevt-1.6.1-gentoo.diff 734 RMD160 3686fc92095ccb8a00d9714aca7a130956ae9e8f SHA1 6068619443b04f9865c94c1b56c594042119ddae SHA256 f6ea36b1856241077db6379488aae9e4a33a5f3d089204b64fb50319bdcce73a
 AUX alevt-1.6.1-respectflags.patch 1393 RMD160 331c947593704211f278d6e401a0b3e2b2556617 SHA1 1877d4c479e81888a6730020a01d86c077ad47c3 SHA256 34c0df3e80a5bf04f4d9127d3487f9de92bbfca3037cedd52214d1df2d94afce
 AUX alevt-1.6.1-v4l2.patch 1328 RMD160 0307eaa492a955f0c1acd4252316b15545d6d859 SHA1 6236f5dfc83211bb3285febc302c01f8be9eb61d SHA256 eb1ffed392f1b91e84d39fd9f3d9dc6312c900e988336583bd0a1c83b471b902
 AUX alevt-1.6.1-vbi.patch 219 RMD160 b6172f8382dbe7d0eadb9c731da59d26fd911568 SHA1 05134720ff0cb59c6e6cdfb44705702bb86ef730 SHA256 35bd7aa7f6b5bf975e17f3b2a003e008697d6f4f61d217e980bedd5ae89636ff
+AUX alevt-1.6.2-libpng15.patch 179 RMD160 712c14fbad5e17b4778a2697bb7beb18bfcbb072 SHA1 773603d8a11a5c885f841d21117c4610e80efe29 SHA256 686d2d0720ac880a1ced5b29ae0cb454553178e5c53ded94dcc6289e3415b126
 AUX alevt-1.6.2-respectflags.patch 1178 RMD160 486b334cb1276d16c9265223022f03a81ff41078 SHA1 2bdce50ba3f2f084393e55d05156626e481cd6cb SHA256 92151dafd890b0a04cf2f7ac1631b7812406fb51d072b93c1d9c0e10aa3aa135
 DIST alevt-1.6.1.tar.gz 117731 RMD160 9c38525387140610c17fc474c87896aa74cb877d SHA1 0dffba71b911e79fce34a2e6aba9bf69c8a71d28 SHA256 38a3cf23afd48970ee2bc0c63d2152614082cefc7b5ab346c5f4cda22ea707b7
 DIST alevt-1.6.2.tar.gz 133234 RMD160 19bab54e5d5c22cd18d73229524ddc87636850ab SHA1 17f661a22f11f648215efd8d73e1b4dc4a06c5e2 SHA256 9347c2af4b528edec87df8a424ddccebcc252ca7a06f6b18310733cfa547e5f5
@@ -10,6 +14,13 @@ DIST alevt-dvb.patch 55489 RMD160 5395099049854ff39c0bf6006a93116b0c1f3b35 SHA1
 EBUILD alevt-1.6.1-r1.ebuild 1224 RMD160 08a6aa04101e4f84d6f93a726ea24e95bc5f0047 SHA1 af80d18a655fdeec663052ad9f52161daf4bf786 SHA256 c4dfd27cf4287ee06e92b991c38bd36ab9952f5124807c239634ba3e7769122b
 EBUILD alevt-1.6.1-r3.ebuild 1338 RMD160 928a6a58e6a6d877f6291283368c56501a0a33a9 SHA1 27ac9e0b3625250e9e6e170aa6878b7be59d445d SHA256 f2d983a0ae74506f8c7f7d52c17b0c1561b4f7176e056ab7827a59238a34c340
 EBUILD alevt-1.6.1-r4.ebuild 1379 RMD160 18bf8728143e2ce7485126ce1f597cd517258b4b SHA1 1b883c2e22bdc0d2d182171934910e7c7b8e1695 SHA256 54961c94ed623cdf2011ae5db0b91058f62ca8173996bd86f1b09d59f118022d
-EBUILD alevt-1.6.2.ebuild 1090 RMD160 7491f7d43579f5e56043fb8fc73ca25a8544602e SHA1 98b2659ecf23983b4b849b29d18f1353e347cbb1 SHA256 093f1ff3f47b769985f512586ab977066c96d9317c8b879fae7f43babbfd9901
-MISC ChangeLog 4954 RMD160 480460dd7ed7a78d5b2063838512983f7ca83242 SHA1 7694e162ee9b479d2872a8bfbb3d348f1ead2a3b SHA256 3abacb541528705cf8ad5c28461773d871211097a43063778d1dbe90c1c2943e
+EBUILD alevt-1.6.2.ebuild 1127 RMD160 e2d6e62df930c95054b03361cd8af2ac85f34fe2 SHA1 1261a696e4a6e8d161f4084dc4d9662a498c82d5 SHA256 6dd95db8cbdec224e3f588afa03124af0e881a4482e90639ab54b6b08bfcd86a
+MISC ChangeLog 5163 RMD160 61d8d6b2ab1d6e439533a1b8b5fb154a4081d22d SHA1 14342d06dc0e7775adaebe603a1a94272044259c SHA256 a7b88f1d84adcd6ec64c0e3f1105a69d258f30b239985a3d5fa8061530b03bcd
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5wljwACgkQXkR9YqOcLPHg+AD9FSdXDArsbrUmU0oqX41QPk8f
+LA6L/RB+FtI+kUg83PUA/jVUCwqHNXtXcFNMjemwJSqtgFfAY/zCTYCBpOGiN7st
+=4zyx
+-----END PGP SIGNATURE-----

diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index a0f2fbcdd2ec4aba3c0cbcd524dfcbf586e2bf96..5d3170e6958d849ddcfcd2226386741ea010e399 100644 (file)
--- 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 (file)
index 0000000..337a6f7
--- /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"
+