audio-creation/aeolus: version 0.9.7

6 files changed, 64 insertions, 7 deletions

diff --git a/audio-creation/aeolus/0001-fix-Makefile.patch b/audio-creation/aeolus/0001-fix-Makefile.patch
new file mode 100644
index 0000000000..a6cc193f6a
--- /dev/null
+++ b/audio-creation/aeolus/0001-fix-Makefile.patch
@@ -0,0 +1,43 @@
+From 068a506c372dea3debc02ed01b43c71805c4c5bc Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Mon, 31 Dec 2018 11:30:27 +0100
+Subject: [PATCH] fix Makefile
+
+---
+ source/Makefile | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/source/Makefile b/source/Makefile
+index f9e75bd..503b192 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -17,15 +17,13 @@
+ #
+ # -------------------------------------------------------------------------
+ 
+-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+-LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++LIBDIR ?= $(PREFIX)/lib
+ 
+ VERSION = 0.9.7
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
+-CXXFLAGS += -O2 -Wall
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall
+ 
+ 
+ all:	aeolus aeolus_x11.so aeolus_txt.so
+@@ -45,7 +43,7 @@ $(AEOLUS_O):
+ XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \
+ 	midimatrix.o multislider.o functionwin.o xiface.o addsynth.o
+ aeolus_x11.so:	CPPFLAGS += -D_REENTRANT
+-aeolus_x11.so:	CPPFLAGS += $(shell pkgconf --cflags freetype2)
++aeolus_x11.so:	CPPFLAGS += $(shell pkg-config --cflags freetype2)
+ aeolus_x11.so:	CXXFLAGS += -shared -fPIC
+ aeolus_x11.so:	LDFLAGS += -shared
+ aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11
+-- 
+2.20.1
+
diff --git a/audio-creation/aeolus/BUILD b/audio-creation/aeolus/BUILD
index 8f58e6df93..35b81cf650 100755
--- a/audio-creation/aeolus/BUILD
+++ b/audio-creation/aeolus/BUILD
@@ -1 +1,6 @@
-make
+cd source &&
+
+PREFIX="$INSTALL_ROOT/usr" default_build_make &&
+
+cd ..
+
diff --git a/audio-creation/aeolus/DETAILS b/audio-creation/aeolus/DETAILS
index d5458409ed..d6c10d8b57 100755
--- a/audio-creation/aeolus/DETAILS
+++ b/audio-creation/aeolus/DETAILS
@@ -1,10 +1,10 @@
            SPELL=aeolus
-         VERSION=0.8.2
+         VERSION=0.9.7
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/${SOURCE}
-     SOURCE_HASH=sha512:c34c8337d709bde2fa0e3dc16c777e6cba8a8c267a4d50cf9f777d510bfed14cdbded3cfccae1f463bfcc4132df010cd4ea8bd7c0e455bcdb85646fbdcacdba4
+   SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/$SOURCE
+     SOURCE_HASH=sha512:ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://www.kokkinizita.net/linuxaudio/aeolus/index.html"
+        WEB_SITE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/"
       LICENSE[0]=GPL
          ENTERED=20090701
            SHORT="a synthesised pipe organ emulator"
diff --git a/audio-creation/aeolus/HISTORY b/audio-creation/aeolus/HISTORY
index d4adefc36d..9fbb40defd 100644
--- a/audio-creation/aeolus/HISTORY
+++ b/audio-creation/aeolus/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* BUILD, DETAILS, INSTALL, PRE_BUILD, 0001-fix-Makefile.patch:
+	  version 0.9.7
+
 2009-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD, aeolus.conf:
 	  spell created
diff --git a/audio-creation/aeolus/INSTALL b/audio-creation/aeolus/INSTALL
index 3226c1e15e..02ad70687c 100755
--- a/audio-creation/aeolus/INSTALL
+++ b/audio-creation/aeolus/INSTALL
@@ -1,2 +1,6 @@
-default_install &&
+cd source                                  &&
+
+PREFIX="$INSTALL_ROOT/usr" default_install &&
+
 install_config_file ${SPELL_DIRECTORY}/aeolus.conf /etc/aeolus.conf
+
diff --git a/audio-creation/aeolus/PRE_BUILD b/audio-creation/aeolus/PRE_BUILD
index 120c5420f6..500dd27e02 100755
--- a/audio-creation/aeolus/PRE_BUILD
+++ b/audio-creation/aeolus/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
-sedit  "s:PREFIX = .*:PREFIX = ${INSTALL_ROOT}/usr:"  Makefile
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-Makefile.patch"
+