Fix building with libjpeg-turbo extended libjpeg.so.62 API with jpeg_mem_src() and jpeg_mem_dest() wrt #479822 by Julian Ospald. Fix freetype2 related build error wrt #479822#c3.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 44 insertions, 20 deletions

diff --git a/games-fps/turtlearena/ChangeLog b/games-fps/turtlearena/ChangeLog
index 742f691a2b62..ab6b484bb0de 100644
--- a/games-fps/turtlearena/ChangeLog
+++ b/games-fps/turtlearena/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/turtlearena
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/turtlearena/ChangeLog,v 1.4 2013/06/25 12:55:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/turtlearena/ChangeLog,v 1.5 2013/08/06 08:26:53 ssuominen Exp $
+
+  06 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> turtlearena-0.6.1.ebuild,
+  +files/turtlearena-0.6.1-freetype.patch:
+  Fix building with libjpeg-turbo extended libjpeg.so.62 API with
+  jpeg_mem_src() and jpeg_mem_dest() wrt #479822 by Julian Ospald. Fix
+  freetype2 related build error wrt #479822#c3.
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> turtlearena-0.6.1.ebuild:
   Stable for amd64, wrt bug #474382
diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest
index c65e36e9dcb4..21c5d6732c26 100644
--- a/games-fps/turtlearena/Manifest
+++ b/games-fps/turtlearena/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX turtlearena-0.6.1-build.patch 6389 SHA256 408ba4ab4a875aa7997c2e9c0d00f238458974c0e6dd1c3c08185c32722aa6e4 SHA512 d20dccd531d4e517106bb61955c529351c779b9b5935ad2ea2643192f79063c28860ad965218610f73da4addcffed9cad53b2b6d5faf6ee06ca66d7b23ecc77b WHIRLPOOL 0488a974baf55c860df6144554dd1c1a83dbd4e6fa61b22cf064233f82274eea1f5fadee598529f3df6ef9fb5378a4f8677ee3b117756dc8351b17b881147657
+AUX turtlearena-0.6.1-freetype.patch 447 SHA256 5a579abcff666ab535092e67e808b77f4180e42fe242f374da2dad3161aac19e SHA512 872acb67f1938a410679bbcfc846a5f983af17207eafdaf7ebbcd0426cdd68087672b9399754f8c311da585210f289a9ca0bb8e6882b019b3dd5655627dffcef WHIRLPOOL 36fb12a2e005471983227b298459f881c32e0b284f97886e4c3f986cd5ecc9f3a87c745656c08e05fbc05937607bfe7d28e60d69cb1f0b467f5f193a62d15225
 DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 SHA256 82a16aabab30b2f77e7541ec9bf0d946207b82cce49d2ef5c1d4e9b11e287c98 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf WHIRLPOOL 89505581cb80e744657d83e81009461131c9bb898994c51e66b3ebe442de691d871fcb5aa63042d662a537d43dac920831291861db803d01b19067cfd0aaf595
 DIST turtlearena-0.6.1-0.zip 73713016 SHA256 99dfc41e1f00c860f8f0ceb222128cc9c363f20e7bd9e830e47c4c0aceed2a09 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378 WHIRLPOOL 666582948843469cb051dcec3e3404707b7ee9a8a047bf73b6f2948a0ca4da2ab6446ea228927f8173d6fda0ca8d051738fe58f45824056dcd0a5a4336682268
-EBUILD turtlearena-0.6.1.ebuild 3171 SHA256 dae6056d28b924d826583ed95b5f342085652e55d7de512ab0d404af02a93ec1 SHA512 fd777acbc464cbde7d27607c06dc4f47726071d03275c396812d32fb72b1fd2bb90b429ce2bd480a9d8a715fdc205d05e56ecbd089f20d17568b176f7bb03348 WHIRLPOOL 96b0d50a922783fa93efddf8d4c57888ff80d08a530c29496c1dfea64bfd834f4725a5b6d6234a8e0f107a1a367e100e80406f530dee782704c31dac4edbc278
-MISC ChangeLog 730 SHA256 9b906850f2c2a82a4cc7e37dd3681ee613206fff7d19d12acfeef93ec8b71ee4 SHA512 bbd882d5e51fb8cfc9dbf7c09fcfcf2a93642081726973be43263504e60c51ad672f16f960798ca31727dfa79dd47706b6ec4bb41c59626f0b2ae15ab65f2859 WHIRLPOOL c3993a6f1c1325ed2514cfcee5dd1395dcb31391833461087da37747fb6ae89bf3ee18ac97f9546b0562b388f619b0c1ef15342d385b48a1027ca1a22e5add81
+EBUILD turtlearena-0.6.1.ebuild 3341 SHA256 4d3fce31597f4330fb20cdf8b8b5199d2e95cc3489a7b3d319b2ad30a3ef4bd7 SHA512 b3c4297c9964dec66d1bf0d111fc81beea190b60e6c481d1b101c961db344284fd3cf7daacadc01b68c1432c7df45036776eedf143a4dbf9b7e86055881339ee WHIRLPOOL cc7a934f7d91f39a089b57006d3cd55c6174a1ee3a042dd91ee75931a0f5a29de2f49463a96901998b4530892ed997432060e00805ab0618bc5b22ee0ece895e
+MISC ChangeLog 1045 SHA256 468d4d1365d017aab8aea060869dbb0b7351fb7e2f04e3e133f4067c0869f1f8 SHA512 1d17dcec472fc9257f3641cafb0f077ebccb08bd7aacd4aec0a120e6998eb7348fa1159964c1b5c1df92ed74bd60c20d2549b21b9634f5da111be6b1092c87ac WHIRLPOOL 3dc84f83fac03d65f53e4060a59bce51c34060d607aeff811ce92bf83da0c393f60a5882c066bbd6586a41d2e7b323c99024b88d814373a5d8ae87b7f102adf9
 MISC metadata.xml 455 SHA256 59274bd90137e89236c7252d4b7ff32695ef7143f6ae7e6f0775ff58957cfc21 SHA512 e09a66958bfeff70ce31b4a612ede1d68cfc58dba6d31b37dbb278dfb40b7e3d74b7e910132ccf0dc124796a6e4fadc7d7c5e8e584608a264913a6170850d20b WHIRLPOOL 3a434bc61307407dc7ef6f01ec1052c8c545841d15e84315b4513c6cb1be9b24810b9bfd5ab75c8d68195aa6421b0d0d0da60da2b8b87ed0450ee5e1ab93811e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZNAAAoJELp701BxlEWf3KkQAJYxxy05zWhy8LBzSGD2d5NA
