Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
Date: Wed, 31 Aug 2022 09:54:14
Message-Id: 1661939644.708a70a3e5b5db451a964e3817bd4c45fa00e1fd.andrewammerlaan@gentoo
1 commit: 708a70a3e5b5db451a964e3817bd4c45fa00e1fd
2 Author: T Malfatti <malfatti <AT> disroot <DOT> org>
3 AuthorDate: Thu Aug 25 13:36:39 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 09:54:04 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=708a70a3
7
8 sci-biology/open-ephys-gui: Add 0.6.1 and update live ebuilds
9
10 Signed-off-by: Thawann Malfatti <malfatti <AT> disroot.org>
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12 Closes: https://github.com/gentoo/sci/pull/1168
13
14 .../open-ephys-gui/files/open-ephys-gui-0.6.1.patch | 15 +++++++++++++++
15 .../open-ephys-gui/files/open-ephys-gui-9999.patch | 12 ------------
16 .../open-ephys-gui/files/open-ephys-gui-99999999.patch | 12 ------------
17 sci-biology/open-ephys-gui/metadata.xml | 4 ++++
18 ...ys-gui-99999999.ebuild => open-ephys-gui-0.6.1.ebuild} | 11 +++++++----
19 sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild | 13 ++++++++-----
20 sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild | 13 ++++++++-----
21 7 files changed, 42 insertions(+), 38 deletions(-)
22
23 diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.1.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.1.patch
24 new file mode 100644
25 index 000000000..0992f2241
26 --- /dev/null
27 +++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.1.patch
28 @@ -0,0 +1,15 @@
29 +# Add 'Gentoo' build type
30 +
31 +--- ../CMakeLists.txt 2022-08-24 15:27:32.871426442 -0300
32 ++++ ../CMakeLists.txt 2022-08-24 15:31:03.438087613 -0300
33 +@@ -171,8 +171,8 @@
34 + target_compile_options(open-ephys PRIVATE -O0) #enable optimization for linux debug
35 + elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
36 + target_compile_options(open-ephys PRIVATE -O3) #enable optimization for linux release
37 +- else()
38 +- message(FATAL_ERROR "Invalid build type")
39 ++ # else()
40 ++ # message(FATAL_ERROR "Invalid build type")
41 + endif()
42 + find_package(CURL REQUIRED)
43 + find_package(PkgConfig REQUIRED)
44
45 diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-9999.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-9999.patch
46 deleted file mode 100644
47 index 77e401639..000000000
48 --- a/sci-biology/open-ephys-gui/files/open-ephys-gui-9999.patch
49 +++ /dev/null
50 @@ -1,12 +0,0 @@
51 -# Add 'Gentoo' build type
52 -
53 ---- ../CMakeLists.txt 2019-12-02 22:29:24.021065669 -0300
54 -+++ ../CMakeLists.txt 2019-12-02 22:29:11.251065418 -0300
55 -@@ -123,6 +123,7 @@
56 - if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
57 -
58 - elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
59 -+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Gentoo")
60 - else()
61 - message(FATAL_ERROR "Invalid build type")
62 - endif()
63
64 diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-99999999.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-99999999.patch
65 deleted file mode 100644
66 index 77e401639..000000000
67 --- a/sci-biology/open-ephys-gui/files/open-ephys-gui-99999999.patch
68 +++ /dev/null
69 @@ -1,12 +0,0 @@
70 -# Add 'Gentoo' build type
71 -
72 ---- ../CMakeLists.txt 2019-12-02 22:29:24.021065669 -0300
73 -+++ ../CMakeLists.txt 2019-12-02 22:29:11.251065418 -0300
74 -@@ -123,6 +123,7 @@
75 - if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
76 -
77 - elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
78 -+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Gentoo")
79 - else()
80 - message(FATAL_ERROR "Invalid build type")
81 - endif()
82
83 diff --git a/sci-biology/open-ephys-gui/metadata.xml b/sci-biology/open-ephys-gui/metadata.xml
84 index ed9bf87e3..2c9af77a9 100644
85 --- a/sci-biology/open-ephys-gui/metadata.xml
86 +++ b/sci-biology/open-ephys-gui/metadata.xml
87 @@ -5,6 +5,10 @@
88 <email>malfatti@×××××××.org</email>
89 <name>T Malfatti</name>
90 </maintainer>
91 + <maintainer type="project">
92 + <email>sci@g.o</email>
93 + <name>Gentoo Science Project</name>
94 + </maintainer>
95 <upstream>
96 <remote-id type="github">open-ephys/plugin-GUI</remote-id>
97 </upstream>
98
99 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.1.ebuild
100 similarity index 89%
101 copy from sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
102 copy to sci-biology/open-ephys-gui/open-ephys-gui-0.6.1.ebuild
103 index 1c2b20e24..fe6791a2d 100644
104 --- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
105 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.1.ebuild
106 @@ -1,7 +1,7 @@
107 -# Copyright 2019-2021 Gentoo Authors
108 +# Copyright 2019-2022 Gentoo Authors
109 # Distributed under the terms of the GNU General Public License v2
110
111 -EAPI=7
112 +EAPI=8
113 inherit cmake udev
114
115 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
116 @@ -11,7 +11,7 @@ LICENSE="GPL-3"
117 if [[ ${PV} == "9999" ]] ; then
118 inherit git-r3
119 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
120 - EGIT_BRANCH="master"
121 + EGIT_BRANCH="main"
122 Suffix=${EGIT_BRANCH}
123 SubDir=${P}
124 elif [[ ${PV} == "99999999" ]] ; then
125 @@ -32,9 +32,12 @@ SLOT="${PV}"
126 IUSE="jack"
127
128 DEPEND="
129 + dev-libs/openssl
130 media-libs/alsa-lib
131 media-libs/freeglut
132 media-libs/freetype
133 + net-libs/webkit-gtk
134 + net-misc/curl
135 x11-libs/libXrandr
136 x11-libs/libXcursor
137 x11-libs/libXinerama
138 @@ -66,7 +69,7 @@ src_configure() {
139
140 src_install() {
141 dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
142 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
143 + cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
144 udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
145 dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
146 }
147
148 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
149 index 1c2b20e24..446972aeb 100644
150 --- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
151 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
152 @@ -1,7 +1,7 @@
153 -# Copyright 2019-2021 Gentoo Authors
154 +# Copyright 2019-2022 Gentoo Authors
155 # Distributed under the terms of the GNU General Public License v2
156
157 -EAPI=7
158 +EAPI=8
159 inherit cmake udev
160
161 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
162 @@ -11,7 +11,7 @@ LICENSE="GPL-3"
163 if [[ ${PV} == "9999" ]] ; then
164 inherit git-r3
165 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
166 - EGIT_BRANCH="master"
167 + EGIT_BRANCH="main"
168 Suffix=${EGIT_BRANCH}
169 SubDir=${P}
170 elif [[ ${PV} == "99999999" ]] ; then
171 @@ -32,9 +32,12 @@ SLOT="${PV}"
172 IUSE="jack"
173
174 DEPEND="
175 + dev-libs/openssl
176 media-libs/alsa-lib
177 media-libs/freeglut
178 media-libs/freetype
179 + net-libs/webkit-gtk
180 + net-misc/curl
181 x11-libs/libXrandr
182 x11-libs/libXcursor
183 x11-libs/libXinerama
184 @@ -43,7 +46,7 @@ DEPEND="
185 RDEPEND="${DEPEND}"
186
187 BUILD_DIR="${S}/Build"
188 -PATCHES=( "${FILESDIR}"/${P}.patch )
189 +PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
190
191 QA_PREBUILT="opt/open-ephys-*/shared/*.so"
192 QA_PRESTRIPPED="
193 @@ -66,7 +69,7 @@ src_configure() {
194
195 src_install() {
196 dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
197 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
198 + cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
199 udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
200 dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
201 }
202
203 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
204 index 1c2b20e24..446972aeb 100644
205 --- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
206 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
207 @@ -1,7 +1,7 @@
208 -# Copyright 2019-2021 Gentoo Authors
209 +# Copyright 2019-2022 Gentoo Authors
210 # Distributed under the terms of the GNU General Public License v2
211
212 -EAPI=7
213 +EAPI=8
214 inherit cmake udev
215
216 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
217 @@ -11,7 +11,7 @@ LICENSE="GPL-3"
218 if [[ ${PV} == "9999" ]] ; then
219 inherit git-r3
220 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
221 - EGIT_BRANCH="master"
222 + EGIT_BRANCH="main"
223 Suffix=${EGIT_BRANCH}
224 SubDir=${P}
225 elif [[ ${PV} == "99999999" ]] ; then
226 @@ -32,9 +32,12 @@ SLOT="${PV}"
227 IUSE="jack"
228
229 DEPEND="
230 + dev-libs/openssl
231 media-libs/alsa-lib
232 media-libs/freeglut
233 media-libs/freetype
234 + net-libs/webkit-gtk
235 + net-misc/curl
236 x11-libs/libXrandr
237 x11-libs/libXcursor
238 x11-libs/libXinerama
239 @@ -43,7 +46,7 @@ DEPEND="
240 RDEPEND="${DEPEND}"
241
242 BUILD_DIR="${S}/Build"
243 -PATCHES=( "${FILESDIR}"/${P}.patch )
244 +PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
245
246 QA_PREBUILT="opt/open-ephys-*/shared/*.so"
247 QA_PRESTRIPPED="
248 @@ -66,7 +69,7 @@ src_configure() {
249
250 src_install() {
251 dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
252 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
253 + cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
254 udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
255 dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
256 }
Report Message
Find on MARC Find on Google Groups