summaryrefslogtreecommitdiffstats
path: root/audio-libs
diff options
context:
space:
mode:
authorFlorian Franzmann2018-12-31 11:01:49 +0100
committerFlorian Franzmann2018-12-31 12:00:08 +0100
commit8314e1c978c13488241438020095882a2dd3710a (patch)
tree16faae9afdeae369953cd623843198858cc1d8a7 /audio-libs
parent6bc11efe128c58ca1da6ec5e39affd83b3c21fdb (diff)
libs/clthreads: version 2.4.2
Diffstat (limited to 'audio-libs')
-rw-r--r--audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch70
-rwxr-xr-xaudio-libs/zita-alsa-pcmi/BUILD4
-rwxr-xr-xaudio-libs/zita-alsa-pcmi/DETAILS4
-rw-r--r--audio-libs/zita-alsa-pcmi/HISTORY3
-rwxr-xr-xaudio-libs/zita-alsa-pcmi/INSTALL2
5 files changed, 39 insertions, 44 deletions
diff --git a/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch b/audio-libs/zita-alsa-pcmi/0001-fix-Makefiles.patch
index 802546c32d..346bf2b5d2 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@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@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 7bf5f5b155..8f141e9de5 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 726a42ea4b..fc4e842a79 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 50fc78fe0c..678904fd32 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@hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL, 0001-fix-Makefiles.patch: version 0.3.2
+
2014-03-21 Florian Franzmann <siflfran@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 68648edff1..d05fc3a204 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