[gentoo-commits] repo/gentoo:master commit in: media-gfx/mandelbulber/, media-gfx/mandelbulber/files/
commit: 3f453ccd260c84814c8a352e218ec8cffe7b4921 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 08:15:46 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 08:30:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f453ccd media-gfx/mandelbulber: drop 2.26-r3 Signed-off-by: Sam James gentoo.org> media-gfx/mandelbulber/Manifest| 1 - .../files/mandelbulber-2.26-openexr-3-imath.patch | 32 --- media-gfx/mandelbulber/mandelbulber-2.26-r3.ebuild | 97 -- 3 files changed, 130 deletions(-) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index 193b0edba7c3..36c34c6e78d8 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,2 +1 @@ -DIST mandelbulber2-2.26.tar.gz 113563064 BLAKE2B 6fd333a42f5e4b106b950079277ff1bb6cc2395382e12ea37424df137ed11cf5fb103185b325d9615bd890404fe596133644a5cdd3911140eabb2f8c0c1d0e14 SHA512 cc547cab6e2b672a35be5d3d214ad3b292eaf1b3b06daf12cecce0f69e612fcfb4123cd837fd87003eea3103086947639fd04cae4b0ed7cd231d78e5d775e299 DIST mandelbulber2-2.28.tar.gz 122800825 BLAKE2B a1bc8b3b743687003aeccaea7763b8100736b03dcd5044e43193f07bb519a7e78075c63cd0466373e8240a317fc2bbb6481bc07b51b137241cbb477e679093c3 SHA512 9bb2ecdcc2a2976efb6af930d49f067462713c6fd48f54631477102f3153479df6336b43b160c98c4e01f00d48188b314ccc86a84055a05cac5eb009db4e52e2 diff --git a/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch b/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch deleted file mode 100644 index 372b3e655536.. --- a/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/buddhi1980/mandelbulber2/commit/4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234.patch - -Slightly rebased. - -From 4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234 Mon Sep 17 00:00:00 2001 -From: cagelight -Date: Sat, 22 Jan 2022 00:13:52 -0500 -Subject: [PATCH] Upgrade build files for linking with OpenEXR 3 - - mandelbulber2/qmake/common.pri | 7 +++ - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/mandelbulber2/qmake/common.pri b/mandelbulber2/qmake/common.pri -index 2e579c5c1..17242e702 100644 a/makefiles/common.pri -+++ b/makefiles/common.pri -@@ -26,11 +26,10 @@ qtHaveModule(gamepad){ - message("Use QtGamepad module") - } - --packagesExist(IlmBase){ -- PKGCONFIG += IlmBase -- LIBS += -lIlmImf -lHalf -+packagesExist(OpenEXR){ -+ PKGCONFIG += OpenEXR - DEFINES += USE_EXR -- message("Use IlmBase library for EXR files") -+ message("Use OpenEXR libraries for EXR files") - } - - packagesExist(libtiff-4){ diff --git a/media-gfx/mandelbulber/mandelbulber-2.26-r3.ebuild b/media-gfx/mandelbulber/mandelbulber-2.26-r3.ebuild deleted file mode 100644 index 6502cc633427.. --- a/media-gfx/mandelbulber/mandelbulber-2.26-r3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="${PN}2-${PV}" -inherit desktop qmake-utils toolchain-funcs xdg-utils - -DESCRIPTION="Tool to render 3D fractals" -HOMEPAGE="https://www.mandelbulber.com"; -SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="CC-BY-4.0 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="joystick opencl openexr sndfile tiff" - -BDEPEND=" - virtual/pkgconfig -" -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:= - sci-libs/gsl:= - joystick? ( dev-qt/qtgamepad:5 ) - opencl? ( - dev-libs/clhpp - virtual/opencl - ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND} - dev-qt/designer:5 -" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-openexr-3-imath.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -src_prepare() { - default - - use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die - use openexr || sed -i -e "s/packagesExist(OpenEXR)/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 makef
[gentoo-commits] repo/gentoo:master commit in: media-gfx/mandelbulber/, media-gfx/mandelbulber/files/
commit: 87b2e40da0525fd89e85597d3b0f54e6c2256843 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 27 15:39:00 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 27 16:13:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b2e40d media-gfx/mandelbulber: Drop old Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-gfx/mandelbulber/Manifest| 1 - .../files/mandelbulber-1.21.1-qa.patch | 30 -- media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild | 47 -- 3 files changed, 78 deletions(-) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index c9e2536bcb0..eca3ca3f3ad 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,2 +1 @@ -DIST mandelbulber1.21-1.orig.tar.gz 1076836 BLAKE2B 6cb17351d8070abb092faa48a2254c76af40cd95942e8ecb46f3fd651423b5e8be8555906c946fb5b28024f23015680abce2f92adc33a742fadea8c0e10c6fac SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3 DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch deleted file mode 100644 index 6fea9525cfe..000 --- a/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch +++ /dev/null @@ -1,30 +0,0 @@ mandelbulber1.21-1.orig/makefiles/makefile -+++ mandelbulber1.21-1.orig/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/ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(USER_OBJS) $(LIBS) -+ $(CXX) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - mandelbulber1.21-1.orig/makefiles/src/subdir.mk -+++ mandelbulber1.21-1.orig/makefiles/src/subdir.mk -@@ -71,7 +71,7 @@ - src/%.o: ../src/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: GCC C++ Compiler' -- g++ -O3 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) $(CPPFLAGS) -o"$@" "$<" -+ $(CXX) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) $(CPPFLAGS) -o"$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - diff --git a/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild deleted file mode 100644 index 070f34fc6d4..000 --- a/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 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 '-' ).orig - -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 - dev-libs/glib:2 - >=media-libs/libpng-1.4:0= - 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/* - domenu ${PN}.desktop -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}" - fi -}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/mandelbulber/, media-gfx/mandelbulber/files/
commit: 3d873d090769de6ad0516512589922455c02bd17 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 7 22:47:58 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 7 22:48:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d873d09 media-gfx/mandelbulber: Drop old Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-gfx/mandelbulber/Manifest| 2 - .../mandelbulber/files/mandelbulber-1.11-qa.patch | 37 - .../mandelbulber-1.12.1-memcpy_and_memset.patch| 22 --- media-gfx/mandelbulber/mandelbulber-1.11.ebuild| 45 - media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild | 46 -- 5 files changed, 152 deletions(-) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index 95a8c017df0..bbd387ba6e9 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,3 +1 @@ -DIST mandelbulber1.11.tar.gz 1176248 BLAKE2B 6a5eb1391aa94630ba2b24e1f811202c2e1b642a6b5122c43dd8352d339286a4f0c894fb83870be5472ed542b510475dca4ba8cad298fb4be7db24c716c3c80e SHA512 fddd351fd235e42899b5dbf26099cb5c315539b1352f1c4dad7a59e39fe34a07aba41140349e1bfd869ef4f39c39ca017285b3726557e52fb9ec4f82291b -DIST mandelbulber1.12-1.tar.gz 1179684 BLAKE2B 726315b34e0785846e0184fa2702a27329d4f61a9674e08626a2059dd9c6c418a0d9f83c0e225be09ce321fa76e0f957cd7e6c73aabfe53c9c3cdd5d38901778 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512 DIST mandelbulber1.21-1.orig.tar.gz 1076836 BLAKE2B 6cb17351d8070abb092faa48a2254c76af40cd95942e8ecb46f3fd651423b5e8be8555906c946fb5b28024f23015680abce2f92adc33a742fadea8c0e10c6fac SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3 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 f457c1902c8..000 --- 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 43fb0b982db..000 --- 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 -+#include - #include "texture.hpp" - #include "files.h" - src/timeline.cpp -+++ src/timeline.cpp -@@ -6,6 +6,7 @@ - */ - - #include -+#include - - #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 e3761ae9b17..000 --- 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 - >=medi