1 |
commit: cbc7946c9210e0fb6951582db287ac8adb0238b8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 24 09:02:01 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 24 09:03:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=cbc7946c |
7 |
|
8 |
media-sound/hydrogen: Import 0.9.5-r1 from before slot 4 removal |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
RepoMan-Options: --force |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../hydrogen/files/hydrogen-0.9.5-gcc47.patch | 27 +++++++++ |
15 |
.../hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 ++++ |
16 |
.../files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch | 23 +++++++ |
17 |
media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild | 70 ++++++++++++++++++++++ |
18 |
media-sound/hydrogen/metadata.xml | 5 +- |
19 |
5 files changed, 136 insertions(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch |
22 |
new file mode 100644 |
23 |
index 00000000..3ea43e36 |
24 |
--- /dev/null |
25 |
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch |
26 |
@@ -0,0 +1,27 @@ |
27 |
+Build with gcc 4.7 |
28 |
+https://bugs.gentoo.org/show_bug.cgi?id=421913 |
29 |
+ |
30 |
+Index: hydrogen-0.9.5/gui/src/MainForm.cpp |
31 |
+=================================================================== |
32 |
+--- hydrogen-0.9.5.orig/gui/src/MainForm.cpp |
33 |
++++ hydrogen-0.9.5/gui/src/MainForm.cpp |
34 |
+@@ -70,6 +70,7 @@ using namespace H2Core; |
35 |
+ |
36 |
+ #include <memory> |
37 |
+ #include <cassert> |
38 |
++#include <unistd.h> |
39 |
+ |
40 |
+ using namespace std; |
41 |
+ using namespace H2Core; |
42 |
+Index: hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp |
43 |
+=================================================================== |
44 |
+--- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp |
45 |
++++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp |
46 |
+@@ -21,6 +21,7 @@ |
47 |
+ */ |
48 |
+ |
49 |
+ #include <assert.h> |
50 |
++#include <unistd.h> |
51 |
+ #include <algorithm> |
52 |
+ #include <memory> |
53 |
+ |
54 |
|
55 |
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch |
56 |
new file mode 100644 |
57 |
index 00000000..586e82af |
58 |
--- /dev/null |
59 |
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch |
60 |
@@ -0,0 +1,12 @@ |
61 |
+diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp |
62 |
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp 2011-01-29 00:33:23.000000000 +0100 |
63 |
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp 2017-09-26 20:07:31.128723252 +0200 |
64 |
+@@ -980,7 +980,7 @@ |
65 |
+ |
66 |
+ std::string playlistInfoFile = patternname; |
67 |
+ std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary ); |
68 |
+- if ( verify == NULL ) { |
69 |
++ if ( !verify ) { |
70 |
+ //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." ); |
71 |
+ return NULL; |
72 |
+ } |
73 |
|
74 |
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch |
75 |
new file mode 100644 |
76 |
index 00000000..6c862eac |
77 |
--- /dev/null |
78 |
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch |
79 |
@@ -0,0 +1,23 @@ |
80 |
+conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead |
81 |
+ |
82 |
+--- Sconstruct |
83 |
++++ Sconstruct |
84 |
+@@ -268,7 +268,8 @@ |
85 |
+ env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' ) |
86 |
+ env.Append( LIBS = [ "pthread" ] ) |
87 |
+ |
88 |
+- if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] ) |
89 |
++ if str(env['lrdf']) == "1": |
90 |
++ env.ParseConfig('pkg-config --cflags --libs lrdf') |
91 |
+ if str(env['jack']) == "1": env.Append( LIBS = ["jack"]) |
92 |
+ if str(env['alsa']) == "1": env.Append( LIBS = ["asound"]) |
93 |
+ if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"]) |
94 |
+@@ -449,7 +450,7 @@ |
95 |
+ Exit(1) |
96 |
+ |
97 |
+ #lrdf: categorizing of ladspa effects |
98 |
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'): |
99 |
++if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'): |
100 |
+ print 'lrdf must be installed!' |
101 |
+ Exit(1) |
102 |
+ |
103 |
|
104 |
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild |
105 |
new file mode 100644 |
106 |
index 00000000..7079b060 |
107 |
--- /dev/null |
108 |
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild |
109 |
@@ -0,0 +1,70 @@ |
110 |
+# Copyright 1999-2020 Gentoo Authors |
111 |
+# Distributed under the terms of the GNU General Public License v2 |
112 |
+ |
113 |
+EAPI=4 |
114 |
+ |
115 |
+inherit eutils multilib flag-o-matic toolchain-funcs |
116 |
+ |
117 |
+DESCRIPTION="Advanced drum machine" |
118 |
+HOMEPAGE="http://hydrogen-music.org/" |
119 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
120 |
+ |
121 |
+LICENSE="GPL-2 ZLIB" |
122 |
+SLOT="0" |
123 |
+KEYWORDS="amd64 ppc ppc64 x86" |
124 |
+IUSE="alsa +archive jack ladspa lash oss portaudio" |
125 |
+ |
126 |
+RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4 |
127 |
+ archive? ( app-arch/libarchive ) |
128 |
+ !archive? ( >=dev-libs/libtar-1.2.11-r3 ) |
129 |
+ >=media-libs/libsndfile-1.0.18 |
130 |
+ alsa? ( media-libs/alsa-lib ) |
131 |
+ jack? ( virtual/jack ) |
132 |
+ ladspa? ( media-libs/liblrdf ) |
133 |
+ lash? ( media-sound/lash ) |
134 |
+ portaudio? ( >=media-libs/portaudio-19_pre )" |
135 |
+DEPEND="${RDEPEND} |
136 |
+ virtual/pkgconfig |
137 |
+ dev-util/scons" |
138 |
+ |
139 |
+src_prepare() { |
140 |
+ sed -i -e '/cppflags +=/d' Sconstruct || die |
141 |
+ epatch \ |
142 |
+ patches/portaudio.patch \ |
143 |
+ "${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \ |
144 |
+ "${FILESDIR}"/${P}-gcc47.patch \ |
145 |
+ "${FILESDIR}"/${P}-gcc6.patch |
146 |
+} |
147 |
+ |
148 |
+src_compile() { |
149 |
+ # FIXME: The -I/usr/include/raptor2 gets lost in middle of build |
150 |
+ # despite -use_lrdf_pkgconfig.patch |
151 |
+ use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf) |
152 |
+ |
153 |
+ export QTDIR="/usr/$(get_libdir)" |
154 |
+ local myconf='portmidi=0' #90614 |
155 |
+ |
156 |
+ use alsa || myconf+=' alsa=0' |
157 |
+ use archive && myconf+=' libarchive=1' |
158 |
+ use jack || myconf+=' jack=0' |
159 |
+ use ladspa || myconf+=' lrdf=0' |
160 |
+ use lash && myconf+=' lash=1' |
161 |
+ use oss || myconf+=' oss=0' |
162 |
+ use portaudio && myconf+=' portaudio=1' |
163 |
+ |
164 |
+ scons \ |
165 |
+ prefix=/usr \ |
166 |
+ DESTDIR="${D}" \ |
167 |
+ optflags="${CXXFLAGS}" \ |
168 |
+ ${myconf} || die |
169 |
+} |
170 |
+ |
171 |
+src_install() { |
172 |
+ dobin hydrogen |
173 |
+ insinto /usr/share/hydrogen |
174 |
+ doins -r data |
175 |
+ doicon data/img/gray/h2-icon.svg |
176 |
+ domenu hydrogen.desktop |
177 |
+ dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html |
178 |
+ dodoc AUTHORS ChangeLog README.txt |
179 |
+} |
180 |
|
181 |
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml |
182 |
index 942721e0..0e24fd6b 100644 |
183 |
--- a/media-sound/hydrogen/metadata.xml |
184 |
+++ b/media-sound/hydrogen/metadata.xml |
185 |
@@ -1,5 +1,8 @@ |
186 |
<?xml version="1.0" encoding="UTF-8"?> |
187 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
188 |
<pkgmetadata> |
189 |
-<!-- maintainer-needed --> |
190 |
+<!-- maintainer-needed --> |
191 |
+ <use> |
192 |
+ <flag name="archive">Use libarchive instead of libtar</flag> |
193 |
+ </use> |
194 |
</pkgmetadata> |