Backport build fix for libjpeg-turbo

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 79 insertions, 17 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9960590d6fc5..271fb85cbea2 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.185 2011/05/14 20:20:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.186 2011/05/20 22:29:03 dilfridge Exp $
+
+  20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-turbo.patch:
+  Backport build fix for libjpeg-turbo
 
   14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -digikam-1.2.0-r4.ebuild, -files/digikam-1.2.0-docs-r3.patch,
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 77a4f1c869d2..422f6be78808 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -4,26 +4,27 @@ Hash: SHA512
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
+AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
+EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 48c089acb9877c64d52f9596d8bfae42933c562c SHA1 a99fd713c345bc396811e1eb4ae76898dfbf55f7 SHA256 eab9b63180fefe06150a4dabedbb2926b4c7837700f4c13292bcb9f649302cb0
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-MISC ChangeLog 30926 RMD160 c8049d36e2aed1efb51e04dc6fe1afa55b6b0d62 SHA1 fb08354e1a87dc0f7d72707b86c160017d789138 SHA256 7eb5d1c88fe1c349e6fa37f7f8d0804e4fd0851ddd92d42a7bec4761447467a7
+MISC ChangeLog 31084 RMD160 5bb24099d8fc5e1c9fb41cfc71ec09f431234158 SHA1 b761428116dce1a9af28a9c51acd3d87f1e5ec70 SHA256 d686b1b6f7916a89587a51f802045c5f80a52bf444d07d9335bfbb78ac26f7b5
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNzujhAAoJENwGBM22xffeU1YP/A+OAqp4SRb3dw9EWld3xsrL
-7nUJCCB7USaI3/ZB8/Kygd4stdrV6lNTccs7C/OdGddhBjKyJb+0acutU49gsYR8
-rS1fkoRXPyyxWHz8eH36CIRk6cWuvX0yFFraV4OPP/ZS4uey86S9xcuJUj7YBB/m
-t2LOGQCnFg+5Isc5mTpDOGEIxay/a41NYNrZY8cegIGyLemr44kmuZyemfrzPGc4
-c60mrDMkW7Ib2ZtehDcGFf1kLZVZMsWRhlXwMavXyGASriBIjIcM9T9W8xa7CZqt
-aimBOsfCMGJ6hxDZX3cyuVEBfTR1FMg6sNTarbDvuznnI8LHmoNR/HYNZNiKKOtQ
-O9QEZMaJarxKDkHofQbnORXvynkx35joQlqD5HP4pzRuj2MIeXtS9Rbw9gFA6Alq
-U0vp1ejyKOHW6T1FrUlIOhA2NB72C4y+/BJu9yZaMaGBrQm8pgSjrPeTEHUgnFCo
-afxduMxAtFzV6B3fdNYWDwlFVBCbSPTiD6oXcbqXFfBuOR3aScZt6cWfoFaDSGHY
-+xiFUzO30iMqw1AzHKV6rikw7ErXZ8IVdXbrEv6PIuhtGfm3b4yDKPmcuTUa7G/6
-hk8VM2CZtUU1J1jFxUbo3SvmWKzHLwEZwsMUEOHz14Q5KYYxjJj7oB7FsqimWHdj
-MwDUjODcnVDrTlZWi66I
-=4zzC
+iQIcBAEBCgAGBQJN1u/9AAoJENwGBM22xffecHAP/i+xGeCX7qsrmVLNeSu4bKWq
+XpX05Y532hMC0c6Ev4mD+fVHebFI4FScWDxNwuePX/UIg4Z2G3YinHOs7hiLXbqm
+gHhEdK4sEZqsFBA7dx9W/YXhz1hDTUOyfn2jIZx7Kx0XI7MG5LJj9Sb0BApp39eJ
+LYyq16gg1w9RuLl8iKHH+MdTidzKQXtzmOldGJsiIDDZ9MKq5rfS2ABaQPh2SAcR
+bSRkaoEDmbhYh68tQ4r9enZ9sdecyl2POLFI04UwQ3/osfOsIva3l3CyIMMyIEeC
+rnYGBRuD3FA1O7l/3Aio2v4G25GlXDEk+8Ig2BFYyQ/LRcdWQmOjAuXUgstxYrOc
+nkvKYgKEVNIYoUHSXoX+O/rl16hSe0YpYqe0uFUojxZ10O4xLohKF5rkx6m2cZN9
+B6nVtpqElKXv2GRQ1R1aAJlqNWk47csazVbHKpCtFMZG+BxWffECmC6ZIn9Fi72t
+PUKLu3Oc32Z5UjZMhzREAFjpK1YA5LEWKZ3WlYTShYOypAVxN8XSnV5dYTJcgfCG
+SG5GSH0Z5FfWxlXIDx1qNYKDoAI3tQtgQJBTCtGcSgBenzDbMT/quhPCV6agsdCw
+0UBmJawDAPYTKUM1EAG4Z+3Ml7p8U+YuEDXZme/g8T8d+RPYz3Sy4IbGBuFF+5t5
+m+xQNtCiN/T7GuR/3b1+
+=0jAz
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
index 6e439a43e942..83997cdd2fd5 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.3 2011/05/20 22:29:03 dilfridge Exp $
 
 EAPI=4
 
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-1.9.0-docs.patch
 	"${FILESDIR}/${PN}"-1.8.0-tests.patch
 	"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
+	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
new file mode 100644
index 000000000000..bd105529b0bd
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
@@ -0,0 +1,56 @@
+From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001
+From: Riccardo Iaconelli <riccardo@kde.org>
+Date: Sun, 15 May 2011 16:18:44 +0200
+Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo
+
+Patch by Rex Dieter
+
+BUG: 265431
+
+Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>
+---
+ CMakeLists.txt |   28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43293ef..63402e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,17 +166,23 @@ ELSE(NOT APPLE)
+     SET(CLAPACK_FOUND FALSE)
+ ENDIF(NOT APPLE)
+ 
+-# Extract version of libjpeg so that we can use the appropriate dir
+-# See bug #227313, #228483
+-FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+-STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+-MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
+-
+-IF ("${jpeglib_version}" LESS 80)
+-    SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
+-ELSE ("${jpeglib_version}" LESS 80)
+-    SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
+-ENDIF ("${jpeglib_version}" LESS 80)
++# check version of libjpeg so that we can use the appropriate dir
++# See bug #227313
++set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
++set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
++file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
++set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
++
++try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
++
++if(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 62")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-62)
++else(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 80+")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
++endif(_jpeglib_version_compile_result)
++
+ 
+ IF (ENABLE_INTERNALMYSQL)
+ # Check MySQL executables
+-- 
+1.7.3.4
+