/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Dec 15 00:16:15 2013 UTC (7 months, 2 weeks ago) by johu
Branch: MAIN
CVS Tags: HEAD
Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find logic for media-libs/freetype-2.5.1, bug #493656.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 From: Julian Ospald <hasufell@gentoo.org>
2 Date: Sun Dec 8 13:38:06 UTC 2013
3 Subject: fix check for freetype-2.5.1
4
5 --- Modules/FindFreetype.cmake
6 +++ Modules/FindFreetype.cmake
7 @@ -64,6 +64,19 @@
8 PATH_SUFFIXES include/freetype2 include
9 )
10
11 +if(NOT FREETYPE_INCLUDE_DIR_freetype2)
12 + find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
13 + HINTS
14 + ENV FREETYPE_DIR
15 + PATHS
16 + /usr/X11R6
17 + /usr/local/X11R6
18 + /usr/local/X11
19 + /usr/freeware
20 + PATH_SUFFIXES include/freetype2 include
21 + )
22 +endif()
23 +
24 find_library(FREETYPE_LIBRARY
25 NAMES freetype libfreetype freetype219
26 HINTS
27 @@ -82,8 +95,14 @@
28 endif()
29 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
30
31 -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
32 - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
33 +if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
34 + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
35 +elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
36 + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
37 +endif()
38 +
39 +if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
40 + file(STRINGS "${FREETYPE_H}" freetype_version_str
41 REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
42
43 unset(FREETYPE_VERSION_STRING)

  ViewVC Help
Powered by ViewVC 1.1.20