From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- x11-misc/rss-glx/Manifest | 5 +- .../files/rss-glx-0.9.1-c++11-narrowing.patch | 22 ++++ x11-misc/rss-glx/metadata.xml | 9 +- x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild | 128 ------------------- x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild | 136 +++++++++++++++++++++ 5 files changed, 169 insertions(+), 131 deletions(-) create mode 100644 x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch delete mode 100644 x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild create mode 100644 x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild (limited to 'x11-misc/rss-glx') diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest index 9b77261467ca..762a8004d76c 100644 --- a/x11-misc/rss-glx/Manifest +++ b/x11-misc/rss-glx/Manifest @@ -1,6 +1,7 @@ AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629a6074ba0fe6624b929ea74ff11385e347f7c56a598b53937ceefa32e2db86daa17e89c03c667b481a500be752ebfd SHA512 0e863458e14b97a1fcfb054cc0072ded458da4d9c9bf237fc91aa4937b41b207f024bdceca59dc1703c75405520afca8dd55ec9ef69259d52c9430bcdf3c045e +AUX rss-glx-0.9.1-c++11-narrowing.patch 1207 BLAKE2B 1b23dafe33b43f559859da3c4ad4395fab9bab556dd09261c5764257a7992b0cb29453646ae02c4791a378cb18671c3233fa1351bd60d7c5ae970309d3cfee3a SHA512 8c262ca79cd9bfd263576868b35dc0ad6444d15a10c6d550439d1dc87dd7eb7f8058291193479de45461b2610bc068be6b6a9e140c329383a3792ad15d73e060 AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961 -EBUILD rss-glx-0.9.1-r1.ebuild 3696 BLAKE2B 81d4a20aa44dd47efb5806d1fe95b097a9bfd89992989915ee2b8801a0f1a6fb5e619d915fd8b7050766d163109c74706019e165c8e387cb6f8a1616c37517f1 SHA512 38feb06443545b1b6f40cfb62f6dbe762d0757d50199eb7a1b7e6e4c646a536f9b91e7b4cc95d7c6cb6560c4c53a09b448fa52f32e262d79de528b95697e4b31 -MISC metadata.xml 335 BLAKE2B 6ffac028e510fc7e26e03b19ba6b0cfb7b66e6461a26446a32235a75204e959a8daa694e9a41bd5df193af51d5dfd33b21b58afe4323b6e54bee8c87bf34ab6b SHA512 9496f0e4b0358864b2028e4b26d9da56d961b7c55fdc6f6c89e023613ec1155dd26472a98be99d24c9bad25606708adab551cf509c5f7a81d282f73b420ee138 +EBUILD rss-glx-0.9.1-r2.ebuild 3889 BLAKE2B 683b3438bac0a26d25624a9a5a25af79cac0664258ae3ae63c9864b2f2a7863ce19840d8a6005c43f2c33bdf8c1e68dac31a60a470b797015a05d0627a539650 SHA512 59e7144e04ac084e85288d7dfedbdb78f2a7d34ef49cc15354c9f3a0d26620edef94460732e841ab2466583d5d22eebc3270e402ed16c6bf78cb999ba5f0f67d +MISC metadata.xml 535 BLAKE2B c0dac8ef95340aa65fccd3b160ad6c281c2e6286aa8fda7d29f09a7fe4a51336a3d48bcc85d163253f84ff53c70daceaa6d8a4ab7c58e358e9d9c619a20deb23 SHA512 e9b3ee968ad5e87435f9ed27f22a2e6bb9540799b3df496126910e2f5abc8e9a6328cc8dbff217f5a9f86c96f1dba603f835a3bfc481a4eb88b999ee27eaee2e diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch new file mode 100644 index 000000000000..c92f1162dd37 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch @@ -0,0 +1,22 @@ +--- rss-glx_0.9.1/src/hyperspace.cpp 2009-05-16 23:41:52.000000000 +0100 ++++ rss-glx_0.9.1/src/hyperspace.cpp 2021-01-22 22:54:20.297572792 +0000 +@@ -376,7 +376,7 @@ + double flarepos[3] = {0.0f, 2.0f, 0.0f}; + glBindTexture(GL_TEXTURE_2D, flaretex[0]); + sunStar->draw(camPos); +- float diff[3] = {flarepos[0] - camPos[0], flarepos[1] - camPos[1], flarepos[2] - camPos[2]}; ++ float diff[3] = {(float)flarepos[0] - camPos[0], (float)flarepos[1] - camPos[1], (float)flarepos[2] - camPos[2]}; + float alpha = 0.5f - 0.005f * sqrtf(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]); + if(alpha > 0.0f) + flare(flarepos, 1.0f, 1.0f, 1.0f, alpha); +--- rss-glx_0.9.1/src/flare.cpp 2009-04-21 17:54:42.000000000 +0100 ++++ rss-glx_0.9.1/src/flare.cpp 2021-01-22 22:54:57.808305771 +0000 +@@ -193,7 +193,7 @@ + &winx, &winy, &winz); + x = (float(winx) / float(xsize)) * aspectRatio; + y = float(winy) / float(ysize); +- float diff[3] = {pos[0] - camPos[0], pos[1] - camPos[1], pos[2] - camPos[2]}; ++ float diff[3] = {(float)pos[0] - camPos[0], (float)pos[1] - camPos[1], (float)pos[2] - camPos[2]}; + if(diff[0] * billboardMat[8] + diff[1] * billboardMat[9] + diff[2] * billboardMat[10] > 0.0f) + return; + diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml index 6cf8d17a20e8..a8d95d93452b 100644 --- a/x11-misc/rss-glx/metadata.xml +++ b/x11-misc/rss-glx/metadata.xml @@ -1,7 +1,14 @@ - + + alex.miller@gmx.de + Alexander Miller + + + proxy-maint@gentoo.org + Proxy Maintainers + Enable support for OpenGL Character Renderer diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild deleted file mode 100644 index 2faf1cb8c311..000000000000 --- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils multilib - -MY_P=${PN}_${PV} - -DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver" -HOMEPAGE="http://rss-glx.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86" -IUSE="+bzip2 openal quesoglc" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - >=media-libs/glew-1.5.1:= - media-libs/mesa[X(+)] - >=media-gfx/imagemagick-6.4:= - >=x11-misc/xscreensaver-5.08-r2 - bzip2? ( app-arch/bzip2 ) - openal? ( >=media-libs/freealut-1.1.0-r1 ) - quesoglc? ( media-libs/quesoglc ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig - sys-apps/sed -" - -DOCS="ChangeLog README*" -S=${WORKDIR}/${MY_P} -PATCHES=( - "${FILESDIR}"/${P}-quesoglc.patch - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-imagemagick-7.patch -) - -src_prepare() { - default - - sed -i \ - -e '/CFLAGS=/s:-O2:${CFLAGS}:' \ - -e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.in || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable bzip2) \ - $(use_enable openal sound) \ - $(use_with quesoglc) \ - --bindir=/usr/$(get_libdir)/misc/xscreensaver \ - --enable-shared \ - --with-configdir=/usr/share/xscreensaver/config -} - -pkg_postinst() { - local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver" - - if [ -f ${xssconf} ]; then - sed -e '/*programs:/a\ - GL: \"Cyclone\" cyclone --root \\n\\\ - GL: \"Euphoria\" euphoria --root \\n\\\ - GL: \"Fieldlines\" fieldlines --root \\n\\\ - GL: \"Flocks\" flocks --root \\n\\\ - GL: \"Flux\" flux --root \\n\\\ - GL: \"Helios\" helios --root \\n\\\ - GL: \"Hyperspace\" hyperspace --root \\n\\\ - GL: \"Lattice\" lattice --root \\n\\\ - GL: \"Plasma\" plasma --root \\n\\\ - GL: \"Pixelcity\" pixelcity --root \\n\\\ - GL: \"Skyrocket\" skyrocket --root \\n\\\ - GL: \"Solarwinds\" solarwinds --root \\n\\\ - GL: \"Colorfire\" colorfire --root \\n\\\ - GL: \"Hufos Smoke\" hufo_smoke --root \\n\\\ - GL: \"Hufos Tunnel\" hufo_tunnel --root \\n\\\ - GL: \"Sundancer2\" sundancer2 --root \\n\\\ - GL: \"BioF\" biof --root \\n\\\ - GL: \"BusySpheres\" busyspheres --root \\n\\\ - GL: \"SpirographX\" spirographx --root \\n\\\ - GL: \"MatrixView\" matrixview --root \\n\\\ - GL: \"Lorenz\" lorenz --root \\n\\\ - GL: \"Drempels\" drempels --root \\n\\\ - GL: \"Feedback\" feedback --root \\n\\' \ - -i ${xssconf} || die - fi -} - -pkg_postrm() { - local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver" - - if [ -f ${xssconf} ]; then - sed \ - -e '/\"Cyclone\" cyclone/d' \ - -e '/\"Euphoria\" euphoria/d' \ - -e '/\"Fieldlines\" fieldlines/d' \ - -e '/\"Flocks\" flocks/d' \ - -e '/\"Flux\" flux/d' \ - -e '/\"Helios\" helios/d' \ - -e '/\"Hyperspace\" hyperspace/d' \ - -e '/\"Lattice\" lattice/d' \ - -e '/\"Plasma\" plasma/d' \ - -e '/\"Pixelcity\" pixelcity/d' \ - -e '/\"Skyrocket\" skyrocket/d' \ - -e '/\"Solarwinds\" solarwinds/d' \ - -e '/\"Colorfire\" colorfire/d' \ - -e '/\"Hufos Smoke\" hufo_smoke/d' \ - -e '/\"Hufos Tunnel\" hufo_tunnel/d' \ - -e '/\"Sundancer2\" sundancer2/d' \ - -e '/\"BioF\" biof/d' \ - -e '/\"BusySpheres\" busyspheres/d' \ - -e '/\"SpirographX\" spirographx/d' \ - -e '/\"MatrixView\" matrixview/d' \ - -e '/\"Lorenz\" lorenz/d' \ - -e '/\"Drempels\" drempels/d' \ - -e '/\"Feedback\" feedback/d' \ - -i ${xssconf} || die - fi -} diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild new file mode 100644 index 000000000000..61300f4958c1 --- /dev/null +++ b/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P=${PN}_${PV} + +DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver" +HOMEPAGE="http://rss-glx.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+bzip2 openal quesoglc" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + >=media-libs/glew-1.5.1:= + media-libs/mesa[X(+)] + >=media-gfx/imagemagick-6.4:= + >=x11-misc/xscreensaver-5.08-r2 + bzip2? ( app-arch/bzip2 ) + openal? ( >=media-libs/freealut-1.1.0-r1 ) + quesoglc? ( media-libs/quesoglc )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig + bzip2? ( app-arch/bzip2 )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-quesoglc.patch + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-imagemagick-7.patch + "${FILESDIR}"/${P}-c++11-narrowing.patch +) + +src_prepare() { + default + + sed -i \ + -e '/CFLAGS=/s:-O2:${CFLAGS}:' \ + -e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.in || die + mv configure.{in,ac} || die + + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --enable-shared \ + $(use_enable bzip2) \ + $(use_enable openal sound) \ + $(use_with quesoglc) \ + --bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver \ + --with-configdir="${EPREFIX}"/usr/share/xscreensaver/config +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver + + if [[ -f ${xssconf} ]]; then + sed -e '/*programs:/a\ + GL: \"Cyclone\" cyclone --root \\n\\\ + GL: \"Euphoria\" euphoria --root \\n\\\ + GL: \"Fieldlines\" fieldlines --root \\n\\\ + GL: \"Flocks\" flocks --root \\n\\\ + GL: \"Flux\" flux --root \\n\\\ + GL: \"Helios\" helios --root \\n\\\ + GL: \"Hyperspace\" hyperspace --root \\n\\\ + GL: \"Lattice\" lattice --root \\n\\\ + GL: \"Plasma\" plasma --root \\n\\\ + GL: \"Pixelcity\" pixelcity --root \\n\\\ + GL: \"Skyrocket\" skyrocket --root \\n\\\ + GL: \"Solarwinds\" solarwinds --root \\n\\\ + GL: \"Colorfire\" colorfire --root \\n\\\ + GL: \"Hufo\x27s Smoke\" hufo_smoke --root \\n\\\ + GL: \"Hufo\x27s Tunnel\" hufo_tunnel --root \\n\\\ + GL: \"Sundancer2\" sundancer2 --root \\n\\\ + GL: \"BioF\" biof --root \\n\\\ + GL: \"BusySpheres\" busyspheres --root \\n\\\ + GL: \"SpirographX\" spirographx --root \\n\\\ + GL: \"MatrixView\" matrixview --root \\n\\\ + GL: \"Lorenz\" lorenz --root \\n\\\ + GL: \"Drempels\" drempels --root \\n\\\ + GL: \"Feedback\" feedback --root \\n\\' \ + -i "${xssconf}" || die + fi +} + +pkg_postrm() { + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver + + if [[ -f ${xssconf} ]]; then + sed \ + -e '/\"Cyclone\" cyclone/d' \ + -e '/\"Euphoria\" euphoria/d' \ + -e '/\"Fieldlines\" fieldlines/d' \ + -e '/\"Flocks\" flocks/d' \ + -e '/\"Flux\" flux/d' \ + -e '/\"Helios\" helios/d' \ + -e '/\"Hyperspace\" hyperspace/d' \ + -e '/\"Lattice\" lattice/d' \ + -e '/\"Plasma\" plasma/d' \ + -e '/\"Pixelcity\" pixelcity/d' \ + -e '/\"Skyrocket\" skyrocket/d' \ + -e '/\"Solarwinds\" solarwinds/d' \ + -e '/\"Colorfire\" colorfire/d' \ + -e '/\"Hufo.*Smoke\" hufo_smoke/d' \ + -e '/\"Hufo.*Tunnel\" hufo_tunnel/d' \ + -e '/\"Sundancer2\" sundancer2/d' \ + -e '/\"BioF\" biof/d' \ + -e '/\"BusySpheres\" busyspheres/d' \ + -e '/\"SpirographX\" spirographx/d' \ + -e '/\"MatrixView\" matrixview/d' \ + -e '/\"Lorenz\" lorenz/d' \ + -e '/\"Drempels\" drempels/d' \ + -e '/\"Feedback\" feedback/d' \ + -i "${xssconf}" || die + fi +} -- cgit v1.2.3