* [gentoo-commits] repo/gentoo:master commit in: media-libs/SoXt/, media-libs/SoXt/files/
@ 2020-03-11 12:22 Guilherme Amadio
0 siblings, 0 replies; 2+ messages in thread
From: Guilherme Amadio @ 2020-03-11 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 4658562489678824f4a7efdea14c972e678e75b7
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 12:18:21 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 12:21:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46585624
media-libs/SoXt: bump to EAPI=7
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
media-libs/SoXt/{SoXt-1.3.0.ebuild => SoXt-1.3.0-r1.ebuild} | 12 ++++--------
media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/media-libs/SoXt/SoXt-1.3.0.ebuild b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
similarity index 78%
rename from media-libs/SoXt/SoXt-1.3.0.ebuild
rename to media-libs/SoXt/SoXt-1.3.0-r1.ebuild
index 449806a1369..9a19d767294 100644
--- a/media-libs/SoXt/SoXt-1.3.0.ebuild
+++ b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
@@ -1,9 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit autotools-utils
+EAPI=7
HOMEPAGE="http://www.coin3d.org/"
DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
@@ -41,11 +39,9 @@ src_configure() {
$(use_enable doc html)
$(use_enable doc man)
)
- autotools-utils_src_configure
+ default
# Remove SoXt from Libs.private (patch installs it in Libs)
- sed -i -e '/Libs.private/s/ -lSoXt//' "${BUILD_DIR}"/SoXt.pc || die
+ sed -i -e '/Libs.private/s/ -lSoXt//' SoXt.pc || die
# Strip the default libdir
- sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg
- # soxt-config is arch dependent
- sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" soxt-config
+ sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg || die
}
diff --git a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
index 397d223b615..d9f1ad25eef 100644
--- a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
+++ b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
@@ -1,5 +1,5 @@
---- SoXt.pc.in.orig 2013-06-17 11:26:59.998321839 -0700
-+++ SoXt.pc.in 2013-06-17 11:28:01.603654611 -0700
+--- a/SoXt.pc.in 2013-06-17 11:26:59.998321839 -0700
++++ b/SoXt.pc.in 2013-06-17 11:28:01.603654611 -0700
@@ -10,7 +10,8 @@
Version: @SOXT_VERSION@
Requires: Coin
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/SoXt/, media-libs/SoXt/files/
@ 2023-10-27 8:39 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-10-27 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 71917d863d44659a4aae444db1f84ff87ec83a99
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 07:40:52 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 08:35:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71917d86
media-libs/SoXt: Fix C++17 does not allow register storage class
and update EAPI 7 -> 8
Closes: https://bugs.gentoo.org/896234
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32826
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-libs/SoXt/SoXt-1.4.0-r1.ebuild | 47 ++++++++++++++++++++++
.../files/SoXt-1.4.0-drop-register-keyword.patch | 43 ++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/media-libs/SoXt/SoXt-1.4.0-r1.ebuild b/media-libs/SoXt/SoXt-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..64483888e526
--- /dev/null
+++ b/media-libs/SoXt/SoXt-1.4.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_P=${P/soxt/SoXt}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
+SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc"
+
+RDEPEND="
+ media-libs/coin
+ x11-libs/motif:0
+ virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/soxt"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.0-drop-register-keyword.patch
+)
+
+src_configure() {
+ use debug && append-cppflags -DSOXT_DEBUG=1
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DSOXT_BUILD_DOCUMENTATION=$(usex doc)
+ -DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF
+ -DSOXT_VERBOSE=$(usex debug)
+ )
+ cmake_src_configure
+}
diff --git a/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch b/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch
new file mode 100644
index 000000000000..fcbfa7dfd357
--- /dev/null
+++ b/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch
@@ -0,0 +1,43 @@
+https://github.com/coin3d/soxt/pull/17
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sat, 16 Sep 2023 07:32:47 +0000
+Subject: [PATCH] Fix C++17 does not allow register storage class specifier
+
+The register storage class was deprecated in C++14 and completely
+removed in C++17. Hence, we cannot use it anymore and would result in a
+build error.
+
+Bug: https://bugs.gentoo.org/896234
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/Inventor/Xt/widgets/SoXtGLArea.cpp
++++ b/src/Inventor/Xt/widgets/SoXtGLArea.cpp
+@@ -468,7 +468,7 @@ createColormap(
+ } * cmapCache;
+ static int cacheEntries = 0;
+ static int cacheMalloced = 0;
+- register int i;
++ int i;
+
+ assert(widget->soxtGLArea.visualInfo);
+
+@@ -564,7 +564,7 @@ Realize(
+ Mask * valueMask,
+ XSetWindowAttributes * attributes)
+ {
+- register SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget;
++ SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget;
+ SoXtGLAreaCallbackStruct cb;
+ Widget parentShell;
+ Status status;
+@@ -670,7 +670,7 @@ Destroy(
+ Widget parentShell;
+ Status status;
+ int countReturn;
+- register int i;
++ int i;
+
+ if (glw->soxtGLArea.myList && glw->soxtGLArea.attribList)
+ XtFree((char *) glw->soxtGLArea.attribList);
+--
+2.42.0
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-27 8:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-11 12:22 [gentoo-commits] repo/gentoo:master commit in: media-libs/SoXt/, media-libs/SoXt/files/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2023-10-27 8:39 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox