1 |
commit: fd7de8dbb506c592f7d7039da3af5ce72449f9d1 |
2 |
Author: Gavin Pryke <gavinlee303 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 17 04:45:09 2015 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 30 17:29:59 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7de8db |
7 |
|
8 |
media-libs/zita-convolver: fix HOMEPAGE, SRC_URI, EAPI=5. bug #437186 |
9 |
|
10 |
The HOMEPAGE and SRC_URI for kokkinizita upstream was changed |
11 |
some time ago. These changes point said variables to the new |
12 |
location. Bumped to EAPI=5, revbumped and modified ebuild |
13 |
accordingly. |
14 |
Fix QA notice about missing soname symlink |
15 |
Re-add optimisations by cpu_flags_* that were patched out of |
16 |
the Makefile. |
17 |
Modifications as per github pull request #268 |
18 |
|
19 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=437186 |
20 |
|
21 |
.../files/zita-convolver-2.0.0-makefile.patch | 15 +++++---- |
22 |
.../zita-convolver/zita-convolver-2.0.0-r1.ebuild | 37 ++++++++++++++++++++++ |
23 |
2 files changed, 45 insertions(+), 7 deletions(-) |
24 |
|
25 |
diff --git a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch |
26 |
index cfc45f4..46c4417 100644 |
27 |
--- a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch |
28 |
+++ b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch |
29 |
@@ -1,8 +1,6 @@ |
30 |
-Index: zita-convolver-2.0.0/libs/Makefile |
31 |
-=================================================================== |
32 |
---- zita-convolver-2.0.0.orig/libs/Makefile |
33 |
-+++ zita-convolver-2.0.0/libs/Makefile |
34 |
-@@ -28,9 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS) |
35 |
+--- libs/Makefile.orig 2015-10-16 16:00:45.639918246 +0100 |
36 |
++++ libs/Makefile 2015-10-28 15:52:17.539967709 +0000 |
37 |
+@@ -28,9 +28,8 @@ |
38 |
DISTDIR = zita-convolver-$(VERSION) |
39 |
|
40 |
|
41 |
@@ -10,10 +8,11 @@ Index: zita-convolver-2.0.0/libs/Makefile |
42 |
-CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive |
43 |
-CPPFLAGS += -march=i686 |
44 |
+CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS |
45 |
++CXXFLAGS += -ffast-math |
46 |
#CPPFLAGS += -DVECTORIZE |
47 |
|
48 |
LDLFAGS += |
49 |
-@@ -46,7 +44,7 @@ ZITA-CONVOLVER_H = zita-convolver.h |
50 |
+@@ -46,7 +45,7 @@ |
51 |
|
52 |
|
53 |
$(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O) |
54 |
@@ -22,11 +21,13 @@ Index: zita-convolver-2.0.0/libs/Makefile |
55 |
|
56 |
|
57 |
install: $(ZITA-CONVOLVER_MIN) |
58 |
-@@ -54,7 +52,6 @@ install: $(ZITA-CONVOLVER_MIN) |
59 |
+@@ -54,8 +53,8 @@ |
60 |
install -d $(PREFIX)/$(LIBDIR) |
61 |
install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include |
62 |
install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR) |
63 |
- ldconfig |
64 |
ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO) |
65 |
++ ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ) |
66 |
|
67 |
|
68 |
+ clean: |
69 |
|
70 |
diff --git a/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild |
71 |
new file mode 100644 |
72 |
index 0000000..86eeeac |
73 |
--- /dev/null |
74 |
+++ b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild |
75 |
@@ -0,0 +1,37 @@ |
76 |
+# Copyright 1999-2015 Gentoo Foundation |
77 |
+# Distributed under the terms of the GNU General Public License v2 |
78 |
+# $Id$ |
79 |
+ |
80 |
+EAPI=5 |
81 |
+inherit eutils flag-o-matic multilib toolchain-funcs |
82 |
+ |
83 |
+DESCRIPTION="C++ library implementing a real-time convolution matrix" |
84 |
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html" |
85 |
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" |
86 |
+ |
87 |
+LICENSE="GPL-2" |
88 |
+SLOT="0" |
89 |
+KEYWORDS="~amd64" |
90 |
+IUSE="cpu_flags_x86_sse" |
91 |
+ |
92 |
+RDEPEND="sci-libs/fftw:3.0=" |
93 |
+DEPEND="${RDEPEND}" |
94 |
+ |
95 |
+S=${WORKDIR}/${P}/libs |
96 |
+ |
97 |
+src_prepare() { |
98 |
+ epatch "${FILESDIR}"/${P}-makefile.patch |
99 |
+} |
100 |
+ |
101 |
+src_compile() { |
102 |
+ # upstream defaults to this on x86 but patched out of the Makefile |
103 |
+ # try to reenable optimisation for x86 and allow building on other arch's |
104 |
+ use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" |
105 |
+ |
106 |
+ emake CXX="$(tc-getCXX)" |
107 |
+} |
108 |
+ |
109 |
+src_install() { |
110 |
+ emake PREFIX="${ED}/usr" LIBDIR="$(get_libdir)" install |
111 |
+ dodoc "${WORKDIR}/${P}/AUTHORS" |
112 |
+} |