[gentoo-commits] gentoo-x86 commit in media-sound/lmms/files: lmms-0.4.10-unembedfltk.patch

[gentoo-commits] gentoo-x86 commit in media-sound/lmms/files: lmms-0.4.10-unembedfltk.patch

[Alexis Ballier (aballier)]

aballier    11/04/03 15:14:32

  Added:                lmms-0.4.10-unembedfltk.patch
  Log:
  version bump
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch?rev=1.1&content-type=text/plain

Index: lmms-0.4.10-unembedfltk.patch
===================================================================
Index: lmms-0.4.10/plugins/zynaddsubfx/CMakeLists.txt
===================================================================
--- lmms-0.4.10.orig/plugins/zynaddsubfx/CMakeLists.txt
+++ lmms-0.4.10/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,27 +109,10 @@ 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 ZynAddSubFxCore POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/libZynAddSubFxCore.dll)
 	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)
 

[gentoo-commits] gentoo-x86 commit in media-sound/lmms/files: lmms-0.4.10-unembedfltk.patch

[Lars Wendler (polynomial-c)]

polynomial-c    14/04/27 11:18:41

  Removed:              lmms-0.4.10-unembedfltk.patch
  Log:
  Removed old files from FILESDIR
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)