version bump

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

4 files changed, 132 insertions, 5 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index ce426cf7b679..0ae8e8bd7067 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.19 2011/03/20 20:10:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.20 2011/04/03 15:14:32 aballier Exp $
+
+*lmms-0.4.10 (03 Apr 2011)
+
+  03 Apr 2011; Alexis Ballier <aballier@gentoo.org> +lmms-0.4.10.ebuild,
+  +files/lmms-0.4.10-unembedfltk.patch:
+  version bump
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> lmms-0.4.9.ebuild,
   lmms-0.4.9-r1.ebuild, lmms-0.4.9-r2.ebuild, lmms-0.4.9-r3.ebuild:
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index fd7a3418e362..39eb872b3f34 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lmms-0.4.10-unembedfltk.patch 2816 RMD160 36beadffff1c867d682907640cc94715a51491ee SHA1 bdd933b04b556e334dfb66d3f7f9f99b937766a0 SHA256 f2b07178f0979618b8e180e64b0a43bf1ee774b38b418a2e22464c305b38e8a4
 AUX lmms-unembedfltk.patch 2688 RMD160 749131b0f05e1fca3ddae57810a450e3554885c2 SHA1 5c8c6b73e7767e8381c7012f3895312a0c676343 SHA256 99b1931c8e18c0d0ad13e15162705d9683af2b5ae3ba80eb595fc7e3cd5876d9
+DIST lmms-0.4.10.tar.bz2 12748082 RMD160 b45adc819ae05311139c7dd116344ab0043aa221 SHA1 401d085f4f8e63942cd26bb0160f7009a644515c SHA256 2bf3ee8e17dbde6b00f65dadd9b75a180a5c003cb4ecc6a2bd31e5c57ac5ac0c
 DIST lmms-0.4.9.tar.bz2 12768353 RMD160 1548be4b94a9ab9aaa0c3ab504ed262d6806497e SHA1 559e4836a8855878ad1e1608be27cc56b8ee9c80 SHA256 a0e5ea787884d438516b5506d2fe8a130f446f1b675901940877fc3120e46f25
+EBUILD lmms-0.4.10.ebuild 1993 RMD160 f8e1e148033e8d1758bb16761649c4941d9c91a6 SHA1 d0e9fdff201b809398a010788cb5e89d465e2976 SHA256 6a16ca8b6449c1fe3bf04807512a98eca881395b73d494c1cf28d4455dd143d7
 EBUILD lmms-0.4.9-r1.ebuild 1723 RMD160 f7d95b65084a6ab12c52360f804ba8bed2c65c9a SHA1 e34a92a976ef817f2cebaa343ac4a1ff4e9da8a1 SHA256 9ed64440cf2e4e83b22e9fbbe4015cbf0596b77d472bbf31cda2a5f09a2d4d23
 EBUILD lmms-0.4.9-r2.ebuild 1865 RMD160 f984037ee01e299cd3a92cfbd3f7377009e9293b SHA1 83fe4e6bf7b606a67562590205882c7d30f99f99 SHA256 ca9397456ff0abfd6173ac969f6403272871a22a7d61af63bbc5a3d17d49ec76
 EBUILD lmms-0.4.9-r3.ebuild 1889 RMD160 bdead57b1dffdc884c2dfb3480821f2eee95bbf0 SHA1 769e0258bcf6a66aedd0fb791f0ceb20849bf48d SHA256 8d55311e9f2c8996774efd42bf7fda49a9de89decb1dd8ce73c68bd01d1317cb
 EBUILD lmms-0.4.9.ebuild 1642 RMD160 6fb790381d8a9eaf546b50a9dab4da8304fb2c61 SHA1 227a6c0532b28a90b61b7a89b89407c89dbab728 SHA256 44c45cf3352608541d57ae794a7d3c7fcf7af487e67869e82ade78b17d4017a4
-MISC ChangeLog 3229 RMD160 d170355b97b62f6349b4549306eb3e599c9cad77 SHA1 dc8c1fb078b4d4da2108c83bcfb7d39f5d9020c2 SHA256 844d272013cd10d0da98639ce1b5b3ed68a04ec54ac003e08d91cf1253cb7f13
+MISC ChangeLog 3390 RMD160 d795a2ee8f8abf0a5587b899d040112fdca6f539 SHA1 038410708827687f1ee3b5108275901558ab3e7b SHA256 f7fe16aaec6b15e27b53b25ed9cd4d329b46c51e67349c6d64ed14c89134ba43
 MISC metadata.xml 598 RMD160 a020f694ec8d17b69a0ba01958e474b3264f1981 SHA1 d4a666e0a5ebb2fec3e4fbf053a8cf30422fec72 SHA256 ce319b79bf0fba551bbffe0a1f96e5862a3bbed27e3bce0e38cdc6fe87b8ca78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2GXygACgkQgAnW8HDreRbsJwCgwrZIt/uqKxydiBQSRtjC1jWc
-qRQAnRC4lhSsNhJ/vHRN/RMVla4xMUg1
-=KEII
+iEYEARECAAYFAk2Yjt4ACgkQvFcC4BYPU0oujgCdGziqjbQ6Sm1dDTAM8BDoVqe7
+bmoAn2ayJDroTx4GxcoOIASb3bEdmJer
+=5FUh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch b/media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch
new file mode 100644
index 000000000000..8ed5e6fa82fb
--- /dev/null
+++ b/media-sound/lmms/files/lmms-0.4.10-unembedfltk.patch
@@ -0,0 +1,51 @@
+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)
+ 
diff --git a/media-sound/lmms/lmms-0.4.10.ebuild b/media-sound/lmms/lmms-0.4.10.ebuild
new file mode 100644
index 000000000000..8c34ef11c27b
--- /dev/null
+++ b/media-sound/lmms/lmms-0.4.10.ebuild
@@ -0,0 +1,67 @@
+# 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.10.ebuild,v 1.1 2011/04/03 15:14:32 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 portaudio 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.0 >=x11-libs/fltk-1.3.0_rc3:1 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
+	ogg? ( media-libs/libvorbis
+			media-libs/libogg )
+	fluidsynth? ( media-sound/fluidsynth )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	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"
+RDEPEND="${RDEPEND}
+	media-plugins/swh-plugins
+	media-plugins/caps-plugins
+	media-plugins/tap-plugins
+	media-libs/ladspa-cmt"
+
+DOCS="README AUTHORS TODO"
+
+PATCHES=( "${FILESDIR}/${P}-unembedfltk.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-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 portaudio PORTAUDIO)
+		$(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
+}