[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/

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

From: "Marc Schiffbauer" <mschiff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/
Date: Sat,  3 Jun 2023 11:43:13 +0000 (UTC)	[thread overview]
Message-ID: <1685792580.5d08c4cb6dc345dc7e784027cb6a8dc4717cad76.mschiff@gentoo> (raw)

commit:     5d08c4cb6dc345dc7e784027cb6a8dc4717cad76
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 11:41:12 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 11:43:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d08c4cb

sci-geosciences/opencpn: fix build deps

Closes: https://bugs.gentoo.org/862591
Closes: https://bugs.gentoo.org/846953
Bug: https://bugs.gentoo.org/907738
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild    |  7 ++++---
 ...cpn-5.6.2-r2.ebuild => opencpn-5.6.2-r3.ebuild} | 10 +++++----
 ...cpn-5.6.2-r2.ebuild => opencpn-5.8.2-r2.ebuild} | 24 ++++++++++++++--------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
index 53ecdb5e91ac..884fa909efe4 100644
--- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenCPN-Release_${PV}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc lzma opengl"
+IUSE="doc lzma"
 
 RDEPEND="
 	app-arch/bzip2
@@ -28,9 +28,10 @@ RDEPEND="
 	media-libs/portaudio
 	net-misc/curl
 	sys-libs/zlib
-	opengl? ( virtual/opengl )
+	virtual/opengl
+	x11-base/xorg-proto
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="

diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild
similarity index 91%
copy from sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
copy to sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild
index 53ecdb5e91ac..cb75281d7cff 100644
--- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild
@@ -18,19 +18,21 @@ S="${WORKDIR}/OpenCPN-Release_${PV}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc lzma opengl"
+IUSE="doc lzma"
 
 RDEPEND="
 	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
 	dev-libs/tinyxml
+	lzma? ( app-arch/xz-utils )
 	media-libs/freetype:2
 	media-libs/portaudio
 	net-misc/curl
 	sys-libs/zlib
-	opengl? ( virtual/opengl )
+	virtual/libusb:1
+	virtual/opengl
+	x11-base/xorg-proto
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="

diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild
similarity index 80%
copy from sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
copy to sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild
index 53ecdb5e91ac..7d5e879a5b06 100644
--- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 inherit wxwidgets xdg cmake
 
 DOC_VERSION="4.8.2.0"
@@ -18,24 +18,30 @@ S="${WORKDIR}/OpenCPN-Release_${PV}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc lzma opengl"
+IUSE="doc lzma"
 
 RDEPEND="
 	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
 	dev-libs/tinyxml
+	lzma? ( app-arch/xz-utils )
 	media-libs/freetype:2
+	media-libs/glew:0
+	media-libs/jasper
 	media-libs/portaudio
 	net-misc/curl
 	sys-libs/zlib
-	opengl? ( virtual/opengl )
+	virtual/libusb:1
+	virtual/opengl
+	x11-base/xorg-proto
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/gettext
+	dev-cpp/gtest
+	dev-libs/rapidjson
 	sys-apps/lsb-release
+	sys-devel/gettext
 	"
 
 src_configure() {
@@ -43,11 +49,11 @@ src_configure() {
 
 	setup-wxwidgets
 	local mycmakeargs=(
-		-DUSE_S57=ON
 		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
 	)
+#		-DUSE_S57=ON
+#		-DBUNDLE_TCDATA=ON
+#		-DBUNDLE_GSHHS=CRUDE
 
 	cmake_src_configure
 }

next             reply	other threads:[~2023-06-03 11:43 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-03 11:43 Marc Schiffbauer [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-24 22:51 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/ Marc Schiffbauer
2024-04-09 14:44 Sam James
2024-04-05  1:21 Sam James
2023-07-18 21:26 Marc Schiffbauer
2023-06-04  7:20 Marc Schiffbauer
2023-06-04  7:20 Marc Schiffbauer
2023-06-03 11:43 Marc Schiffbauer
2023-06-03  0:54 Marc Schiffbauer
2023-06-02 11:43 Marc Schiffbauer
2023-06-02 11:25 Marc Schiffbauer
2023-06-02 11:25 Marc Schiffbauer
2023-06-01 22:16 Marc Schiffbauer
2023-05-31 18:20 Marc Schiffbauer
2023-05-28 21:01 Marc Schiffbauer
2023-05-28 21:01 Marc Schiffbauer
2022-05-18  9:16 Marc Schiffbauer
2022-05-18  9:16 Marc Schiffbauer
2021-11-18  0:44 Marc Schiffbauer
2018-12-02  0:18 Marc Schiffbauer
2018-05-21 17:05 Aaron Bauman
2018-03-16 23:46 Marc Schiffbauer
2018-03-16 22:01 Marc Schiffbauer
2018-03-16 21:47 Marc Schiffbauer
2017-08-13 23:31 Marc Schiffbauer
2017-08-13  0:17 Marc Schiffbauer
2017-07-14 19:19 Marc Schiffbauer
2016-12-30 18:00 Marc Schiffbauer
2016-10-31 22:03 Marc Schiffbauer
2016-03-30 23:26 Marc Schiffbauer
2016-03-30 23:26 Marc Schiffbauer
2015-10-25 16:45 Pacho Ramos

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:53ecdb5e91a dfblob:884fa909efe dfblob:53ecdb5e91a
dfblob:cb75281d7cf dfblob:53ecdb5e91a dfblob:7d5e879a5b0 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/" )
	(help)

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=1685792580.5d08c4cb6dc345dc7e784027cb6a8dc4717cad76.mschiff@gentoo \
    --to=mschiff@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