summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
diff options
context:
space:
mode:
authorMoritz Blume <moritz.blume@bmw-carit.de>2015-06-23 17:50:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-26 14:08:03 +0100
commitc171909352b5ed92166857b0bbcd901ae0f74996 (patch)
treed6bb3a1a4c469e296cfde6d7eea3a1b0f46ec520 /meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
parentcce89c44948ee66ad0abb491be57e270038270e4 (diff)
downloadopenembedded-core-c171909352b5ed92166857b0bbcd901ae0f74996.tar.gz
openembedded-core-c171909352b5ed92166857b0bbcd901ae0f74996.tar.bz2
openembedded-core-c171909352b5ed92166857b0bbcd901ae0f74996.zip
cmake: Upgrade 2.8.12.2 -> 3.2.2
Patches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch" were adapted in order to fit to CMake 3.2.2 (refer to the commit message in the respective patch for details). Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was rejected upstream and its functionality otherwise implemented in the meantime. Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch')
-rw-r--r--meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
deleted file mode 100644
index 1b523c057b..0000000000
--- a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Dec 8 13:38:06 UTC 2013
-Subject: fix check for freetype-2.5.1
-
-Upstream-Status: Submitted http://www.cmake.org/Bug/view.php?id=14601
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
---- old/Modules/FindFreetype.cmake
-+++ new/Modules/FindFreetype.cmake
-@@ -64,6 +64,19 @@
- PATH_SUFFIXES include/freetype2 include
- )
-
-+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
-+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
-+ HINTS
-+ ENV FREETYPE_DIR
-+ PATHS
-+ /usr/X11R6
-+ /usr/local/X11R6
-+ /usr/local/X11
-+ /usr/freeware
-+ PATH_SUFFIXES include/freetype2 include
-+ )
-+endif()
-+
- find_library(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
- HINTS
-@@ -82,8 +95,14 @@
- endif()
- set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
--if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
-+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-+endif()
-+
-+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
-+ file(STRINGS "${FREETYPE_H}" freetype_version_str
- REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
-
- unset(FREETYPE_VERSION_STRING)