summaryrefslogtreecommitdiff
path: root/media-gfx/mandelbulber
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/mandelbulber')
-rw-r--r--media-gfx/mandelbulber/Manifest10
-rw-r--r--media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch37
-rw-r--r--media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch22
-rw-r--r--media-gfx/mandelbulber/mandelbulber-1.11.ebuild45
-rw-r--r--media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild46
-rw-r--r--media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild82
-rw-r--r--media-gfx/mandelbulber/metadata.xml3
7 files changed, 88 insertions, 157 deletions
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index d1472766c00e..8498dda676eb 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,10 +1,6 @@
-AUX mandelbulber-1.11-qa.patch 1313 BLAKE2B 85b4dd8143edfc8324c1fa24c7472f79d2d9acc820bc6623ec7647d4b0f5df2db9be087a9c17d70abd42dfd0814c7aa418fb8e731836b24c58f32d10f6ed23d9 SHA512 d4ec5a1e6f475a518414a402942240b5679b0eae15d1ac83cb73148759ade31e69cb5bf61081ec9a9e9349697ed4eccd61f180b67588937d84cc990202393770
-AUX mandelbulber-1.12.1-memcpy_and_memset.patch 358 BLAKE2B 3611058bd93c36508a8db5cb13800ee9b14577c8444f49cfc0a868c0feb40b3d7eea0039e790f89427f9bafe65f162809865ce155837c3009c2d3009fd4be57a SHA512 3ace39be67fc5ee66c66a7d6ff6b81f8939c2d1c598effe676f6b8f750fa904c294197aea5f4a62519f1c129580ed8f037a55af0d88da0e02cbe993b2630082c
AUX mandelbulber-1.21.1-qa.patch 1254 BLAKE2B 082adc25eb99578470b572680d770113916cdf6972df8ba878247e14ce734375b13c3ca9226c6132ca211a6dffe199ea9e2012b36b9417e9a69c3065a7ba7963 SHA512 90a7638b702a40af9c5f0927d8e13c8db6f67c1dc0fc144910a5a3da1872e05b4cba137a8f16856fc7d9c6883fec9e0bdb0e801d9d5d685c324a708a63a8e9c0
-DIST mandelbulber1.11.tar.gz 1176248 BLAKE2B 6a5eb1391aa94630ba2b24e1f811202c2e1b642a6b5122c43dd8352d339286a4f0c894fb83870be5472ed542b510475dca4ba8cad298fb4be7db24c716c3c80e SHA512 fddd351fd235e42899b5dbf26099cb5c315539b1352f1c4dad7a59e39fe34a07aba41140349e1bfd8dddd69ef4f39c39ca017285b3726557e52fb9ec4f82291b
-DIST mandelbulber1.12-1.tar.gz 1179684 BLAKE2B 726315b34e0785846e0184fa2702a27329d4f61a9674e08626a2059dd9c6c418a0d9f83c0e225be09ce321fa76e0f957cd7e6c73aabfe53c9c3cdd5d38901778 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512
DIST mandelbulber1.21-1.orig.tar.gz 1076836 BLAKE2B 6cb17351d8070abb092faa48a2254c76af40cd95942e8ecb46f3fd651423b5e8be8555906c946fb5b28024f23015680abce2f92adc33a742fadea8c0e10c6fac SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3
-EBUILD mandelbulber-1.11.ebuild 853 BLAKE2B c672df734327ef5b8b6d74500b67b00a44d1089cd46323f8fb337497e6fe0c65221d6d6a7cf7711548b472fe59c5a0da7cebe2903f44737e2de0d741762a33f5 SHA512 14e43a6284b891993ab8c45c6ba2d76eb71b74538e85594e5806ed6e7631766c9f1202f975274564a8fe1bc5bc08992d77bea0dacb1bdd3740e0d4b510477fe5
-EBUILD mandelbulber-1.12.1.ebuild 954 BLAKE2B 063845be577cf6104d160e6d6976d02380fcf13dce742f0431dab8a98b8ad25e5ef2203b0a3c83d980667ba36135ba502761fed70ec854ca817a9d1ca1e1c3f1 SHA512 84dfbdb0aaae1723dfe8d3347cc4103f7567d6bd819e092647670092ebd119e303180a16ebf96e10793a51f8d9786eef91b53c7c698ffb6052b96c626e58b4bc
+DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
EBUILD mandelbulber-1.21.1.ebuild 962 BLAKE2B 7e30bea64d0b790c287cec38fc3041844cb440af59b1c5921b7b04e3b32325c3e996b03f7f6670db880e5466844c4650e268209a7994146350d8a095e98f45ef SHA512 e7ece0314fef4fa0ea0812cd61b42eb02f06dbb751c0efec5f03b11bad6e5c8a960bc4b1ffe32a41018db438ea1ca865fb32b5f284fbb88f4a5647ac3878eeaa
-MISC metadata.xml 613 BLAKE2B 30eed2c5a6b80b41165f0d3e05f33ccc501d4a60531baf249827e53fce5d5aff43b8ea273fe0cedb09dff09963332ec6c7171da1cc99f343689e798a99a280bc SHA512 ff9d6feda80e64a4f5c18c0c951f9f1578323f4fee378223c1580d3210d0d0b265c8f996cc645410117e2676837fd3e2edb1cd574cdb04923b6bd8cf1da9ebce
+EBUILD mandelbulber-2.12-r1.ebuild 1697 BLAKE2B 85e269a30efbc6474644330d6391d2fadad82ca1f4121626c0b65f078da9190168ccc5afe52f6e8f336fc288d361a3cd1f5b5d1239b9c2ca74d9491e5ba9b44e SHA512 97d0c3b61054e5cfc65874cee87ac3a109c6440a01a9c93b88fbea06fc3d8e83c3189e30dcde732c1f25b75ebcc16962f31d1a51fb1b2b94a33a357e3140c2f5
+MISC metadata.xml 699 BLAKE2B d9aa974727aa0bb7cf821cc6a982477aaf59d6e2cae666e4476196507a22233feac875347797799df4babd9dffbaa97f0d5fc5d190bcc11a03554f6755e6f458 SHA512 a6d7cfc42cf2bd56454f7834ff4aaa907772052d855f7a471c57ba18d21437af5ff0ec48f0ea1929d18aa2e0eed9073b903dc34b4de19d304d4839f2c267b535
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
deleted file mode 100644
index f457c1902c8f..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/makefiles/makefile
-+++ b/makefiles/makefile
-@@ -5,6 +5,7 @@
- -include ../makefile.init
-
- RM := rm -rf
-+CXX ?= g++
-
- # All of the sources participating in the build are defined here
- -include sources.mk
-@@ -44,7 +45,7 @@
- mandelbulber: $(OBJS) $(USER_OBJS)
- @echo 'Building target: $@'
- @echo 'Invoking: GCC C++ Linker'
-- g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0`
-+ $(CXX) $(LDFLAGS) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0`
- @echo 'Finished building target: $@'
- @echo ' '
-
---- a/makefiles/src/subdir.mk
-+++ b/makefiles/src/subdir.mk
-@@ -63,12 +63,14 @@
- ./src/undo.d \
- ./src/cl_support.d
-
-+CXX ?= g++
-+CXXFLAGS ?= -O2 -fast-math
-
- # Each subdirectory must supply rules for building sources it contributes
- src/%.o: ../src/%.cpp
- @echo 'Building file: $<'
- @echo 'Invoking: GCC C++ Compiler'
-- g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-+ $(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
- @echo 'Finished building: $<'
- @echo ' '
-
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
deleted file mode 100644
index 43fb0b982dbd..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/464972
-
---- src/texture.cpp
-+++ src/texture.cpp
-@@ -5,6 +5,7 @@
- * Author: krzysztof
- */
- #include <stdio.h>
-+#include <string.h>
- #include "texture.hpp"
- #include "files.h"
-
---- src/timeline.cpp
-+++ src/timeline.cpp
-@@ -6,6 +6,7 @@
- */
-
- #include <cstdlib>
-+#include <cstring>
-
- #include "timeline.hpp"
- #include "files.h"
diff --git a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild b/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
deleted file mode 100644
index e3761ae9b170..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
- >=media-libs/libsndfile-1
- >=media-libs/libpng-1.4
- virtual/jpeg"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-qa.patch
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" -C makefiles all
-}
-
-src_install() {
- dobin makefiles/${PN}
- dodoc README NEWS
- insinto /usr/share/${PN}
- doins -r usr/share/*
-}
-
-pkg_postinst() {
- elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
-}
diff --git a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
deleted file mode 100644
index cfeefff2b52e..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-MY_P=${PN}$(replace_version_separator 2 '-' )
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
- >=media-libs/libsndfile-1
- >=media-libs/libpng-1.4:0=
- virtual/jpeg"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.11-qa.patch \
- "${FILESDIR}"/${P}-memcpy_and_memset.patch
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" -C makefiles all
-}
-
-src_install() {
- dobin makefiles/${PN}
- dodoc README NEWS
- insinto /usr/share/${PN}
- doins -r usr/share/*
-}
-
-pkg_postinst() {
- elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
-}
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
new file mode 100644
index 000000000000..31967ec72549
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}-1"
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="http://www.mandelbulber.com"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="CC-BY-4.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opencl openexr sndfile tiff"
+
+RDEPEND="
+ dev-libs/lzo
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ media-libs/libpng:0=
+ sci-libs/gsl:=
+ opencl? ( virtual/opencl )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ sndfile? ( media-libs/libsndfile )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ dev-qt/designer:5
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ # not packaged yet, but may be in the future
+ sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+
+ use openexr || sed -i -e "s/packagesExist(IlmBase)/false/" makefiles/common.pri || die
+ use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
+ use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
+}
+
+src_configure() {
+ if use opencl; then
+ eqmake5 makefiles/${PN}-opencl.pro
+ else
+ eqmake5 makefiles/${PN}.pro
+ fi
+}
+
+src_install() {
+ dobin ${PN}2
+
+ dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
+
+ insinto /usr/share/${PN}2
+ doins -r usr/share/${PN}2/*
+
+ insinto /usr/share/applications
+ doins ${PN}2.desktop
+
+ newicon -s 256 qt/icons/${PN}.png ${PN}2.png
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index b170ece12c0e..2942a4cc4a6f 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -11,6 +11,9 @@
and some other kind of 3D fractals like Mandelbox, Bulbbox, Juliabulb,
Menger Sponge.
</longdescription>
+ <use>
+ <flag name="opencl">Enable GPU rendering support using OpenCL</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">mandelbulber</remote-id>
</upstream>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 01:16:16 +0000