diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 16:59:35 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 16:59:35 +0000 |
commit | e09fd90e5076c5bebc743844ef200deedd6e9fc7 (patch) | |
tree | a6d3df09ff733c28b062c807a146db33ff20276f /games-arcade/briquolo | |
parent | net-im/qutecom: new ebuild for bug 237941 (diff) | |
download | historical-e09fd90e5076c5bebc743844ef200deedd6e9fc7.tar.gz historical-e09fd90e5076c5bebc743844ef200deedd6e9fc7.tar.bz2 historical-e09fd90e5076c5bebc743844ef200deedd6e9fc7.zip |
Fix building with libpng14 wrt #308667 by Locke Shinseiko (Wizzleby).
Package-Manager: portage-2.2_rc66/cvs/Linux x86_64
Diffstat (limited to 'games-arcade/briquolo')
-rw-r--r-- | games-arcade/briquolo/ChangeLog | 8 | ||||
-rw-r--r-- | games-arcade/briquolo/Manifest | 5 | ||||
-rw-r--r-- | games-arcade/briquolo/briquolo-0.5.7.ebuild | 7 | ||||
-rw-r--r-- | games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch | 31 |
4 files changed, 44 insertions, 7 deletions
diff --git a/games-arcade/briquolo/ChangeLog b/games-arcade/briquolo/ChangeLog index 9351fe25557f..a804b1b9897f 100644 --- a/games-arcade/briquolo/ChangeLog +++ b/games-arcade/briquolo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/briquolo -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/ChangeLog,v 1.17 2009/10/25 12:58:17 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/ChangeLog,v 1.18 2010/03/09 16:59:33 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> briquolo-0.5.7.ebuild, + +files/briquolo-0.5.7-libpng14.patch: + Fix building with libpng14 wrt #308667 by Locke Shinseiko (Wizzleby). 25 Oct 2009; Markus Meier <maekke@gentoo.org> briquolo-0.5.7.ebuild: amd64/x86 stable, bug #288808 diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest index 42843cf699f7..9ca7f5967881 100644 --- a/games-arcade/briquolo/Manifest +++ b/games-arcade/briquolo/Manifest @@ -1,5 +1,6 @@ AUX briquolo-0.5.7-gcc43.patch 2954 RMD160 8906b14ca4a3241d36405c3873f20ab09b57c4e2 SHA1 c9f73bbbaed131ac8b9b9b7c0f8d152ad65d06fe SHA256 af08db985c22b92966d1225aa8706db53fed8e26820c8e88da81208363cb10d6 +AUX briquolo-0.5.7-libpng14.patch 1058 RMD160 9e1af90ba9fe7160843f5f5027ea187499e0ff65 SHA1 77390b32c7545ce5f56227ec95be57dee7cae999 SHA256 9efb32386d531846655e07e9f9f9b9cb65138c7521b6e0df557f85bb4c7a0f9f DIST briquolo-0.5.7.tar.bz2 2588084 RMD160 47f100dd842050f033dbe0efce29b5fef4be3e42 SHA1 72823b6548e0b76bbf5fdf63fe1803eec89a1cba SHA256 061055dba524a784d6569fd74f3e4490db264da1356b53d68aae5523416f8f11 -EBUILD briquolo-0.5.7.ebuild 1435 RMD160 568bb17fca8f4fc624c499d563f0b2983fde7dab SHA1 0ed9c824bbfc76b9a1e9867497d386d515edac38 SHA256 1a8103ccb0bda94cc7f4af03f128d570986a7e6af6c792568ef23f9efd2d49d3 -MISC ChangeLog 2314 RMD160 b52663076c38c97cd48d2dca3df2956bc126a998 SHA1 c07a70b3b6e4265c4ceb4ce8d3b8e1abfca8e708 SHA256 4f34390fa3c9f9e92e5afc045dd858d97c29cd8515dd91b2adc9e5b93acf2919 +EBUILD briquolo-0.5.7.ebuild 1476 RMD160 9b2db9c3c963fc1c73c0e60c2e5c73b1de4f39b6 SHA1 59feae63bfda1948fe57e655a0887c1b10efb63e SHA256 eab50e9922c1ab1ba115723ef7c96dd05904491d2ec9e7793727df84c7463bad +MISC ChangeLog 2507 RMD160 f1b960d5fef73e112e3d9258ddf554b3c26c1cfc SHA1 4da5595d8d6486942f6c7e599c3d395847ca7cb5 SHA256 a6e060101b5f7e5dd2efd9b486ce710a5181b50fab739a006fa687f8375c14b5 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild index cf3e8d78ce90..d9292d3613a4 100644 --- a/games-arcade/briquolo/briquolo-0.5.7.ebuild +++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/briquolo-0.5.7.ebuild,v 1.2 2009/10/25 12:58:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/briquolo-0.5.7.ebuild,v 1.3 2010/03/09 16:59:33 ssuominen Exp $ inherit eutils games @@ -25,7 +25,8 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-libpng14.patch # no thanks we'll take care of it. sed -i \ -e '/^SUBDIRS/s/desktop//' \ diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch new file mode 100644 index 000000000000..d325bac02578 --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308667 + +--- src/MOGL/MOGL_Image.cpp ++++ src/MOGL/MOGL_Image.cpp +@@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char * + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) + { +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + return false; + } + +@@ -191,7 +191,7 @@ bool MOGL_Image::ChargerPNG(const char * + if (setjmp(png_jmpbuf(png_ptr))) + { + // On libère la mémoire +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return false; + } + +@@ -235,7 +235,7 @@ bool MOGL_Image::ChargerPNG(const char * + /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + /* Expand paletted or RGB images with transparency to full alpha channels |