[gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/, media-gfx/opencsg/files/
commit: 196c412ef6fdeb61ddc752176248c82e4745a6bd
Author: Chris Mayo gmail com>
AuthorDate: Wed Mar 27 19:23:11 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu May 9 12:56:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196c412e
media-gfx/opencsg: drop dependency on Qt 5
Signed-off-by: Chris Mayo gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35935
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/opencsg/files/opencsg-1.6.0-cmake.patch | 61 +++
media-gfx/opencsg/opencsg-1.6.0-r1.ebuild | 36 +
2 files changed, 97 insertions(+)
diff --git a/media-gfx/opencsg/files/opencsg-1.6.0-cmake.patch
b/media-gfx/opencsg/files/opencsg-1.6.0-cmake.patch
new file mode 100644
index ..19866126da08
--- /dev/null
+++ b/media-gfx/opencsg/files/opencsg-1.6.0-cmake.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 000..0ba23fe
+--- /dev/null
b/CMakeLists.txt
+@@ -0,0 +1,12 @@
++cmake_minimum_required(VERSION 3.16)
++project(opencsg VERSION 1.6.0 LANGUAGES CXX)
++
++option(BUILD_EXAMPLE "Build example program" ON)
++option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
++
++include(GNUInstallDirs)
++
++add_subdirectory(src)
++if(BUILD_EXAMPLE)
++add_subdirectory(example)
++endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+new file mode 100644
+index 000..323a491
+--- /dev/null
b/src/CMakeLists.txt
+@@ -0,0 +1,37 @@
++add_library(opencsg
++area.cpp area.h
++batch.cpp batch.h
++channelManager.cpp channelManager.h
++context.cpp context.h
++frameBufferObject.cpp frameBufferObject.h
++frameBufferObjectExt.cpp frameBufferObjectExt.h
++glad/include/KHR/khrplatform.h
++glad/include/glad/gl.h
++glad/src/gl.cpp
++occlusionQuery.cpp occlusionQuery.h
++offscreenBuffer.h
++opencsgConfig.h
++opencsgRender.cpp opencsgRender.h
++openglExt.h
++openglHelper.cpp openglHelper.h
++primitive.cpp
++primitiveHelper.cpp primitiveHelper.h
++renderGoldfeather.cpp
++renderSCS.cpp
++scissorMemo.cpp scissorMemo.h
++settings.cpp settings.h
++)
++target_include_directories(opencsg PUBLIC
++${CMAKE_SOURCE_DIR}/include
++)
++
++set_target_properties(opencsg PROPERTIES
++VERSION ${PROJECT_VERSION}
++SOVERSION ${PROJECT_VERSION_MAJOR}
++PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/opencsg.h
++)
++
++install(TARGETS opencsg
++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++)
diff --git a/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild
b/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild
new file mode 100644
index ..020597e9a1b0
--- /dev/null
+++ b/media-gfx/opencsg/opencsg-1.6.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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"
+
+DOCS=( build.txt changelog.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.0-cmake.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLE=OFF
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use doc && local HTML_DOCS=( doc/. )
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/, media-gfx/opencsg/files/
commit: 4c48b38e185de8672deed3aee4871355cc22b8fa
Author: Chris Mayo gmail com>
AuthorDate: Tue Sep 19 18:43:29 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Dec 11 13:30:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c48b38e
media-gfx/opencsg: add 1.6.0
Signed-off-by: Chris Mayo gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32932
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/opencsg/Manifest | 1 +
.../opencsg/files/opencsg-1.6.0-includepath.patch | 24 +++
media-gfx/opencsg/opencsg-1.6.0.ebuild | 50 ++
3 files changed, 75 insertions(+)
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 1ed379730a40..59d87480dc81 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1 +1,2 @@
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.6.0-includepath.patch
b/media-gfx/opencsg/files/opencsg-1.6.0-includepath.patch
new file mode 100644
index ..419a0f7478b3
--- /dev/null
+++ b/media-gfx/opencsg/files/opencsg-1.6.0-includepath.patch
@@ -0,0 +1,24 @@
+* 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.6.0.ebuild
b/media-gfx/opencsg/opencsg-1.6.0.ebuild
new file mode 100644
index ..cdcf6421d4a4
--- /dev/null
+++ b/media-gfx/opencsg/opencsg-1.6.0.ebuild
@@ -0,0 +1,50 @@
+# 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.6"
+KEYWORDS="~amd64 ~arm64 ~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
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/opencsg/, media-gfx/opencsg/files/
commit: bf12696b2f18ba3843984a54d3a1ec7ade416fbb
Author: Bernd Waibel gmail com>
AuthorDate: Sun Nov 3 15:04:24 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 5 19:47:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf12696b
media-gfx/opencsg: fix build failure with GLES2
Fix an issue where qmake isn't able to find opengles2 feature.
Add myself as proxy-maintainer.
Closes: https://bugs.gentoo.org/639314
Reported-by: Toralf Förster gentoo.org>
Package-Manager: Portage-2.3.96-r1, Repoman-2.3.22
Signed-off-by: Bernd Waibel gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13537
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../opencsg/files/opencsg-1.4.2-includepath.patch | 4 +--
media-gfx/opencsg/metadata.xml | 9 -
media-gfx/opencsg/opencsg-1.4.2-r1.ebuild | 40 +-
3 files changed, 41 insertions(+), 12 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
index 9b66ae44ed0..1a623a5629b 100644
--- a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
+++ b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
@@ -3,8 +3,8 @@
Gentoo-bug: 623840
a/src.pro
-+++ b/src.pro
+--- a/src/src.pro
b/src/src.pro
@@ -7,14 +7,14 @@
}
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index 9fe432b2d59..a6159b39f26 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,7 +1,14 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
+ wae...@gmail.com
+ Bernd Waibel
+
+
+ proxy-ma...@gentoo.org
+ Gentoo Proxy Maintainer Team
+
OpenCSG is a library that does image-based CSG rendering using
OpenGL. OpenCSG is written in C++ and supports most modern
diff --git a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
index faa23f4458b..bf738882fe5 100644
--- a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
+++ b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit qmake-utils
@@ -13,15 +13,29 @@ SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
-RDEPEND="media-libs/glew:0="
+RDEPEND="
+ dev-libs/libbsd
+ media-libs/glew:0=
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libxcb:=
+"
+
+# qtgui is needed for opengles2 feature by
+# /usr/lib64/qt5/mkspecs/feature/unix/opengl.prf
DEPEND="${RDEPEND}
dev-qt/qtcore:5
- media-libs/mesa[gles2]
+ dev-qt/qtgui:5
"
-S="${WORKDIR}/${MY_P}/src"
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( build.txt changelog.txt )
PATCHES=(
"${FILESDIR}/${P}-includepath.patch"
@@ -31,13 +45,21 @@ src_prepare() {
default
# removes duplicated headers
- rm -r ../glew || die "failed to remove bundled glew"
+ rm -r glew || die "failed to remove bundled glew"
}
src_configure() {
- eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)"
+ 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 INSTALL_ROOT="${D}" install
+ emake -C src INSTALL_ROOT="${ED}" install
+ use doc && local HTML_DOCS=( doc/. )
+ einstalldocs
}
