[proaudio] [1701] proaudio-dev / zynaddsubfx: repo changed to git, this ebuild contains some ugly patches.

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


Revision: 1701
Author:   gentoid
Date:     2010-06-19 18:58:47 +0200 (Sat, 19 Jun 2010)
Log Message:
-----------
proaudio-dev / zynaddsubfx: repo changed to git, this ebuild contains some ugly patches. I was not able to build zynaddsubfx, it stops near 100%

Added Paths:
-----------
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-fltk-include-2.patch
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-include-fltk.patch
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-math-include.patch
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/metadata.xml
    trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild

Added: trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-fltk-include-2.patch
===================================================================
--- trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-fltk-include-2.patch	                        (rev 0)
+++ trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-fltk-include-2.patch	2010-06-19 16:58:47 UTC (rev 1701)
@@ -0,0 +1,10 @@
+--- ./src/CMakeLists.txt.old	2010-06-19 19:41:01.000000000 +0400
++++ ./src/CMakeLists.txt	2010-06-19 20:38:05.000000000 +0400
+@@ -164,6 +164,7 @@
+ include_directories(
+ 	${CMAKE_CURRENT_SOURCE_DIR}
+ 	${CMAKE_CURRENT_BINARY_DIR}
++	/usr/include/fltk-1.1
+ 	)
+ 
+ 

Added: trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-include-fltk.patch
===================================================================
--- trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-include-fltk.patch	                        (rev 0)
+++ trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-include-fltk.patch	2010-06-19 16:58:47 UTC (rev 1701)
@@ -0,0 +1,13 @@
+--- ./src/UI/CMakeLists.txt.old	2010-06-19 18:25:13.000000000 +0400
++++ ./src/UI/CMakeLists.txt	2010-06-19 18:47:06.000000000 +0400
+@@ -20,6 +20,10 @@
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
++## workaround ##
++set(ZYNADD_INCLUDES ${FLTK_INCLUDE_DIR})
++include_directories(AFTER ${ZYNADD_INCLUDES})
++
+ set_source_files_properties(UI/MasterUI.h PROPERTIES GENERATED 1)
+ fltk_wrap_ui(zynaddsubfx_gui ${UI_fl_files})
+ 

Added: trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-math-include.patch
===================================================================
--- trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-math-include.patch	                        (rev 0)
+++ trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/files/fix-math-include.patch	2010-06-19 16:58:47 UTC (rev 1701)
@@ -0,0 +1,12 @@
+--- ./src/UI/FilterUI.fl.old	2010-06-19 19:28:19.000000000 +0400
++++ ./src/UI/FilterUI.fl	2010-06-19 19:29:00.000000000 +0400
+@@ -36,6 +36,9 @@
+ decl {\#include "PresetsUI.h"} {public
+ } 
+ 
++decl {\#include <math.h>} {public
++}
++
+ class FormantFilterGraph {: {public Fl_Box}
+ } {
+   Function {FormantFilterGraph(int x,int y, int w, int h, const char *label=0):Fl_Box(x,y,w,h,label)} {} {

Copied: trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/metadata.xml (from rev 1700, trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml)
===================================================================
--- trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/metadata.xml	                        (rev 0)
+++ trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/metadata.xml	2010-06-19 16:58:47 UTC (rev 1701)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>proaudio@xxxxxxxxxxxxx</email>
+		<name>pro-audio overlay team</name>
+	</maintainer>
+</pkgmetadata>

Copied: trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild (from rev 1700, trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild)
===================================================================
--- trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio-dev/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild	2010-06-19 16:58:47 UTC (rev 1701)
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit git cmake-utils 
+#extutils patcher jackmidi
+RESTRICT="mirror"
+
+#MY_P=ZynAddSubFX-${PV}
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
+SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
+
+EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+EGIT_BRANCH="master"
+#EGIT_COMMIT="${EGIT_BRANCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+#IUSE="oss alsa jack mmx"
+IUSE="oss alsa jack jackmidi lash"
+
+RDEPEND="media-libs/zynaddsubfx-banks"
+
+DEPEND="${RDEPEND}
+	x11-libs/fltk:1.1
+	=sci-libs/fftw-3*
+	jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
+	!jackmidi? ( media-sound/jack-audio-connection-kit )
+	>=dev-libs/mini-xml-2.2.1
+	lash? ( >=media-sound/lash-0.5 )"
+#	portaudio? ( media-libs/portaudio )"
+
+#RDEPEND="media-libs/zynaddsubfx-banks
+#	!media-sound/zynaddsubfx-cvs"
+
+#S=${WORKDIR}/${ECVS_MODULE}
+#MY_PN="${PN/-cvs/}"
+
+#pkg_setup() {
+	# jackmidi.eclass
+#	use jackmidi && need_jackmidi
+#}
+
+src_unpack() {
+	git_src_unpack
+}
+#	cd "${S}"
+#	patcher "${FILESDIR}/01-mutex-split.patch" -a -f
+#	patcher "${FILESDIR}/02-ifdef-jackmidi.patch" -a -f
+#	patcher "${FILESDIR}/03-fix_jackmidi.patch" -a -f
+#	patcher "${FILESDIR}/fix_jack_midi_api.patch" -a -f
+
+src_prepare() {
+	CMAKE_IN_SOURCE_BUILD=1
+	#fixup 01-mutex-split patch
+	#esed_check -i -e 's@\(applyparameters(\)true@\1@g' src/Params/PADnoteParameters.C
+	#cd "${S}"
+	unpack "zynaddsubfx-presets-0.1.tar.bz2"
+	epatch ${FILESDIR}/fix-include-fltk.patch
+	epatch ${FILESDIR}/fix-math-include.patch
+	epatch ${FILESDIR}/fix-fltk-include-2.patch
+	#mycmakeargs="-DFLTK_INCLUDE_DIR=/usr/include/fltk-1.1 \
+	#-I/usr/include/fltk-1.1"
+	## fix include path ##
+#	for i in $(grep -rl "<FL/" "${S}" | grep -v "\.git"); do
+#		einfo ${i}
+#		sed -e "s/<FL\//<fltk-1.1\/FL\//" -i ${i};
+#	done
+	#cd src/
+	# add our CXXFLAGS
+	#esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
+	#esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C
+}
+
+#src_compile() {
+#	local FFTW_VERSION=3
+#	local ASM_F2I=NO
+#	local LINUX_MIDIIN=NONE
+#	local LINUX_AUDIOOUT=NONE
+#	local LINUX_USE_LASH=NO
+#
+#	if use oss ; then
+#		LINUX_MIDIIN=OSS
+#		LINUX_AUDIOOUT=OSS
+#		use jack && LINUX_AUDIOOUT=OSS_AND_JACK
+#	else
+#		use jack && LINUX_AUDIOOUT=JACK
+#	fi
+#
+#	use lash && LINUX_USE_LASH=YES
+#	use jackmidi && LINUX_USE_JACKMIDI=YES
+#	use alsa && LINUX_MIDIIN=ALSA
+##	use portaudio && LINUX_AUDIOOUT=PA
+##	use mmx && ASM_F2I=YES
+#
+#	local myconf="FFTW_VERSION=${FFTW_VERSION}"
+#	myconf="${myconf} ASM_F2I=${ASM_F2I}"
+#	myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
+#	myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
+#	myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
+#	myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
+#
+#	cd "${S}/src"
+#	echo "make ${myconf}" > gentoo_make_options # for easier debugging
+#	chmod +x gentoo_make_options
+#
+#	emake -j1 ${myconf} || die "make failed with this options: ${myconf}"
+#
+#	cd "${S}/ExternalPrograms/Spliter"
+#	./compile.sh
+#	cd "${S}/ExternalPrograms/Controller"
+#	./compile.sh
+#}
+
+#src_install() {
+#	dobin "${S}/src/zynaddsubfx"
+#	dobin "${S}/ExternalPrograms/Spliter/spliter"
+#	dobin "${S}/ExternalPrograms/Controller/controller"
+#	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
+#
+#	# -------- install examples presets
+#	[ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
+#	insinto /usr/share/${MY_PN}/presets
+#	doins "${S}/presets/"*
+#	insinto /usr/share/${MY_PN}/examples
+#	doins "${S}/examples/"*
+#	# --------
+#
+#	mogrify -format png zynaddsubfx_icon.ico
+#	newicon "${S}/zynaddsubfx_icon.png" "zynaddsubfx_icon.png"
+#	make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
+#		"zynaddsubfx_icon.png" "AudioVideo;Audio"
+#
+#}
+
+#pkg_postinst() {
+#	einfo "Banks are now provided with the package zynaddsubfx-banks"
+#	einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
+#}


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