sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (7597abff2fe95c7e16951d3f19c40de12bc401de)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7597abff2fe95c7e16951d3f19c40de12bc401de)
- Date: Mon, 31 Dec 2018 11:01:40 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
audio-creation/aeolus/0001-fix-Makefile.patch
| 43 ++++++
audio-creation/aeolus/BUILD
| 7 -
audio-creation/aeolus/DETAILS
| 8 -
audio-creation/aeolus/HISTORY
| 4
audio-creation/aeolus/INSTALL
| 6
audio-creation/aeolus/PRE_BUILD
| 3
audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
| 70 ++++------
audio-libs/zita-alsa-pcmi/BUILD
| 4
audio-libs/zita-alsa-pcmi/DETAILS
| 4
audio-libs/zita-alsa-pcmi/HISTORY
| 3
audio-libs/zita-alsa-pcmi/INSTALL
| 2
audio-libs/zita-resampler/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch
| 68 ---------
audio-libs/zita-resampler/0001-fix-Makefiles.patch
| 55 +++++++
audio-libs/zita-resampler/BUILD
| 6
audio-libs/zita-resampler/DEPENDS
| 1
audio-libs/zita-resampler/DETAILS
| 4
audio-libs/zita-resampler/HISTORY
| 5
audio-libs/zita-resampler/INSTALL
| 2
audio-libs/zita-resampler/PRE_BUILD
| 3
libs/clthreads/BUILD
| 7 -
libs/clthreads/DETAILS
| 6
libs/clthreads/HISTORY
| 4
libs/clthreads/INSTALL
| 3
libs/clthreads/PRE_BUILD
| 4
libs/clxclient/0001-fix-Makefile.patch
| 38 +++++
libs/clxclient/BUILD
| 6
libs/clxclient/DETAILS
| 6
libs/clxclient/HISTORY
| 3
libs/clxclient/INSTALL
| 3
libs/clxclient/PRE_BUILD
| 3
30 files changed, 242 insertions(+), 139 deletions(-)
New commits:
commit 7597abff2fe95c7e16951d3f19c40de12bc401de
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-creation/aeolus: version 0.9.7
commit 1b4ddddb2472486d80239b82c6616c1daaabb933
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-libs/zita-resampler: version 1.6.2
commit 29eb254726306ae5d2d8fd48790860ba595de213
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/clxclient: version 3.9.2
commit 8314e1c978c13488241438020095882a2dd3710a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/clthreads: version 2.4.2
diff --git a/audio-creation/aeolus/0001-fix-Makefile.patch
b/audio-creation/aeolus/0001-fix-Makefile.patch
new file mode 100644
index 0000000..a6cc193
--- /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 AT 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 8f58e6d..35b81cf 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 d545840..d6c10d8 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 d4adefc..9fbb40d 100644
--- a/audio-creation/aeolus/HISTORY
+++ b/audio-creation/aeolus/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL, PRE_BUILD, 0001-fix-Makefile.patch:
+ version 0.9.7
+
2009-07-02 Florian Franzmann <siflfran AT 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 3226c1e..02ad706 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 120c542..500dd27 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"
+
diff --git a/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
b/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
index 802546c..346bf2b 100644
--- a/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
+++ b/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
@@ -1,62 +1,54 @@
-From 7eec0508880ca5eb68e701b78aabbed23fc63cb4 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 21 Mar 2014 18:11:46 +0100
+From 240fdd5e802faee23ad1c716f18bf27c3e4f554c Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 31 Dec 2018 10:46:21 +0100
Subject: [PATCH] fix Makefiles
---
- apps/Makefile | 8 ++++----
- libs/Makefile | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ apps/Makefile | 5 +++--
+ source/Makefile | 6 ++----
+ 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/apps/Makefile b/apps/Makefile
-index 6d61617..d96bdae 100644
+index 9d48cb2..ca26511 100644
--- a/apps/Makefile
+++ b/apps/Makefile
-@@ -19,13 +19,13 @@
- #
----------------------------------------------------------------------------
+@@ -24,8 +24,9 @@ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
-
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
--LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
- VERSION = "0.1.0"
--LDFLAGS += -L$(PREFIX)/$(LIBDIR)
-+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L../libs
- CPPFLAGS += -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O2 -Wall -MMD -MP
-+CXXFLAGS += -Wall -MMD -MP -I../libs
+ VERSION = "0.3.2"
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2 -Wall
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I../source
++CXXFLAGS += -Wall
++LDFLAGS += -L../source
all: alsa_loopback alsa_delay
-diff --git a/libs/Makefile b/libs/Makefile
-index dd99b1d..ee8f238 100644
---- a/libs/Makefile
-+++ b/libs/Makefile
-@@ -20,9 +20,9 @@
+diff --git a/source/Makefile b/source/Makefile
+index a99c5a3..0e315de 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -20,18 +20,16 @@
# Modify as required.
#
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
--LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
-
+-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+-LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++LIBDIR ?= $(PREFIX)/lib
MAJVERS = 0
-@@ -30,8 +30,8 @@ MINVERS = 2.0
+ MINVERS = 3.2
VERSION = $(MAJVERS).$(MINVERS)
-
--CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -O2 -Wall -I. -fPIC
-+CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DPIC
-+CXXFLAGS += -Wall -I. -fPIC
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -O2 -Wall -fPIC
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -DPIC
LDLFAGS +=
LDLIBS +=
--
-1.9.0
+2.20.1
diff --git a/audio-libs/zita-alsa-pcmi/BUILD b/audio-libs/zita-alsa-pcmi/BUILD
index 7bf5f5b..8f141e9 100755
--- a/audio-libs/zita-alsa-pcmi/BUILD
+++ b/audio-libs/zita-alsa-pcmi/BUILD
@@ -1,5 +1,5 @@
-cd ${SOURCE_DIRECTORY}/libs &&
-default_build_make &&
+cd ${SOURCE_DIRECTORY}/source &&
+default_build_make &&
ln -s libzita-alsa-pcmi.so.* libzita-alsa-pcmi.so &&
cd ${SOURCE_DIRECTORY}/apps &&
default_build_make
diff --git a/audio-libs/zita-alsa-pcmi/DETAILS
b/audio-libs/zita-alsa-pcmi/DETAILS
index 726a42e..fc4e842 100755
--- a/audio-libs/zita-alsa-pcmi/DETAILS
+++ b/audio-libs/zita-alsa-pcmi/DETAILS
@@ -1,8 +1,8 @@
SPELL=zita-alsa-pcmi
- VERSION=0.2.0
+ VERSION=0.3.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${SOURCE}
-
SOURCE_HASH=sha512:6b521dc8bef96a6ee73bc2accd3c7d0641e9a4f3d955868cd3fe04ae46f15a1b1ffaa45d56518f54f4fdf9f68f629e3036dca294936015205c20f01d55338e96
+
SOURCE_HASH=sha512:9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html";
LICENSE[0]=GPL
diff --git a/audio-libs/zita-alsa-pcmi/HISTORY
b/audio-libs/zita-alsa-pcmi/HISTORY
index 50fc78f..678904f 100644
--- a/audio-libs/zita-alsa-pcmi/HISTORY
+++ b/audio-libs/zita-alsa-pcmi/HISTORY
@@ -1,3 +1,6 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL, 0001-fix-Makefiles.patch: version 0.3.2
+
2014-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-fix-Makefiles.patch, BUILD, DEPENDS, DETAILS, INSTALL,
PRE_BUILD: spell created
diff --git a/audio-libs/zita-alsa-pcmi/INSTALL
b/audio-libs/zita-alsa-pcmi/INSTALL
index 68648ed..d05fc3a 100755
--- a/audio-libs/zita-alsa-pcmi/INSTALL
+++ b/audio-libs/zita-alsa-pcmi/INSTALL
@@ -1,4 +1,4 @@
-cd ${SOURCE_DIRECTORY}/libs &&
+cd ${SOURCE_DIRECTORY}/source &&
PREFIX=${INSTALL_ROOT}/usr default_install &&
cd ${SOURCE_DIRECTORY}/apps &&
PREFIX=${INSTALL_ROOT}/usr default_install
diff --git
a/audio-libs/zita-resampler/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch
b/audio-libs/zita-resampler/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch
deleted file mode 100644
index 7f8d723..0000000
---
a/audio-libs/zita-resampler/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From cd3d0caf78e3437fbdf24300fb7ef859a20d0935 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 21 Mar 2014 14:52:17 +0100
-Subject: [PATCH] allow PREFIX to be passed in from the environment
-
-- also honour CXXFLAGS/LDFLAGS passed in
-- remove the need to first install the library before building the apps
----
- apps/Makefile | 9 ++++-----
- libs/Makefile | 9 ++++-----
- 2 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/apps/Makefile b/apps/Makefile
-index a0f56ae..3fbfd6e 100644
---- a/apps/Makefile
-+++ b/apps/Makefile
-@@ -18,16 +18,15 @@
- #
----------------------------------------------------------------------------
-
-
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
--LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
- DISTDIR = zresample-$(VERSION)
- VERSION = 0.4.0
- MANDIR = /usr/share/man/man1
--LDFLAGS += -L$(PREFIX)/$(LIBDIR)
-+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L../libs
- CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O3 -ffast-math -Wall
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -I../libs
-
-
- all: zresample zretune zresample.1.gz zretune.1.gz
-diff --git a/libs/Makefile b/libs/Makefile
-index 6877e52..45e06f2 100644
---- a/libs/Makefile
-+++ b/libs/Makefile
-@@ -20,9 +20,9 @@
-
- # Modify as required.
- #
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
--LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
-
- MAJVERS = 1
- MINVERS = 3.0
-@@ -30,9 +30,8 @@ VERSION = $(MAJVERS).$(MINVERS)
- DISTDIR = zita-resampler-$(VERSION)
-
-
--CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -Wall -fPIC -O2 -ffast-math
--CXXFLAGS += -march=native
-+CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DPIC
-+CXXFLAGS += -Wall -fPIC
- LDFLAGS +=
- LDLIBS +=
-
---
-1.9.0
-
diff --git a/audio-libs/zita-resampler/0001-fix-Makefiles.patch
b/audio-libs/zita-resampler/0001-fix-Makefiles.patch
new file mode 100644
index 0000000..8b59e51
--- /dev/null
+++ b/audio-libs/zita-resampler/0001-fix-Makefiles.patch
@@ -0,0 +1,55 @@
+From 0d37e5a916c59004f76b8dbf08420250eeef06df Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 31 Dec 2018 11:19:33 +0100
+Subject: [PATCH] fix Makefiles
+
+---
+ apps/Makefile | 6 +++---
+ source/Makefile | 7 +++----
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/apps/Makefile b/apps/Makefile
+index 053b9a6..261a3fd 100644
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -23,9 +23,9 @@ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= /usr/share/man/man1
+
+ VERSION = 1.6.0
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2 -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I../source
++CXXFLAGS += -Wall
++LDFLAGS += -L../source
+
+
+ all: zresample zretune zresample.1.gz zretune.1.gz
+diff --git a/source/Makefile b/source/Makefile
+index cd54ff5..9fad8ae 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -23,7 +23,7 @@
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+-LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++LIBDIR ?= $(PREFIX)/lib
+
+ MAJVERS = 1
+ MINVERS = 6.2
+@@ -31,9 +31,8 @@ VERSION = $(MAJVERS).$(MINVERS)
+ DISTDIR = zita-resampler-$(VERSION)
+
+
+-CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DPIC
++CXXFLAGS += -Wall -fPIC
+ LDFLAGS +=
+ LDLIBS +=
+
+--
+2.20.1
+
diff --git a/audio-libs/zita-resampler/BUILD b/audio-libs/zita-resampler/BUILD
index 8770c29..fcba640 100755
--- a/audio-libs/zita-resampler/BUILD
+++ b/audio-libs/zita-resampler/BUILD
@@ -1,5 +1,5 @@
-cd $SOURCE_DIRECTORY/libs &&
-default_build_make &&
+cd $SOURCE_DIRECTORY/source &&
+default_build_make &&
ln -s libzita-resampler.so.* libzita-resampler.so &&
-cd $SOURCE_DIRECTORY/apps &&
+cd $SOURCE_DIRECTORY/apps &&
default_build_make
diff --git a/audio-libs/zita-resampler/DEPENDS
b/audio-libs/zita-resampler/DEPENDS
index f148724..b0a74a6 100755
--- a/audio-libs/zita-resampler/DEPENDS
+++ b/audio-libs/zita-resampler/DEPENDS
@@ -1 +1,2 @@
+depends libsndfile &&
depends -sub CXX gcc
diff --git a/audio-libs/zita-resampler/DETAILS
b/audio-libs/zita-resampler/DETAILS
index 04f424b..e8bdfd8 100755
--- a/audio-libs/zita-resampler/DETAILS
+++ b/audio-libs/zita-resampler/DETAILS
@@ -1,8 +1,8 @@
SPELL=zita-resampler
- VERSION=1.3.0
+ VERSION=1.6.2
SOURCE="zita-resampler-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${SOURCE}
-
SOURCE_HASH=sha512:c782d1aca3761b42a66c4f049a19608e6a3334f1de125b483c2fb5c29eb2afd1bcf1d02a66db39619971411f0fbc35c404d3495a868f82b36627d9793cc0c93b
+
SOURCE_HASH=sha512:d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/zita-resampler-${VERSION}"
WEB_SITE="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html";
LICENSE[0]=GPL
diff --git a/audio-libs/zita-resampler/HISTORY
b/audio-libs/zita-resampler/HISTORY
index 33b8af3..43dd8a6 100644
--- a/audio-libs/zita-resampler/HISTORY
+++ b/audio-libs/zita-resampler/HISTORY
@@ -1,3 +1,8 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, 0001-fix-Makefiles.patch, BUILD, INSTALL, PRE_BUILD:
version 1.6.2
+ * DEPENDS: depend on libsndfile
+ * 0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch:
removed
+
2014-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD,
0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch: spell
created
diff --git a/audio-libs/zita-resampler/INSTALL
b/audio-libs/zita-resampler/INSTALL
index 96458da..1d09715 100755
--- a/audio-libs/zita-resampler/INSTALL
+++ b/audio-libs/zita-resampler/INSTALL
@@ -1,4 +1,4 @@
-cd $SOURCE_DIRECTORY/libs &&
+cd $SOURCE_DIRECTORY/source &&
PREFIX=${INSTALL_ROOT}/usr default_install &&
cd $SOURCE_DIRECTORY/apps &&
PREFIX=${INSTALL_ROOT}/usr default_install
diff --git a/audio-libs/zita-resampler/PRE_BUILD
b/audio-libs/zita-resampler/PRE_BUILD
index 1d999a8..3fe370d 100755
--- a/audio-libs/zita-resampler/PRE_BUILD
+++ b/audio-libs/zita-resampler/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
$SPELL_DIRECTORY/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-Makefiles.patch"
+
diff --git a/libs/clthreads/BUILD b/libs/clthreads/BUILD
index 8f58e6d..53cbf7e 100755
--- a/libs/clthreads/BUILD
+++ b/libs/clthreads/BUILD
@@ -1 +1,6 @@
-make
+cd source &&
+
+default_build_make &&
+
+cd ..
+
diff --git a/libs/clthreads/DETAILS b/libs/clthreads/DETAILS
index afb51be..e720b13 100755
--- a/libs/clthreads/DETAILS
+++ b/libs/clthreads/DETAILS
@@ -1,8 +1,8 @@
SPELL=clthreads
- VERSION=2.4.0
+ VERSION=2.4.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/${SOURCE}
-
SOURCE_HASH=sha512:c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
+
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/$SOURCE
+
SOURCE_HASH=sha512:a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.kokkinizita.net/linuxaudio/downloads/index.html";
LICENSE[0]=LGPL
diff --git a/libs/clthreads/HISTORY b/libs/clthreads/HISTORY
index 37b9c98..c2fe35c 100644
--- a/libs/clthreads/HISTORY
+++ b/libs/clthreads/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, INSTALL: version 2.4.2
+ * PRE_BUILD: removed
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/clthreads/INSTALL b/libs/clthreads/INSTALL
new file mode 100755
index 0000000..3716eda
--- /dev/null
+++ b/libs/clthreads/INSTALL
@@ -0,0 +1,3 @@
+cd source &&
+
+PREFIX="${INSTALL_ROOT}/usr" default_install
diff --git a/libs/clthreads/PRE_BUILD b/libs/clthreads/PRE_BUILD
deleted file mode 100755
index 120c542..0000000
--- a/libs/clthreads/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "s:PREFIX = .*:PREFIX = ${INSTALL_ROOT}/usr:" Makefile
diff --git a/libs/clxclient/0001-fix-Makefile.patch
b/libs/clxclient/0001-fix-Makefile.patch
new file mode 100644
index 0000000..c2c3189
--- /dev/null
+++ b/libs/clxclient/0001-fix-Makefile.patch
@@ -0,0 +1,38 @@
+From 0212af79b7ccfe49e212aca526f9360d8f876540 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 31 Dec 2018 11:08:41 +0100
+Subject: [PATCH] fix Makefile
+
+---
+ source/Makefile | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/source/Makefile b/source/Makefile
+index 177115f..8973b3a 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -23,17 +23,16 @@
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e
's/^x86_64/$/64/')
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+-LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++LIBDIR ?= $(PREFIX)/lib
+
+ MAJVERS = 3
+ MINVERS = 9.2
+ VERSION = $(MAJVERS).$(MINVERS)
+
+
+-CPPFLAGS += $(shell pkgconf --cflags freetype2)
+-CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT
-D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
+-CXXFLAGS += -Wall -O2 -fPIC
+-CXXFLAGS += -march=native
++CPPFLAGS += $(shell pkg-config --cflags freetype2) -I.
++CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT
-D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL) -DPIC
++CXXFLAGS += -Wall -fPIC
+ LDLIBS +=
+
+
+--
+2.20.1
+
diff --git a/libs/clxclient/BUILD b/libs/clxclient/BUILD
index 8f58e6d..4e66b34 100755
--- a/libs/clxclient/BUILD
+++ b/libs/clxclient/BUILD
@@ -1 +1,5 @@
-make
+cd source &&
+
+default_build_make &&
+
+cd ..
diff --git a/libs/clxclient/DETAILS b/libs/clxclient/DETAILS
index e163200..8f98101 100755
--- a/libs/clxclient/DETAILS
+++ b/libs/clxclient/DETAILS
@@ -1,8 +1,8 @@
SPELL=clxclient
- VERSION=3.6.1
+ VERSION=3.9.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/${SOURCE}
-
SOURCE_HASH=sha512:9f4592d8fa11b6dd0e27af73ca140591d0f8b2672e127e44e5dc58ced5eea9d6956c12990f84f7d6706cdbbf641f0611605c410ea8daa7ff565178c01298166e
+
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/$SOURCE
+
SOURCE_HASH=sha512:38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.kokkinizita.net/linuxaudio/downloads/index.html";
LICENSE[0]=LGPL
diff --git a/libs/clxclient/HISTORY b/libs/clxclient/HISTORY
index 3339704..0e7a45b 100644
--- a/libs/clxclient/HISTORY
+++ b/libs/clxclient/HISTORY
@@ -1,3 +1,6 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, PRE_BUILD, 0001-fix-Makefile.patch: version 3.9.2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/clxclient/INSTALL b/libs/clxclient/INSTALL
new file mode 100755
index 0000000..a03b478
--- /dev/null
+++ b/libs/clxclient/INSTALL
@@ -0,0 +1,3 @@
+cd source &&
+
+PREFIX="${INSTALL_ROOT}/usr" default_install
diff --git a/libs/clxclient/PRE_BUILD b/libs/clxclient/PRE_BUILD
index 120c542..500dd27 100755
--- a/libs/clxclient/PRE_BUILD
+++ b/libs/clxclient/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"
+
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7597abff2fe95c7e16951d3f19c40de12bc401de), Florian Franzmann, 12/31/2018
Archive powered by MHonArc 2.6.24.