| [proaudio] [2909] media-libs/zita-convolver: stabilize version 3.1.0, remove old ebuild, make patch upstream friendly, refer to ChangeLog |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2909
Author: lilrc
Date: 2014-12-10 17:42:21 +0100 (Wed, 10 Dec 2014)
Log Message:
-----------
media-libs/zita-convolver: stabilize version 3.1.0, remove old ebuild, make patch upstream friendly, refer to ChangeLog
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/zita-convolver/ChangeLog
trunk/overlays/proaudio/media-libs/zita-convolver/Manifest
trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-2.0.0-Makefile.patch
trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-Makefile.patch
trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-2.0.0.ebuild
Modified: trunk/overlays/proaudio/media-libs/zita-convolver/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/ChangeLog 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/ChangeLog 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,7 +1,19 @@
# ChangeLog for media-libs/zita-convolver
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Dec 2014; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ -zita-convolver-2.0.0.ebuild, zita-convolver-3.1.0.ebuild,
+ -files/zita-convolver-2.0.0-Makefile.patch,
+ -files/zita-convolver-3.1.0-Makefile.patch,
+ +files/zita-convolver-3.1.0-makefile.patch:
+ make the patch upstream friendly
+ stabilize version 3.1.0
+ remove old ebuild
+ bump to EAPI 5
+ remove version specifier for fftw (there is no older version in tree)
+ simplify some parts and make somewhat more similar to the ebuild in tree
+
*zita-convolver-3.1.0 (10 Jan 2012)
10 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
Modified: trunk/overlays/proaudio/media-libs/zita-convolver/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/Manifest 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/Manifest 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,8 +1,5 @@
-AUX zita-convolver-2.0.0-Makefile.patch 1769 RMD160 c5c026b74046a1d088faa37ef24d32f99c845323 SHA1 6e90cace23d723606c6e197abe18238b474d7257 SHA256 44ed9d04ef68ebb199837a19770644d00f80abf7e7efd586a2fcc8bdd5e7ad23
-AUX zita-convolver-3.1.0-Makefile.patch 1284 RMD160 6e267f090b53b9c4868d678b3a1f2386034b7f52 SHA1 fe1f776994feb82e87d4e68ca829809e4983b016 SHA256 28b191de4d50a24ab2f42cc60b1dbf94b9d12ee7e535e7cfdcbca705173db28b
-DIST zita-convolver-2.0.0.tar.bz2 12858 RMD160 93c93d45b473156d8a1cc9f1c270ee5ac7402ef9 SHA1 0b6c6bee9bfc4c69ce572a01b84163fa4ac5d318 SHA256 a2c9b3a19f24522819ab2ff852915da27cef93b5e32b1a339ece5627ac3c63e4
-DIST zita-convolver-3.1.0.tar.bz2 21485 RMD160 4ecf7c9c210f430235ff10afdc7a85fb71477e88 SHA1 438988bca66466cb958ee11b052c7740ddeab0d9 SHA256 bf7e93b582168b78d40666974460ad8142c2fa3c3412e327e4ab960b3fb31993
-EBUILD zita-convolver-2.0.0.ebuild 746 RMD160 2c680c9a07af447ee15514501f27a80d9659e315 SHA1 fdaf866ef63d196865868be3a49ea71e31c59cc4 SHA256 7f4bffe4ebf328208d559e8c9b5d69dcb7578a50f094998d54015497807c7261
-EBUILD zita-convolver-3.1.0.ebuild 740 RMD160 af775c1dc3e9891f0c479b51e8d7a3b70e50499a SHA1 aa69c144ef47449988f2228cc0d93cf552510b08 SHA256 dfc4d4df07ac3ce095cb9ecf0fa863d1a32a359f4ad9b2cd4dc9fa3f67f31cbe
-MISC ChangeLog 1228 RMD160 3433f92eff348ae8e64951578df7127ce9038876 SHA1 2393b1b6f4176b2a5b25a6dc0890b6a8404e7aab SHA256 072860447d537af398a58292f8cc2e66e408a892b6282aca755efd091ef13e79
-MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f
+AUX zita-convolver-3.1.0-makefile.patch 2311 SHA256 6b193ed1cc2b5b47cf1fc9ee1ca7c9a3396ec7aab652d3f613d2ae6f28a054fc SHA512 112fa1a0bc154bd81d761854e25377d9098411dd303e2b845a19269b39cd9072d511de129560c5373b798b280a516e843298089f16930d2a817950c9f30bb454 WHIRLPOOL e2b070bf670f09e5513e2c90bf4a80c22b07488bf56ca175685ebc064777226d1818bf18bb0dca5ace9f2224f63e6129899b05287c1564ce44fdcd397561cfce
+DIST zita-convolver-3.1.0.tar.bz2 21485 SHA256 bf7e93b582168b78d40666974460ad8142c2fa3c3412e327e4ab960b3fb31993 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9 WHIRLPOOL e570fe14c1722cb0540df53dc1492d4c7f0a469d5a265aedd1dbd2f8f1c27031c191626a67146262b42505a4d57f6d9287b44525fb917432914fb2d1a62dcc9e
+EBUILD zita-convolver-3.1.0.ebuild 737 SHA256 4a3d8e8458564b2bc1f7d049d666ddd71efe4b49407f3874b4169f6bd27ca150 SHA512 4de9ff935f1d533a2d4a15a2b16a33aa62dcb4515c7f4dc99a2846a3c81f15dd6a7102618810b872931d09cb24209c403dca86790db78b20231dcfdd47a68234 WHIRLPOOL 105330cf2effc77fa1202ca69774f21c738e192ecbdc84ef7189b2ef24e76bc91ba42d0ffd829379327a732124fc0f0964a52e29c38657b0890d22ef6b96e162
+MISC ChangeLog 1738 SHA256 d139e642629d9e2429ea4dbb5d6d89624f1a08c76ceccfdc4d225b31752bbd3e SHA512 0cb79d24e1f78baa276d567dedc2a86682eb6c4423d62af4cfbec6ffd7f8988e7858b9b12a06618bab0b130643411a5e71077a9bf4a05b6da0761e1530c1e015 WHIRLPOOL 5c2c240f2db91acb6e35402ed7441b81d73169a98484f1321f6f019655328a492779e7d88c9a3a6033afd5c05f99abdb34446aad22e68940e407d952cbd5e4d9
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Deleted: trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-2.0.0-Makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-2.0.0-Makefile.patch 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-2.0.0-Makefile.patch 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,51 +0,0 @@
---- zita-convolver-2.0.0/libs/Makefile.old 2011-01-19 08:14:23.574717257 +0000
-+++ zita-convolver-2.0.0/libs/Makefile 2011-01-19 08:21:32.962716987 +0000
-@@ -17,9 +17,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$(SUFFIX)
-
-
- MAJVERS = 2
-@@ -28,9 +28,9 @@
- DISTDIR = zita-convolver-$(VERSION)
-
-
--CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O3
--CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive
--CPPFLAGS += -march=i686
-+CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-+CPPFLAGS += -ffast-math -funroll-loops -fpermissive
-+#CPPFLAGS += -march=i686
- #CPPFLAGS += -DVECTORIZE
-
- LDLFAGS +=
-@@ -46,16 +46,16 @@
-
-
- $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O)
-- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-
-
- install: $(ZITA-CONVOLVER_MIN)
-- install -d $(PREFIX)/include
-- install -d $(PREFIX)/$(LIBDIR)
-- install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
-- install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
-- ldconfig
-- ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-+ install -d $(DESTDIR)$(PREFIX)/include
-+ install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+ install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
-+ install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+ #ldconfig
-+ ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-
-
- clean:
Deleted: trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-Makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-Makefile.patch 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-Makefile.patch 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,38 +0,0 @@
---- libs/Makefile.orig 2012-01-10 10:33:50.210906767 +0000
-+++ libs/Makefile 2012-01-10 10:55:05.766595132 +0000
-@@ -20,6 +20,7 @@
-
- # Modify as required.
- #
-+CXX ?= g++
- PREFIX = /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
-@@ -32,8 +33,7 @@
-
- CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE
- CXXFLAGS += -fPIC -Wall
--CXXFLAGS += -ffast-math -funroll-loops -O3
--CXXFLAGS += -march=native
-+CXXFLAGS += -ffast-math
- LDLFAGS +=
- LDLIBS +=
-
-@@ -47,7 +47,7 @@
-
-
- $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O)
-- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
-
-
- install: $(ZITA-CONVOLVER_MIN)
-@@ -56,7 +56,7 @@
- install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
- install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
- ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-- ldconfig
-+ ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
-
- clean:
- /bin/rm -f *~ *.o *.a *.d *.so.*
Added: trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch 2014-12-10 16:42:21 UTC (rev 2909)
@@ -0,0 +1,64 @@
+# AUTHOR: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# STATUS: Sent upstream (by email).
+# An upstream friendly patch with various improvements to the Makefile
+# including
+# 1. possibility to turn off optimizations
+# 2. respecting the CXX variable,
+# 3. creation of the libzita-convolver.so.3 symlink,
+# 4. possibility to turn off the ldconfig call.
+
+diff -ur zita-convolver-3.1.0.orig/libs/Makefile zita-convolver-3.1.0/libs/Makefile
+--- zita-convolver-3.1.0.orig/libs/Makefile 2014-12-10 14:55:25.256570999 +0100
++++ zita-convolver-3.1.0/libs/Makefile 2014-12-10 16:27:19.886269610 +0100
+@@ -20,6 +20,7 @@
+
+ # Modify as required.
+ #
++LDCONFIG = $(shell which ldconfig)
+ PREFIX = /usr/local
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+ LIBDIR = lib$(SUFFIX)
+@@ -30,24 +31,23 @@
+ VERSION = $(MAJVERS).$(MINVERS)
+
+
+-CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE
++CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE
+ CXXFLAGS += -fPIC -Wall
+-CXXFLAGS += -ffast-math -funroll-loops -O3
+-CXXFLAGS += -march=native
+-LDLFAGS +=
+-LDLIBS +=
+-
++ifndef NOOPTIMIZE
++ CXXFLAGS += -ffast-math -funroll-loops -O3
++ CXXFLAGS += -march=native
++endif
+
+ ZITA-CONVOLVER_SO = libzita-convolver.so
+ ZITA-CONVOLVER_MAJ = $(ZITA-CONVOLVER_SO).$(MAJVERS)
+ ZITA-CONVOLVER_MIN = $(ZITA-CONVOLVER_MAJ).$(MINVERS)
+ ZITA-CONVOLVER_DEP = -lfftw3f -lpthread
+ ZITA-CONVOLVER_O = zita-convolver.o
+-ZITA-CONVOLVER_H = zita-convolver.h
++ZITA-CONVOLVER_H = zita-convolver.h
+
+
+ $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O)
+- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
+
+
+ install: $(ZITA-CONVOLVER_MIN)
+@@ -56,8 +56,9 @@
+ install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
+ install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
+- ldconfig
++ ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
++ $(LDCONFIG)
+
+ clean:
+- /bin/rm -f *~ *.o *.a *.d *.so.*
++ rm -f *~ *.o *.a *.d *.so.*
+
Deleted: trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-2.0.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-2.0.0.ebuild 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-2.0.0.ebuild 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="A high performance audio signal convolver library"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2";
-
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sci-libs/fftw-3.2.2:3.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/libs"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
- CXX="$(tc-getCXX)" emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" PREFIX=/usr LIBDIR="$(get_libdir)" install || die
- dodoc ../AUTHORS
-}
Modified: trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild 2014-12-08 10:21:32 UTC (rev 2908)
+++ trunk/overlays/proaudio/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild 2014-12-10 16:42:21 UTC (rev 2909)
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
-inherit base toolchain-funcs multilib
+EAPI=5
+inherit base multilib toolchain-funcs
DESCRIPTION="A high performance audio signal convolver library"
HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
@@ -13,21 +13,21 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-DEPEND=">=sci-libs/fftw-3.2.2:3.0"
+DEPEND="sci-libs/fftw:3.0"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P}/libs"
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
-PATCHES=("${FILESDIR}/${P}-Makefile.patch")
-
src_compile() {
- CXX="$(tc-getCXX)" emake || die
+ tc-export CXX
+ emake -C libs NOOPTIMIZE=1
}
src_install() {
- emake DESTDIR="${D}" PREFIX=/usr LIBDIR="$(get_libdir)" install || die
- dodoc ../AUTHORS ../README
+ emake -C libs DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
+ LIBDIR="$(get_libdir)" LDCONFIG= install
+ dodoc AUTHORS README
}