ignatenkobrain pushed to supertuxkart (f22). "unbundle angelscript (..more)"

[notifications at fedoraproject.org]

From 2fe344e1d5b3ed62dd7d4f1444f5bf0be33317c7 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Sun, 17 May 2015 11:20:09 +0300
Subject: unbundle angelscript

Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

diff --git a/supertuxkart-unbundle-angelscript.patch b/supertuxkart-unbundle-angelscript.patch
new file mode 100644
index 0000000..80c0cf5
--- /dev/null
+++ b/supertuxkart-unbundle-angelscript.patch
@@ -0,0 +1,64 @@
+diff -uNr supertuxkart-0.9.orig/cmake/FindAngelscript.cmake supertuxkart-0.9/cmake/FindAngelscript.cmake
+--- supertuxkart-0.9.orig/cmake/FindAngelscript.cmake	1970-01-01 03:00:00.000000000 +0300
++++ supertuxkart-0.9/cmake/FindAngelscript.cmake	2015-05-14 12:33:07.921232926 +0300
+@@ -0,0 +1,34 @@
++# - Try to find enet
++# Once done this will define
++#
++#  ANGELSCRIPT_FOUND - system has enet
++#  Angelscript_INCLUDE_DIRS - the enet include directory
++#  Angelscript_LIBRARIES - the libraries needed to use enet
++#
++
++FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
++    PATHS
++    /usr/local
++    /usr
++    PATH_SUFFIXES include
++    )
++
++FIND_LIBRARY(Angelscript_LIBRARY
++    NAMES angelscript
++    PATHS
++    /usr/local
++    /usr
++    PATH_SUFFIXES lib
++    )
++
++# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
++
++IF (ANGELSCRIPT_FOUND)
++    SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
++ENDIF (ANGELSCRIPT_FOUND)
++
++MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)
++
+diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt
+--- supertuxkart-0.9.orig/CMakeLists.txt	2015-05-14 12:28:55.707748866 +0300
++++ supertuxkart-0.9/CMakeLists.txt	2015-05-14 12:35:13.005449979 +0300
+@@ -119,10 +119,9 @@
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
+ endif()
+ 
+-
+-# Build the angelscript library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
++# Angelscript
++find_package(Angelscript REQUIRED)
++include_directories(${Angelscript_INCLUDE_DIRS})
+ 
+ # OpenAL
+ if(APPLE)
+@@ -309,7 +308,7 @@
+     ${ENet_LIBRARIES}
+     glew
+     stkirrlicht
+-    angelscript
++    ${Angelscript_LIBRARIES}
+     ${CURL_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
+     ${OPENAL_LIBRARY}
diff --git a/supertuxkart.spec b/supertuxkart.spec
index a2dfd7b..d90f93b 100644
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -10,6 +10,7 @@ Source1:        %{name}.6
 Source2:        supertuxkart-0.7.3-license-clarification.txt
 Patch0:         supertuxkart-unbundle-wiiuse.patch
 Patch1:         supertuxkart-unbundle-enet.patch
+Patch2:         supertuxkart-unbundle-angelscript.patch
 BuildRequires:  cmake
 BuildRequires:  libvorbis-devel freeglut-devel desktop-file-utils
 BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10 libtool
@@ -17,6 +18,7 @@ BuildRequires:  libcurl-devel enet-devel fribidi-devel
 BuildRequires:  wiiuse-devel bluez-libs-devel
 BuildRequires:  libpng-devel libjpeg-turbo-devel
 BuildRequires:  libXrandr-devel
+BuildRequires:  angelscript-devel
 Requires:       hicolor-icon-theme opengl-games-utils
 # Provide so that yum install tuxkart will work, obsolete for auto upgrade
 Provides:       tuxkart = %{version}-%{release}
@@ -47,8 +49,9 @@ This package contains the data files for SuperTuxKart.
 cp -p %{SOURCE2} .
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Delete bundled libs
-rm -rf lib/enet lib/wiiuse
+rm -rf lib/enet lib/wiiuse lib/angelscript
 #sed -i -e '/setAnimationStrength/s/^/\/\//' src/karts/kart_model.cpp
 
 %build
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/supertuxkart.git/commit/?h=f22&id=2fe344e1d5b3ed62dd7d4f1444f5bf0be33317c7