1 |
commit: cec84b5e29ebf6738ac3f7febdcf2bde6aa61f59 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 3 23:25:22 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 3 23:26:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec84b5e |
7 |
|
8 |
media-sound/bristol: Fix build, fix QA warning, EAPI-7 bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/590510 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
13 |
|
14 |
media-sound/bristol/bristol-0.60.11-r1.ebuild | 57 ++++++++++++++++++++++ |
15 |
.../files/bristol-0.60.11-dontcompress.patch | 12 +++++ |
16 |
.../files/bristol-0.60.11-rm_alsa-iatomic.h.patch | 26 ++++++++++ |
17 |
3 files changed, 95 insertions(+) |
18 |
|
19 |
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild |
20 |
new file mode 100644 |
21 |
index 00000000000..0cb211ac285 |
22 |
--- /dev/null |
23 |
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild |
24 |
@@ -0,0 +1,57 @@ |
25 |
+# Copyright 1999-2018 Gentoo Authors |
26 |
+# Distributed under the terms of the GNU General Public License v2 |
27 |
+ |
28 |
+EAPI=7 |
29 |
+ |
30 |
+inherit autotools |
31 |
+ |
32 |
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" |
33 |
+HOMEPAGE="https://sourceforge.net/projects/bristol" |
34 |
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz" |
35 |
+ |
36 |
+LICENSE="GPL-2" |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~x86" |
39 |
+IUSE="alsa oss static-libs" |
40 |
+# osc : configure option but no code it seems... |
41 |
+# jack: fails to build if disabled |
42 |
+# pulseaudio: not fully supported |
43 |
+ |
44 |
+RDEPEND=" |
45 |
+ >=media-sound/jack-audio-connection-kit-0.109.2 |
46 |
+ x11-libs/libX11 |
47 |
+ alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
48 |
+" |
49 |
+# osc? ( >=media-libs/liblo-0.22 ) |
50 |
+DEPEND="${RDEPEND}" |
51 |
+BDEPEND=" |
52 |
+ virtual/pkgconfig |
53 |
+ x11-base/xorg-proto |
54 |
+" |
55 |
+ |
56 |
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) |
57 |
+ |
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}"/${P}-cflags.patch |
60 |
+ "${FILESDIR}"/${P}-implicit-dec.patch |
61 |
+ "${FILESDIR}"/${P}-dontcompress.patch |
62 |
+ "${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch |
63 |
+) |
64 |
+ |
65 |
+src_prepare() { |
66 |
+ default |
67 |
+ eautoreconf |
68 |
+} |
69 |
+ |
70 |
+src_configure() { |
71 |
+ econf \ |
72 |
+ --disable-version-check \ |
73 |
+ $(use_enable alsa) \ |
74 |
+ $(use_enable oss) \ |
75 |
+ $(use_enable static-libs static) |
76 |
+} |
77 |
+ |
78 |
+src_install() { |
79 |
+ default |
80 |
+ find "${D}" -name '*.la' -delete || die |
81 |
+} |
82 |
|
83 |
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch |
84 |
new file mode 100644 |
85 |
index 00000000000..0b7cedc9e29 |
86 |
--- /dev/null |
87 |
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch |
88 |
@@ -0,0 +1,12 @@ |
89 |
+--- a/Makefile.am 2012-01-12 18:23:23.000000000 +0100 |
90 |
++++ b/Makefile.am 2018-10-04 01:22:03.656483227 +0200 |
91 |
+@@ -9,9 +9,6 @@ |
92 |
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 |
93 |
+ $(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/ |
94 |
+ $(INSTALL) -m 0644 $(srcdir)/bristoljackstats.1 $(DESTDIR)$(mandir)/man1/ |
95 |
+- gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1 |
96 |
+- gzip -9fn $(DESTDIR)$(mandir)/man1/bristoljackstats.1 |
97 |
+- cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz |
98 |
+ |
99 |
+ installdb: |
100 |
+ mkdir -p -m 0755 $(DESTDIR)$(bristoldir) |
101 |
|
102 |
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch |
103 |
new file mode 100644 |
104 |
index 00000000000..9d11b4f7d99 |
105 |
--- /dev/null |
106 |
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch |
107 |
@@ -0,0 +1,26 @@ |
108 |
+Description: Stop using alsa/iatomic.h |
109 |
+ Technically this is an API breakage in libasound 1.1.2, |
110 |
+ but it makes sense to me that this header was removed |
111 |
+ by ALSA upstream. |
112 |
+ . |
113 |
+ bristol was the only user in Debian, and even here the |
114 |
+ code that once used it was already commented out. |
115 |
+Author: Adrian Bunk <bunk@××××××.de> |
116 |
+Reviewed-by: James Cowgill <jcowgill@××××××.org> |
117 |
+ Herbert Parentes Fortes Neto <hpfn@××××××.org> |
118 |
+Bug-Debian: https://bugs.debian.org/834180 |
119 |
+Forwarded: no |
120 |
+Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c |
121 |
+=================================================================== |
122 |
+--- a/libbristolaudio/audioEngineJack.c |
123 |
++++ b/libbristolaudio/audioEngineJack.c |
124 |
+@@ -38,9 +38,6 @@ |
125 |
+ #include <string.h> |
126 |
+ |
127 |
+ #ifdef _BRISTOL_JACK |
128 |
+-#if (BRISTOL_HAS_ALSA == 1) |
129 |
+-#include <alsa/iatomic.h> |
130 |
+-#endif |
131 |
+ |
132 |
+ /* |
133 |
+ * Drop this atomic stuff, it comes from the ALSA library and it not present on |