[media-sound/lmms] Sync with tree, move to git.

(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key F3CFD2BD)

6 files changed, 138 insertions, 206 deletions

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index ecfe25d..39cd054 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,3 +1,17 @@
-AUX lmms-qt4_configure_gentoo.patch 1711 RMD160 c011a072d5b7e55be2a46eff4e1e2c1d9924db16 SHA1 6140f36cb7684e70076aea063dd683a288ea19c8 SHA256 06d6d92288f304b567b7d58f5cc9ada17efb8dc44a9f0578c7582f4ac59ce5a2
-EBUILD lmms-9999-r1.ebuild 2420 RMD160 307e6857b43246226c86189c24e4bc3db9451b07 SHA1 240630bd91537ce0b3f1be3a892605a0f2faa683 SHA256 f44640505f0dcf4ff410243c4916d64e3dfa0a2bcf4a7ccf46d9aedcb32399e1
-EBUILD lmms-9999.ebuild 2420 RMD160 c380c961df07231f09591046f75da72a9c710216 SHA1 e21ef939f46054d92128f75b9deb8ba6d660f7bc SHA256 53cfe7a228612eb537660f1cf4e1a1235c767962a162499e967d954b23ac1815
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lmms-0.4.10-unembedfltk.patch 2816 SHA256 f2b07178f0979618b8e180e64b0a43bf1ee774b38b418a2e22464c305b38e8a4 SHA512 6a25fdbb1f4212c62d01d849c23ffdf465ac602219e5e184a9a5db3985700a3a2ae998d3b293cf4417aa5d3e09648c78195d2016eec7973e64d819d7874f0f05 WHIRLPOOL b10b201b724bfd6415b23d0ee01efb7e24596a52a7cb6c1240a014b8140cbec086663e633f870174c8e3e4ce985160062d1d8c6b788a9e1ba7500ee7fc646168
+EBUILD lmms-9999.ebuild 2004 SHA256 a3f064d30cf946bb2f8f225faa37e17df328c83b4b6fed11e60e4f66b691ece8 SHA512 d95e05e3b562a5bdc0644da6a2ea098880b07635761e44e8d9268f5623fece7a56ad91960bc44f8dd3444d51c973ccd847e66b69e3247997e12bae09b3edb660 WHIRLPOOL 1af595b4f2a4b960366a407a477dffba2c12843261712ff6ac60f1708fcba6f6a8da08d10309ce59084c74cd19cd77b8afb1f914f73bfd1215bb5801f9d3daf7
+MISC metadata.xml 598 SHA256 ce319b79bf0fba551bbffe0a1f96e5862a3bbed27e3bce0e38cdc6fe87b8ca78 SHA512 479bdaafc299f5a75a7e6163f7a96c51058a2ef2dd5beb679d2f90d4b6ac10b19356a29b8102e80b404f9c832ea811840752cb7e35e90383c7b1e430b7411bae WHIRLPOOL e4744428df76901b73d18aab8140b89a51974d25261a4823b938a88a00fc043ead39733246d2e54f8d388c7852340da104c8c13059bf89a765cd3dbca0192785
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQEXWrAAoJEO+t9ga+3I3aP7gIAL0lZE1qIU+xqDLZl1FrP4q8
+RrbdKXLPM5gogdeDCU3c91NiHV1R0j1DrN1qIKeMR4VG49CHXM7KBJZ5Tr29p3P7
+YGUOUcDx/wgJR+phX4I5BJ0H7hlmk2Y9TP9Gu+ImpZolNQHW7m9bJ5jbQLjWeC+d
+QMmUJLv4zLvYyvhphXe9uZD39g3kUY/E0A425o/h81oNBXkjBo1laiUOMZqPQPxU
+HD4IP8b5kXUbdwT665jsE8AfDt2EYFpEOE5/5wnjIH6FXNm9baR626aSW9qLzs3/
+4vW8flUg929FH+GuTR9cTiYgNc9I5TPgVYawD/Ln+hMu/f2aVZm2GEacoPZrgM0=
+=1V6Q
+-----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 0000000..8ed5e6f
--- /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/files/lmms-qt4_configure_gentoo.patch b/media-sound/lmms/files/lmms-qt4_configure_gentoo.patch
deleted file mode 100644
index 980e169..0000000
--- a/media-sound/lmms/files/lmms-qt4_configure_gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-*** configure.orig	2006-09-20 17:31:33.000000000 +0200
---- configure	2006-09-20 17:45:59.000000000 +0200
-***************
-*** 21626,21638 ****
-  # Check that QTDIR is defined or that --with-qtdir given
-  if test x"$QTDIR" = x ; then
-  	# some usual Qt-locations
-! 	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
-  else
-  	QT_SEARCH=$QTDIR
-  	QTDIR=""
-  fi
-  for i in $QT_SEARCH ; do
-! 	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/Qt"
-  	for j in $QT_INCLUDE_SEARCH ; do
-  	        if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
-  			QTDIR=$i
---- 21626,21638 ----
-  # Check that QTDIR is defined or that --with-qtdir given
-  if test x"$QTDIR" = x ; then
-  	# some usual Qt-locations
-! 	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0 /usr/lib/qt4"
-  else
-  	QT_SEARCH=$QTDIR
-  	QTDIR=""
-  fi
-  for i in $QT_SEARCH ; do
-! 	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/Qt include/qt4 include/qt4/Qt"
-  	for j in $QT_INCLUDE_SEARCH ; do
-  	        if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
-  			QTDIR=$i
diff --git a/media-sound/lmms/lmms-9999-r1.ebuild b/media-sound/lmms/lmms-9999-r1.ebuild
deleted file mode 100644
index 52653c5..0000000
--- a/media-sound/lmms/lmms-9999-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# ==========================================================================
-# This ebuild come from pro-audio repository. Zugaina.org only host a copy.
-# For more info go to http://gentoo.zugaina.org/
-# ***************** General Portage Overlay (11/20/06) *****************
-# ==========================================================================
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils subversion autotools
-
-DESCRIPTION="free alternative to popular programs such as FruityLoops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
-
-ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/lmms/trunk/lmms"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-S="${WORKDIR}/${PN}"
-
-IUSE="alsa debug flac jack ladspa oss pic samplerate sdl surround stk vorbis
-vst qt3 qt4"
-DEPEND="qt4? ( >=x11-libs/qt-4.1 ) 
-	qt3? ( =x11-libs/qt-3.3* )
-	vorbis? ( media-libs/libvorbis )
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl 
-		>=media-libs/sdl-sound-1.0.1 )
-	samplerate? ( media-libs/libsamplerate )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
-	vst? ( >=media-libs/vst-sdk-2.3-r3 
-			app-emulation/wine )
-	ladspa? ( media-libs/ladspa-sdk )"
-
-pkg_setup() {
-	if use qt4; then
-		if use qt3; then
-			die "Please choose qt3 OR qt4 in USE"
-		fi
-	fi
-}
-
-src_compile() {
-	# autofoo
-	eautoreconf || die
-	
-	# copy VST headers
-	if use vst; then
-		cp /usr/include/vst/aeffectx.h include/
-		cp /usr/include/vst/AEffect.h include/
-	fi
-	
-	# configure options
-	local myconf
-	myconf="`use_with alsa asound` \
-		`use_with oss` \
-		`use_with vorbis` \
-		`use_with samplerate libsrc` \
-		`use_with sdl` \
-		`use_with sdl sdlsound`\
-		`use_with jack` \
-		`use_with flac` \
-		`use_with ladspa` \
-		`use_with pic` \
-		`use_enable surround` \
-		`use_enable debug` \
-		`use_with vst` \
-		`use_with stk` \
-		--enable-hqsinc"
-	
-	# qt4 fixups
-	if use qt4; then
-		myconf="${myconf} --with-qtdir=/usr"
-		#epatch ${FILESDIR}/lmms-qt4_configure_gentoo.patch
-	fi
-
-	econf ${myconf} || die "Configure failed"
-
-	# we need MAKEOPTS="-j1" for VST support
-	if use vst; then
-		emake -j1 || die "Make failed"
-	else
-		emake || die "Make failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	make_desktop_entry lmms "Linux Multimedia Studio" "/usr/share/lmms/icon.png"
-	dodoc README AUTHORS ChangeLog TODO || die "dodoc failed"
-}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 4063365..679109e 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,94 +1,67 @@
-# ==========================================================================
-# This ebuild come from pro-audio repository. Zugaina.org only host a copy.
-# For more info go to http://gentoo.zugaina.org/
-# ***************** General Portage Overlay (11/20/06) *****************
-# ==========================================================================
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.13.ebuild,v 1.1 2012/02/14 12:28:11 aballier Exp $
 
