[gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
@ 2021-09-07 12:56 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-09-07 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     62113d3ad5aa7336888fea7ba6d5237e175df5e4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 12:41:56 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 12:56:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=62113d3a

sci-biology/open-ephys-gui: add version 0.5.5

Closes: https://github.com/gentoo/sci/pull/1111
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/open-ephys-gui-0.5.5.patch               | 12 +++++++
 .../open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild   |  2 +-
 ...-0.5.2.2.ebuild => open-ephys-gui-0.5.5.ebuild} | 40 ++++++++++------------
 .../open-ephys-gui/open-ephys-gui-9999.ebuild      | 40 ++++++++++------------
 .../open-ephys-gui/open-ephys-gui-99999999.ebuild  | 40 ++++++++++------------
 5 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch
new file mode 100644
index 000000000..77e401639
--- /dev/null
+++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch
@@ -0,0 +1,12 @@
+# 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/open-ephys-gui-0.5.2.2.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
index b0266e0ac..b4cbc6d8f 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
-HOMEPAGE="http://www.open-ephys.org/gui/"
+HOMEPAGE="https://open-ephys.org/gui/"
 LICENSE="GPL-3"
 
 if [[ ${PV} == "9999" ]] ; then

diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
similarity index 60%
copy from sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
copy to sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
index b0266e0ac..1c2b20e24 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
@@ -2,38 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake
+inherit cmake udev
 
 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
-HOMEPAGE="http://www.open-ephys.org/gui/"
+HOMEPAGE="https://open-ephys.org/gui/"
 LICENSE="GPL-3"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="master"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 elif [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="development"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 else
 	SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	Suffix=${PV}
 	SubDir="plugin-GUI-${PV}"
-	S="${WORKDIR}/$SubDir"
+	S="${WORKDIR}/${SubDir}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 SLOT="${PV}"
 IUSE="jack"
 
-BDEPEND="
-	<sys-devel/gcc-9
-"
 DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
@@ -41,17 +38,17 @@ DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXinerama
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
 "
 RDEPEND="${DEPEND}"
 
-BUILD_DIR="$S/Build"
+BUILD_DIR="${S}/Build"
 PATCHES=( "${FILESDIR}"/${P}.patch )
 
-QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
+QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="
-	opt/open-ephys-0.5.2.2/plugins/*.so
-	opt/open-ephys-0.5.2.2/open-ephys
+	opt/open-ephys-*/plugins/*.so
+	opt/open-ephys-*/open-ephys
 "
 
 src_prepare() {
@@ -68,15 +65,16 @@ 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 "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
-	dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
+	dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
+	cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+	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}"
 }
 
 pkg_postinst() {
-	ewarn " "
-	ewarn "You must restart the udev service in order to allow your computer to"
-	ewarn "communicate with the Open Ephys acquisition board."
-	ewarn " "
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }

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 b0266e0ac..1c2b20e24 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
@@ -2,38 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake
+inherit cmake udev
 
 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
-HOMEPAGE="http://www.open-ephys.org/gui/"
+HOMEPAGE="https://open-ephys.org/gui/"
 LICENSE="GPL-3"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="master"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 elif [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="development"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 else
 	SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	Suffix=${PV}
 	SubDir="plugin-GUI-${PV}"
-	S="${WORKDIR}/$SubDir"
+	S="${WORKDIR}/${SubDir}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 SLOT="${PV}"
 IUSE="jack"
 
-BDEPEND="
-	<sys-devel/gcc-9
-"
 DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
@@ -41,17 +38,17 @@ DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXinerama
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
 "
 RDEPEND="${DEPEND}"
 
-BUILD_DIR="$S/Build"
+BUILD_DIR="${S}/Build"
 PATCHES=( "${FILESDIR}"/${P}.patch )
 
-QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
+QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="
-	opt/open-ephys-0.5.2.2/plugins/*.so
-	opt/open-ephys-0.5.2.2/open-ephys
+	opt/open-ephys-*/plugins/*.so
+	opt/open-ephys-*/open-ephys
 "
 
 src_prepare() {
@@ -68,15 +65,16 @@ 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 "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
-	dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
+	dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
+	cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+	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}"
 }
 
 pkg_postinst() {
-	ewarn " "
-	ewarn "You must restart the udev service in order to allow your computer to"
-	ewarn "communicate with the Open Ephys acquisition board."
-	ewarn " "
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }

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 b0266e0ac..1c2b20e24 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
@@ -2,38 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake
+inherit cmake udev
 
 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
