[stage] Add patch to ignore the fluid binary from fltk

rmattes rmattes at fedoraproject.org
Tue Jan 17 02:53:18 UTC 2012


commit 012c5a02956305d20113867ecbb2081f838cc0d7
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Jan 16 21:53:12 2012 -0500

    Add patch to ignore the fluid binary from fltk

 Stage-4.1.1.fixfltk.patch |   13 +++++++++++++
 stage.spec                |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/Stage-4.1.1.fixfltk.patch b/Stage-4.1.1.fixfltk.patch
new file mode 100644
index 0000000..877992b
--- /dev/null
+++ b/Stage-4.1.1.fixfltk.patch
@@ -0,0 +1,13 @@
+diff -up ./CMakeLists.txt.fixfltk ./CMakeLists.txt
+--- ./CMakeLists.txt.fixfltk	2012-01-16 21:49:52.535208280 -0500
++++ ./CMakeLists.txt	2012-01-16 21:50:15.975190960 -0500
+@@ -101,7 +101,8 @@ IF( PNG_FOUND )
+ ELSE( PNG_FOUND )
+    MESSAGE( ${INDENT} "PNG library not detected" )
+ ENDIF( PNG_FOUND )
+-   
++ 
++set (FLTK_SKIP_FLUID TRUE) 
+ find_package( FLTK REQUIRED )
+ IF( FLTK_FOUND )
+ #  MESSAGE( STATUS ${INDENT} "FLTK_LIBRARIES=${FLTK_LIBRARIES}" )
diff --git a/stage.spec b/stage.spec
index d122dfe..9d5d34c 100644
--- a/stage.spec
+++ b/stage.spec
@@ -19,7 +19,9 @@ Patch1:         Stage-4.0.0.s390x-typos.patch
 # This patch allows libstageplugin's graphics2d interface to be compatible
 # with Player versions earlier than 3.1
 Patch2:         Stage-4.0.1.multiline.patch
-
+# This patch allows the build system to ignore the FLTK FLUID binary (since it is
+# not required at build time)
+Patch3:         Stage-4.1.1.fixfltk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -72,6 +74,7 @@ and manipulated through the Player server.
 %patch0 -p0
 %patch1 -p1 -b .s390x-typos
 %patch2 -p1
+%patch3 -p0
 sed -i 's/PLAYER_CAPABILITIES_REQ/PLAYER_CAPABILTIES_REQ/' libstageplugin/p_simulation.cc
 
 %build


More information about the scm-commits mailing list