Un-embed fltk for the zynaddsubfx plugin.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 121 insertions, 6 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index ac4d9ecbbdf9..06852fffd1cf 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lmms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.15 2011/01/02 13:14:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.16 2011/02/26 14:46:50 aballier Exp $
+
+*lmms-0.4.9-r1 (26 Feb 2011)
+
+  26 Feb 2011; Alexis Ballier <aballier@gentoo.org> +lmms-0.4.9-r1.ebuild,
+  +files/lmms-unembedfltk.patch:
+  Un-embed fltk for the zynaddsubfx plugin.
 
   02 Jan 2011; Alexis Ballier <aballier@gentoo.org> -lmms-0.4.5.ebuild,
   -lmms-0.4.6.ebuild, -lmms-0.4.7.ebuild:
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 5622e860d9a9..b493c4d37598 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lmms-unembedfltk.patch 2688 RMD160 749131b0f05e1fca3ddae57810a450e3554885c2 SHA1 5c8c6b73e7767e8381c7012f3895312a0c676343 SHA256 99b1931c8e18c0d0ad13e15162705d9683af2b5ae3ba80eb595fc7e3cd5876d9
 DIST lmms-0.4.9.tar.bz2 12768353 RMD160 1548be4b94a9ab9aaa0c3ab504ed262d6806497e SHA1 559e4836a8855878ad1e1608be27cc56b8ee9c80 SHA256 a0e5ea787884d438516b5506d2fe8a130f446f1b675901940877fc3120e46f25
+EBUILD lmms-0.4.9-r1.ebuild 1727 RMD160 08fef46475549ab99a0ae7d978bcf05903575e89 SHA1 281d7290056c1e6d65f3145859ab68af5719af47 SHA256 c44b189402b10d59a80b13b90ea23126d55f5720e6a6dd24ec23b2a850f7e819
 EBUILD lmms-0.4.9.ebuild 1645 RMD160 d3db6e83d4f0fc7ae9f027e308d7dd4c3b1a5e17 SHA1 ef7c968e2747d6c95f9faaeaafe2c489ebde7845 SHA256 90ab2704694ed68334dc4c0ca158d35e651de57984faf61b0c331b92ea39c4ad
-MISC ChangeLog 2501 RMD160 60d937a7fbfc4c9c2aac96973d7cb74275e7c1b6 SHA1 1f2091ed26aa8d257ac09d9f01a40d55f7571512 SHA256 1e0f6b7627cc72f9b79651275d50230a6df3043b49f23145c04948ec2d865974
+MISC ChangeLog 2684 RMD160 36f461b39319a2b0e5729c6f259cdd6480cc941e SHA1 b249b08c84f3cd267c3ff21f434f2835d16ef2d6 SHA256 69a420f1657ad595466de45ea6b46325cf0717b94518f5c3f4f4e9650c1c970b
 MISC metadata.xml 598 RMD160 a020f694ec8d17b69a0ba01958e474b3264f1981 SHA1 d4a666e0a5ebb2fec3e4fbf053a8cf30422fec72 SHA256 ce319b79bf0fba551bbffe0a1f96e5862a3bbed27e3bce0e38cdc6fe87b8ca78
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0gekUACgkQvFcC4BYPU0rAhQCfdCYC4JgZNIMv6+Qc4f0PvW1/
-6G4An1kArn+/EnXyffn+Pz70ZWhQG6BX
-=9U7j
+iEYEARECAAYFAk1pEl8ACgkQvFcC4BYPU0r3KQCfQkssJsgKNh12/65+RhIdMbC7
+p7cAniCKcMJgCxRtjErSGndtla42F9hx
+=l/cZ
 -----END PGP SIGNATURE-----
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)
+ 
diff --git a/media-sound/lmms/lmms-0.4.9-r1.ebuild b/media-sound/lmms/lmms-0.4.9-r1.ebuild
new file mode 100644
index 000000000000..d0f0f4660ef1
--- /dev/null
+++ b/media-sound/lmms/lmms-0.4.9-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r1.ebuild,v 1.1 2011/02/26 14:46:50 aballier Exp $
+
+EAPI="2"
+
+inherit eutils cmake-utils
+
+DESCRIPTION="free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa debug fftw fluidsynth jack ogg pulseaudio sdl stk vst"
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4[accessibility]
+	>=media-libs/libsndfile-1.0.11
+	>=media-libs/libsamplerate-0.1.7
+	x11-libs/libXinerama
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( =sci-libs/fftw-3* >=x11-libs/fltk-1.3.0_rc:1.1 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
+	ogg? ( media-libs/libvorbis
+			media-libs/libogg )
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl
+			>=media-libs/sdl-sound-1.0.1 )
+	stk? ( media-libs/stk )
+	vst? ( app-emulation/wine )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.5"
+
+DOCS="README AUTHORS TODO"
+
+PATCHES=( "${FILESDIR}/${PN}-unembedfltk.patch" )
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=TRUE
+		-DWANT_TAP=TRUE
+		-DWANT_CALF=TRUE
+		$(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want fftw FFTW3F)
+		$(cmake-utils_use_want jack JACK)
+		$(cmake-utils_use_want ogg OGGVORBIS)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want sdl SDL)
+		$(cmake-utils_use_want stk STK)
+		$(cmake-utils_use_want vst VST)
+		$(cmake-utils_use_want fluidsynth SF2)"
+	cmake-utils_src_configure
+}