* [gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/files/, media-gfx/opencsg/
@ 2017-07-06 12:56 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2017-07-06 12:56 UTC (permalink / raw
To: gentoo-commits
commit: dfbc1b4b7a8ad01f03defd04329140d5bb1e1a9e
Author: maurerpe <junk4me46806 <AT> yahoo <DOT> com>
AuthorDate: Thu Jul 6 12:55:30 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 12:56:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbc1b4b
media-gfx/opencsg: fix build with GCC 6
Gentoo-bug: 623840
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../opencsg/files/opencsg-1.4.2-includepath.patch | 25 ++++++++++++++++++++++
media-gfx/opencsg/opencsg-1.4.2.ebuild | 10 ++++-----
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
new file mode 100644
index 00000000000..9b66ae44ed0
--- /dev/null
+++ b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
@@ -0,0 +1,25 @@
+* Fix build with GCC 6
+* Don't hardcode libdir
+
+Gentoo-bug: 623840
+
+--- a/src.pro
++++ b/src.pro
+@@ -7,14 +7,14 @@
+ }
+
+ CONFIG += opengl warn_on release
+-INCLUDEPATH += ../include ../ $$INSTALLDIR/include
++INCLUDEPATH += ../include ..
+ CONFIG -= qt
+-LIBS += -L$$INSTALLDIR/lib -lGLEW
++LIBS += -lGLEW
+
+ DESTDIR = ../lib
+ headers.files = ../include/opencsg.h
+ headers.path = $$INSTALLDIR/include
+-target.path = $$INSTALLDIR/lib
++target.path = $$INSTALLDIR/$$LIBDIR
+ INSTALLS += target headers
+
+ HEADERS = ../include/opencsg.h \
diff --git a/media-gfx/opencsg/opencsg-1.4.2.ebuild b/media-gfx/opencsg/opencsg-1.4.2.ebuild
index 1c905349bf8..9f02e2a9c1d 100644
--- a/media-gfx/opencsg/opencsg-1.4.2.ebuild
+++ b/media-gfx/opencsg/opencsg-1.4.2.ebuild
@@ -22,19 +22,19 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}/src"
+PATCHES=(
+ "${FILESDIR}/${P}-includepath.patch"
+)
+
src_prepare() {
default
# removes duplicated headers
rm -r ../glew || die "failed to remove bundled glew"
-
- sed -i -e "s:^target.path.*:target.path = \$\$INSTALLDIR/$(get_libdir):" \
- src.pro \
- || die 'failed to fix target.path in src.pro'
}
src_configure() {
- eqmake5 src.pro INSTALLDIR="/usr"
+ eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)"
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/files/, media-gfx/opencsg/
@ 2025-03-22 19:53 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-03-22 19:53 UTC (permalink / raw
To: gentoo-commits
commit: e17189cb8ded09376c7a6526b0703a2dfef8f391
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 19:22:18 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 19:53:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17189cb
media-gfx/opencsg: drop 1.5.1-r1, 1.6.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/opencsg/Manifest | 1 -
.../opencsg/files/opencsg-1.4.2-includepath.patch | 25 ----------
.../opencsg/files/opencsg-1.6.0-includepath.patch | 24 ---------
media-gfx/opencsg/opencsg-1.5.1-r1.ebuild | 58 ----------------------
media-gfx/opencsg/opencsg-1.6.0.ebuild | 50 -------------------
5 files changed, 158 deletions(-)
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 59d87480dc81..a51db6d1b7f9 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,2 +1 @@
-DIST OpenCSG-1.5.1.tar.gz 967182 BLAKE2B a24d7e736b58af78dfed218e7015c9a580c447b65367209fade0c90a36cf7bb638c4abe10cdf37a07c8f16d46389e92341ab72ea8d9c189e380502cbb2962d29 SHA512 aef3e785e730fd8f2ee06719d1c7a57c105e7432fb4dc6f4ad4305aabf1c7d4438ef869ae4eb840dc272b35f20c4ff296e6dd5418337230081e74ac4c91cd342
DIST OpenCSG-1.6.0.tar.gz 302547 BLAKE2B ceb99fb6558b38df0eb629cfd5e5e2b768311f026f2f42e0e35ca948761bd7c67fcfc35322d54eb6c013eded39d95ede08f634b30241ebad4231bf783f76b591 SHA512 0cbf28353aafb47738a122bd5fa8e8ab0abc616d7b3f4e5f1ee02f550a060ccfbd6569d1183fcc4e992fe9bbb49584c23aa9cc7db2a7e7c53b119544aa9589a7
diff --git a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
deleted file mode 100644
index 1a623a5629be..000000000000
--- a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* Fix build with GCC 6
-* Don't hardcode libdir
-
-Gentoo-bug: 623840
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -7,14 +7,14 @@
- }
-
- CONFIG += opengl warn_on release
--INCLUDEPATH += ../include ../ $$INSTALLDIR/include
-+INCLUDEPATH += ../include ..
- CONFIG -= qt
--LIBS += -L$$INSTALLDIR/lib -lGLEW
-+LIBS += -lGLEW
-
- DESTDIR = ../lib
- headers.files = ../include/opencsg.h
- headers.path = $$INSTALLDIR/include
--target.path = $$INSTALLDIR/lib
-+target.path = $$INSTALLDIR/$$LIBDIR
- INSTALLS += target headers
-
- HEADERS = ../include/opencsg.h \
diff --git a/media-gfx/opencsg/files/opencsg-1.6.0-includepath.patch b/media-gfx/opencsg/files/opencsg-1.6.0-includepath.patch
deleted file mode 100644
index 419a0f7478b3..000000000000
--- a/media-gfx/opencsg/files/opencsg-1.6.0-includepath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-* Fix build with GCC 6
-* Don't hardcode libdir
-
-Gentoo-bug: 623840
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -7,14 +7,13 @@
- }
-
- CONFIG += opengl warn_on release
--INCLUDEPATH += ../include ../ $$INSTALLDIR/include
-+INCLUDEPATH += ../include ..
- CONFIG -= qt
--LIBS += -L$$INSTALLDIR/lib
-
- DESTDIR = ../lib
- headers.files = ../include/opencsg.h
- headers.path = $$INSTALLDIR/include
--target.path = $$INSTALLDIR/lib
-+target.path = $$INSTALLDIR/$$LIBDIR
- INSTALLS += target headers
-
- HEADERS = ../include/opencsg.h \
diff --git a/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild b/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild
deleted file mode 100644
index 5afe93217eaf..000000000000
--- a/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_P="OpenCSG-${PV}"
-
-DESCRIPTION="The Constructive Solid Geometry rendering library"
-HOMEPAGE="https://www.opencsg.org"
-SRC_URI="https://www.opencsg.org/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0/1.5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc"
-RESTRICT="test"
-
-RDEPEND="
- media-libs/glew:0=
- virtual/opengl
-"
-
-# qtgui is needed for opengles2 feature by
-# /usr/lib64/qt5/mkspecs/feature/unix/opengl.prf
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
-"
-
-DOCS=( build.txt changelog.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.2-includepath.patch )
-
-src_prepare() {
- default
-
- # removes duplicated headers
- rm -r glew || die "failed to remove bundled glew"
-}
-
-src_configure() {
- eqmake5 opencsg.pro INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-src_compile() {
- # rebuild Makefiles in subdirs
- emake INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)" qmake_all
- emake sub-src
-}
-
-src_install() {
- emake -C src INSTALL_ROOT="${ED}" install
- use doc && local HTML_DOCS=( doc/. )
- einstalldocs
-}
diff --git a/media-gfx/opencsg/opencsg-1.6.0.ebuild b/media-gfx/opencsg/opencsg-1.6.0.ebuild
deleted file mode 100644
index c08bc4b44e2a..000000000000
--- a/media-gfx/opencsg/opencsg-1.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_P="OpenCSG-${PV}"
-
-DESCRIPTION="The Constructive Solid Geometry rendering library"
-HOMEPAGE="https://www.opencsg.org"
-SRC_URI="https://www.opencsg.org/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0/1.6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc"
-RESTRICT="test"
-
-RDEPEND="
- virtual/opengl
-"
-
-# qtgui is needed for opengles2 feature by
-# /usr/lib64/qt5/mkspecs/feature/unix/opengl.prf
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
-"
-
-DOCS=( build.txt changelog.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.6.0-includepath.patch )
-
-src_configure() {
- eqmake5 opencsg.pro INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-src_compile() {
- # rebuild Makefiles in subdirs
- emake INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)" qmake_all
- emake sub-src
-}
-
-src_install() {
- emake -C src INSTALL_ROOT="${ED}" install
- use doc && local HTML_DOCS=( doc/. )
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-22 19:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-06 12:56 [gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/files/, media-gfx/opencsg/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2025-03-22 19:53 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox