diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 38362 -> 38357 bytes | |||
-rw-r--r-- | media-gfx/hugin/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/hugin/files/boost-1.85-932315.patch | 25 | ||||
-rw-r--r-- | media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 99 | ||||
-rw-r--r-- | media-gfx/prusaslicer/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch | 57 | ||||
-rw-r--r-- | media-gfx/prusaslicer/prusaslicer-9999.ebuild | 5 |
7 files changed, 60 insertions, 132 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex f8787b2f64e8..92abe455b486 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index b93969a1b75c..0e764af0c43c 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,7 +1,4 @@ -AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085 -DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 DIST hugin-2024.0.1.tar.bz2 10352250 BLAKE2B 07b6ec632ad8525f58750a1894223102f354879e95c33cb4251d7aa237328a5180ffe6c7de0f3e23fc07dd8dd4f254cda7a9f452dc02b786bc867f15ca20b8f4 SHA512 4109f3be0b03d8b4205a79e0d76e18186278601d3e56f46271df1804db6f11f2e93fe1e1b68f2d7966c6d50ce58d4bf47e555e9cf8c34674315b2e89da36a722 -EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf EBUILD hugin-2024.0.1.ebuild 2095 BLAKE2B 4c8a0dc3da7c05f6146d7768537a1fc8a244f7617ebd34a3a2f14adc6bd3c60dbc1915d3cc1166b72ea58d86710669dd35942b40393a7578cd0ac5038e2ce2d8 SHA512 c70381f1614ce40457176c6ac1bce79a6ff8b711d069f51ec60d7282e4f373a6c0ef9ebe8cb766b9fccf6c5dd7165e48d53da138bd811db32f499e9281f70a18 EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch deleted file mode 100644 index e8fc5c2daa1f..000000000000 --- a/media-gfx/hugin/files/boost-1.85-932315.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User tmodes -# Date 1710260877 -3600 -# Tue Mar 12 17:27:57 2024 +0100 -# Node ID 4d081490b48aaff820cee7601b8624b37b652c06 -# Parent 4b55f17c4e72d6c2f8b4930e3367ff52e1741b45 -Fixed deprecated boost::filesystem::copy_option enum - -diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h ---- a/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:29 2024 +0100 -+++ b/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:57 2024 +0100 -@@ -64,6 +64,12 @@ - #endif
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
-- #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
-+ #if BOOST_VERSION>=107400
-+ // in Boost 1.74 and later filesystem::copy_option is deprecated
-+ // use filesystem::copy_options instead
-+ #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
-+ #else
-+ #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
-+ #endif
- #endif
- #endif // _HUGIN_UTILS_FILESYSTEM_H
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild deleted file mode 100644 index 40c4d46a93f6..000000000000 --- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.2-gtk3" -PYTHON_COMPAT=( python3_{10..12} ) - -inherit python-single-r1 wxwidgets cmake xdg - -DESCRIPTION="GUI for the creation & processing of panoramic images" -HOMEPAGE="http://hugin.sf.net" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/}.tar.bz2" - -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" -SLOT="0" -KEYWORDS="amd64 arm64 ~x86" - -LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" - -CDEPEND=" - dev-db/sqlite:3 - dev-libs/boost:= - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - media-libs/libjpeg-turbo:= - >=media-libs/libpano13-2.9.19_beta1:= - media-libs/libpng:= - media-libs/openexr:= - media-libs/tiff:= - >=media-libs/vigra-1.11.1-r5[openexr] - sci-libs/fftw:3.0= - sci-libs/flann - sys-libs/zlib - virtual/glu - virtual/opengl - x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] - lapack? ( virtual/blas virtual/lapack ) - python? ( ${PYTHON_DEPS} ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool - raw? ( media-gfx/dcraw )" -DEPEND="${CDEPEND} - dev-cpp/tclap - sys-devel/gettext - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.4 )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( authors.txt README TODO ) - -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - -pkg_setup() { - use python && python-single-r1_pkg_setup - setup-wxwidgets -} - -src_prepare() { - # Fix build with boost >=1.85 - eapply "${FILESDIR}/boost-1.85-932315.patch" - - sed -i \ - -e "/COMMAND.*GZIP/d" \ - -e "s/\.gz//g" \ - "${S}"/doc/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HSI=$(usex python) - -DENABLE_LAPACK=$(usex lapack) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - use python && python_optimize - - local lang - for lang in ${LANGS} ; do - case ${lang} in - ca) dir=ca_ES;; - ca-valencia) dir=ca_ES@valencia;; - cs) dir=cs_CZ;; - *) dir=${lang/-/_};; - esac - if ! use l10n_${lang} ; then - rm -r "${ED}"/usr/share/locale/${dir} || die - fi - done -} diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index f1a7655ddf48..418718866434 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -6,7 +6,8 @@ AUX prusaslicer-2.8.1-fix-libsoup-double-linking.patch 482 BLAKE2B 0b4f0ba5808ac AUX prusaslicer-2.8.1-fixed-linking.patch 394 BLAKE2B bb4d6285ee9e199f4d8bed3ecf0a4e0ac814f311a5220958e8a6023a343954bc78454697704ce9ee8bc583a9a536cec249f42b8b3d28fff6515e2499c4de3442 SHA512 b84c966d22be5fda04c8a97421026855289038d69de11ac1a9b053381a35b2e5d3f3354ac51d37ad58f0ba4fec177894de67ef44360b050b9ca61cb06d5a178c AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22 AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49 +AUX prusaslicer-2.9.0-fpic.patch 2470 BLAKE2B c2e97f6451b3b8f3eb791780ab49269767e7a47eb22f085f6559d5009c0dc66ad0f0fffd521f3262f595d8b21a783167094e0b8882c26d37c7bed645d8f51048 SHA512 22d708b0e077e15a83a6a515d10c2aad91674c7fcd0a855470431e1506b98b70f263eae5fe32f1a584b8ad079ed58c3610a9d4e5d88a296d4baebf3afda48ed5 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 EBUILD prusaslicer-2.8.1-r1.ebuild 2708 BLAKE2B 895f155bc49426f137807be45a3f2942d6255090cecc15657896e21f6fdb4ebc1c144ef474f69ae9487306b36cb83860dcebb09cef73e825e658206933b5d0cc SHA512 cf473a7b8978acffae92d579272ee69717b59e849a052422f0aaf66b6b82357ef85536025d8e6e1c32fada8e907be1ecb81ed19a16e14ade1b6fab132c636b3c -EBUILD prusaslicer-9999.ebuild 2709 BLAKE2B 720b5d4954e1fa45cc5ca5feaa7f3b71f537cec1e6cb03002ae93676fc8989149fa7e47555fcc83b73f52fb6bd6cee406bdc8b77badfe686b5be7607c9c8789d SHA512 fe5979e54dac63f5ae449207444f3f55780793acbbc2ba3235142802fe5e051c8c94a03b44a0c92b590d29b5c471094fcfa3937aded6088a6f1301c27dd5af9f +EBUILD prusaslicer-9999.ebuild 2571 BLAKE2B 37a804380047fdb934bd4aa0e59ef2a7eb3ef5a4eb4cd78dd276413fc6922497a8e01f9673468dfbac0816d48d205b0c66e0d4fa38af4d9c208fa58fbaafaf05 SHA512 ea743a8c7bddfeea7bc44c9e27bc8e79590be434b628d12fdcbd1d4f7f8f62e644d59e492b7412fc7fb73f62fc8c9d6d67733dfc4e7983c713cfc6f0c14c6755 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch new file mode 100644 index 000000000000..ea6e297e96db --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch @@ -0,0 +1,57 @@ +--- a/bundled_deps/admesh/CMakeLists.txt ++++ b/bundled_deps/admesh/CMakeLists.txt +@@ -14,3 +14,4 @@ add_library(admesh STATIC + target_include_directories(admesh PUBLIC .) + target_link_libraries(admesh PRIVATE boost_headeronly localesutils) + target_link_libraries(admesh PUBLIC Eigen3::Eigen) ++set_target_properties(admesh PROPERTIES POSITION_INDEPENDENT_CODE ON) +--- a/bundled_deps/glu-libtess/CMakeLists.txt ++++ b/bundled_deps/glu-libtess/CMakeLists.txt +@@ -34,3 +34,4 @@ if(UNIX) + endif(UNIX) + + target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) ++set_target_properties(glu-libtess PROPERTIES POSITION_INDEPENDENT_CODE ON) +--- a/bundled_deps/miniz/CMakeLists.txt ++++ b/bundled_deps/miniz/CMakeLists.txt +@@ -7,6 +7,7 @@ add_library(miniz_static STATIC + miniz.c + miniz.h + ) ++set_target_properties(miniz_static PROPERTIES POSITION_INDEPENDENT_CODE ON) + + if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") + target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) +--- a/bundled_deps/CMakeLists.txt ++++ b/bundled_deps/CMakeLists.txt +@@ -33,6 +33,7 @@ add_library(localesutils STATIC + ) + target_include_directories(localesutils PUBLIC localesutils) + target_link_libraries(localesutils PRIVATE fastfloat) ++set_target_properties(localesutils PROPERTIES POSITION_INDEPENDENT_CODE ON) + + add_library(ankerl INTERFACE) + target_include_directories(ankerl INTERFACE ankerl) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -532,6 +532,7 @@ add_library(libslic3r_cgal STATIC + TryCatchSignal.hpp TryCatchSignal.cpp + Triangulation.hpp Triangulation.cpp + ) ++set_target_properties(libslic3r_cgal PROPERTIES POSITION_INDEPENDENT_CODE ON) + target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(libslic3r_cgal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) + +@@ -622,3 +623,5 @@ endif () + if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) + add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE) + endif () ++ ++set_target_properties(libslic3r PROPERTIES POSITION_INDEPENDENT_CODE ON) +--- a/src/clipper/CMakeLists.txt ++++ b/src/clipper/CMakeLists.txt +@@ -12,3 +12,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 .) ++set_target_properties(clipper PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 66c1089c97e8..1832088d5630 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -64,10 +64,10 @@ 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.1-fixed-linking.patch" "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fstream.patch" "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" + "${FILESDIR}/${PN}-2.9.0-fpic.patch" ) src_prepare() { @@ -80,9 +80,6 @@ src_prepare() { sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ src/occt_wrapper/CMakeLists.txt || die - # remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608 - rm cmake/modules/FindEigen3.cmake || die - cmake_src_prepare } |