From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
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:10 +0000 (UTC) [thread overview]
Message-ID: <1661939644.708a70a3e5b5db451a964e3817bd4c45fa00e1fd.andrewammerlaan@gentoo> (raw)
commit: 708a70a3e5b5db451a964e3817bd4c45fa00e1fd
Author: T Malfatti <malfatti <AT> disroot <DOT> org>
AuthorDate: Thu Aug 25 13:36:39 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 09:54:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=708a70a3
sci-biology/open-ephys-gui: Add 0.6.1 and update live ebuilds
Signed-off-by: Thawann Malfatti <malfatti <AT> disroot.org>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/sci/pull/1168
.../open-ephys-gui/files/open-ephys-gui-0.6.1.patch | 15 +++++++++++++++
.../open-ephys-gui/files/open-ephys-gui-9999.patch | 12 ------------
.../open-ephys-gui/files/open-ephys-gui-99999999.patch | 12 ------------
sci-biology/open-ephys-gui/metadata.xml | 4 ++++
...ys-gui-99999999.ebuild => open-ephys-gui-0.6.1.ebuild} | 11 +++++++----
sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild | 13 ++++++++-----
sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild | 13 ++++++++-----
7 files changed, 42 insertions(+), 38 deletions(-)
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
new file mode 100644
index 000000000..0992f2241
--- /dev/null
+++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.1.patch
@@ -0,0 +1,15 @@
+# Add 'Gentoo' build type
+
+--- ../CMakeLists.txt 2022-08-24 15:27:32.871426442 -0300
++++ ../CMakeLists.txt 2022-08-24 15:31:03.438087613 -0300
+@@ -171,8 +171,8 @@
+ target_compile_options(open-ephys PRIVATE -O0) #enable optimization for linux debug
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ target_compile_options(open-ephys PRIVATE -O3) #enable optimization for linux release
+- else()
+- message(FATAL_ERROR "Invalid build type")
++ # else()
++ # message(FATAL_ERROR "Invalid build type")
+ endif()
+ find_package(CURL REQUIRED)
+ find_package(PkgConfig REQUIRED)
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
deleted file mode 100644
index 77e401639..000000000
--- a/sci-biology/open-ephys-gui/files/open-ephys-gui-9999.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Add 'Gentoo' build type
-
---- ../CMakeLists.txt 2019-12-02 22:29:24.021065669 -0300
-+++ ../CMakeLists.txt 2019-12-02 22:29:11.251065418 -0300
-@@ -123,6 +123,7 @@
- if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
-+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Gentoo")
- else()
- message(FATAL_ERROR "Invalid build type")
- endif()
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
deleted file mode 100644
index 77e401639..000000000
--- a/sci-biology/open-ephys-gui/files/open-ephys-gui-99999999.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Add 'Gentoo' build type
-
---- ../CMakeLists.txt 2019-12-02 22:29:24.021065669 -0300
-+++ ../CMakeLists.txt 2019-12-02 22:29:11.251065418 -0300
-@@ -123,6 +123,7 @@
- if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
-+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Gentoo")
- else()
- message(FATAL_ERROR "Invalid build type")
- endif()
diff --git a/sci-biology/open-ephys-gui/metadata.xml b/sci-biology/open-ephys-gui/metadata.xml
index ed9bf87e3..2c9af77a9 100644
--- a/sci-biology/open-ephys-gui/metadata.xml
+++ b/sci-biology/open-ephys-gui/metadata.xml
@@ -5,6 +5,10 @@
<email>malfatti@disroot.org</email>
<name>T Malfatti</name>
</maintainer>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">open-ephys/plugin-GUI</remote-id>
</upstream>
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
similarity index 89%
copy from sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
copy to sci-biology/open-ephys-gui/open-ephys-gui-0.6.1.ebuild
index 1c2b20e24..fe6791a2d 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake udev
DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="main"
Suffix=${EGIT_BRANCH}
SubDir=${P}
elif [[ ${PV} == "99999999" ]] ; then
@@ -32,9 +32,12 @@ SLOT="${PV}"
IUSE="jack"
DEPEND="
+ dev-libs/openssl
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
+ net-libs/webkit-gtk
+ net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXinerama
@@ -66,7 +69,7 @@ src_configure() {
src_install() {
dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
- cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+ cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
}
diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
index 1c2b20e24..446972aeb 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake udev
DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="main"
Suffix=${EGIT_BRANCH}
SubDir=${P}
elif [[ ${PV} == "99999999" ]] ; then
@@ -32,9 +32,12 @@ SLOT="${PV}"
IUSE="jack"
DEPEND="
+ dev-libs/openssl
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
+ net-libs/webkit-gtk
+ net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXinerama
@@ -43,7 +46,7 @@ DEPEND="
RDEPEND="${DEPEND}"
BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
QA_PREBUILT="opt/open-ephys-*/shared/*.so"
QA_PRESTRIPPED="
@@ -66,7 +69,7 @@ src_configure() {
src_install() {
dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
- cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+ cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
}
diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
index 1c2b20e24..446972aeb 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake udev
DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="main"
Suffix=${EGIT_BRANCH}
SubDir=${P}
elif [[ ${PV} == "99999999" ]] ; then
@@ -32,9 +32,12 @@ SLOT="${PV}"
IUSE="jack"
DEPEND="
+ dev-libs/openssl
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
+ net-libs/webkit-gtk
+ net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXinerama
@@ -43,7 +46,7 @@ DEPEND="
RDEPEND="${DEPEND}"
BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
QA_PREBUILT="opt/open-ephys-*/shared/*.so"
QA_PRESTRIPPED="
@@ -66,7 +69,7 @@ src_configure() {
src_install() {
dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
- cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+ cp -R "${BUILD_DIR}"/RelWithDebInfo/* "${ED}"/opt/open-ephys-"${Suffix}"/ || die
udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
}
next reply other threads:[~2022-08-31 9:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 9:54 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 19:31 [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/ Andrew Ammerlaan
2022-01-26 17:48 Andrew Ammerlaan
2021-09-07 12:56 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1661939644.708a70a3e5b5db451a964e3817bd4c45fa00e1fd.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox