diff options
Diffstat (limited to 'media-gfx')
20 files changed, 288 insertions, 403 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 4c085d97af71..58a84ccfad67 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index ff2d87343fef..512f55a0d404 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -3,6 +3,5 @@ AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f AUX digikam-8.4.0-fix-find_libheif-regex.patch 856 BLAKE2B 5b2f2bea0c4a7cae5aed2d385123082576c95fd7ea66521c7245db844af0bb86422279674a3f46ba56075547ff161d1bfbf30c37fb57efcfd15e10b55c255b36 SHA512 bedcc963511afd0037ab1dbfa05b06e72c0b6785b222a33f15dbe84535e62820d9b1e437a3cb11a3fffe5c6e4f474609e63dcc515482a14b09e98a5fa5dd34f6 DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b -EBUILD digikam-8.4.0-r11.ebuild 4033 BLAKE2B 5e5c262e2ff5a56dc1a744d7acdeb0c3a840dc20867419eaa9a33c4aa486d7fbe33552848e48cb77bc18fdb2ed35e51f9932f7a034b67db5b9b79051d909a11d SHA512 d333537e818eb1f6a89afd6dfaa2557dd0ee2905d108fd02ba937e292c9998ad78daff87b94356ae1312cbfb10683999c1ac396ab6b35430ba203ff47e6595b2 -EBUILD digikam-8.4.0.ebuild 4317 BLAKE2B 451131ac82a5507fb0f563c2795176bf74d8481ee73b7b1686ef7bf00c092d8002e99af431fb4d5c5547fdc54d2d43c38c05f23ede974e614e92c288fa848c0f SHA512 38d03dbd4b924c2e92d593a79a9be6fe45b03057f51a2448265723f59a2bbd249bd1ded30da0e41d768af3f10632ce43b890489528390935d289cc6c64c7ccf8 +EBUILD digikam-8.4.0-r11.ebuild 4032 BLAKE2B bd5b43030acb8f92ee1dd9c09af52b38f6752daadfeeaba92e54f2242d87063d7baa726ffea7429008a20fc341afc38e5d15a24bcd5e8c756deafa77f8739f4d SHA512 96bd118cd133c5f34c6a2988ddcadc2952a1bcea7626717ee6028b3688b46928fa09caab442eb5e9dabe0f093b7549863b4ba14bdff71ad1790c038fb31a3f22 MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85 diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.4.0-r11.ebuild index b5e242ad01f2..ab9884b9b338 100644 --- a/media-gfx/digikam/digikam-8.4.0-r11.ebuild +++ b/media-gfx/digikam/digikam-8.4.0-r11.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" # bug 366505 diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild deleted file mode 100644 index b3d5ace50bc3..000000000000 --- a/media-gfx/digikam/digikam-8.4.0.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - TARNAME="digiKam-${PV/_/-}" - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz" - fi - KEYWORDS="amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell" - -# bug 366505 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtnetworkauth-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27.1:=[xmp] - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/liblqr - media-libs/libpng:= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:= - x11-libs/libX11 - addressbook? ( - >=kde-apps/akonadi-contacts-23.08.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - jpegxl? ( media-libs/libjxl:= ) - lensfun? ( media-libs/lensfun ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-23.08.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost - addressbook? ( >=kde-apps/akonadi-23.08.3:5 ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/exiftool - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - app-alternatives/lex - app-alternatives/yacc - ) -" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" - "${FILESDIR}/${P}-fix-find_libheif-regex.patch" # bug 936507 -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681 - -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - -DENABLE_GEOLOCATION=$(usex geolocation) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif Libheif) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package jpegxl Libjxl) - $(cmake_use_find_package lensfun LensFun) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package spell KF5Sonnet) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - ) - - ecm_src_configure -} diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index abeb3ad8f860..8557488f6ff4 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,5 @@ DIST lximage-qt-1.4.0.tar.xz 841028 BLAKE2B d5f76bfe9763807e8e836de43ff433a1553cea0858b61e76411017ee239fbec6dfd9d3776322b60da6ad8b6b9b1b30c6a02a8c494b62eef440f4d8c5ab9e7143 SHA512 c0dea9418890745de685c7df228ceb849fa21781764c2089481bea89526842e5e8f0972e032ba9c52b07c32202ed284d977f47ace598c44880dff661d76cd125 DIST lximage-qt-2.0.1.tar.xz 848348 BLAKE2B d2484baffaae220436ae157dccda86e126b416101f047133f494cb44d9c3bba007ce797c1aa88d21ba4b242abdf8cacf73706831570943e4d7a36eb02591fc7b SHA512 594e86a4bedf3f9689107d79d852ba1ef4db83f06572b8c077ed5850dc10cc05a33fe79a0c05632f7e7541a6f895919b72c264635306f7a468eac6ecde531ba4 EBUILD lximage-qt-1.4.0.ebuild 1087 BLAKE2B 95edea7c02f664c8d60b1ea00749da95899459b9dca4ca94f8137ef9e91a0579888212c90f3a057f0aff81435261b8c872a1b38e5d764017c024715d0bd9648d SHA512 ff4e17eed33bf1be3188b38e0d26a107b55fd547a609a8465d79fc5ba91eee6e4c0587102b8448f5da04819a97705e43f15bc9bbd8335206845dc45a3f769ef1 -EBUILD lximage-qt-2.0.1.ebuild 926 BLAKE2B 4cce5ca2716a0fafab25f15b4a7902d7485cd0c51b8a25a0a641b636eb7d7fca05425e69c9f4656c1a1609a506d23339fa95c5e1c73a95da11ad480f30683572 SHA512 169d3c668f64ce7c4eda687381d15882181816503654577a36b1d8d0161f52c8ef3c1a178b9049902b4e2b931b46e937fa8909ed3798201a31ea82ef8554b5e6 +EBUILD lximage-qt-2.0.1.ebuild 931 BLAKE2B 787bdfeee7b6b399c3987ed2f7d43152c33c369489d674c62df6ff96cd592a498dd72679197ce120c89d0b52c8b768acc6cf3003de4be2a3d1332b77f6b3e3db SHA512 b8e5ce2bb6b7bec20ce554e118d30c25cb524d525d6b6208647372bbdc6ed715800ea05877b71626bae93e8c42629894896735024724e81431c114e69cc451d4 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f diff --git a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild index b3cd3e926aa9..fd3becd868c6 100644 --- a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~riscv" + KEYWORDS="amd64 arm64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index a012911f21b9..0dc1e5e32ae9 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,13 +1,14 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0 -AUX prusaslicer-2.8.0-cgal-6.0.patch 11324 BLAKE2B 6a82345a3e85fd49d327c5660090d6ec2a5a41f30402dc478383b1d1873cc9f244b5dbf4fe6d6be7c19402e6a7b25d23697e740368b1bb499b954b5bf4227e17 SHA512 7be77f8dd1c66652bc482a97ddcfa8002c6441afaca20aabe6d19f3b683c2b20c9cae7eb35026d430148bc7cafd35ecb19c087cd3233ddc7a773df10d34a4d97 +AUX prusaslicer-2.8.0-cgal-6.0.patch 11085 BLAKE2B 459d6862ab6dceab56beaba58b15d91b398a16b7a8e2a25f0ed2e3f9a699f52d1408027501f4e29903ae50ef52a07555a63de370022de9bd4444e107c6c0df1f SHA512 b2339ab275600126a72a9eb60b805d72dc5101e140cfb31e713413ea2d3d96a5533ac058672d9c10df347ddd001597ec0af375b3eb429ad0f83e18386870497f AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2 -AUX prusaslicer-2.8.1-eigen3.patch 258 BLAKE2B 4f45f9a4000d0b4a8302ddee2049120b496627eda2fbff5bd1b9af4fb7451414c200d79ac74fe883a5a4b44e4c7d38e12b8a4d3c2cb2f39f67062ae4133c2af9 SHA512 e13a3be87adecd28a38fa2cc46dbc32bf8de8ad8517e59719205a4ed2576ad7d72b24daac80d7c0726271de0f2f61cf71541d96bc7854eb36a9d9639aca49660 -AUX prusaslicer-2.8.1-fixed-linking.patch 226 BLAKE2B 839b7055224ef5abf73042ae9f3e6607b8cf8b0b5974573f44eafb924aa20f6c939fd3d77d495a53f9ad6ef3d66e8932271bc75ba2a34e4cf0a351c48dd2d119 SHA512 f1a8a15becf04ecc36f3dcaf2612b5c12ad50a1d589ab0401153c6674e5bf1b40544f35831fd0a3d649030b444b05d0004143322178196e93be450e2ccd14a26 +AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885 +AUX prusaslicer-2.8.1-fixed-linking.patch 1220 BLAKE2B ef23b03e3fef11d7d1080a140af1085be748b5c0009084acd77f3596c8dffddbad0c612b6a0a2c0da12b130f325cf2798c3e7f41d99b75fd22c093b3e0747912 SHA512 9bdbbb76163549612157976e3770aae7c3b4644b4f9c29c17ca1420a9f7269e30db6556c5c0b06cb7475d6202346b69d21908e0847a7953fa6687ae58d8b0c8b +AUX prusaslicer-2.8.1-fstream.patch 1862 BLAKE2B 872e9c5b035a3545e328c4d26504bbb4c64202d0d1a2c855ee1cda6e2a3923a7e12b7c9b7c3c236704a9f63ef6ca620744ba7264d08776ec6511b0c60aa9eb55 SHA512 8dea5eaba9e83cdfe8d0ede198fbc91d06619ffddc9ca8b950b9d1610fb4fa8d33778df184124dc31b787763caf335cb3ccc7aa5ab2ec9474653c725d8d7263f AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49 DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937 EBUILD prusaslicer-2.8.0-r1.ebuild 2448 BLAKE2B 500db712e5ea5911c11a50c757ac52cf1ac03675e97b365fd6089fe5ca483becd6ad1c8648ddd50ea1e2c29b6e47f06d7d907968a338f0b090128f5803bf6128 SHA512 95dd1d9d6e5cb6a97af18f1dd9b2bcbd2b23cbd69f402fe1893c2834c4388fb8655b0f711f5fada72b884feb8a85f616b8db151bc2340e3b8ee2818cb6e57520 -EBUILD prusaslicer-9999.ebuild 2807 BLAKE2B 68a18ae08252d7dea33fea353010fc80b08411384cae9dffacaaa8e78dfbdbcb45deee5810d86b2748aab757ba6bb2dfce87701e657885a184e7dc6000556f6b SHA512 d1e7ebd87fe12da599448188429628618de45ccc153f21a8ee6e15444b17c33715d456140fddda9c61506327d69b2cdb1f454872c08671f65c8276d683320e62 +EBUILD prusaslicer-9999.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch index 31c98bd75580..52013146b1c3 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch @@ -3,12 +3,6 @@ From: Laurent Rineau <laurent.rineau@cgal.org> Date: Sat, 13 Jul 2024 01:19:21 +0200 Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) ---- - src/libslic3r/CutSurface.cpp | 53 +++++++++++++++++++++--------------- - 1 file changed, 31 insertions(+), 22 deletions(-) - -diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp -index b2cf3d96596..5e66d41a8f1 100644 --- a/src/libslic3r/CutSurface.cpp +++ b/src/libslic3r/CutSurface.cpp @@ -4,6 +4,14 @@ diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch new file mode 100644 index 000000000000..3aac479197bb --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch @@ -0,0 +1,191 @@ +From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Sat, 13 Jul 2024 01:19:21 +0200 +Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) + +updated for 2.8.1 + +--- a/src/libslic3r/CutSurface.cpp ++++ b/src/libslic3r/CutSurface.cpp +@@ -4,6 +4,14 @@ + ///|/ + #include "CutSurface.hpp" + ++template <typename T> ++auto access_pmap(std::optional<T> opt) -> T { ++ return opt.value(); ++} ++ ++template <typename Pair> ++auto access_pmap(Pair pair) { return pair.first; } ++ + /// models_input.obj - Check transormation of model to each others + /// projection_center.obj - circle representing center of projection with correct distance + /// {M} .. model index +@@ -31,6 +39,7 @@ using namespace Slic3r; + #include <CGAL/Exact_integer.h> + #include <CGAL/Surface_mesh.h> + #include <CGAL/Cartesian_converter.h> ++#include <CGAL/AABB_traits.h> + #include <oneapi/tbb/blocked_range.h> + #include <oneapi/tbb/parallel_for.h> + #include <boost/property_map/property_map.hpp> +@@ -1021,8 +1030,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons &shapes, + if (shapes.empty()) return {}; + + CutMesh result; +- EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ EdgeShapeMap edge_shape_map = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ FaceShapeMap face_shape_map = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name))); + + std::vector<VI> indices; + auto insert_contour = [&projection, &indices, &result, +@@ -1432,17 +1441,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + const ExPolygonsIndices &s2i) + { + // pointer to edge or face shape_map +- VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first; ++ VertexShapeMap vert_shape_map = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr))); + + // detect anomalities in visitor. + bool is_valid = true; + // NOTE: map are created when convert shapes to cgal model +- const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ const EdgeShapeMap& edge_shape_map = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ const FaceShapeMap& face_shape_map = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name))); + Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid}; + + // a property map containing the constrained-or-not status of each edge +- EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first; ++ EdgeBoolMap ecm = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false))); + const auto &p = CGAL::parameters::visitor(visitor) + .edge_is_constrained_map(ecm) + .throw_on_self_intersection(false); +@@ -1451,7 +1460,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + + if (!is_valid) return {}; + +- FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first; ++ FaceTypeMap face_type_map = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained))); + + // Select inside and outside face in model + set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i); +@@ -1587,8 +1596,8 @@ void priv::collect_surface_data(std::queue<FI> &process, + + void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh) + { +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; +- const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); ++ const EdgeBoolMap &ecm = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name))); + + // check if vertex was made by edge_2 which is diagonal of quad + auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool { +@@ -1773,10 +1782,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches, + for (const SurfacePatch &patch : patches) { + // map is created during intersection by corefine visitor + const VertexShapeMap &vert_shape_map = +- models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + uint32_t patch_index = &patch - &patches.front(); + // map is created during patch creation / dividing +- const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + // for each point on outline + for (const Loop &loop : patch.loops) + for (const VI &vi_patch : loop) { +@@ -2666,7 +2675,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + /* const */ CutMesh &mesh, + const ReductionMap *rmap) + { +- auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first; ++ auto is_counted = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted"))); + uint32_t count_vertices = 0; + if (rmap == nullptr) { + for (FI fi : fis) +@@ -2696,7 +2705,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + cm.reserve(count_vertices, count_edges, count_faces); + + // vertex conversion function from mesh VI to result VI +- CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first; ++ CvtVI2VI mesh2result = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result"))); + + if (rmap == nullptr) { + for (FI fi : fis) { +@@ -2748,7 +2757,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + assert(count_edges >= cm.edges().size()); + + // convert VI from this patch to source VI, when exist +- CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((cm.add_property_map<VI, VI>(patch_source_name))); + // vi_s .. VertexIndex into mesh (source) + // vi_d .. new VertexIndex in cm (destination) + for (VI vi_s : mesh.vertices()) { +@@ -2939,7 +2948,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch, + uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model) + { + // map is created during intersection by corefine visitor +- const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + // for each half edge of outline + for (HI hi : cut.second) { + VI vi = model.source(hi); +@@ -2964,7 +2973,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis, + patch_new.model_id = patch.model_id; + patch_new.shape_id = patch.shape_id; + // fix cvt +- CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name))); + for (VI &vi : cvt) { + if (!vi.is_valid()) continue; + vi = cvt_from[vi]; +@@ -2982,9 +2991,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches) + CutMesh& cm = patch.mesh; + assert(!cm.faces().empty()); + std::string patch_number_name = "f:patch_number"; +- CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first; ++ CutMesh::Property_map<FI,bool> is_processed = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false))); + +- const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt_from = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + + std::vector<FI> fis; + fis.reserve(cm.faces().size()); +@@ -3085,7 +3094,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, + CutAOIs &model_cuts = cuts[model_index]; + CutMesh &cut_model_ = cut_models[model_index]; + const CutMesh &cut_model = cut_model_; +- ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first; ++ ReductionMap vertex_reduction_map = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name))); + create_reduce_map(vertex_reduction_map, cut_model); + + for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) { +@@ -3171,7 +3180,7 @@ bool priv::is_over_whole_expoly(const CutAOI &cutAOI, + const CutMesh &mesh) + { + // NonInterupted contour is without other point and contain all from shape +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); + for (HI hi : cutAOI.second) { + const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)]; + const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)]; +@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st + } + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first; ++ auto face_colors = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color"))); + for (FI fi : mesh.faces()) { + auto &color = face_colors[fi]; + switch (face_type_map[fi]) { +@@ -3734,7 +3743,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s + std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off"; + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first; ++ auto vertex_colors = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color"))); + // initialize to gray color + for (VI vi: mesh.vertices()) + vertex_colors[vi] = CGAL::Color{127, 127, 127}; diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-eigen3.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-eigen3.patch deleted file mode 100644 index e215125b1486..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-eigen3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -629,7 +629,7 @@ target_link_libraries(libslic3r PRIVATE - int128 - ) - target_link_libraries(libslic3r PUBLIC -- Eigen3::Eigen -+ Eigen3 - semver - admesh - localesutils diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch index 2c7ab74a4c87..b7fc95554591 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch @@ -1,6 +1,31 @@ +--- a/bundled_deps/admesh/CMakeLists.txt ++++ b/bundled_deps/admesh/CMakeLists.txt +@@ -13,4 +13,3 @@ add_library(admesh STATIC + + target_include_directories(admesh PUBLIC .) + target_link_libraries(admesh PRIVATE boost_headeronly localesutils) +-target_link_libraries(admesh PUBLIC Eigen3::Eigen) +--- a/src/clipper/CMakeLists.txt ++++ b/src/clipper/CMakeLists.txt +@@ -10,5 +10,4 @@ add_library(clipper STATIC + ) + + target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128) +-target_link_libraries(clipper PUBLIC Eigen3::Eigen) + target_include_directories(clipper PUBLIC .) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE + int128 + ) + target_link_libraries(libslic3r PUBLIC +- Eigen3::Eigen + semver + admesh + localesutils --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt -@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES +@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES ) find_package(NanoSVG REQUIRED) @@ -8,3 +33,13 @@ if (APPLE) list(APPEND SLIC3R_GUI_SOURCES +@@ -438,6 +439,9 @@ target_link_libraries( + NanoSVG::nanosvgrast + stb_dxt + fastfloat ++ OpenSSL::SSL ++ OpenSSL::Crypto ++ Boost::log + ) + + if (MSVC) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch new file mode 100644 index 000000000000..b4a92de67ab6 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch @@ -0,0 +1,49 @@ +--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp ++++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +@@ -1595,7 +1595,7 @@ void GLGizmoSVG::draw_filename(){ + if (dlg.ShowModal() == wxID_OK ){ + last_used_directory = dlg.GetDirectory(); + std::string out_path_str(into_u8(dlg.GetPath())); +- boost::nowide::ofstream stream(out_path_str); ++ std::ofstream stream(out_path_str); + if (stream.is_open()){ + stream << *svg.file_data; + +--- a/src/slic3r/GUI/PresetArchiveDatabase.cpp ++++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp +@@ -514,7 +514,7 @@ void PresetArchiveDatabase::load_app_manifest_json() + if (!fs::exists(path, ec) || ec) { + copy_initial_manifest(); + } +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string data; + if (file.is_open()) { + std::string line; +@@ -681,7 +681,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const + data += "]"; + + std::string path = get_stored_manifest_path().string(); +- boost::nowide::ofstream file(path); ++ std::ofstream file(path); + if (file.is_open()) { + file << data; + file.close(); +@@ -916,4 +916,4 @@ void PresetArchiveDatabase::sync_blocking() + read_server_manifest(std::move(manifest)); + } + +-}} // Slic3r::GUI +\ No newline at end of file ++}} // Slic3r::GUI +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -301,7 +301,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + //FIXME may throw! Is the caller aware of it? + void Http::priv::set_post_body(const fs::path &path) + { +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string file_content { std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>() }; + postfields = std::move(file_content); + } diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 69208dbb54d1..fbf13e9d7d66 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -63,9 +63,9 @@ PATCHES=( "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" - "${FILESDIR}/${PN}-2.8.0-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch" - "${FILESDIR}/${PN}-2.8.1-eigen3.patch" + "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" + "${FILESDIR}/${PN}-2.8.1-fstream.patch" ) src_prepare() { @@ -79,9 +79,7 @@ src_prepare() { src/occt_wrapper/CMakeLists.txt || die find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ - sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g' {} + || die - find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ - sed -i 's|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die + sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die cmake_src_prepare } diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 639c6a12e40d..18cb4f6884e7 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,6 +1,3 @@ -AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358 -DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d DIST qiv-2.3.3.tgz 139301 BLAKE2B 0167e074f859ef028e3b343a8e521573f953ba43b7bd78f58e8b337a558b0d48a3c857cccafa2d55384fb48afdc0735949d873de878eff18658f09b98700c61c SHA512 95b5f3759c03648dea1ea1eacaf3d38d808a6eff4d26edf711df0e20a741fc22a0c16bcd84b8740f1455f5d35db9c2b04392dff8b4e030ec3d3c05cd01886759 -EBUILD qiv-2.3.2-r3.ebuild 1209 BLAKE2B d9f0dd4e51d27e0a81df429581bb1114c49b6d9aaff92d90b0725e5407597bfc527f2c6be93ec526e1f3c8aa70ae70c7de203d658c5a01ace96efc033206bda0 SHA512 eb0eba33bf4630d68fa02b339365aae9631c7580b1c0714cde1b0d0b47235f95c1d3e912e111f0e70d648e1865ae79957f1dcf929e0c87531ed61b50d7de4768 EBUILD qiv-2.3.3.ebuild 1157 BLAKE2B ac9b1ee17a105047481605f73baa05cd61fc13111a16c25ab0591adab0add356dd45985eec094300b1e2f20b323f29e10d5bfda14b604013c47c3a970b87f9db SHA512 a95dac67ac2c98301570074dfef14c87bc9b9942fc0588e17d988436aa213a73b6b06f324722b48113d8a32c852850dae0f688a5e5f6e916b1693f124d4729f5 MISC metadata.xml 248 BLAKE2B 374595d5e26ff95209fa2ffc9ffd10db830ed966d8c14c91fbda1c444d4a96c55a938a2be083a93218ff0e2e59cb876b3311429266efc1c07e39ed913412b669 SHA512 fe38b08d3554e7aa56699814cd72f9b64481ca4e7c7e715e01cc3ed29ac7dddc17f0b8b56bac42ff2c0550c4ddd09537853a272ec7d0ce08506b46b73e1872c9 diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch deleted file mode 100644 index e00ad10f93e2..000000000000 --- a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch +++ /dev/null @@ -1,22 +0,0 @@ -Make tiff header usage conditional on LCMS support as intended. - ---- ciberandy-qiv-14b562fe2fc3/qiv.h -+++ ciberandy-qiv-14b562fe2fc3/qiv.h -@@ -12,6 +12,7 @@ - #ifdef SUPPORT_LCMS - #include <lcms2.h> - #include <jpeglib.h> -+#include <tiffio.h> - #endif - - /* ---- ciberandy-qiv-14b562fe2fc3/utils.c -+++ ciberandy-qiv-14b562fe2fc3/utils.c -@@ -17,7 +17,6 @@ - #include <dirent.h> - #include <fcntl.h> - #include <errno.h> --#include <tiffio.h> - #include <X11/extensions/dpms.h> - #ifdef HAVE_EXIF - #include <libexif/exif-loader.h> diff --git a/media-gfx/qiv/qiv-2.3.2-r3.ebuild b/media-gfx/qiv/qiv-2.3.2-r3.ebuild deleted file mode 100644 index 7329747aa9a0..000000000000 --- a/media-gfx/qiv/qiv-2.3.2-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs xdg - -DESCRIPTION="Quick Image Viewer" -HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv" -SRC_URI="https://spiegl.de/qiv/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~mips ~x86" -IUSE="exif lcms magic" - -RDEPEND=" - media-libs/imlib2[X] - >=x11-libs/gtk+-2.12:2 - exif? ( media-libs/libexif ) - lcms? ( - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/tiff:= - ) - magic? ( sys-apps/file )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch ) - -src_prepare() { - default - - sed -i \ - -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ - Makefile || die - - if ! use exif ; then - sed -i 's/^EXIF =/#\0/' Makefile || die - fi - - if ! use lcms ; then - sed -i 's/^LCMS =/#\0/' Makefile || die - fi - - if ! use magic ; then - sed -i 's/^MAGIC =/#\0/' Makefile || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dobin qiv - doman qiv.1 - dodoc Changelog contrib/qiv-command.example README README.TODO - - domenu qiv.desktop - doicon qiv.png -} diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest index 267d5fcf420a..b4b43d087fcc 100644 --- a/media-gfx/quat/Manifest +++ b/media-gfx/quat/Manifest @@ -1,5 +1,4 @@ AUX quat-1.20-fix-build-for-clang16.patch 2955 BLAKE2B f12610d484006de26bc42475af99269911e186bdc490b4c4d1e48d0ae152b97be162aa2ba178b10cef0ae1bb9e4199aaa79ab512ce8bad41a6bb414151d125f1 SHA512 53b2eb52f1c062da4b4f594ea0a62ca11c5b37bba3f7ac5028906412c03a2bdee831e9dbd42cf63798f5f5ff8a8aadac5a808c6596e5d6dff53358a6ca0cf206 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b -EBUILD quat-1.20-r2.ebuild 785 BLAKE2B da0d6ab813115a0279ae46dcd0fb1e7d1edde4fdd3ea01c83d5abcd836ee0d4e73f60ecaa0a82f5b4a36d0ffadc0c405548c681499fc0c1fb44b562ad33b4d2e SHA512 32568d76deca41238afbdf13049582467e6b09dc31535c65dcaf49bb4a427c67560ae9c7573f40436c29e69e7f78fd8e5fdad75e2eb7c2b9b582fffe4630d44c EBUILD quat-1.20-r3.ebuild 972 BLAKE2B 3dba3013826bf82e854be298e994094f627cfd1ba504f610ea52b53b242f48d2d4232383949701d9423975078e189b2d9b36bd581deeb8bc3a76635d1430ca92 SHA512 dca80aa41fd6cacf7c3a16cb6d6134a65f7a3d29bf9bdc6cb3e7589e29239e4052aed0b04347c49a968277c85b3efd52d43a66f881471fa43de6a043a80f7f50 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/quat/quat-1.20-r2.ebuild b/media-gfx/quat/quat-1.20-r2.ebuild deleted file mode 100644 index 17e06e1566e8..000000000000 --- a/media-gfx/quat/quat-1.20-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A 3D quaternionic fractal generator" -HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html" -SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X debug" - -DEPEND=" - >=sys-libs/zlib-1.1.4 - X? ( - =x11-libs/fltk-1* - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option - econf \ - $(use_enable X gui) \ - $(use_enable debug) \ - $(use_enable debug prof) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index c3fce2aa8436..2f8f9890f0b2 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -10,7 +10,6 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7 SHA512 a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 -EBUILD xloadimage-4.1-r14.ebuild 2498 BLAKE2B fc00f76584349c7c86dfc4905fba0648893fc52d9bc715ecd82e305524b5cbbb8296d88ef62ae6352925531f9bae988c0957399631d7588975ed59e9ca922371 SHA512 c161c90df4bc6797566d04db9eec5aeb2cf486a8d9456d5e428994b0da42aaf1d8aa0461b3625230b483e40e146a5408255c8a46118179232f9327376c43c53e EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd EBUILD xloadimage-4.1-r16.ebuild 2548 BLAKE2B 1c119a00e638d2a9df4372e0bf58ae971ba77805cbac31d8d0f7a3baf7d96b9933bb46aa846c305fae6a2f343e0587e02f5a60326b2d0a6cb5e113cc543cb184 SHA512 9003ed1adb849509a835d43925f5fc852d203dac5393ab766d4313de1dad4f633715cb60f1d3538ec93311d756792f4ea12d00fbe76587abfb13892be948962b MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild deleted file mode 100644 index c04a11db820a..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="utility to view many different types of images under X11" -HOMEPAGE="https://tracker.debian.org/pkg/xloadimage" -SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= )" -DEPEND="${RDEPEND} - !media-gfx/xli" - -S=${WORKDIR}/${P/-/.} - -src_prepare() { - eapply "${WORKDIR}"/${P}-gentoo-r1.diff - eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff - eapply "${FILESDIR}"/${P}-endif.patch - - # Do not define errno extern, but rather include errno.h - # <azarah@gentoo.org> (1 Jan 2003) - eapply "${FILESDIR}"/${P}-include-errno_h.patch - - eapply "${FILESDIR}"/xloadimage-gentoo.patch - - sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - - # On FreeBSD systems malloc.h is a false header asking for fixes. - # On MacOSX it would require malloc/malloc.h - # On other systems it's simply unneeded - sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die - - eapply "${FILESDIR}"/${P}-unaligned-access.patch - eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch - - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - - eapply "${FILESDIR}"/${P}-libpng15.patch - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - # One of the previous patches screws up a bracket... - eapply "${FILESDIR}"/${P}-bracket.patch - - default - - chmod +x configure || die - eautoreconf -} - -src_configure() { - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} |