summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/renpy-modules/ChangeLog5
-rw-r--r--dev-games/renpy-modules/Manifest7
-rwxr-xr-xdev-games/renpy-modules/files/renpy-modules-libpng15.patch26
-rw-r--r--dev-games/renpy-modules/renpy-modules-6.13.7.ebuild (renamed from dev-games/renpy-modules/renpy-modules-6.12.2.ebuild)8
4 files changed, 42 insertions, 4 deletions
diff --git a/dev-games/renpy-modules/ChangeLog b/dev-games/renpy-modules/ChangeLog
index cf1f5e93f..91fdc5bef 100644
--- a/dev-games/renpy-modules/ChangeLog
+++ b/dev-games/renpy-modules/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Oct 2011; James Broadhead (hangfire) <jamesbroadhead@gmail.com>
+ -renpy-modules-6.12.2.ebuild, +renpy-modules-6.13.7.ebuild,
+ +files/renpy-modules-libpng15.patch:
+ Bump to latest, builds with libpng-1.5
+
18 Oct 2011; James Broadhead (hangfire) <jamesbroadhead@gmail.com>
renpy-modules-6.12.2.ebuild:
Removing !DEPEND on renpy:6.10. Offending version no longer in sunrise.
diff --git a/dev-games/renpy-modules/Manifest b/dev-games/renpy-modules/Manifest
index 956ae530d..958a4c90d 100644
--- a/dev-games/renpy-modules/Manifest
+++ b/dev-games/renpy-modules/Manifest
@@ -1,4 +1,5 @@
-DIST renpy-6.12.2-source.tar.bz2 9264749 RMD160 8f085749840afb989522c673fe31f4e0fee284e2 SHA1 93a5430a9ca5bcb3e2f647ef5e4601fcd7d1ace2 SHA256 6dad1cf2bae8841969f8519487abca95c74535f1babb169a6b0144954d32d7e3
-EBUILD renpy-modules-6.12.2.ebuild 766 RMD160 0011a02ad773374d5e5d31560b9ee8b730eef68b SHA1 0f22a583c91ebb87690f615403ee2f51f369d4c2 SHA256 19a80b3e6e9ade1e010f06be4a235be5ecbe8695746d3a38f9e61ac67246d1af
-MISC ChangeLog 2211 RMD160 964ad8c4ea2a1af77b4e65de7003bd7e89f49777 SHA1 0407cb01d15a02b226fdeeff239dfd08f98e0893 SHA256 774a409ebf01d4017b67c5f9a9e5814094bf4d814717deca2090ba4af2bd65c0
+AUX renpy-modules-libpng15.patch 789 RMD160 e4e68f4db8b3323b9931f81c9460679ee4437ac4 SHA1 c83725ac626143d716e87c5b159a7945535da7c7 SHA256 59a6dde9e0dd7448ec8701837d7ac506ce23660c0b0c494121ea5d9c1ccd88ac
+DIST renpy-6.13.7-source.tar.bz2 9668093 RMD160 d02a43027a4a1bd9fbea0354daefea04e3ced93c SHA1 ed9a7b4717086ed3eb34b1a0c7e2d7ff542e8daa SHA256 984febaaaad0ac6b6c1516c2901f3f80831276df4202e2c5cfb53a609fc1415b
+EBUILD renpy-modules-6.13.7.ebuild 909 RMD160 a4c21108c7a7b84cc79e18ce5d067e54860020b4 SHA1 1f298f46cba1b310017309c82eb528bc2bff6355 SHA256 67eab1212552858db89cc76c60ae0c3843ab880bd89d3d43469e668727df3cfd
+MISC ChangeLog 2422 RMD160 bcfa585e7248c41fdbd00cfae2eb4b4d3f891e05 SHA1 cbe3cb717a8aae1adc4cb0720b705f3c882b7ba8 SHA256 427b2eb8f45a79194c7083c6e525057b1d19b07d35c354fde72c0c59ab3ecbf3
MISC metadata.xml 911 RMD160 4f10041efe2d1949de7bf357ea175edb6d773001 SHA1 dff1a0b91183a3fad3298c6f83bd24fe43470a12 SHA256 dfe648b430045aa7187f05b44626288bb181769c129f13f4a0e0fa94936201a5
diff --git a/dev-games/renpy-modules/files/renpy-modules-libpng15.patch b/dev-games/renpy-modules/files/renpy-modules-libpng15.patch
new file mode 100755
index 000000000..2447ccbc3
--- /dev/null
+++ b/dev-games/renpy-modules/files/renpy-modules-libpng15.patch
@@ -0,0 +1,26 @@
+--- renpy-6.13.7-unpatched/module/IMG_savepng.c 2009-04-02 02:44:53.000000000 +0100
++++ renpy-6.13.7/module/IMG_savepng.c 2011-10-21 15:28:20.991437000 +0100
+@@ -28,8 +28,14 @@
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_byteorder.h>
+ #include <png.h>
++#include <zlib.h>
+ #include "IMG_savepng.h"
+
++// Backwards compat. with libpng-1.2 - libpng-1.4
++#ifndef png_voidp
++ #define png_voidp voidp
++#endif
++
+ int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression){
+ SDL_RWops *fp;
+ int ret;
+@@ -84,7 +90,7 @@
+ goto savedone;
+ }
+ /* setup custom writer functions */
+- png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
++ png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL);
+
+ if (setjmp(png_jmpbuf(png_ptr))){
+ SDL_SetError("Unknown error writing PNG");
diff --git a/dev-games/renpy-modules/renpy-modules-6.12.2.ebuild b/dev-games/renpy-modules/renpy-modules-6.13.7.ebuild
index 3713b3687..9af877925 100644
--- a/dev-games/renpy-modules/renpy-modules-6.12.2.ebuild
+++ b/dev-games/renpy-modules/renpy-modules-6.13.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="4"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
@@ -34,6 +34,12 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}/module"
+src_prepare() {
+ # Fix building with libpng-1.5
+ # https://bugs.launchpad.net/renpy/+bug/879474
+ epatch "${FILESDIR}/${PN}-libpng15.patch"
+}
+
src_compile() {
export RENPY_DEPS_INSTALL="${ROOT}usr"
distutils_src_compile