diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-02-26 14:46:50 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-26 14:46:50 +0000 |
| commit | 5a00b7f1b90b71a0a93cf24c25731ba8688674ae (patch) | |
| tree | 78c320efe6ddd009597527765e22f1bfc9e9a71c /media-sound/lmms/files | |
| parent | depend virtual/jpeg (diff) | |
| download | gentoo-2-5a00b7f1b90b71a0a93cf24c25731ba8688674ae.tar.gz gentoo-2-5a00b7f1b90b71a0a93cf24c25731ba8688674ae.tar.bz2 gentoo-2-5a00b7f1b90b71a0a93cf24c25731ba8688674ae.zip | |
Un-embed fltk for the zynaddsubfx plugin.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/lmms/files')
| -rw-r--r-- | media-sound/lmms/files/lmms-unembedfltk.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/media-sound/lmms/files/lmms-unembedfltk.patch b/media-sound/lmms/files/lmms-unembedfltk.patch new file mode 100644 index 000000000000..c54708b6a01e --- /dev/null +++ b/media-sound/lmms/files/lmms-unembedfltk.patch @@ -0,0 +1,50 @@ +Index: lmms-0.4.9/plugins/zynaddsubfx/CMakeLists.txt +=================================================================== +--- lmms-0.4.9.orig/plugins/zynaddsubfx/CMakeLists.txt ++++ lmms-0.4.9/plugins/zynaddsubfx/CMakeLists.txt +@@ -47,7 +47,8 @@ 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} ) ++FIND_PACKAGE(FLTK) ++INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) + + set(ZASF_CORE_LIBS + zynaddsubfx_input +@@ -100,7 +101,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) + INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_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 ${FLTK_LIBRARIES}) + ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + + # link system libraries when on win32 +@@ -108,26 +109,9 @@ IF(LMMS_BUILD_WIN32) + TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32 -lws2_32) + ENDIF(LMMS_BUILD_WIN32) + +-# FLTK needs X +-IF(LMMS_BUILD_LINUX) +- FIND_PACKAGE(X11) +- FIND_PACKAGE(Freetype) +- TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl ${X11_LIBRARIES} ${X11_Xft_LIB} ${X11_Xinerama_LIB} ${FREETYPE_LIBRARY} -lfontconfig) +-ENDIF(LMMS_BUILD_LINUX) +- +- + IF(LMMS_BUILD_WIN32) + ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe) + ENDIF(LMMS_BUILD_WIN32) + +-# build FLTK +-IF(LMMS_BUILD_WIN64) +- SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake") +-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) + |