[proaudio] Fix for zynaddsubfx-99999999-r1 (patch included)

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


hi,

this patch fixes configuration error because submodules are not
correctly initialized.


i have also other compilation issues that i worked around with following
command:

CXXFLAGS="-std=c++11" LDFLAGS="-lpthread" emerge -va1 zynaddsubfx

zynaddsubfx fails without that flag because nullptr is undefined. and
libpthread seems to be missing too.

as i am not c++ guy, i'll leave this for somebody else :-)

miroslav
Index: media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild
===================================================================
--- media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild	(revision 2896)
+++ media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild	(working copy)
@@ -14,10 +14,8 @@
 
 EGIT_REPO_URI="git://git.code.sf.net/p/zynaddsubfx/code"
 EGIT_PROJECT="${PN}"
+EGIT_HAS_SUBMODULES="true"
 
-EGIT_REPO_URI_INSTRUMENTS="git://git.code.sf.net/p/zynaddsubfx/instruments"
-EGIT_PROJECT_INSTRUMENTS="${PN}-instruments"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
@@ -42,17 +40,7 @@
 src_unpack() {
 	git-2_src_unpack
 
-	unset EGIT_BRANCH EGIT_COMMIT
-	EGIT_SOURCEDIR="${S}"/instruments \
-		EGIT_REPO_URI="${EGIT_REPO_URI_INSTRUMENTS}" \
-		EGIT_PROJECT="${EGIT_PROJECT_INSTRUMENTS}" \
-		git-2_src_unpack
-
 	unpack "zynaddsubfx-presets-0.1.tar.bz2"
-
-	# fix the desktop files
-	esed_check -i -e 's:Application;AudioVideo;:AudioVideo;Audio;:' "${S}"/zynaddsubfx-alsa.desktop
-	esed_check -i -e 's:Application;AudioVideo;:AudioVideo;Audio;:' "${S}"/zynaddsubfx-jack.desktop
 }
 
 src_configure() {


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/