-HOMEPAGE="http://www.open-ephys.org/gui/"
+HOMEPAGE="https://open-ephys.org/gui/"
 LICENSE="GPL-3"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="master"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 elif [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
 	EGIT_BRANCH="development"
-	Suffix=$EGIT_BRANCH
+	Suffix=${EGIT_BRANCH}
 	SubDir=${P}
 else
 	SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	Suffix=${PV}
 	SubDir="plugin-GUI-${PV}"
-	S="${WORKDIR}/$SubDir"
+	S="${WORKDIR}/${SubDir}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 SLOT="${PV}"
 IUSE="jack"
 
-BDEPEND="
-	<sys-devel/gcc-9
-"
 DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
@@ -41,17 +38,17 @@ DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXinerama
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
 "
 RDEPEND="${DEPEND}"
 
-BUILD_DIR="$S/Build"
+BUILD_DIR="${S}/Build"
 PATCHES=( "${FILESDIR}"/${P}.patch )
 
-QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
+QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="
-	opt/open-ephys-0.5.2.2/plugins/*.so
-	opt/open-ephys-0.5.2.2/open-ephys
+	opt/open-ephys-*/plugins/*.so
+	opt/open-ephys-*/open-ephys
 "
 
 src_prepare() {
@@ -68,15 +65,16 @@ 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 "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
-	dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
+	dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
+	cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
+	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}"
 }
 
 pkg_postinst() {
-	ewarn " "
-	ewarn "You must restart the udev service in order to allow your computer to"
-	ewarn "communicate with the Open Ephys acquisition board."
-	ewarn " "
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
@ 2022-01-26 17:48 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-01-26 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     57f6350f5741a96939473889ca15ee4352d8a4e4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 26 11:00:17 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 26 11:00:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=57f6350f

sci-biology/open-ephys-gui: drop old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/open-ephys-gui-0.5.2.2.patch             | 12 ----
 .../open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild   | 82 ----------------------
 2 files changed, 94 deletions(-)

diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.2.2.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.2.2.patch
deleted file mode 100644
index 77e401639..000000000
--- a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.2.2.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/open-ephys-gui-0.5.2.2.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
deleted file mode 100644
index b4cbc6d8f..000000000
--- a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
-HOMEPAGE="https://open-ephys.org/gui/"
-LICENSE="GPL-3"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
-	EGIT_BRANCH="master"
-	Suffix=$EGIT_BRANCH
-	SubDir=${P}
-elif [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
-	EGIT_BRANCH="development"
-	Suffix=$EGIT_BRANCH
-	SubDir=${P}
-else
-	SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	Suffix=${PV}
-	SubDir="plugin-GUI-${PV}"
-	S="${WORKDIR}/$SubDir"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="${PV}"
-IUSE="jack"
-
-BDEPEND="
-	<sys-devel/gcc-9
-"
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/freeglut
-	media-libs/freetype
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	jack? ( media-sound/jack-audio-connection-kit )
-"
-RDEPEND="${DEPEND}"
-
-BUILD_DIR="$S/Build"
-PATCHES=( "${FILESDIR}"/${P}.patch )
-
-QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
-QA_PRESTRIPPED="
-	opt/open-ephys-0.5.2.2/plugins/*.so
-	opt/open-ephys-0.5.2.2/open-ephys
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use jack; then
-		sed -i 's/JUCE_APP_VERSION=/JUCE_JACK=1\n    JUCE_APP_VERSION=/' "${WORKDIR}/${SubDir}/CMakeLists.txt" || die "Sed failed!"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON )
-	cmake_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 "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
-	dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
-}
-
-pkg_postinst() {
-	ewarn " "
-	ewarn "You must restart the udev service in order to allow your computer to"
-	ewarn "communicate with the Open Ephys acquisition board."
-	ewarn " "
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
@ 2022-08-31  9:54 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-08-31  9:54 UTC (permalink / raw
  To: gentoo-commits

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}"
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
@ 2023-04-06 19:31 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-04-06 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     30e19eb79e85403c3a742c03e41b58743bb20e8b
Author:     T Malfatti <malfatti <AT> disroot <DOT> org>
AuthorDate: Wed Apr  5 09:08:20 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr  6 19:31:21 2023 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=30e19eb7

sci-biology/open-ephys-gui: version bump

Signed-off-by: Thawann Malfatti <malfatti <AT> disroot.org>
Closes: https://github.com/gentoo/sci/pull/1193
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../open-ephys-gui/files/open-ephys-gui-0.6.4.patch       | 15 +++++++++++++++
 ...-ephys-gui-9999.ebuild => open-ephys-gui-0.6.4.ebuild} |  6 +++---
 sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild     |  6 +++---
 sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild |  6 +++---
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.patch
new file mode 100644
index 000000000..5c0c6526e
--- /dev/null
+++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.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
+@@ -173,8 +173,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/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
similarity index 94%
copy from sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
copy to sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
index 446972aeb..cae41e773 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
 	media-libs/freetype
-	net-libs/webkit-gtk
+	net-libs/webkit-gtk:4
 	net-misc/curl
 	x11-libs/libXrandr
 	x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/${P}.patch )
 
 QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="

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 446972aeb..2ab957f40 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
 	media-libs/freetype
-	net-libs/webkit-gtk
+	net-libs/webkit-gtk:4
 	net-misc/curl
 	x11-libs/libXrandr
 	x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.4.patch )
 
 QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="

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 446972aeb..2ab957f40 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/freeglut
 	media-libs/freetype
-	net-libs/webkit-gtk
+	net-libs/webkit-gtk:4
 	net-misc/curl
 	x11-libs/libXrandr
 	x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.4.patch )
 
 QA_PREBUILT="opt/open-ephys-*/shared/*.so"
 QA_PRESTRIPPED="


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-04-06 19:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-31  9:54 [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2023-04-06 19:31 Andrew Ammerlaan
2022-01-26 17:48 Andrew Ammerlaan
2021-09-07 12:56 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox