diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:26:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:26:11 +0000 |
| commit | b703ebdf6b2c59e7f3eee7cbcd713b6990bf0f80 (patch) | |
| tree | 30810577856d1b8ca4a671bc4e37ddcea8d716bf /dev-games | |
| parent | Build with media-libs/libpng-1.5 Bug #380631 (diff) | |
| download | historical-b703ebdf6b2c59e7f3eee7cbcd713b6990bf0f80.tar.gz historical-b703ebdf6b2c59e7f3eee7cbcd713b6990bf0f80.tar.bz2 historical-b703ebdf6b2c59e7f3eee7cbcd713b6990bf0f80.zip | |
Fix building with libpng15 wrt #378351 by Diego Elio Pettenò
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/vamos/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/vamos/Manifest | 15 | ||||
| -rw-r--r-- | dev-games/vamos/files/vamos-0.6.2-libpng15.patch | 23 | ||||
| -rw-r--r-- | dev-games/vamos/vamos-0.6.2.ebuild | 8 |
4 files changed, 47 insertions, 7 deletions
diff --git a/dev-games/vamos/ChangeLog b/dev-games/vamos/ChangeLog index b410bdc2f575..2a28e53c2b5f 100644 --- a/dev-games/vamos/ChangeLog +++ b/dev-games/vamos/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/vamos -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.15 2010/09/17 11:09:08 scarabeus Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.16 2011/09/14 12:26:11 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vamos-0.6.2.ebuild, + +files/vamos-0.6.2-libpng15.patch: + Fix building with libpng15 wrt #378351 by Diego Elio Pettenò 17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> vamos-0.6.2.ebuild: Remove virtual/glu where already virtual/opengl is stated. diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest index 5c2f12639e4e..4fd3591ba05c 100644 --- a/dev-games/vamos/Manifest +++ b/dev-games/vamos/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX vamos-0.6.2-as-needed.patch 539 RMD160 c950db06fdac6952114daeab1230e879f8dbfca0 SHA1 a3e36f935b9e6a9ed5910305de8cb05f563eb06b SHA256 126ec3f14aab19691c168406f8852505a5da11e29e2c8b7170e608b46f1dcab0 +AUX vamos-0.6.2-libpng15.patch 870 RMD160 2ddcd3e19aa1433ebc8fc5d5fbc7f8b5776d0863 SHA1 983428a1209a0d15d5cc5b0c1ac3d045ab6f411b SHA256 f9782dc84d39f73b970f90851f1788e9597df1d9a8b05ea5c51f398db0932856 DIST vamos-0.6.2.tar.gz 1555156 RMD160 1a9b72e69cdaa4a273ea13b0fb56e6365391fabe SHA1 c2be97ed6fb3b276aadb22699880106a057c1167 SHA256 75f539bcdd6fa6f0cf7cb4014d27f0cd8f581f8ff690b3054eb644e573bc3646 -EBUILD vamos-0.6.2.ebuild 1131 RMD160 61e0fdd1358b2169c39283e302d4456bba4d5e98 SHA1 c2f44df90da2c199a3fd932286cbb016f6e8becb SHA256 f718a9d71cec11de5712d9467473fc8a20c476aa8743a3fb59593f52cddd12f0 -MISC ChangeLog 2276 RMD160 d3e36af76827c2f07ed14fd7f0631654d8adfd43 SHA1 0df76ef8539d371b870cb66eb82c3d7bf93f4392 SHA256 95d693bbe67667da72ebe152825cc3efe3efcbbe7328f24c3f6d9c5e612ed7b6 +EBUILD vamos-0.6.2.ebuild 1173 RMD160 45a2b96d60e63650320ea45334122d6c222b029a SHA1 a015ff3050770b09df9de26ac369b906752abf06 SHA256 85a9696bcfa83818fb00cb3fcef275e07bc71185ed332a18d5a12d2f30044040 +MISC ChangeLog 2452 RMD160 9588ed4a1da94b5bab6a19ba4b6e3d4b2add74ed SHA1 28c691d9964cf5b5592cbf7955771f6b7924ab13 SHA256 564da862bb9cfcf0ebfb8cfad9813d5fc90890c3ebaa8200dc3516507163ce10 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5wnZkACgkQXkR9YqOcLPHnfgEAh54x/jzCvNqgvFQEXfFO/6Jk +rCHrbhYpSYldZHG6bbYBAJgtXdvYbo+HLpXmbZffZDA4YQO9Xi4iHf1upLRltcPx +=P7nI +-----END PGP SIGNATURE----- diff --git a/dev-games/vamos/files/vamos-0.6.2-libpng15.patch b/dev-games/vamos/files/vamos-0.6.2-libpng15.patch new file mode 100644 index 000000000000..19a564c99fef --- /dev/null +++ b/dev-games/vamos/files/vamos-0.6.2-libpng15.patch @@ -0,0 +1,23 @@ +--- media/Texture_Image.cc ++++ media/Texture_Image.cc +@@ -162,15 +162,15 @@ + + png_bytep* row_pointers = png_get_rows (png_ptr, info_ptr); + +- m_width_pixels = info_ptr->width; +- m_height_pixels = info_ptr->height; +- m_channels = info_ptr->channels; +- size_t row_size = info_ptr->width * info_ptr->channels; ++ m_width_pixels = png_get_image_width(png_ptr, info_ptr); ++ m_height_pixels = png_get_image_height(png_ptr, info_ptr); ++ m_channels = png_get_channels(png_ptr, info_ptr); ++ size_t row_size = png_get_image_width(png_ptr, info_ptr) * png_get_channels(png_ptr, info_ptr); + + size_t data_size = row_size * m_height_pixels; + unsigned char* data = new unsigned char [data_size]; + +- for (size_t i = 0; i < info_ptr->height; i++) ++ for (size_t i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) + { + for (size_t j = 0; j < row_size; j++) + { diff --git a/dev-games/vamos/vamos-0.6.2.ebuild b/dev-games/vamos/vamos-0.6.2.ebuild index fc820fec9827..ef5df3385e9f 100644 --- a/dev-games/vamos/vamos-0.6.2.ebuild +++ b/dev-games/vamos/vamos-0.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.6 2010/09/17 11:09:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.7 2011/09/14 12:26:11 ssuominen Exp $ EAPI=2 inherit eutils @@ -24,7 +24,9 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${P}-as-needed.patch + epatch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { |