[gentoo-commits] dev/yngwin:master commit in: media-sound/helm/files/, media-sound/helm/

Ben de Groot Sat, 22 Aug 2015 10:12:51 -0700

commit:     7d8c7d1e78d748c37c052c92856b7ee6fafecbe2
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 17:06:35 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 17:06:35 2015 +0000
URL:        https://gitweb.gentoo.org/dev/yngwin.git/commit/?id=7d8c7d1e


media-sound/helm: add live ebuild

Package-Manager: portage-2.2.20.1

 media-sound/helm/Manifest                           |  1 -
 .../helm/files/helm-0.4.1-vst-location.patch        | 20 --------------------
 media-sound/helm/files/helm-vst-location.patch      | 21 +++++++++++++++++++++
 .../helm/{helm-0.4.1.ebuild => helm-9999.ebuild}    | 18 ++++++++++++++----
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
deleted file mode 100644
index 7090407..0000000
--- a/media-sound/helm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST helm-0.4.1.tar.gz 10170154 SHA256 
00fa6b973b3e13d574a19dc009e07cbbcb7823476ffc59cc89e6816b7a70bd72 SHA512 
093abfd47a7f3e25d168df675b8a9c067a361ae1891af208c75ec4bc02d8a30cc5de4ab2433179bcbb6074c142c8ef9b4ef11b1854fdde0551fcd340dd6b8fe0
 WHIRLPOOL 
6d7297b2e064d24252d11b415225e081cb2033230aba013e774198b66e6ca89196691ed8db61d9baa02e7cc09497af61462f36244668a8b3469828388f3c5d49

diff --git a/media-sound/helm/files/helm-0.4.1-vst-location.patch 
b/media-sound/helm/files/helm-0.4.1-vst-location.patch
deleted file mode 100644
index faa1a17..0000000
--- a/media-sound/helm/files/helm-0.4.1-vst-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- helm-0.4.1.orig/builds/linux/VST/Makefile  2015-08-04 06:06:31.000000000 
+0800
-+++ helm-0.4.1/builds/linux/VST/Makefile       2015-08-17 20:09:55.781014640 
+0800
-@@ -18,7 +18,7 @@
-     TARGET_ARCH := 
-   endif
- 
--  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst-sdk/VST3-SDK -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 -ffast-math 
-mtune=generic -msse -msse2 -mfpmath=sse
-   CXXFLAGS += $(CFLAGS) -std=c++11
-   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype 
-lpthread -lrt -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse
-@@ -38,7 +38,7 @@
-     TARGET_ARCH := 
-   endif
- 
--  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst-sdk/VST3-SDK -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os -ffast-math -mtune=generic 
-msse -msse2 -mfpmath=sse
-   CXXFLAGS += $(CFLAGS) -std=c++11
-   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama 
-lasound -ldl -lfreetype -lpthread -lrt -ffast-math -mtune=generic -msse -msse2 
-mfpmath=sse

diff --git a/media-sound/helm/files/helm-vst-location.patch 
b/media-sound/helm/files/helm-vst-location.patch
new file mode 100644
index 0000000..a82bc50
--- /dev/null
+++ b/media-sound/helm/files/helm-vst-location.patch
@@ -0,0 +1,21 @@
+diff -burN helm-9999.orig/builds/linux/VST/Makefile 
helm-9999/builds/linux/VST/Makefile
+--- helm-9999.orig/builds/linux/VST/Makefile   2015-08-23 00:52:12.611831553 
+0800
++++ helm-9999/builds/linux/VST/Makefile        2015-08-23 00:54:20.018838145 
+0800
+@@ -18,7 +18,7 @@
+     TARGET_ARCH := 
+   endif
+ 
+-  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" 
-D "JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
++  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" 
-D "JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst3-sdk -I ../../../JuceLibraryCode -I ../../../JUCE/modules -I 
../../../mopo/src -I ../../../src -I ../../../src/common -I 
../../../src/editor_components -I ../../../src/editor_sections -I 
../../../src/look_and_feel -I ../../../src/standalone -I ../../../src/synthesis
+   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 -ffast-math
+   CXXFLAGS += $(CFLAGS)
+   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype 
-lpthread -lrt -ffast-math
+@@ -38,7 +38,7 @@
+     TARGET_ARCH := 
+   endif
+ 
+-  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
++  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D 
"JUCER_LINUX_MAKE_1D79FBD2=1" -D "JUCE_APP_VERSION=0.4.1" -D 
"JUCE_APP_VERSION_HEX=0x401" -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst3-sdk -I ../../../JuceLibraryCode -I ../../../JUCE/modules -I 
../../../mopo/src -I ../../../src -I ../../../src/common -I 
../../../src/editor_components -I ../../../src/editor_sections -I 
../../../src/look_and_feel -I ../../../src/standalone -I ../../../src/synthesis
+   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os -ffast-math
+   CXXFLAGS += $(CFLAGS)
+   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama 
-lasound -ldl -lfreetype -lpthread -lrt -ffast-math

diff --git a/media-sound/helm/helm-0.4.1.ebuild 
b/media-sound/helm/helm-9999.ebuild
similarity index 60%
rename from media-sound/helm/helm-0.4.1.ebuild
rename to media-sound/helm/helm-9999.ebuild
index ccaf268..128e90d 100644
--- a/media-sound/helm/helm-0.4.1.ebuild
+++ b/media-sound/helm/helm-9999.ebuild
@@ -7,15 +7,22 @@ inherit eutils
 
 DESCRIPTION="Open source polyphonic software synthesizer with lots of 
modulation"
 HOMEPAGE="http://tytel.org/helm/";
-SRC_URI="https://github.com/mtytel/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="vst"
 
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/mtytel/helm.git";
+       inherit git-r3
+else
+       SRC_URI="https://github.com/mtytel/helm/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64"
+fi
+
 RDEPEND="media-libs/alsa-lib
        media-libs/lv2
+       media-sound/jack-audio-connection-kit
        virtual/opengl
        x11-libs/libX11
        x11-libs/libXext"
@@ -25,7 +32,9 @@ DEPEND="${RDEPEND}
 DOCS="README.md"
 
 src_prepare() {
-       epatch "${FILESDIR}/${P}-vst-location.patch"
+       rm patches/Synth/.DS_Store || die
+       rm {images,patches}/LICENSE || die
+       epatch "${FILESDIR}"/helm-vst-location.patch
        sed -e 's|/usr/lib/|/usr/'$(get_libdir)'/|' -i Makefile || die
        epatch_user
 }
@@ -40,4 +49,5 @@ src_install() {
                exeinto /usr/$(get_libdir)/vst
                doexe builds/linux/VST/build/helm.so
        fi
+       make_desktop_entry /usr/bin/helm Helm 
/usr/share/helm/icons/helm_icon_32_1x.png
 }

[gentoo-commits] dev/yngwin:master commit in: media-sound/helm/files/, media-sound/helm/

Reply via email to