1 |
commit: 643fa50bb6f0bbb52c5e176d3d905027fdedb7f4 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 7 14:41:56 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 7 14:42:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643fa50b |
7 |
|
8 |
media-sound/qsampler: bump to 0.9.1, switched to cmake, updated live |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
media-sound/qsampler/Manifest | 1 + |
14 |
.../files/qsampler-0.9.1-cmake-no-git.patch | 21 ++++++++ |
15 |
media-sound/qsampler/qsampler-0.9.1.ebuild | 58 ++++++++++++++++++++++ |
16 |
media-sound/qsampler/qsampler-9999.ebuild | 38 +++++++------- |
17 |
4 files changed, 99 insertions(+), 19 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest |
20 |
index 66b24d017d6..894056cf727 100644 |
21 |
--- a/media-sound/qsampler/Manifest |
22 |
+++ b/media-sound/qsampler/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae |
25 |
+DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d |
26 |
|
27 |
diff --git a/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..44b7c3cb644 |
30 |
--- /dev/null |
31 |
+++ b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch |
32 |
@@ -0,0 +1,21 @@ |
33 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
+index 8304e80..666deb5 100644 |
35 |
+--- a/CMakeLists.txt |
36 |
++++ b/CMakeLists.txt |
37 |
+@@ -6,6 +6,7 @@ project(qsampler |
38 |
+ LANGUAGES C CXX) |
39 |
+ |
40 |
+ set (CONFIG_VERSION ${PROJECT_VERSION}) |
41 |
++#[[ |
42 |
+ execute_process ( |
43 |
+ COMMAND git describe --tags --dirty --abbrev=6 |
44 |
+ OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT |
45 |
+@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0) |
46 |
+ else () |
47 |
+ set (VERSION "${PROJECT_VERSION}") |
48 |
+ endif () |
49 |
++]] |
50 |
++set (VERSION "${PROJECT_VERSION}") |
51 |
+ |
52 |
+ set (PACKAGE_NAME "Qsampler") |
53 |
+ set (PACKAGE_VERSION "${VERSION}") |
54 |
|
55 |
diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..d2d0dd804cb |
58 |
--- /dev/null |
59 |
+++ b/media-sound/qsampler/qsampler-0.9.1.ebuild |
60 |
@@ -0,0 +1,58 @@ |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=7 |
65 |
+ |
66 |
+inherit cmake qmake-utils xdg |
67 |
+ |
68 |
+if [[ ${PV} == *9999* ]]; then |
69 |
+ EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code" |
70 |
+ inherit git-r3 |
71 |
+else |
72 |
+ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" |
73 |
+ KEYWORDS="~amd64 ~x86" |
74 |
+fi |
75 |
+ |
76 |
+DESCRIPTION="Graphical frontend to the LinuxSampler engine" |
77 |
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" |
78 |
+ |
79 |
+LICENSE="GPL-2" |
80 |
+SLOT="0" |
81 |
+KEYWORDS="" |
82 |
+IUSE="debug +libgig" |
83 |
+ |
84 |
+DEPEND=" |
85 |
+ dev-qt/qtcore:5 |
86 |
+ dev-qt/qtgui:5 |
87 |
+ dev-qt/qtnetwork:5 |
88 |
+ dev-qt/qtwidgets:5 |
89 |
+ dev-qt/qtx11extras:5 |
90 |
+ media-libs/alsa-lib |
91 |
+ media-libs/liblscp:= |
92 |
+ x11-libs/libX11 |
93 |
+ libgig? ( media-libs/libgig:= ) |
94 |
+" |
95 |
+RDEPEND="${DEPEND} |
96 |
+ media-sound/linuxsampler |
97 |
+" |
98 |
+BDEPEND="dev-qt/linguist-tools:5" |
99 |
+ |
100 |
+PATCHES=( |
101 |
+ "${FILESDIR}/${P}-cmake-no-git.patch" |
102 |
+) |
103 |
+ |
104 |
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS ) |
105 |
+ |
106 |
+src_prepare() { |
107 |
+ cmake_src_prepare |
108 |
+ |
109 |
+ sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die |
110 |
+} |
111 |
+ |
112 |
+src_configure() { |
113 |
+ local mycmakeargs=( |
114 |
+ -DCONFIG_DEBUG=$(usex debug 1 0) |
115 |
+ -DCONFIG_LIBGIG=$(usex libgig 1 0) |
116 |
+ ) |
117 |
+ cmake_src_configure |
118 |
+} |
119 |
|
120 |
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild |
121 |
index 23f189c07e1..cd513200a60 100644 |
122 |
--- a/media-sound/qsampler/qsampler-9999.ebuild |
123 |
+++ b/media-sound/qsampler/qsampler-9999.ebuild |
124 |
@@ -1,10 +1,17 @@ |
125 |
-# Copyright 1999-2020 Gentoo Authors |
126 |
+# Copyright 1999-2021 Gentoo Authors |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
|
129 |
EAPI=7 |
130 |
|
131 |
-EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code" |
132 |
-inherit qmake-utils xdg autotools git-r3 |
133 |
+inherit cmake qmake-utils xdg |
134 |
+ |
135 |
+if [[ ${PV} == *9999* ]]; then |
136 |
+ EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code" |
137 |
+ inherit git-r3 |
138 |
+else |
139 |
+ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" |
140 |
+ KEYWORDS="~amd64 ~x86" |
141 |
+fi |
142 |
|
143 |
DESCRIPTION="Graphical frontend to the LinuxSampler engine" |
144 |
HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" |
145 |
@@ -21,34 +28,27 @@ DEPEND=" |
146 |
dev-qt/qtwidgets:5 |
147 |
dev-qt/qtx11extras:5 |
148 |
media-libs/alsa-lib |
149 |
- >=media-libs/liblscp-0.5.6:= |
150 |
+ media-libs/liblscp:= |
151 |
x11-libs/libX11 |
152 |
- libgig? ( >=media-libs/libgig-3.3.0:= ) |
153 |
+ libgig? ( media-libs/libgig:= ) |
154 |
" |
155 |
RDEPEND="${DEPEND} |
156 |
- >=media-sound/linuxsampler-0.5 |
157 |
+ media-sound/linuxsampler |
158 |
" |
159 |
BDEPEND="dev-qt/linguist-tools:5" |
160 |
|
161 |
DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS ) |
162 |
|
163 |
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) |
164 |
- |
165 |
src_prepare() { |
166 |
- default |
167 |
+ cmake_src_prepare |
168 |
|
169 |
- emake -f Makefile.git |
170 |
- eautoreconf |
171 |
+ sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die |
172 |
} |
173 |
|
174 |
src_configure() { |
175 |
- local myeconfargs=( |
176 |
- $(use_enable debug) |
177 |
- $(use_enable libgig) |
178 |
+ local mycmakeargs=( |
179 |
+ -DCONFIG_DEBUG=$(usex debug 1 0) |
180 |
+ -DCONFIG_LIBGIG=$(usex libgig 1 0) |
181 |
) |
182 |
- ac_qmake="$(qt5_get_bindir)/qmake" \ |
183 |
- econf "${myeconfargs[@]}" |
184 |
- |
185 |
- cd src || die |
186 |
- eqmake5 src.pro -o Makefile |
187 |
+ cmake_src_configure |
188 |
} |