diff options
Diffstat (limited to 'games-action/openclonk')
| -rw-r--r-- | games-action/openclonk/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/openclonk/Manifest | 21 | ||||
| -rw-r--r-- | games-action/openclonk/files/openclonk-5.2.2-zlib-1.2.6.patch | 271 | ||||
| -rw-r--r-- | games-action/openclonk/openclonk-5.2.2.ebuild | 5 |
4 files changed, 291 insertions, 12 deletions
diff --git a/games-action/openclonk/ChangeLog b/games-action/openclonk/ChangeLog index 2c81ea2ad975..9f0bf4717166 100644 --- a/games-action/openclonk/ChangeLog +++ b/games-action/openclonk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/openclonk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.6 2012/07/10 13:42:06 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.7 2012/07/29 12:00:46 hasufell Exp $ + + 29 Jul 2012; Julian Ospald <hasufell@gentoo.org> openclonk-5.2.2.ebuild, + +files/openclonk-5.2.2-zlib-1.2.6.patch: + fix compilation for zlib-1.2.[67] wrt #428496 10 Jul 2012; Julian Ospald <hasufell@gentoo.org> openclonk-5.2.2.ebuild: add WANT_AUTOMAKE to fix bug #425576 diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest index 448fe08e7898..de280c6837b0 100644 --- a/games-action/openclonk/Manifest +++ b/games-action/openclonk/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX openclonk-5.2.2-zlib-1.2.6.patch 7636 SHA256 a3c9750ca092235f51c8b34af9335b720c44ab7d5554b0504ca6ed28e3d819c6 SHA512 fa319f4ccb21238406932d5a650d5b41754aba2a4916a4808cd7315cc650504a9fbc8eda203c88eaa59c09e4fb81aa0917a6dbbf968819be7a17afc454e77d1e WHIRLPOOL 1be78b87e18d110ec57c9a33fd18d96e14763ac98705643ab6e77f805ee0ebf616f989a4b5acd6a2a1d28a1fdbb34d21a7349b7c2182ac18f8dfcfb0f7b376d7 AUX openclonk-wrapper-script.sh 229 SHA256 96fbef61769c0b4950dfde6d35648f9f5b2d9261c4b99687cfc02c24635ed939 SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3 WHIRLPOOL 5395e432dab01140abcedcbf49573094bf13269b15fc7a1758a6c00258e1246560c1f50ae658fe27ef2cf579633debb4ed8efcd64d028bc9be2e2fb9603112d0 DIST openclonk-release-5.2.2-src.tar.gz 43078356 SHA256 87bf6c4836ed5c15e8ae66f7f2b0eec097e0d641a36bf1b328568be8d8fe39a9 SHA512 41549f2c7061b093f44f0b430801535de121405ba846f7aa2ef4e0a02d0f8c97099fbb2b789b74598bceb47f505b4cc9a8ed5b7dcf4b05c7b942650662a42833 WHIRLPOOL b905111fb911edbc796409a30a144c1352e397c515c31e30db26bb8efd663f4f91c7ff7aaa5fdcd368f1a821d6708f2b751d1c47312c61fe845afaf48f69b81c DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13 -EBUILD openclonk-5.2.2.ebuild 2223 SHA256 ed349e10e6927565cc40cd51082a54f39c286c08386f406c796c99bee8817e71 SHA512 2264903f6cb19ea6a637dad036975da31bfa1e6390a05d9d25fe6b9ad94cc647395ca89d610400ac9cc255f823feda81f2fa5342bb6f669cc1789a2332f0c02d WHIRLPOOL 760087b8835cfb19fec9bd80d2111cc419cca3cd77b9f1d810b08c85e9f61dc9a89d834e681b3de327c2524f0775d706e4768bc6f8d6aee0d52590f9a288c7f4 -MISC ChangeLog 957 SHA256 ba3daf199ede0d91ff04bf1498da85a51aa0f7b11f92e1d69b50d44d74677ada SHA512 d70e7548819f93302285e6a63faf0575be0232799667fd6435f5f6f0e827eda7c39d8a9136f189c2d757f3e4d777b1ac7a864e0f8179e55cf285e1f47556b27f WHIRLPOOL 4b3dda49811b3e78d390a6bdd7fbd036ba875c05c49d83d07e8419fa89daad147e57aa9e81f7dd66d4fcdde37ab53a7c948962183dd89e5a39486c7181dfb303 +EBUILD openclonk-5.2.2.ebuild 2283 SHA256 5c07a8f6d1bd1bec18a7caa88ec8c9999bdb5e5ca7e0e4ba1e774201faa38a81 SHA512 1f4afb486f7c2d48a3f8f5b1c548b9e7b4334125a99dfe5a943196758508a6927cd562ce78c7316abb7fa1dafbb3abd42fbd3bf4746cec5c26bb32c223799129 WHIRLPOOL 1aca402b3c81d628c80cc0c8f93e1321d70e90a3a531b99ad5fd5363e9f4e15d0e7c74812824bdcaeed976de3892fefbfd800907424f868a0c13b5a0059ac115 +MISC ChangeLog 1124 SHA256 d688d9e4e6723ed2c2931edb23a3c81641a4e0d7fb6b7db997c0b0a84e2fcf9f SHA512 02db0ffb748bc87c13920b484f33afe9e5675fe9f243126f1d794454781e3acc8fd6a27e247f3e4e584c42466f9fc6bdea014a3048367c9e67eebd5b9621493d WHIRLPOOL 5f74ce59d7ff3d405fc7ad3997afc1847f9ba7d206c193ca8e4a0f36c20fb8fd83f19ad2ce1407374aebe03712c77cf63f5d21ebb74fd957b435e9ed8f346dcc MISC metadata.xml 1089 SHA256 d1d9811cfc3649763d90d459c42c68b2c8bcf08c419e03de8b1616263628ab90 SHA512 3a212632f94dfd01128b9c27ea782ab7f499857346d468de7d375eca0f0dd8c7319d03e64c80bb66b6c24836146bae6d305cbc618b6cc8b9fc1c7a2dc369b8c8 WHIRLPOOL 08a4b45f9b3463df0dbbfbdcbade30492697d5102272a9e758536ed1c24f2ea5113fa91271dfd2050ef5cbcdd2768e3b49fb45c4b3e0a5a1a11100710d5d1923 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJP/DBQAAoJEFpvPKfnPDWzA4wH/0AmPZBAsqTqVSNc3YIBlEZI -qxizyRDDoO0qeHUN8OsGADXi5naCt4uGaDt4K4TWLm/wlbvmjLm7+EGYqAqL6UCU -qq+ZHGq8d+GpryUYO9VAxm1xJ0HsQokE+5lE2Wlqdyy6W+i4p/I8YtYg5msyRPqb -VtgGDZRaevRVQfwHbY1RaSQdTnhYh8Eglny9lIyWziDtMKYesgG/9/fBpU386NUv -2hENQ4lcAsrc/oqODWQQfOESqvUNM8MRUXRBG/L/+paLjUGMuytQU5BqqtFNlabY -B0OwHpWVlxthXtpc9unXBRbCkfVSfu1Z66J7CKUvOvxPSvzMAqgScveumrZdI8E= -=erIv +iQEcBAEBCAAGBQJQFSTwAAoJEFpvPKfnPDWzOhoH/itDiSVCtMLnAzFJhQm02ue5 +r4VFMo8tXit+VwDR0uylbmo+9yK/JjcZo+L4nUqTk5wT1kq8frfY4tSl+CieE8Rs +dXiJInKlZGGmW9STsf8hTpPpDjcPZQUK+KbQVQJbT7Kp+dLMYOtJE9STOvsNWRiI +ptDDLsCfWjPl5g5nWbntQbbetkaa1HKYCoaEPHzpgU6WE/MY58VHIA4pkYymR2B/ +QlFdX9WanQRJixz+r8yYsx1is+eg0s9i2B9UE6HhQ1PIizjmTDLm83EMh2oArFkt +cnjN6yhwO3+V04YI0vkrQS//FciRCjA+jMox9NkVPMNXbOq68pMy92WCrp12Oh8= +=w3Zy -----END PGP SIGNATURE----- diff --git a/games-action/openclonk/files/openclonk-5.2.2-zlib-1.2.6.patch b/games-action/openclonk/files/openclonk-5.2.2-zlib-1.2.6.patch new file mode 100644 index 000000000000..f963338784f9 --- /dev/null +++ b/games-action/openclonk/files/openclonk-5.2.2-zlib-1.2.6.patch @@ -0,0 +1,271 @@ +From: upstream +Date: Tue Feb 21 17:12:00 2012 +0100 +Subject: fix compilation for zlib-1.2.[67] + +backported upstream commits including: +http://hg.openclonk.org/openclonk/rev/7a5ee23b58aa + +bug report: +https://bugs.gentoo.org/show_bug.cgi?id=428496 + +--- src/c4group/CStdFile.h ++++ src/c4group/CStdFile.h +@@ -26,11 +26,10 @@ + #include <stdio.h> + #include <StdFile.h> + #include <StdBuf.h> ++#include <zlib.h> // for gzFile + + const int CStdFileBufSize = 4096; + +-typedef void* gzFile; +- + class CStdStream + { + public: +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Jul 29 11:29:27 UTC 2012 +Subject: + +--- /dev/null ++++ src/zlib/gzio.h +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2012 Armin Burgmeier ++ */ ++ ++#ifndef C4_GZIO_H ++#define C4_GZIO_H ++ ++#include <zlib.h> ++ ++extern "C" ++{ ++ ++gzFile ZEXPORT c4_gzopen (const char* path, const char* mode); ++gzFile ZEXPORT c4_gzdopen (int fd, const char* mode); ++int ZEXPORT c4_gzsetparams (gzFile file, int level, int strategy); ++int ZEXPORT c4_gzread (gzFile file, voidp buf, unsigned len); ++int ZEXPORT c4_gzgetc(gzFile file); ++int ZEXPORT c4_gzungetc(int c, gzFile file); ++char * ZEXPORT c4_gzgets(gzFile file, char* buf, int len); ++int ZEXPORT c4_gzwrite (gzFile file, voidpc buf, unsigned len); ++int ZEXPORTVA c4_gzprintf (gzFile file, const char *format, /* args */ ...); ++int ZEXPORT c4_gzputc(gzFile file, int c); ++int ZEXPORT c4_gzputs(gzFile file, const char* s); ++int ZEXPORT c4_gzflush (gzFile file, int flush); ++z_off_t ZEXPORT c4_gzseek (gzFile file, z_off_t offset, int whence); ++int ZEXPORT c4_gzrewind (gzFile file); ++z_off_t ZEXPORT c4_gztell (gzFile file); ++int ZEXPORT c4_gzeof (gzFile file); ++int ZEXPORT c4_gzdirect (gzFile file); ++int ZEXPORT c4_gzclose (gzFile file); ++void ZEXPORT c4_gzclearerr (gzFile file); ++ ++} ++ ++#endif // C4_GZIO_H +--- src/zlib/gzio.c ++++ src/zlib/gzio.c +@@ -208,20 +208,13 @@ + s->start = ftell(s->file) - s->stream.avail_in; + } + +- /* Reject uncompressed files */ +- if (s->transparent) +- { +- gzclose( (gzFile)s ); +- return (gzFile)Z_NULL; +- } +- + return (gzFile)s; + } + + /* =========================================================================== + Opens a gzip (.gz) file for reading or writing. + */ +-gzFile ZEXPORT gzopen (path, mode) ++gzFile ZEXPORT c4_gzopen (path, mode) + const char *path; + const char *mode; + { +@@ -232,7 +225,7 @@ + Associate a gzFile with the file descriptor fd. fd is not dup'ed here + to mimic the behavio(u)r of fdopen. + */ +-gzFile ZEXPORT gzdopen (fd, mode) ++gzFile ZEXPORT c4_gzdopen (fd, mode) + int fd; + const char *mode; + { +@@ -247,7 +240,7 @@ + /* =========================================================================== + * Update the compression level and strategy + */ +-int ZEXPORT gzsetparams (file, level, strategy) ++int ZEXPORT c4_gzsetparams (file, level, strategy) + gzFile file; + int level; + int strategy; +@@ -409,7 +402,7 @@ + Reads the given number of uncompressed bytes from the compressed file. + gzread returns the number of bytes actually read (0 for end of file). + */ +-int ZEXPORT gzread (file, buf, len) ++int ZEXPORT c4_gzread (file, buf, len) + gzFile file; + voidp buf; + unsigned len; +@@ -518,7 +511,7 @@ + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. + */ +-int ZEXPORT gzgetc(file) ++int ZEXPORT c4_gzgetc(file) + gzFile file; + { + unsigned char c; +@@ -530,7 +523,7 @@ + /* =========================================================================== + Push one byte back onto the stream. + */ +-int ZEXPORT gzungetc(c, file) ++int ZEXPORT c4_gzungetc(c, file) + int c; + gzFile file; + { +@@ -555,7 +548,7 @@ + + The current implementation is not optimized at all. + */ +-char * ZEXPORT gzgets(file, buf, len) ++char * ZEXPORT c4_gzgets(file, buf, len) + gzFile file; + char *buf; + int len; +@@ -574,7 +567,7 @@ + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of bytes actually written (0 in case of error). + */ +-int ZEXPORT gzwrite (file, buf, len) ++int ZEXPORT c4_gzwrite (file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +@@ -618,7 +611,7 @@ + #ifdef STDC + #include <stdarg.h> + +-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) ++int ZEXPORTVA c4_gzprintf (gzFile file, const char *format, /* args */ ...) + { + char buf[Z_PRINTF_BUFSIZE]; + va_list va; +@@ -652,7 +645,7 @@ + } + #else /* not ANSI C */ + +-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, ++int ZEXPORTVA c4_gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; +@@ -693,7 +686,7 @@ + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. + */ +-int ZEXPORT gzputc(file, c) ++int ZEXPORT c4_gzputc(file, c) + gzFile file; + int c; + { +@@ -708,7 +701,7 @@ + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. + */ +-int ZEXPORT gzputs(file, s) ++int ZEXPORT c4_gzputs(file, s) + gzFile file; + const char *s; + { +@@ -761,7 +754,7 @@ + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; + } + +-int ZEXPORT gzflush (file, flush) ++int ZEXPORT c4_gzflush (file, flush) + gzFile file; + int flush; + { +@@ -782,7 +775,7 @@ + SEEK_END is not implemented, returns error. + In this version of the library, gzseek can be extremely slow. + */ +-z_off_t ZEXPORT gzseek (file, offset, whence) ++z_off_t ZEXPORT c4_gzseek (file, offset, whence) + gzFile file; + z_off_t offset; + int whence; +@@ -872,7 +865,7 @@ + /* =========================================================================== + Rewinds input file. + */ +-int ZEXPORT gzrewind (file) ++int ZEXPORT c4_gzrewind (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -896,7 +889,7 @@ + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + */ +-z_off_t ZEXPORT gztell (file) ++z_off_t ZEXPORT c4_gztell (file) + gzFile file; + { + return gzseek(file, 0L, SEEK_CUR); +@@ -906,7 +899,7 @@ + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. + */ +-int ZEXPORT gzeof (file) ++int ZEXPORT c4_gzeof (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -923,7 +916,7 @@ + /* =========================================================================== + Returns 1 if reading and doing so transparently, otherwise zero. + */ +-int ZEXPORT gzdirect (file) ++int ZEXPORT c4_gzdirect (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -968,7 +961,7 @@ + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. + */ +-int ZEXPORT gzclose (file) ++int ZEXPORT c4_gzclose (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -1003,7 +996,7 @@ + to get the exact error code. + */ + #if 0 +-const char * ZEXPORT gzerror (file, errnum) ++const char * ZEXPORT c4_gzerror (file, errnum) + gzFile file; + int *errnum; + { +@@ -1034,7 +1027,7 @@ + /* =========================================================================== + Clear the error and end-of-file flags, and do the same for the real file. + */ +-void ZEXPORT gzclearerr (file) ++void ZEXPORT c4_gzclearerr (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; diff --git a/games-action/openclonk/openclonk-5.2.2.ebuild b/games-action/openclonk/openclonk-5.2.2.ebuild index a714f86612c6..cbc67fe9abf1 100644 --- a/games-action/openclonk/openclonk-5.2.2.ebuild +++ b/games-action/openclonk/openclonk-5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.2.2.ebuild,v 1.6 2012/07/10 13:42:06 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.2.2.ebuild,v 1.7 2012/07/29 12:00:46 hasufell Exp $ EAPI=4 @@ -72,6 +72,9 @@ src_prepare() { -e "/AM_SILENT_RULES/d" \ -i configure.ac || die + # wrt #428496 + epatch "${FILESDIR}"/${P}-zlib-1.2.6.patch + eautoreconf } |