| 1 |
aballier 11/02/26 14:46:50 |
| 2 |
|
| 3 |
Added: lmms-unembedfltk.patch |
| 4 |
Log: |
| 5 |
Un-embed fltk for the zynaddsubfx plugin. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/lmms/files/lmms-unembedfltk.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lmms/files/lmms-unembedfltk.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lmms/files/lmms-unembedfltk.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lmms-unembedfltk.patch |
| 16 |
=================================================================== |
| 17 |
Index: lmms-0.4.9/plugins/zynaddsubfx/CMakeLists.txt |
| 18 |
=================================================================== |
| 19 |
--- lmms-0.4.9.orig/plugins/zynaddsubfx/CMakeLists.txt |
| 20 |
+++ lmms-0.4.9/plugins/zynaddsubfx/CMakeLists.txt |
| 21 |
@@ -47,7 +47,8 @@ IF(LMMS_BUILD_WIN32) |
| 22 |
ADD_DEFINITIONS(-DPTW32_STATIC_LIB) |
| 23 |
ENDIF(LMMS_BUILD_WIN32) |
| 24 |
|
| 25 |
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) |
| 26 |
+FIND_PACKAGE(FLTK) |
| 27 |
+INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) |
| 28 |
|
| 29 |
set(ZASF_CORE_LIBS |
| 30 |
zynaddsubfx_input |
| 31 |
@@ -100,7 +101,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL |
| 32 |
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
| 33 |
ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) |
| 34 |
INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR}) |
| 35 |
-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) |
| 36 |
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${FLTK_LIBRARIES}) |
| 37 |
ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) |
| 38 |
|
| 39 |
# link system libraries when on win32 |
| 40 |
@@ -108,26 +109,9 @@ IF(LMMS_BUILD_WIN32) |
| 41 |
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32 -lws2_32) |
| 42 |
ENDIF(LMMS_BUILD_WIN32) |
| 43 |
|
| 44 |
-# FLTK needs X |
| 45 |
-IF(LMMS_BUILD_LINUX) |
| 46 |
- FIND_PACKAGE(X11) |
| 47 |
- FIND_PACKAGE(Freetype) |
| 48 |
- TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl ${X11_LIBRARIES} ${X11_Xft_LIB} ${X11_Xinerama_LIB} ${FREETYPE_LIBRARY} -lfontconfig) |
| 49 |
-ENDIF(LMMS_BUILD_LINUX) |
| 50 |
- |
| 51 |
- |
| 52 |
IF(LMMS_BUILD_WIN32) |
| 53 |
ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe) |
| 54 |
ENDIF(LMMS_BUILD_WIN32) |
| 55 |
|
| 56 |
-# build FLTK |
| 57 |
-IF(LMMS_BUILD_WIN64) |
| 58 |
- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake") |
| 59 |
-ELSEIF(LMMS_BUILD_WIN32) |
| 60 |
- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake") |
| 61 |
-ENDIF(LMMS_BUILD_WIN64) |
| 62 |
-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}) |
| 63 |
- |
| 64 |
-ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk) |
| 65 |
ENDIF(LMMS_HAVE_FFTW3F) |
Archives