diff --git a/ogre-1.8.1-cmake-freetype.patch b/ogre-1.8.1-cmake-freetype.patch new file mode 100644 index 0000000..1c4dc31 --- /dev/null +++ b/ogre-1.8.1-cmake-freetype.patch @@ -0,0 +1,13 @@ +diff -up ./CMake/Dependencies.cmake~ ./CMake/Dependencies.cmake +diff -up ./CMake/Packages/FindFreetype.cmake~ ./CMake/Packages/FindFreetype.cmake +--- ./CMake/Packages/FindFreetype.cmake~ 2012-09-02 07:27:14.000000000 +0200 ++++ ./CMake/Packages/FindFreetype.cmake 2014-05-25 14:11:05.813132929 +0200 +@@ -43,7 +43,7 @@ message(STATUS "CMAKE_PREFIX_PATH: ${CMA + findpkg_framework(FREETYPE) + message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") + +-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) ++find_path(FREETYPE_INCLUDE_DIR NAMES freetype2/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) + find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) + + find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) diff --git a/ogre.spec b/ogre.spec index 5694a8b..a5e614e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -27,6 +27,7 @@ Patch3: ogre-1.7.2-fix-ppc-build.patch Patch5: ogre-1.8.1-build-rcapsdump.patch Patch6: ogre-thread.patch Patch7: ogre-1.8.1-dynlib-allow-no-so.patch +Patch8: ogre-1.8.1-cmake-freetype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel @@ -144,6 +145,7 @@ using SampleBrowser. %patch5 -p0 -z .build-rcapsdump %patch6 -p0 -z .thread %patch7 -p0 -z .dynlib-allow-no-so +%patch8 -p1 -z .cmake-freetype # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ @@ -288,6 +290,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/OGRE/cmake/* $RPM_BUILD_ROOT%{_datadir}/cmake/Modul %changelog * Fri May 23 2014 Petr Machata - 1.8.1-11 - Rebuild for boost 1.55.0 +- Fix detection of libfreetype (ogre-1.8.1-cmake-freetype.patch) * Sat Aug 03 2013 Fedora Release Engineering - 1.8.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild