Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

media-gfx/opencsg: drop dependency on Qt 5 #35935

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

cjmayo
Copy link
Contributor

@cjmayo cjmayo commented Mar 26, 2024

and virtual/opengl.

$ lddtree /usr/lib64/libopencsg.so.1.6.0
libopencsg.so.1.6.0 => /usr/lib64/libopencsg.so.1.6.0 (interpreter => none)
    libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/13/libstdc++.so.6
        libm.so.6 => /usr/lib64/libm.so.6
        ld-linux-x86-64.so.2 => /usr/lib64/ld-linux-x86-64.so.2
    libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/13/libgcc_s.so.1
    libc.so.6 => /usr/lib64/libc.so.6

Carrying a patch to replace the build system is a bit extreme (reported upstream last year) but Qt 5 is not necessary.

--- opencsg-1.6.0.ebuild
+++ opencsg-1.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit qmake-utils
+inherit cmake
 
 MY_P="OpenCSG-${PV}"
 
@@ -18,33 +18,19 @@
 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 )
+PATCHES=( "${FILESDIR}"/${PN}-1.6.0-cmake.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
+	local mycmakeargs=(
+		-DBUILD_EXAMPLE=OFF
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	emake -C src INSTALL_ROOT="${ED}" install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/. )
 	einstalldocs
 }

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @cjmayo
Areas affected: ebuilds
Packages affected: media-gfx/opencsg

media-gfx/opencsg: @waebbl, @gentoo/proxy-maint

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 26, 2024
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-03-26 19:55 UTC
Newest commit scanned: 8f2f3c4
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/18dd1c722e/output.html

Signed-off-by: Chris Mayo <aklhfex@gmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-03-27 19:45 UTC
Newest commit scanned: 9596c70
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/3db580ae58/output.html

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
3 participants