From e94fa48f9a731a056a03c3b4dd53bf341f7a7730 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Jan 03 2011 14:39:54 +0000
Subject: - Add patch to use system's fltk.


---

diff --git a/lmms-0.4.9-system-fltk.patch b/lmms-0.4.9-system-fltk.patch
new file mode 100644
index 0000000..6c99cf9
--- /dev/null
+++ b/lmms-0.4.9-system-fltk.patch
@@ -0,0 +1,44 @@
+From: Thomas Moschny <thomas.moschny@gmx.de>
+Subject: [PATCH] t/system-fltk
+
+Use system's fltk.
+
+Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
+
+---
+ plugins/zynaddsubfx/CMakeLists.txt |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
+index 3b93799..e57b42b 100644
+--- a/plugins/zynaddsubfx/CMakeLists.txt
++++ b/plugins/zynaddsubfx/CMakeLists.txt
+@@ -47,7 +47,7 @@ IF(LMMS_BUILD_WIN32)
+ 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
++INCLUDE_DIRECTORIES(/usr/include/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
+ 
+ set(ZASF_CORE_LIBS
+     zynaddsubfx_input
+@@ -100,7 +100,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
+ INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
+-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk)
+ ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
+ 
+ # link system libraries when on win32
+@@ -126,8 +126,6 @@ IF(LMMS_BUILD_WIN64)
+ ELSEIF(LMMS_BUILD_WIN32)
+ 	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
+ ENDIF(LMMS_BUILD_WIN64)
+-ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
+ 
+-ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
+ ENDIF(LMMS_HAVE_FFTW3F)
+ 
+-- 
+tg: (42d572e..) t/system-fltk (depends on: t/libexecdir)
diff --git a/lmms.spec b/lmms.spec
index bb789ce..dc6e081 100644
--- a/lmms.spec
+++ b/lmms.spec
@@ -1,6 +1,6 @@
 Name:           lmms
 Version:        0.4.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -41,9 +41,10 @@ Patch0:         lmms-0.4.9-libexecdir.patch
 # upstream isn't really interested in.
 Patch1:         lmms-0.4.9-vst-nowine.patch
 
-# FIXME: we surely want to patch zynaddsubfx to use system's
-# fltk. using system's zynaddsubfx however is, according to lmms'
-# developers, not possibe because there are to many changes.
+# make the embedded zynaddsubfx use system's fltk. using system's
+# zynaddsubfx however is, according to lmms' developers, not possibe
+# because there are to many changes.
+Patch2:         lmms-0.4.9-system-fltk.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -126,6 +127,7 @@ developing addons for %{name}.
 %setup0 -q
 %patch0 -p1 -b .libexecdir
 %patch1 -p1 -b .nowine
+%patch2 -p1 -b .fltk
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -217,6 +219,9 @@ This package contains the necessary files to host VST plugins.
 
 
 %changelog
+* Mon Jan  3 2011 Thomas Moschny <thomas.moschny@gmx.de> - 0.4.9-2
+- Add patch to use system's fltk.
+
 * Sat Dec 18 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.4.9-1
 - Update to 0.4.9, rebase patches.