rpms/spring/devel spring-0.80.2-allegro.patch, NONE, 1.1 spring-0.79.1.2-allegro.patch, 1.1, NONE

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965/devel

Added Files:
	spring-0.80.2-allegro.patch 
Removed Files:
	spring-0.79.1.2-allegro.patch 
Log Message:
forgot to cvs add the patch

spring-0.80.2-allegro.patch:
 CMakeLists.txt                |    3 +-
 build/cmake/FindAllegro.cmake |   61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

--- NEW FILE spring-0.80.2-allegro.patch ---
diff -up ./rts/build/cmake/FindAllegro.cmake.allegro ./rts/build/cmake/FindAllegro.cmake
--- ./rts/build/cmake/FindAllegro.cmake.allegro	2009-08-22 20:07:41.000000000 +0200
+++ ./rts/build/cmake/FindAllegro.cmake	2009-08-22 20:07:41.000000000 +0200
@@ -0,0 +1,61 @@
+# http://guichan.googlecode.com/svn/trunk/CMake/Modules/FindAllegro.cmake
+# - Try to find Allegro
+# Once done this will define
+#
+#  ALLEGRO_FOUND - system has Allegro
+#  ALLEGRO_INCLUDE_DIRS - the Allegro include directory
+#  ALLEGRO_LIBRARIES - Link these to use Allegro
+#  ALLEGRO_DEFINITIONS - Compiler switches required for using Allegro
+#
+#  Copyright (c) 2008 Olof Naessen <olof.naessen at gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+  # in cache already
+  set(ALLEGRO_FOUND TRUE)
+else (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+  find_program(ALLEGROCONFIG_EXECUTABLE NAMES allegro-config PATHS
+     /opt/local/bin
+  )
+
+  #reset vars
+  set(ALLEGRO_LIBRARIES)
+  set(ALLEGRO_INCLUDE_DIRS)
+
+  # if allegro-config has been found
+  if(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_LIBRARIES)
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_INCLUDE_DIRS)
+
+    if(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+      set(ALLEGRO_FOUND TRUE)
+    endif(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+    set( ALLEGRO_LIBRARIES ${ALLEGRO_LIBRARIES} CACHE STRING "The libraries for allegro" )
+
+    mark_as_advanced(ALLEGRO_LIBRARIES ALLEGRO_INCLUDE_DIRS)
+
+  endif(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+  if (ALLEGRO_FOUND)
+    if (NOT Allegro_FIND_QUIETLY)
+      message(STATUS "Found Allegro: ${ALLEGRO_LIBRARIES}")
+    endif (NOT Allegro_FIND_QUIETLY)
+  else (ALLEGRO_FOUND)
+    if (Allegro_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Allegro")
+    endif (Allegro_FIND_REQUIRED)
+  endif (ALLEGRO_FOUND)
+
+  # show the ALLEGRO_INCLUDE_DIRS and ALLEGRO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(ALLEGRO_INCLUDE_DIRS ALLEGRO_LIBRARIES)
+
+endif (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
diff -up ./rts/CMakeLists.txt.allegro ./rts/CMakeLists.txt
--- ./rts/CMakeLists.txt.allegro	2009-08-21 20:58:58.000000000 +0200
+++ ./rts/CMakeLists.txt	2009-08-22 20:10:22.000000000 +0200
@@ -57,7 +57,8 @@ FIND_PACKAGE(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLUT REQUIRED)
 FIND_PACKAGE(GLEW REQUIRED)
-LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY})
+FIND_PACKAGE(Allegro REQUIRED)
+LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY} ${ALLEGRO_LIBRARIES})
 
 FIND_PACKAGE(Freetype REQUIRED)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})


--- spring-0.79.1.2-allegro.patch DELETED ---