rpm/MyGUI
SHA256
1
0
Fork 0
forked from pool/MyGUI
Code Pull Requests Activity

Accepting request 227258 from home:seife:branches:games

Browse Source 
fix build on 13.1+:
  * freetype includes are now in include/freetype2
  * OGRE needs libboost_system on linker commandline

OBS-URL: https://build.opensuse.org/request/show/227258
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=11
This commit is contained in:
Matthias Mailänder 2014-03-23 21:11:09 +00:00 committed by Git OBS Bridge
parent 31247bd30a
commit 4e53e57bae
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MyGUI-freetype2-include.patch Normal file
View File

@ -0,0 +1,15 @@
Index: b/CMake/Packages/FindFreetype.cmake
===================================================================
--- a/CMake/Packages/FindFreetype.cmake
+++ b/CMake/Packages/FindFreetype.cmake
@@ -39,6 +39,10 @@ find_library(FREETYPE_LIBRARY_REL NAMES
find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
make_library_set(FREETYPE_LIBRARY)
+# openSUSE +13.1 has both in one directory and there is no freetype/freetype.h inside include/freetype2
+if (NOT FREETYPE_INCLUDE_DIR)
+ set(FREETYPE_INCLUDE_DIR ${FREETYPE_FT2BUILD_INCLUDE_DIR})
+endif ()
findpkg_finish(FREETYPE)
mark_as_advanced(FREETYPE_FT2BUILD_INCLUDE_DIR)
if (NOT FREETYPE_FT2BUILD_INCLUDE_DIR STREQUAL FREETYPE_INCLUDE_DIR)

7
MyGUI.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Mar 23 17:09:00 UTC 2014 - seife+obs@b1-systems.com
- fix build on 13.1+:
* freetype includes are now in include/freetype2
* OGRE needs libboost_system on linker commandline
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 7 11:28:09 UTC 2012 - joop.boonen@opensuse.org Mon May 7 11:28:09 UTC 2012 - joop.boonen@opensuse.org

9
MyGUI.spec
View File

@ -1,7 +1,8 @@
# #
# spec file for package MyGUI # spec file for package MyGUI
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,6 +35,8 @@ Source1: %{name}.png
Patch0: %{name}-lib_suffix.patch Patch0: %{name}-lib_suffix.patch
# PATCH-FIX-UPSTREAM MyGUI-gcc47-visibility.patch # PATCH-FIX-UPSTREAM MyGUI-gcc47-visibility.patch
Patch1: %{name}-gcc47-visibility.patch Patch1: %{name}-gcc47-visibility.patch
# PATCH-FIX-OPENSUSE MyGUI-freetype2-include.patch
Patch2: MyGUI-freetype2-include.patch
BuildRequires: Cg BuildRequires: Cg
BuildRequires: Cg-devel BuildRequires: Cg-devel
BuildRequires: cmake BuildRequires: cmake
@ -131,6 +134,7 @@ Development documentation for package MyGUI.
%setup -q -n %{name}_%{version} %setup -q -n %{name}_%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
dos2unix *.txt COPYING.LESSER dos2unix *.txt COPYING.LESSER
chmod 644 *.txt COPYING.LESSER chmod 644 *.txt COPYING.LESSER
@ -138,7 +142,10 @@ chmod 644 *.txt COPYING.LESSER
%build %build
install -dm 755 build install -dm 755 build
pushd build pushd build
# this is probably an error in OGRE packaging... but let's just fix the build.
export OGRE_LIBRARIES="`pkg-config --libs OGRE` -lboost_system"
cmake \ cmake \
-DOGRE_LIBRARIES="$OGRE_LIBRARIES" \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_SKIP_RPATH=YES \ -DCMAKE_SKIP_RPATH=YES \
-DCMAKE_BUILD_TYPE=release \ -DCMAKE_BUILD_TYPE=release \