summaryrefslogtreecommitdiffstats
path: root/audio-libs
diff options
context:
space:
mode:
Diffstat (limited to 'audio-libs')
-rw-r--r--audio-libs/zita-resampler/0001-allow-PREFIX-to-be-passed-in-from-the-environment.patch68
-rw-r--r--audio-libs/zita-resampler/0001-fix-Makefiles.patch55
-rwxr-xr-xaudio-libs/zita-resampler/BUILD6
-rwxr-xr-xaudio-libs/zita-resampler/DEPENDS1
-rwxr-xr-xaudio-libs/zita-resampler/DETAILS4
-rw-r--r--audio-libs/zita-resampler/HISTORY5
-rwxr-xr-xaudio-libs/zita-resampler/INSTALL2
-rwxr-xr-xaudio-libs/zita-resampler/PRE_BUILD3
8 files changed, 69 insertions, 75 deletions
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 7f8d72325a..0000000000
--- 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@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 0000000000..8b59e51628
--- /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@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 8770c29c8c..fcba640576 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 f148724504..b0a74a695a 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 04f424b9e2..e8bdfd8ef5 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 33b8af3b60..43dd8a69fe 100644
--- a/audio-libs/zita-resampler/HISTORY
+++ b/audio-libs/zita-resampler/HISTORY
@@ -1,3 +1,8 @@
+2018-12-31 Florian Franzmann <siflfran@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@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 96458da223..1d09715ad4 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 1d999a87f8..3fe370dcd8 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"
+