summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-21 13:32:59 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-21 13:32:59 +0000
commit5a05d49c3e60388d2f9d88d105732a0e2002d967 (patch)
tree6f0d218f062a1275eeaf80f06573c68c7ade6a31 /games-fps/qudos
parentFix line handling if package is not installed and contains special character.... (diff)
downloadgentoo-2-5a05d49c3e60388d2f9d88d105732a0e2002d967.tar.gz
gentoo-2-5a05d49c3e60388d2f9d88d105732a0e2002d967.tar.bz2
gentoo-2-5a05d49c3e60388d2f9d88d105732a0e2002d967.zip
Fix building with libpng15 (missing zlib.h include) wrt #387945 by "Jared"
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'games-fps/qudos')
-rw-r--r--games-fps/qudos/ChangeLog6
-rw-r--r--games-fps/qudos/files/qudos-0.40.1-libpng15.patch10
-rw-r--r--games-fps/qudos/qudos-0.40.1.ebuild4
3 files changed, 18 insertions, 2 deletions
diff --git a/games-fps/qudos/ChangeLog b/games-fps/qudos/ChangeLog
index 2363b8b049e6..7db63348c509 100644
--- a/games-fps/qudos/ChangeLog
+++ b/games-fps/qudos/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/qudos
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.12 2011/10/08 21:24:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.13 2011/10/21 13:32:59 ssuominen Exp $
+
+ 21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> qudos-0.40.1.ebuild,
+ +files/qudos-0.40.1-libpng15.patch:
+ Fix building with libpng15 (missing zlib.h include) wrt #387945 by "Jared"
08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> qudos-0.40.1.ebuild:
Improve sys-libs/zlib handling.
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
new file mode 100644
index 000000000000..ecf9de9370e9
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
@@ -0,0 +1,10 @@
+--- src/ref_gl/gl_local.h
++++ src/ref_gl/gl_local.h
+@@ -29,6 +29,7 @@
+ #include <GL/glu.h>
+ #include <GL/glext.h>
+
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ #include <jpeglib.h>
+
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 8fc9b9d915dc..95b9e599efb3 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.15 2011/10/08 21:26:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.16 2011/10/21 13:32:59 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -116,6 +116,8 @@ src_prepare() {
has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
sed -i -e '1i#define OF(x) x' src/qcommon/unzip/ioapi.h
+
+ epatch "${FILESDIR}"/${P}-libpng15.patch
}
src_compile() {