-inherit eutils subversion autotools
+EAPI="2"
 
-DESCRIPTION="free alternative to popular programs such as FruityLoops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
+inherit eutils cmake-utils git-2
 
-ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/lmms/trunk/lmms"
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
+EGIT_REPO_URI="git://lmms.git.sf.net/gitroot/${PN}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS=""
 
-S="${WORKDIR}/${PN}"
+IUSE="alsa debug fftw fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
 
-IUSE="alsa debug flac jack ladspa oss pic samplerate sdl surround stk vorbis
-vst qt3 qt4"
-DEPEND="qt4? ( >=x11-libs/qt-4.1 ) 
-	qt3? ( =x11-libs/qt-3.3* )
-	vorbis? ( media-libs/libvorbis )
+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 )
-	sdl? ( media-libs/libsdl 
-		>=media-libs/sdl-sound-1.0.1 )
-	samplerate? ( media-libs/libsamplerate )
+	fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
-	vst? ( >=media-libs/vst-sdk-2.3-r3 
-			app-emulation/wine )
-	ladspa? ( media-libs/ladspa-sdk )"
+	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"
 
-pkg_setup() {
-	if use qt4; then
-		if use qt3; then
-			die "Please choose qt3 OR qt4 in USE"
-		fi
-	fi
-}
-
-src_compile() {
-	# autofoo
-	eautoreconf || die
-	
-	# copy VST headers
-	if use vst; then
-		cp /usr/include/vst/aeffectx.h include/
-		cp /usr/include/vst/AEffect.h include/
-	fi
-	
-	# configure options
-	local myconf
-	myconf="`use_with alsa asound` \
-		`use_with oss` \
-		`use_with vorbis` \
-		`use_with samplerate libsrc` \
-		`use_with sdl` \
-		`use_with sdl sdlsound`\
-		`use_with jack` \
-		`use_with flac` \
-		`use_with ladspa` \
-		`use_with pic` \
-		`use_enable surround` \
-		`use_enable debug` \
-		`use_with vst` \
-		`use_with stk` \
-		--enable-hqsinc"
-	
-	# qt4 fixups
-	if use qt4; then
-		myconf="${myconf} --with-qtdir=/usr"
-		epatch ${FILESDIR}/lmms-qt4_configure_gentoo.patch
-	fi
+DOCS="README AUTHORS TODO"
 
-	econf ${myconf} || die "Configure failed"
+PATCHES=( "${FILESDIR}/${PN}-0.4.10-unembedfltk.patch" )
 
-	# we need MAKEOPTS="-j1" for VST support
-	if use vst; then
-		emake -j1 || die "Make failed"
-	else
-		emake || die "Make failed"
-	fi
+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
 }
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	make_desktop_entry lmms "Linux Multimedia Studio" "/usr/share/lmms/icon.png"
-	dodoc README AUTHORS ChangeLog TODO || die "dodoc failed"
-}
-
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
new file mode 100644
index 0000000..4175c91
--- /dev/null
+++ b/media-sound/lmms/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<maintainer>
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</name>
+</maintainer>
+<maintainer>
+  <email>gimpel@sonnenkinder.org</email>
+  <name>Thomas Kuther</name>
+</maintainer>
+  <use>
+    <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
+    <flag name="stk">Enables STK Mallet plugin.</flag>
+    <flag name="vst">Enables the VeSTige plugin to run VST plugins through Wine.</flag>
+  </use>
+</pkgmetadata>