diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-19 02:37:58 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-19 02:37:58 +0000 |
| commit | 2f5cebbac1e04a92f861b4fc6a8d7f4fa78f07e9 (patch) | |
| tree | d79dbded45837cb26c5969dccb522f6a17063fcf /media-sound | |
| parent | block old tl-plainextra to avoid collisions, bug #472934 by Muelli (diff) | |
| download | gentoo-2-2f5cebbac1e04a92f861b4fc6a8d7f4fa78f07e9.tar.gz gentoo-2-2f5cebbac1e04a92f861b4fc6a8d7f4fa78f07e9.tar.bz2 gentoo-2-2f5cebbac1e04a92f861b4fc6a8d7f4fa78f07e9.zip | |
update the fltk unembedding patch not to require fltk with opengl, bug #469560 by Daniel Schulte
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/lmms/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog index e41fe4252c66..dd03283d3aeb 100644 --- a/media-sound/lmms/ChangeLog +++ b/media-sound/lmms/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/lmms # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.28 2013/05/08 13:09:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.29 2013/06/19 02:37:58 aballier Exp $ + + 19 Jun 2013; Alexis Ballier <aballier@gentoo.org> + files/lmms-0.4.14-unembedfltk.patch: + update the fltk unembedding patch not to require fltk with opengl, bug + #469560 by Daniel Schulte *lmms-0.4.14 (08 May 2013) diff --git a/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch b/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch index 62e6f512eeea..ba46562109f5 100644 --- a/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch +++ b/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch @@ -2,17 +2,20 @@ Index: lmms-0.4.14/plugins/zynaddsubfx/CMakeLists.txt =================================================================== --- lmms-0.4.14.orig/plugins/zynaddsubfx/CMakeLists.txt +++ lmms-0.4.14/plugins/zynaddsubfx/CMakeLists.txt -@@ -45,7 +45,8 @@ IF(LMMS_BUILD_WIN32) +@@ -45,7 +45,11 @@ 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} ) ++set(FLTK_SKIP_OPENGL true) ++set(FLTK_SKIP_FORMS true) ++set(FLTK_SKIP_IMAGES true) +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 -@@ -98,7 +99,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL +@@ -98,7 +102,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}) @@ -21,7 +24,7 @@ Index: lmms-0.4.14/plugins/zynaddsubfx/CMakeLists.txt ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) # link system libraries when on win32 -@@ -106,25 +107,7 @@ IF(LMMS_BUILD_WIN32) +@@ -106,25 +110,7 @@ IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32 -lws2_32) ENDIF(LMMS_BUILD_WIN32) |