-X6bqZUAouEtl1drc6664tPtyoySBy9Inz/VCPrJDPUew2mfT3b2vKlj/L8rHjGQT
-pGo5TTx6M1nEULyAph4kEZrH+ehIWr/P7pZ3plewdTxg4JWoxb3gFrlR/cIGVqd4
-EWomcKo/DdTfEb8um3o+6x8AU4gCyrMhVU6cYFux6wT1W5n9HmK8NUQbvUTybASE
-sgCbzFJPdrjnKUKVNcoM+EVCiAN2aByiQtAk66kXxfhRGrHAxj2JvRDwgOVZ1dHf
-LiOF5o2l5S4esBKYXEZPqaD/9gbDK8EiRpR85ZAJUJkV/tZehCvTHU/zkFICKavo
-dOq2B5QaeY5ud0+ZrlVqZwruQ1oxWif3PAuq+5c9wVDUvfF/s4+GEIKhKCNPdHwR
-uGE9z7Bb7ZqPQvpaLbWQbwTb1+570YrBfTIe7wsWY42+aLCDeowm8Wjv+MaK0LYu
-o/A245UVXiYpiXhWEM510UluVmWt12KpKmIvqGt6jtra0cOtY0YOflwmpoos6yOr
-cxOd7mmQflG6m2U83DDj0H7JpGl5OkDIm8CKu4FRXx0JVRFff8kYB4A8gRP2UMCh
-kI0fFlpVLAmJ0ncCD/1jtV/qm4q+m9uYvcT4UkI+k4kBztGtYdGg1XmP0s+Yls1M
-QpVjV84dlHj1qcEGv2a9
-=i1iS
+iQEcBAEBCAAGBQJSALLjAAoJEEdUh39IaPFN7HwH/iZMnBI9UpnK+IhAx0F/EamR
+Xf9l+ZFQz+MfvNKKoV8ChsXfRDgtj4oPz66DxJ2f9UtPP5FI2vlqSFxcis6mDzJr
+uwZvkNK3zIkRfRkkAw2S2GAlzeZcKC2Axxq1f4M4U+LMLe7A/UVTXAp3lCKj5O49
+BHJyBg77UxINQCVWHqSQuQtXmlFNH09wUYldFIt404zJ7A0LCFLy6TRaCRkOmO8R
+pw66dDRGxoIjGBEVpigGABZ1oU9vc3NMt5qSuCWMgptYbBqk4PtlL/K4xYsGOTc3
+c9qDWhZ8zVgIWFh69s0Zc6qHSNm1rxAqRlu2XeRO1EUl6JnJTntBGVRoo/YM8pc=
+=z6/N
 -----END PGP SIGNATURE-----
diff --git a/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch b/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch
new file mode 100644
index 000000000000..563a9d0d7042
--- /dev/null
+++ b/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/show_bug.cgi?id=479822#c3
+http://github.com/ioquake/ioq3/commit/ab4c602374caa0f520b3a0801d384a73e29e0bc7
+
+--- engine/code/renderer/tr_font.c
++++ engine/code/renderer/tr_font.c
+@@ -47,10 +47,10 @@
+ #include "../qcommon/qcommon.h"
+ 
+ #include <ft2build.h>
++#include FT_FREETYPE_H
+ #include FT_ERRORS_H
+ #include FT_SYSTEM_H
+ #include FT_IMAGE_H
+-#include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ 
+ #define _FLOOR(x)  ((x) & -64)
diff --git a/games-fps/turtlearena/turtlearena-0.6.1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
index f2e64ec033f8..eb1030ba226a 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/turtlearena/turtlearena-0.6.1.ebuild,v 1.4 2013/06/25 12:55:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/turtlearena/turtlearena-0.6.1.ebuild,v 1.5 2013/08/06 08:26:53 ssuominen Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="
 	!dedicated? (
 		media-libs/freetype:2
 		media-libs/libsdl[X,audio,joystick,opengl,video]
-		virtual/jpeg
+		virtual/jpeg:0
 		virtual/opengl
 		curl? ( net-misc/curl )
 		openal? ( media-libs/openal )
@@ -41,7 +41,13 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}-0-src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-freetype.patch
+
+	sed -i \
+		-e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
+		engine/code/renderer/tr_image_jpg.c || die #479822
 
 	rm -r engine/code/{AL,libcurl,libogg,libspeex,libtheora,libvorbis,SDL12,zlib} \
 		engine/code/freetype* engine/code/jpeg-* \