diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-05-30 01:57:46 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-05-30 01:57:46 +0000 |
| commit | d3e904bd40eac9e9c01876247ab347feda490138 (patch) | |
| tree | 2f94c37ba273d2781b61fa464be3ee8d53684140 /games-sports | |
| parent | Version bump (diff) | |
| download | historical-d3e904bd40eac9e9c01876247ab347feda490138.tar.gz historical-d3e904bd40eac9e9c01876247ab347feda490138.tar.bz2 historical-d3e904bd40eac9e9c01876247ab347feda490138.zip | |
add patch for building with libpng from wrstwssr@yahoo.com via bug #369231
Package-Manager: portage-2.1.9.42/cvs/Linux i686
Diffstat (limited to 'games-sports')
| -rw-r--r-- | games-sports/torcs/ChangeLog | 8 | ||||
| -rw-r--r-- | games-sports/torcs/Manifest | 5 | ||||
| -rw-r--r-- | games-sports/torcs/files/torcs-1.3.1-libpng15.patch | 20 | ||||
| -rw-r--r-- | games-sports/torcs/torcs-1.3.1.ebuild | 7 |
4 files changed, 33 insertions, 7 deletions
diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog index d5507ff97a96..cc7fb458ef1b 100644 --- a/games-sports/torcs/ChangeLog +++ b/games-sports/torcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-sports/torcs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.33 2010/09/16 17:52:51 scarabeus Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.34 2011/05/30 01:57:46 mr_bones_ Exp $ + + 30 May 2011; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.3.1.ebuild, + +files/torcs-1.3.1-libpng15.patch: + add patch for building with libpng from wrstwssr@yahoo.com via bug #369231 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> torcs-1.3.1.ebuild: virtual/glut -> media-libs/glut diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest index a8805e97a53e..a1c12cb364c3 100644 --- a/games-sports/torcs/Manifest +++ b/games-sports/torcs/Manifest @@ -1,5 +1,6 @@ AUX torcs-1.3.1-as-needed.patch 3479 RMD160 7ead736dc188f4945314ef9acf7712f7c05c1989 SHA1 dd384fc8f8500a7fea1c86e1093052574c6d2dec SHA256 e8a0cae374209cd350d978ba5cbfb1756928db4e659b673b106c859acbcfbb55 +AUX torcs-1.3.1-libpng15.patch 516 RMD160 f4853bf2989d1200727d743af52295370d334177 SHA1 6c231fbce242e7c54317b892c1033dc570b127f8 SHA256 8fe1de4656ee42c6ef4910658e18999fa85e59711608d271834452d6eec62500 DIST torcs-1.3.1.tar.bz2 211422481 RMD160 4c03e4f3c4a5e5594d0560219ed215aa36b37595 SHA1 90a7cf9e6605d510d75103b4e1f28efc6faf933a SHA256 901b7baddbdc6c0aa343be1b35fe3ef2eb30100279ba9189d8ec8ed4b33d51fd -EBUILD torcs-1.3.1.ebuild 1381 RMD160 6731a61603de454683562fa776285cf48dfcf5b9 SHA1 745eb9ecfa3600c6d8691a1d82497dfcddac9971 SHA256 ad27aac4c273897900aac18ecca50bdab78cf2b13193a1ec80c0706bae26e5be -MISC ChangeLog 5075 RMD160 dc808938dc5f61c0ce1411b02e41eaf4d96e1573 SHA1 4d9ef8dbc7dc9384cc351d7a14463dca796b1f5d SHA256 9b51657494f92defb17f3fdceed03b2a63f9b479e92e407de31d1aad74f94614 +EBUILD torcs-1.3.1.ebuild 1419 RMD160 0bf1b640b758c5eed86b060e9a1b9bc7e18d354f SHA1 6537d42dd93777580f18dfc091b4d0d18c014d24 SHA256 246719f42fb26edc321504ea4c42d550eba5a75a9ec0dc5f7643b0bbaa679325 +MISC ChangeLog 5265 RMD160 fb9a3024c54bc8619f80657b699b87bd9beb0fee SHA1 7083d07bcd2abf57036f25aa04d6f458da657f0a SHA256 67860079e0abd21236e86050526d0a227f29546d5faab481fca72ba6eafac69a MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-sports/torcs/files/torcs-1.3.1-libpng15.patch b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch new file mode 100644 index 000000000000..6b09ce2a41c8 --- /dev/null +++ b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch @@ -0,0 +1,20 @@ +--- a/src/libs/tgfclient/img.cpp ++++ b/src/libs/tgfclient/img.cpp +@@ -98,7 +98,7 @@ + return (unsigned char *)NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -229,7 +229,7 @@ + return -1; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return -1; diff --git a/games-sports/torcs/torcs-1.3.1.ebuild b/games-sports/torcs/torcs-1.3.1.ebuild index e9e283f893f0..4a4dbb10dbd4 100644 --- a/games-sports/torcs/torcs-1.3.1.ebuild +++ b/games-sports/torcs/torcs-1.3.1.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/games-sports/torcs/torcs-1.3.1.ebuild,v 1.8 2010/09/16 17:52:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.9 2011/05/30 01:57:46 mr_bones_ Exp $ EAPI=2 inherit autotools eutils multilib games @@ -28,7 +28,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ - "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-libpng15.patch eautoreconf ecvs_clean } |