Backport build fix for libjpeg-turbo

(Portage version: 2.1.9.49/cvs/Linux x86_64)

3 files changed, 63 insertions, 2 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/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
+