From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNY2L-0004XG-Sv for garchives@archives.gentoo.org; Fri, 20 May 2011 22:19:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E3B4E04CB; Fri, 20 May 2011 22:19:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16C9AE04CB for ; Fri, 20 May 2011 22:19:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B8771B402B for ; Fri, 20 May 2011 22:19:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 96A168001E for ; Fri, 20 May 2011 22:19:02 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-gfx/digikam/files/digikam-1.9.0-turbo.patch X-VCS-Directories: media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: a8a9b4f54a064fd91f8631ddcde22d265e1034cb Date: Fri, 20 May 2011 22:19:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e959109daa4c4a8869a30db16d6d9f9e commit: a8a9b4f54a064fd91f8631ddcde22d265e1034cb Author: Andreas K. Huettel physik uni-r <= DOT> de> AuthorDate: Fri May 20 22:17:31 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Fri May 20 22:17:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Da8a9b4f5 [media-gfx/digikam] added patch --- media-gfx/digikam/files/digikam-1.9.0-turbo.patch | 56 +++++++++++++++= ++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gf= x/digikam/files/digikam-1.9.0-turbo.patch new file mode 100644 index 0000000..bd10552 --- /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 +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 +--- + 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) +=20 +-# 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" jp= eglib_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 \n#include\n#i= nclude \n int main()\n {\n #if (JPEG_LIB_VERSION >=3D 80) \n #= error JPEG_LIB_VERSION >=3D 80 found \n #endif \n }\n") ++set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpe= glib_version_check.cpp) ++file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source= }") ++set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=3D${JPE= G_INCLUDE_DIR}") ++ ++try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeg= lib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" C= OMPILE_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) ++ +=20 + IF (ENABLE_INTERNALMYSQL) + # Check MySQL executables +--=20 +1.7.3.4 +