diff options
Diffstat (limited to 'media-gfx/opencsg')
-rw-r--r-- | media-gfx/opencsg/Manifest | 7 | ||||
-rw-r--r-- | media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch | 4 | ||||
-rw-r--r-- | media-gfx/opencsg/metadata.xml | 9 | ||||
-rw-r--r-- | media-gfx/opencsg/opencsg-1.4.2-r1.ebuild | 40 | ||||
-rw-r--r-- | media-gfx/opencsg/opencsg-1.4.2.ebuild | 42 |
5 files changed, 44 insertions, 58 deletions
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest index 61337ded544c..bb379c91f51d 100644 --- a/media-gfx/opencsg/Manifest +++ b/media-gfx/opencsg/Manifest @@ -1,5 +1,4 @@ -AUX opencsg-1.4.2-includepath.patch 529 BLAKE2B 300ed0021302cf3c14ea3039c52ca579473b83672227bff2261b1243e4914237e26649c14bdd3e1014cf5a7e5c43a28b55a4658727ccc41b1d361078106d86ae SHA512 352fc772b678336734ee625b708732560e212162279126a368a6f1adeb4f29b8b29960e7a5cf06a2b6c5d1c6a369c8a9347b050c49d6a301c07b6ed259340e87 +AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778 -EBUILD opencsg-1.4.2-r1.ebuild 775 BLAKE2B d41ff856ec2ee82e6bba5c318b656adf1ca234c97a80f9c565a23fda444d6d1cd7f6cb4aeb3b9c1f7d5b6c368ffa2195f693fd469073b0a86363a181eadae1a1 SHA512 fd959b3c0a5e70b7d89a21747de355b05d6ceb4ce18fc78a5f20beea074869a02585d27415dc4b999cca3dbb62730d1953c9681f3eb827f454ff2a870b91dbef -EBUILD opencsg-1.4.2.ebuild 754 BLAKE2B 32fb0c21ba6f023852e258035a33339f72d74d0806176d794f46bf9a17a198a8c2e4b22ffa31a866b2a11815dde170907cbe3c6c5b21fdfeb67779eabba8b7e9 SHA512 356eb205e3de711d0bea816a0b284cf31abbeb5ba5de13bafa71231872c31983e3bf28f04ff2daff92c6905347ce6bcff3f7eb86669f5c9fa098e1887f962d92 -MISC metadata.xml 1070 BLAKE2B 1a892821eaa48f008252d7c88ef7dfb90153b148965620c4dc222b36e2cead376a0a210f894bba92e3b0d6b6206fe52d2b50d073d51aac9160e8a7c7919aa715 SHA512 6ec0f9e9f23969068ee01620785c028d3b8c3ddef2614019ed8b9dc263e8507be748bc8a47f69e55084cf5026e814b4cf1feeb119980e3ecb6a16c8e43037133 +EBUILD opencsg-1.4.2-r1.ebuild 1224 BLAKE2B 53f913bc1e75341ac267a20542d079b9254b122dee1e04caf8860ee18aca171d9270de783f9dd9636fa8bad482e0632497594b6622d3aeaf2f807f79ec12d046 SHA512 f819d3953f79fdacd6b966898c82fe358f5bd57420f56735b1f9b7c20f12536022a98e77c992f635ee31b417d2b538fb1d3fcd62807c564abe4adc479f029121 +MISC metadata.xml 1289 BLAKE2B 7b2ca0df1bdec35319472bdc3b5e9e71412406d6c5bedfa4ceda553ab207e0b8c6027d7c2f4fad9b13c3d850aa976fa94c84b336e69b750f8fb71b0967ec50c6 SHA512 df8a5dc7d1a83728d9bba2be8cc843060c4cc34ff4d3c7e04b1aebd5a05b6c93d844a3e6442620a31760f7763946a1aaeda2cc1e5dc5b6902537425748be58e5 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 9b66ae44ed0e..1a623a5629be 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 9fe432b2d593..a6159b39f26b 100644 --- a/media-gfx/opencsg/metadata.xml +++ b/media-gfx/opencsg/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>waebbl@gmail.com</email> + <name>Bernd Waibel</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <description>Gentoo Proxy Maintainer Team</description> + </maintainer> <longdescription> 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 faa23f4458b3..bf738882fe58 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 } diff --git a/media-gfx/opencsg/opencsg-1.4.2.ebuild b/media-gfx/opencsg/opencsg-1.4.2.ebuild deleted file mode 100644 index 9f02e2a9c1d1..000000000000 --- a/media-gfx/opencsg/opencsg-1.4.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -MY_P="OpenCSG-${PV}" -DESCRIPTION="The Constructive Solid Geometry rendering library" -HOMEPAGE="http://www.opencsg.org" -SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/glew:0=" -DEPEND="${RDEPEND} - dev-qt/qtcore:5 -" - -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" -} - -src_configure() { - eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)" -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} |