diff options
Diffstat (limited to 'media-gfx')
433 files changed, 6507 insertions, 8778 deletions
diff --git a/media-gfx/aewan/aewan-1.0.01-r2.ebuild b/media-gfx/aewan/aewan-1.0.01-r2.ebuild new file mode 100644 index 000000000000..27b18f02d410 --- /dev/null +++ b/media-gfx/aewan/aewan-1.0.01-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A curses-based ascii-art editor" +HOMEPAGE="http://aewan.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS=( CHANGELOG README TODO ) + +DEPEND="sys-libs/zlib + >=sys-libs/ncurses-5.0:0=" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-debug_aewl-warnings.patch" + "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}/${P}-fix-incompatible-function-pointer-types.patch" + "${FILESDIR}/${P}-fix-warnings.patch" +) + +src_prepare() { + default + eautoreconf +} diff --git a/media-gfx/aewan/files/aewan-1.0.01-fix-incompatible-function-pointer-types.patch b/media-gfx/aewan/files/aewan-1.0.01-fix-incompatible-function-pointer-types.patch new file mode 100644 index 000000000000..f26a29998ca0 --- /dev/null +++ b/media-gfx/aewan/files/aewan-1.0.01-fix-incompatible-function-pointer-types.patch @@ -0,0 +1,35 @@ +Subject: [PATCH] Fix incompatible function pointer types + +Clang 16 (and likely GCC 14) will enforce strict C99 semantics + and break old K&R C declarations and require correct C89 + function prototypes. + +Bug: https://bugs.gentoo.org/880809 +Clang: https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213/9 + +Patch has been sent to upstream here: https://sourceforge.net/p/aewan/bugs/14/ + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> +--- a/aeff.c ++++ b/aeff.c +@@ -88,7 +88,7 @@ static bool read_parse_data_line(gzFile f, char **label, char **type, + autod_begin; + autod_register(line, free); + +- autod_assign( line, freadline_ex(f, gzgetc) ); ++ autod_assign( line, freadline_ex(f, (void*)gzgetc) ); + + /* look for ':' field separators and note their locations */ + field_start[0] = line; +@@ -192,7 +192,7 @@ static bool aeff_read_mark(AeFile *f, const char *mark_name, char pref) { + autod_begin; + autod_register(line, free); + +- autod_assign(line, freadline_ex(f->f, gzgetc)); ++ autod_assign(line, freadline_ex(f->f, (void*)gzgetc)); + + /* if EOF was reached before anything could be read, something is wrong */ + if (!line) { +-- +2.39.1 + diff --git a/media-gfx/aewan/files/aewan-1.0.01-fix-warnings.patch b/media-gfx/aewan/files/aewan-1.0.01-fix-warnings.patch new file mode 100644 index 000000000000..a797ae30aad3 --- /dev/null +++ b/media-gfx/aewan/files/aewan-1.0.01-fix-warnings.patch @@ -0,0 +1,49 @@ +Subject: [PATCH] fix warnings + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/bores/kurses.c ++++ b/bores/kurses.c +@@ -139,15 +139,11 @@ void kurses_color_at(int attr) { + } + + int kurses_width() { +- int maxy, maxx; +- getmaxyx(stdscr, maxy, maxx); +- return maxx; ++ return getmaxx(stdscr); + } + + int kurses_height() { +- int maxy, maxx; +- getmaxyx(stdscr, maxy, maxx); +- return maxy; ++ return getmaxy(stdscr); + } + + int kurses_pos_valid(int x, int y) { +--- a/vlayer.c ++++ b/vlayer.c +@@ -9,7 +9,7 @@ static void _get_cell_LYR(Cell *r_cell, int x, int y, void *ud) { + + /* callback that returns a cell from a document composite */ + static void _get_cell_COMPOSITE(Cell *r_cell, int x, int y, void *ud) { +- Document *doc = (Document*) doc; ++ Document *doc = (Document*) NULL; + *r_cell = document_calc_effective_cell(doc, x, y); + } + +-- +2.39.1 + +--- a/helpdlg.h ++++ b/helpdlg.h +@@ -33,7 +33,7 @@ programa, armazenada no arquivo COPYING). + + + #ifndef _btco_aewan_helpdlg_h +-#define _btco_aewan_helprdlg_h ++#define _btco_aewan_helpdlg_h + + /* invokes the "help" dialog */ + void show_help_dlg(void); diff --git a/media-gfx/aewan/metadata.xml b/media-gfx/aewan/metadata.xml index 8fe18743fee8..cac1b404ba81 100644 --- a/media-gfx/aewan/metadata.xml +++ b/media-gfx/aewan/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> Aewan is a multi-layered ascii-art/animation editor that produces both stand-alone cat-able art files and an easy-to-parse format for integration in diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index 0e6d302f6ce2..945025e06f5b 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -1,2 +1 @@ -DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687 diff --git a/media-gfx/alembic/alembic-1.8.3-r2.ebuild b/media-gfx/alembic/alembic-1.8.3-r2.ebuild deleted file mode 100644 index 55cf6d2bd757..000000000000 --- a/media-gfx/alembic/alembic-1.8.3-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open framework for storing and sharing scene data" -HOMEPAGE="https://www.alembic.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="examples hdf5 python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/imath:= - python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] ) - hdf5? ( - >=sci-libs/hdf5-1.10.2:=[zlib(+)] - >=sys-libs/zlib-1.2.11-r1 - ) - python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch - "${FILESDIR}"/${P}-0001-find-py-ilmbase-in-config-mode.patch -) - -DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt ) - -src_prepare() { - cmake_src_prepare - # PyAlembic test doesn't properly find Imath, comment it for now - cmake_run_in python/PyAlembic cmake_comment_add_subdirectory Tests -} - -src_configure() { - local mycmakeargs=( - -DALEMBIC_BUILD_LIBS=ON - -DALEMBIC_SHARED_LIBS=ON - # currently does nothing but require doxygen - -DDOCS_PATH=OFF - -DUSE_ARNOLD=OFF - -DUSE_BINARIES=ON - -DUSE_EXAMPLES=$(usex examples) - -DUSE_HDF5=$(usex hdf5) - -DUSE_MAYA=OFF - -DUSE_PRMAN=OFF - -DUSE_PYALEMBIC=$(usex python) - -DUSE_TESTS=$(usex test) - ) - - use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} ) - - cmake_src_configure -} diff --git a/media-gfx/alembic/alembic-1.8.4.ebuild b/media-gfx/alembic/alembic-1.8.4.ebuild index 3bf6ec05cfba..f3bfe4a9376b 100644 --- a/media-gfx/alembic/alembic-1.8.4.ebuild +++ b/media-gfx/alembic/alembic-1.8.4.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# py311 needs imath-3.1.6+, see PR #28265 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 @@ -14,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="examples hdf5 python test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" diff --git a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch deleted file mode 100644 index bc7ac9f507a8..000000000000 --- a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch +++ /dev/null @@ -1,90 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 30 Oct 2021 11:56:04 +0200 -Subject: [PATCH] find (py)ilmbase in config mode - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> - -diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake -index 9f52ca6..f076e14 100644 ---- a/cmake/AlembicIlmBase.cmake -+++ b/cmake/AlembicIlmBase.cmake -@@ -43,23 +43,27 @@ IF (Imath_FOUND) - ELSE() - MESSAGE(STATUS "Could not find Imath looking for IlmBase instead.") - # What we really want to do is look for libs Imath and half -- FIND_PACKAGE(IlmBase) -+ FIND_PACKAGE(IlmBase CONFIG REQUIRED) - SET(ALEMBIC_USING_IMATH_3 OFF) -+ SET(ILMBASE_FOUND True) -+ GET_TARGET_PROPERTY(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES) -+ SET(ALEMBIC_ILMBASE_HALF_LIB IlmBase::Half) -+ SET(ALEMBIC_ILMBASE_IEX_LIB IlmBase::Iex) -+ SET(ALEMBIC_ILMBASE_IEXMATH_LIB IlmBase::IexMath) -+ SET(ALEMBIC_ILMBASE_ILMTHREAD_LIB IlmBase::IlmThread) -+ SET(ALEMBIC_ILMBASE_IMATH_LIB IlmBase::Imath) -+ SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_HALF_LIB} ${ALEMBIC_ILMBASE_IEX_LIB} ${ALEMBIC_ILMBASE_IEXMATH_LIB} -+ ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB}) - - IF (ILMBASE_FOUND) - SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") -- -- SET(ALEMBIC_ILMBASE_LIBS -- ${ALEMBIC_ILMBASE_IMATH_LIB} -- ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} -- ${ALEMBIC_ILMBASE_IEX_LIB} -- ${ALEMBIC_ILMBASE_HALF_LIB} -- ) -- -- if (${ALEMBIC_ILMBASE_IEXMATH_LIB}) -- SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB}) -- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB}) -- -+ MESSAGE(STATUS "Found package IlmBase") -+ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" ) -+ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" ) -+ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" ) -+ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" ) -+ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" ) -+ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" ) - ELSE() - SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") - ENDIF() -diff --git a/cmake/AlembicPyIlmBase.cmake b/cmake/AlembicPyIlmBase.cmake -index 249e084..3cc6253 100644 ---- a/cmake/AlembicPyIlmBase.cmake -+++ b/cmake/AlembicPyIlmBase.cmake -@@ -43,20 +43,19 @@ IF (Imath_FOUND) - SET(ALEMBIC_PYILMBASE_PYIMATH_LIB Imath::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR}) - MESSAGE(STATUS "Found package Imath using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") - ELSE() -- FIND_PACKAGE(PyIlmBase) -+ MESSAGE(STATUS "Could not find Imath looking for PyIlmBase instead.") -+ FIND_PACKAGE(PyIlmBase CONFIG REQUIRED) -+ SET(PYILMBASE_FOUND True) - IF (PYILMBASE_FOUND) - SET(ALEMBIC_PYILMBASE_FOUND 1 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise") -- -- SET(ALEMBIC_PYILMBASE_LIBS -- ${ALEMBIC_PYILMBASE_PYIMATH_LIB} -- ) -- -- GET_FILENAME_COMPONENT(ALEMBIC_PYILMBASE_LIB_DIRECTORY -- ${ALEMBIC_PYILMBASE_PYIMATH_LIB} -- PATH -- ) -- -+ SET(ALEMBIC_PYILMBASE_PYIMATH_LIB PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR}) -+ MESSAGE(STATUS "Found package PyIlmBase using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") -+ GET_TARGET_PROPERTY(ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR} INTERFACE_INCLUDE_DIRECTORIES) -+ SET(ALEMBIC_PYIMATH_MODULE_DIRECTORY "/usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") -+ MESSAGE(STATUS "PYILMBASE INCLUDE PATH: ${ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY}") -+ MESSAGE(STATUS "PYIMATH LIB: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") -+ MESSAGE(STATUS "PYIMATH MODULE: ${ALEMBIC_PYIMATH_MODULE_DIRECTORY}") - ELSE() - SET(ALEMBIC_PYILMBASE_FOUND 0 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise") - ENDIF() --ENDIF() -\ No newline at end of file -+ENDIF() --- -2.33.1 diff --git a/media-gfx/ansilove/ansilove-4.1.6.ebuild b/media-gfx/ansilove/ansilove-4.1.6.ebuild index e593f48c0fb9..232049c49b2c 100644 --- a/media-gfx/ansilove/ansilove-4.1.6.ebuild +++ b/media-gfx/ansilove/ansilove-4.1.6.ebuild @@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/ansilove/${PN}.git" else SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="BSD-2" diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest index 416e5565d060..e3231c1fcb5c 100644 --- a/media-gfx/argyllcms/Manifest +++ b/media-gfx/argyllcms/Manifest @@ -1,3 +1,2 @@ DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06 -DIST Argyll_V2.3.0_src.zip 14042268 BLAKE2B 3611198746bc443d3425bd297ee6c36f3ae28ace24bfa011a7b0fa491ac1185418f0fba004c2d076f350a27d176d1a6295c26584906744de6002bff6b55035e4 SHA512 959ee656967de583d3061f8c345b6c6cdb86bb23aab21f961271563b7ce33da9e64492a9f1bb248a92ff16709b1c13ef6ccbd4478df92e4b90c62a992d79eedd DIST Argyll_V2.3.1_src.zip 14098636 BLAKE2B 0f215d5852c3ad383833dd643d78729a03e178b2bfad1a955a4ca8108a7b33b5a98507436c2a3bfa9f030ad968787e933e50940a0a7cc045b1082f4c8d519c6a SHA512 a8c2b02638569727015ad8e6e16999e398214fa5d11656bae0a9fe0b3268e81674621e3a7de96b727c578c5fc612ada39b37a94ca8b62f4221c56917654a22e8 diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild index 579891ce1cba..b5f8e47cfd60 100644 --- a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild +++ b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,9 +17,9 @@ KEYWORDS="amd64 arm64 ~hppa x86" IUSE="doc" RDEPEND=" - media-libs/tiff:0 + media-libs/libjpeg-turbo:= + media-libs/tiff:= sys-libs/zlib - virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp @@ -28,7 +28,7 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver - dev-libs/openssl:0= + dev-libs/openssl:= " DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip diff --git a/media-gfx/argyllcms/argyllcms-2.3.0.ebuild b/media-gfx/argyllcms/argyllcms-2.3.0.ebuild deleted file mode 100644 index d049263d907b..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.3.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~riscv ~x86" -IUSE="doc" - -RDEPEND=" - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libXScrnSaver - dev-libs/openssl:0= -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - dev-util/ftjam" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -e "s:ar rusc:$(tc-getAR) rusc:g" \ - -i Jambase || die - - tc-export CC RANLIB - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} diff --git a/media-gfx/argyllcms/argyllcms-2.3.1.ebuild b/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild index b500de7c28eb..cb9dd790126a 100644 --- a/media-gfx/argyllcms/argyllcms-2.3.1.ebuild +++ b/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,13 +13,13 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86" IUSE="doc" RDEPEND=" - dev-libs/openssl:0= + dev-libs/openssl:= media-libs/libjpeg-turbo:= - media-libs/tiff:0 + media-libs/tiff:= sys-libs/zlib x11-libs/libX11 x11-libs/libXScrnSaver @@ -36,6 +36,11 @@ BDEPEND="app-arch/unzip S="${WORKDIR}/${MY_P}" +src_prepare() { + default + sed -e "s/static eset/static int eset/" -i spectro/i1d3.c || die +} + src_compile() { # Make it respect LDFLAGS echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 99ba0fb250c3..55f39a8ba4a7 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,2 +1,2 @@ -DIST asymptote-2.78.src.tgz 15274780 BLAKE2B 0c99aff54df79eabdf059cc0bb2cdd0832d7cc7ae83a2e3ab08116aa6bc75de44f7adfa096b7ed832fc96cd9db0bb41a490a8c5fd29716ad9a7852e52a98ad2b SHA512 dcc27ce608cb72b3979a87bd6e312774008a225b0936027c11bf1862e21dce5db6de9bf5db14c85ba1f7ed25ec77c3a57e2ecf58a73b46315daca11777910c24 DIST asymptote-2.83.src.tgz 15044624 BLAKE2B f364d7fa5d09bfc94f2556d5c99fc2751182f4a231544c24b449f02f36cca62e48272827f5bb405119b82d75517ef1fe49ec87cb75eb30de92ed95ac360a553c SHA512 cb59731f6d68658746cd1e686a54b6f590e4a4990df572e89b4b5faab6bb8ed75de9d7f75e65b8ed76227ead59930d5492d54239db6acdb4bff2377ac2b97dec +DIST asymptote-2.85.src.tgz 15073771 BLAKE2B 5fb965d6fad5c138c00b76a55158c3808022de84ba2a5568af551fe744e5ab0dc3caf168f9467517d917c9716a89a3fd1064324991e8d058a7a27138648903fc SHA512 81e62c3b5c1a4d8a12b37c9ca45f0141cf4034719f08155c2eb61989a2132a79053d611dee29bc0ea24b0aa05d2b4cb2b0dfeadec51e754cd65caf4ace7cc5b1 diff --git a/media-gfx/asymptote/asymptote-2.83.ebuild b/media-gfx/asymptote/asymptote-2.83.ebuild index 365024dcfac8..9cb125926211 100644 --- a/media-gfx/asymptote/asymptote-2.83.ebuild +++ b/media-gfx/asymptote/asymptote-2.83.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit autotools elisp-common latex-package python-r1 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X" RESTRICT="!test? ( test )" diff --git a/media-gfx/asymptote/asymptote-2.78.ebuild b/media-gfx/asymptote/asymptote-2.85-r1.ebuild index 7117ff27b9a0..ba11f4a8c353 100644 --- a/media-gfx/asymptote/asymptote-2.78.ebuild +++ b/media-gfx/asymptote/asymptote-2.85-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools elisp-common latex-package python-r1 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X" RESTRICT="!test? ( test )" @@ -50,7 +50,7 @@ RDEPEND=" ) latex? ( virtual/latex-base - >=dev-texlive/texlive-latexextra-2013 + dev-texlive/texlive-latexextra ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) @@ -61,6 +61,7 @@ DEPEND="${RDEPEND} media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base + dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )" @@ -68,7 +69,7 @@ TEXMF=/usr/share/texmf-site PATCHES=( # Changing pdf, ps, image viewers to xdg-open - "${FILESDIR}/${PN}-2.70-xdg-utils.patch" + "${FILESDIR}/${PN}-2.85-xdg-utils.patch" # Bug #322473 "${FILESDIR}/${PN}-2.70-info.patch" diff --git a/media-gfx/asymptote/files/asymptote-2.85-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.85-xdg-utils.patch new file mode 100644 index 000000000000..59b5640a554b --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.85-xdg-utils.patch @@ -0,0 +1,21 @@ +diff -U3 -r asymptote-2.85.orig/settings.cc asymptote-2.85/settings.cc +--- asymptote-2.85.orig/settings.cc 2023-02-09 11:53:32.000000000 +0700 ++++ asymptote-2.85/settings.cc 2023-02-16 12:55:18.343703131 +0700 +@@ -101,13 +101,13 @@ + string defaultPDFViewer="open"; + string defaultHTMLViewer="open"; + #else +-string defaultPSViewer="evince"; +-string defaultPDFViewer="evince"; +-string defaultHTMLViewer="google-chrome"; ++string defaultPSViewer="xdg-open"; ++string defaultPDFViewer="xdg-open"; ++string defaultHTMLViewer="xdg-open"; + #endif + string defaultGhostscript="gs"; + string defaultGhostscriptLibrary=""; +-string defaultDisplay="display"; ++string defaultDisplay="xdg-open"; + string defaultAnimate="animate"; + void queryRegistry() {} + const string dirsep="/"; diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1-r1.ebuild index aa6387758510..46f392cc4563 100644 --- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild +++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,11 +16,11 @@ IUSE="" DEPEND=" dev-libs/libxml2 - media-libs/libpano13:0= - media-libs/libpng:0= - media-libs/tiff:0= - sys-libs/zlib - virtual/jpeg:0" + media-libs/libjpeg-turbo:= + media-libs/libpano13:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib" RDEPEND="${DEPEND} !media-gfx/autopano-sift " diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild index 0f64724a6032..df9349646162 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -8,11 +8,11 @@ inherit autotools MY_P=${P/_/} DESCRIPTION="ASCII Image Viewer" -HOMEPAGE="http://aa-project.sourceforge.net/aview/" +HOMEPAGE="https://aa-project.sourceforge.net/aview/" SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P/rc*/}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 92cb67f8c203..35bf4c6d6a6c 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,11 +1,7 @@ DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe -DIST blender-2.93.10.tar.xz 43036752 BLAKE2B c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b SHA512 ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7 -DIST blender-2.93.9.tar.xz 43035004 BLAKE2B 3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7 SHA512 605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e +DIST blender-2.93.13.tar.xz 43029716 BLAKE2B ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055 SHA512 c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b +DIST blender-2.93.14.tar.xz 43035804 BLAKE2B 72ca99143da393bb23e15a26e197c5ac45cd0bfb487b5dda617cb42f107dda0518c787294ad799c34712ee5948da81a573880cd642fc26bd1ae437b516ec41b6 SHA512 2b395a6acad808c3d2eb80355320d237fff7c0a188d1455fecd65189d7672927087ab7dcf7d07c3d541279c142846763be8dc495a2aa625c08f17ef543ba8bc5 DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9 SHA512 c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e764583525555ca6d653da809 -DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655 SHA512 9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782 -DIST blender-3.1.2.tar.xz 41014760 BLAKE2B 1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604 SHA512 e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02 -DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B 7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f SHA512 4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8 -DIST blender-3.2.0.tar.xz 41520000 BLAKE2B ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248 SHA512 2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81 -DIST blender-3.2.1.tar.xz 41497540 BLAKE2B bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8 SHA512 fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef -DIST blender-3.2.2.tar.xz 41510144 BLAKE2B 3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62 SHA512 963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04 -DIST blender-3.3.0.tar.xz 41887484 BLAKE2B ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d SHA512 5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243 +DIST blender-3.3.2.tar.xz 41918064 BLAKE2B 76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783 SHA512 2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778 +DIST blender-3.3.3.tar.xz 41918008 BLAKE2B 6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b SHA512 1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83 +DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab diff --git a/media-gfx/blender/blender-2.93.9.ebuild b/media-gfx/blender/blender-2.93.13.ebuild index 8342b99e0295..f3da165815e3 100644 --- a/media-gfx/blender/blender-2.93.9.ebuild +++ b/media-gfx/blender/blender-2.93.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -103,7 +103,7 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) " @@ -126,10 +126,12 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-2.93.13-openvdb-10.patch "${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch "${FILESDIR}"/${PN}-3.0.1-openexr.patch "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch "${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch ) blender_check_requirements() { diff --git a/media-gfx/blender/blender-2.93.10.ebuild b/media-gfx/blender/blender-2.93.14.ebuild index db03095f1e34..e5ed153b5002 100644 --- a/media-gfx/blender/blender-2.93.10.ebuild +++ b/media-gfx/blender/blender-2.93.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -103,7 +103,7 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) " @@ -126,10 +126,12 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-2.93.13-openvdb-10.patch "${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch "${FILESDIR}"/${PN}-3.0.1-openexr.patch "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch "${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch ) blender_check_requirements() { diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild deleted file mode 100644 index 46aa14cdad0d..000000000000 --- a/media-gfx/blender/blender-3.1.2.ebuild +++ /dev/null @@ -1,399 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -if [[ ${PV} = *9999* ]] ; then - # Subversion is needed for downloading unit test files - inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" -else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" - # Update these between major releases. - TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -SLOT="${PV%.*}" -LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - osl? ( cycles ) - test? ( color-management )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( >=media-libs/embree-3.10.0[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) - fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - >=media-gfx/openvdb-9.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-sound/pulseaudio ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -blender_get_version() { - # Get blender version from blender itself. - BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) - if ((${BV:0:1} < 3)) ; then - # Add period (290 -> 2.90). - BV=${BV:0:1}.${BV:1} - else - # Add period and skip the middle number (301 -> 3.1) - BV=${BV:0:1}.${BV:2} - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - if use test; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi - else - default - if use test; then - #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests - mkdir -p lib || die - mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die - fi - fi - -} - -src_prepare() { - cmake_src_prepare - - blender_get_version - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die - - # Prepare icons and .desktop files for slotting. - sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - - sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - - mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die - mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die - - if use test; then - # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - append-lfs-flags - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GMP=$(usex gmp) - -DWITH_GTESTS=$(usex test) - -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex fluid) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_NANOVDB=$(usex nanovdb) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_POTRACE=$(usex potrace) - -DWITH_PUGIXML=$(usex pugixml) - -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - if tc-is-gcc ; then - # These options only exist when GCC is detected. - # We disable these to respect the user's choice of linker. - mycmakeargs+=( - -DWITH_LINKER_GOLD=OFF - -DWITH_LINKER_LLD=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - cmake_src_install - - blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" - - cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${ED}"/* || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - - if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - # Fix doc installdir - docinto html - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_optimize "${ED}/usr/share/blender/${BV}/scripts" - - mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "changing the 'Temporary Files' directory in Blender preferences." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - - if ! use python_single_target_python3_10; then - elog "You are building Blender with a newer python version than" - elog "supported by this version upstream." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${SLOT}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-3.2.0.ebuild b/media-gfx/blender/blender-3.2.0.ebuild deleted file mode 100644 index 57cdab40f12c..000000000000 --- a/media-gfx/blender/blender-3.2.0.ebuild +++ /dev/null @@ -1,399 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -if [[ ${PV} = *9999* ]] ; then - # Subversion is needed for downloading unit test files - inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" -else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" - # Update these between major releases. - TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -SLOT="${PV%.*}" -LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - osl? ( cycles ) - test? ( color-management )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( >=media-libs/embree-3.10.0[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) - fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - >=media-gfx/openvdb-9.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-sound/pulseaudio ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -blender_get_version() { - # Get blender version from blender itself. - BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) - if ((${BV:0:1} < 3)) ; then - # Add period (290 -> 2.90). - BV=${BV:0:1}.${BV:1} - else - # Add period and skip the middle number (301 -> 3.1) - BV=${BV:0:1}.${BV:2} - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - if use test; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi - else - default - if use test; then - #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests - mkdir -p lib || die - mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die - fi - fi - -} - -src_prepare() { - cmake_src_prepare - - blender_get_version - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die - - # Prepare icons and .desktop files for slotting. - sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - - sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - - mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die - mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die - - if use test; then - # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - append-lfs-flags - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GMP=$(usex gmp) - -DWITH_GTESTS=$(usex test) - -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex fluid) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_NANOVDB=$(usex nanovdb) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_POTRACE=$(usex potrace) - -DWITH_PUGIXML=$(usex pugixml) - -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - if tc-is-gcc ; then - # These options only exist when GCC is detected. - # We disable these to respect the user's choice of linker. - mycmakeargs+=( - -DWITH_LINKER_GOLD=OFF - -DWITH_LINKER_LLD=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - cmake_src_install - - blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" - - cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${ED}"/* || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - - if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - # Fix doc installdir - docinto html - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_optimize "${ED}/usr/share/blender/${BV}/scripts" - - mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "changing the 'Temporary Files' directory in Blender preferences." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - - if ! use python_single_target_python3_10; then - elog "You are building Blender with a newer python version than" - elog "supported by this version upstream." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${SLOT}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-3.2.2.ebuild b/media-gfx/blender/blender-3.3.2.ebuild index 655e0a7145f8..fd4e11b2d91a 100644 --- a/media-gfx/blender/blender-3.2.2.ebuild +++ b/media-gfx/blender/blender-3.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,8 +18,8 @@ else SRC_URI="https://download.blender.org/source/${P}.tar.xz" # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" + #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" + KEYWORDS="amd64 ~arm ~arm64" fi SLOT="${PV%.*}" @@ -30,7 +30,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ test +tiff valgrind" -RESTRICT="!test? ( test )" +RESTRICT="!test? ( test ) test" REQUIRED_USE="${PYTHON_REQUIRED_USE} alembic? ( openexr ) @@ -50,10 +50,10 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') - media-libs/freetype:= + media-libs/freetype:=[brotli] media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= @@ -104,7 +104,7 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) " @@ -128,9 +128,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch - "${FILESDIR}"/${PN}-3.2.2-musl-glibc-prereq.patch "${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch "${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch ) blender_check_requirements() { diff --git a/media-gfx/blender/blender-3.3.0.ebuild b/media-gfx/blender/blender-3.3.3.ebuild index 57dfbf4e736a..590b1fa7fc0f 100644 --- a/media-gfx/blender/blender-3.3.0.ebuild +++ b/media-gfx/blender/blender-3.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,7 +50,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') media-libs/freetype:=[brotli] @@ -104,7 +104,7 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) " @@ -130,6 +130,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch "${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch "${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch ) blender_check_requirements() { diff --git a/media-gfx/blender/blender-3.2.1.ebuild b/media-gfx/blender/blender-3.4.1.ebuild index f8bbd1e9fbea..c77ac91a53e5 100644 --- a/media-gfx/blender/blender-3.2.1.ebuild +++ b/media-gfx/blender/blender-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ else SRC_URI="https://download.blender.org/source/${P}.tar.xz" # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" + #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" KEYWORDS="~amd64 ~arm ~arm64" fi @@ -26,9 +26,10 @@ SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" IUSE="+bullet +dds +fluid +openexr +tbb \ alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" + +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ + test +tiff valgrind wayland X" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -37,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) + optix? ( cuda ) osl? ( cycles ) test? ( color-management )" @@ -48,11 +50,11 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') - media-libs/freetype:= - media-libs/glew:* + media-libs/freetype:=[brotli] + media-libs/libepoxy:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate @@ -68,11 +70,6 @@ RDEPEND="${PYTHON_DEPS} ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) @@ -93,6 +90,7 @@ RDEPEND="${PYTHON_DEPS} >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) + optix? ( <dev-libs/optix-7.5.0 ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) @@ -101,8 +99,20 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) + wayland? ( + >=dev-libs/wayland-1.12 + >=dev-libs/wayland-protocols-1.15 + >=x11-libs/libxkbcommon-0.2.0 + media-libs/mesa[wayland] + sys-apps/dbus + ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) " DEPEND="${RDEPEND} @@ -121,8 +131,15 @@ BDEPEND=" dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) + wayland? ( + dev-util/wayland-scanner + ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch +) + blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -195,13 +212,14 @@ src_prepare() { if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die fi } src_configure() { append-lfs-flags + blender_get_version local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -217,16 +235,23 @@ src_configure() { -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) -DWITH_CYCLES_STANDALONE=OFF -DWITH_CYCLES_STANDALONE_GUI=OFF -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) + -DWITH_GHOST_WAYLAND=$(usex wayland) + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} + -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) + -DWITH_GHOST_WAYLAND_DYNLOAD=OFF + -DWITH_GHOST_WAYLAND_LIBDECOR=OFF + -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) + -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) -DWITH_INSTALL_PORTABLE=OFF -DWITH_IMAGE_DDS=$(usex dds) -DWITH_IMAGE_OPENEXR=$(usex openexr) @@ -257,13 +282,19 @@ src_configure() { -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_LZO=ON -DWITH_TBB=$(usex tbb) -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) + if use optix; then + mycmakeargs+=( + -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + ) + fi + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') if tc-is-gcc ; then diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 25a5c6b80b50..11870198acb9 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,9 +13,9 @@ HOMEPAGE="https://www.blender.org" if [[ ${PV} = *9999* ]] ; then # Subversion is needed for downloading unit test files inherit git-r3 subversion - EGIT_REPO_URI="https://git.blender.org/blender.git" + EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" + SRC_URI="https://projects.blender.org/blender/blender/archive/v${PV}.tar.gz" # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" @@ -50,7 +50,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-zstandard[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') media-libs/freetype:=[brotli] @@ -80,7 +80,7 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) + openimageio? ( >=media-libs/openimageio-2.4.6.0:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= @@ -99,7 +99,7 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.12 @@ -215,6 +215,7 @@ src_prepare() { src_configure() { append-lfs-flags + blender_get_version local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -238,6 +239,7 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD=OFF -DWITH_GHOST_WAYLAND_LIBDECOR=OFF diff --git a/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch b/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch new file mode 100644 index 000000000000..42db25179cdc --- /dev/null +++ b/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch @@ -0,0 +1,107 @@ +--- a/intern/cycles/render/volume.cpp ++++ b/intern/cycles/render/volume.cpp +@@ -259,7 +259,8 @@ void VolumeMeshBuilder::add_grid(openvdb::GridBase::ConstPtr grid, + void VolumeMeshBuilder::add_padding(int pad_size) + { + #ifdef WITH_OPENVDB +- openvdb::tools::dilateVoxels(topology_grid->tree(), pad_size); ++ openvdb::tools::dilateActiveValues( ++ topology_grid->tree(), pad_size, openvdb::tools::NN_FACE, openvdb::tools::IGNORE_TILES); + #else + (void)pad_size; + #endif +diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h +index 8b42de7303d..068cdf87d16 100644 +--- a/source/blender/blenkernel/BKE_volume.h ++++ b/source/blender/blenkernel/BKE_volume.h +@@ -104,7 +104,6 @@ typedef enum VolumeGridType { + VOLUME_GRID_INT, + VOLUME_GRID_INT64, + VOLUME_GRID_MASK, +- VOLUME_GRID_STRING, + VOLUME_GRID_VECTOR_FLOAT, + VOLUME_GRID_VECTOR_DOUBLE, + VOLUME_GRID_VECTOR_INT, +@@ -218,8 +217,6 @@ auto BKE_volume_grid_type_operation(const VolumeGridType grid_type, OpType &&op) + return op.template operator()<openvdb::Vec3IGrid>(); + case VOLUME_GRID_VECTOR_DOUBLE: + return op.template operator()<openvdb::Vec3dGrid>(); +- case VOLUME_GRID_STRING: +- return op.template operator()<openvdb::StringGrid>(); + case VOLUME_GRID_MASK: + return op.template operator()<openvdb::MaskGrid>(); + case VOLUME_GRID_POINTS: +diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc +index 39a7725bfa3..a0e2d1a83cd 100644 +--- a/source/blender/blenkernel/intern/volume.cc ++++ b/source/blender/blenkernel/intern/volume.cc +@@ -1345,9 +1345,6 @@ VolumeGridType BKE_volume_grid_type_openvdb(const openvdb::GridBase &grid) + if (grid.isType<openvdb::Vec3dGrid>()) { + return VOLUME_GRID_VECTOR_DOUBLE; + } +- if (grid.isType<openvdb::StringGrid>()) { +- return VOLUME_GRID_STRING; +- } + if (grid.isType<openvdb::MaskGrid>()) { + return VOLUME_GRID_MASK; + } +@@ -1383,7 +1380,6 @@ int BKE_volume_grid_channels(const VolumeGrid *grid) + case VOLUME_GRID_VECTOR_DOUBLE: + case VOLUME_GRID_VECTOR_INT: + return 3; +- case VOLUME_GRID_STRING: + case VOLUME_GRID_POINTS: + case VOLUME_GRID_UNKNOWN: + return 0; +@@ -1624,13 +1620,8 @@ struct CreateGridWithChangedResolutionOp { + + template<typename GridType> typename openvdb::GridBase::Ptr operator()() + { +- if constexpr (std::is_same_v<GridType, openvdb::StringGrid>) { +- return {}; +- } +- else { +- return create_grid_with_changed_resolution(static_cast<const GridType &>(grid), +- resolution_factor); +- } ++ return create_grid_with_changed_resolution(static_cast<const GridType &>(grid), ++ resolution_factor); + } + }; + +diff --git a/source/blender/blenkernel/intern/volume_render.cc b/source/blender/blenkernel/intern/volume_render.cc +index c0a205b5673..7ccf04df941 100644 +--- a/source/blender/blenkernel/intern/volume_render.cc ++++ b/source/blender/blenkernel/intern/volume_render.cc +@@ -77,7 +77,6 @@ static void extract_dense_float_voxels(const VolumeGridType grid_type, + case VOLUME_GRID_VECTOR_INT: + return extract_dense_voxels<openvdb::Vec3IGrid, openvdb::Vec3f>( + grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels)); +- case VOLUME_GRID_STRING: + case VOLUME_GRID_POINTS: + case VOLUME_GRID_UNKNOWN: + /* Zero channels to copy. */ +diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c +index 3100c1195f4..2854f02a4d4 100644 +--- a/source/blender/makesrna/intern/rna_volume.c ++++ b/source/blender/makesrna/intern/rna_volume.c +@@ -241,7 +241,6 @@ + {VOLUME_GRID_INT, "INT", 0, "Integer", "32-bit integer"}, + {VOLUME_GRID_INT64, "INT64", 0, "Integer 64-bit", "64-bit integer"}, + {VOLUME_GRID_MASK, "MASK", 0, "Mask", "No data, boolean mask of active voxels"}, +- {VOLUME_GRID_STRING, "STRING", 0, "String", "Text string"}, + {VOLUME_GRID_VECTOR_FLOAT, "VECTOR_FLOAT", 0, "Float Vector", "3D float vector"}, + {VOLUME_GRID_VECTOR_DOUBLE, "VECTOR_DOUBLE", 0, "Double Vector", "3D double vector"}, + {VOLUME_GRID_VECTOR_INT, "VECTOR_INT", 0, "Integer Vector", "3D integer vector"}, +diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc +index af3a502162d..e2d7f445731 100644 +--- a/source/blender/modifiers/intern/MOD_volume_displace.cc ++++ b/source/blender/modifiers/intern/MOD_volume_displace.cc +@@ -201,7 +201,6 @@ + template<typename GridType> void operator()() + { + if constexpr (std::is_same_v<GridType, openvdb::points::PointDataGrid> || +- std::is_same_v<GridType, openvdb::StringGrid> || + std::is_same_v<GridType, openvdb::MaskGrid>) { + /* We don't support displacing these grid types yet. */ + return; diff --git a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch deleted file mode 100644 index a572f25788de..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix build error in libc_compat when using musl libc - -Checking for the existence of and using __GLIBC_PREREQ can't be done in the -same conditional. - -Please refer: https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068 ---- a/intern/libc_compat/libc_compat.c -+++ b/intern/libc_compat/libc_compat.c -@@ -13,7 +13,8 @@ - # include <features.h> - # include <math.h> - --# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) -+# if defined(__GLIBC_PREREQ) -+# if __GLIBC_PREREQ(2, 31) - - double __exp_finite(double x); - double __exp2_finite(double x); -@@ -112,5 +113,6 @@ float __powf_finite(float x, float y) - return powf(x, y); - } - --# endif /* __GLIBC_PREREQ */ --#endif /* __linux__ */ -+# endif /* __GLIBC_PREREQ(2, 31) */ -+# endif /* __GLIBC_PREREQ */ -+#endif /* __linux__ */ diff --git a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch new file mode 100644 index 000000000000..3a544811e484 --- /dev/null +++ b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/887059 + +Adding include as suggested by the compiler: + +"intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined +in header ‘<iostream>’; did you forget to ‘#include <iostream>’?" + +--- a/intern/locale/boost_locale_wrapper.cpp ++++ b/intern/locale/boost_locale_wrapper.cpp +@@ -9,6 +9,7 @@ + #include <stdio.h> + + #include "boost_locale_wrapper.h" ++#include <iostream> + + static std::string messages_path; + static std::string default_domain; diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index f4186af89ec4..40b482d2dffe 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -1 +1 @@ -DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576 +DIST CairoSVG-2.7.0.tar.gz 8398722 BLAKE2B 00a82ec395480aba7bf1c1e2025f53ad5e3bb6336110e709f9cdb67c8a2eeafb071da0dc44aabceadd4c8c274f4560d264c101f43c89c6faa96ea47018a67f62 SHA512 7775654f55ac436c91e781a91ca9ca89826068638fdbf65b9717899dfd5d974dacc7cf2e7ee24fad1be8ded899e1c1f441137f25c2a8185b67e7ecc84c2c9c50 diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.7.0.ebuild index 9ba5be70ee6a..75d76ad0647d 100644 --- a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.7.0.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYPI_PN="CairoSVG" +PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -MY_PN="CairoSVG" -MY_P="${MY_PN}-${PV}" +inherit distutils-r1 pypi DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG" -HOMEPAGE="https://cairosvg.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" +HOMEPAGE=" + https://cairosvg.org/ + https://github.com/Kozea/CairoSVG/ + https://pypi.org/project/CairoSVG/ +" LICENSE="LGPL-3" SLOT="0" @@ -29,17 +31,8 @@ RDEPEND=" distutils_enable_tests pytest -src_prepare() { - # junk deps - sed -e '/pytest-runner/d' \ - -e '/--flake8/d' \ - -e '/--isort/d' \ - -i setup.cfg || die - +EPYTEST_IGNORE=( # this test compares output against old version; this makes little # sense for us and requires both distfiles around - rm test_non_regression/test_non_regression.py || die - eapply "${FILESDIR}"/cairosvg-2.5.1-no-ref.patch - - distutils-r1_src_prepare -} + test_non_regression +) diff --git a/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch b/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch deleted file mode 100644 index 1b2ff0eb7209..000000000000 --- a/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f79fce1d3703f2985c543575d5eb15ffb0eb7bb6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 7 Jan 2021 00:31:52 +0100 -Subject: [PATCH] Do not use reference_cairosvg - ---- - test_non_regression/__init__.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/test_non_regression/__init__.py b/test_non_regression/__init__.py -index 8876e11..4b2e29b 100644 ---- a/test_non_regression/__init__.py -+++ b/test_non_regression/__init__.py -@@ -8,12 +8,7 @@ import os - - import cairosvg - --reference_cairosvg = imp.load_source( -- 'cairosvg_reference', pathname=os.path.join( -- os.path.dirname(__file__), 'cairosvg_reference', 'cairosvg', -- '__init__.py')) -- --cairosvg.features.LOCALE = reference_cairosvg.features.LOCALE = 'en_US' -+cairosvg.features.LOCALE = 'en_US' - - TEST_FOLDER = os.path.join(os.path.dirname(__file__), 'svg') - --- -2.30.0 - diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml index 85e4ed814fa2..564627f1606c 100644 --- a/media-gfx/cellwriter/metadata.xml +++ b/media-gfx/cellwriter/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">risujin/cellwriter</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest index af59cdfe0ad9..90e03342e843 100644 --- a/media-gfx/chafa/Manifest +++ b/media-gfx/chafa/Manifest @@ -1,2 +1 @@ -DIST chafa-1.12.3.tar.xz 659136 BLAKE2B 2b9878b93c46be37fc7cfaf9ffadf58a84445b2e081c712a9824f323b0aee5725fd0b229a0a073afd0a7e3354d418669c411e02ac0f98a4e2eeaff9c19f6f93c SHA512 00d186aa3e5a184b5fe985909118fe856c7889e6674d55de6fe409f04ccac0a8698ef8063a2049e8b100ea0e9abfa5f89c959333a18cd6f934608b86f256ee5d DIST chafa-1.12.4.tar.xz 934272 BLAKE2B 57009e5b6c8cbb41643e94d224e9a4a7e3c2839ee79a6d4949b6d872ab9e10ab66fe7a609f448cad68ee930e5da84e31a1368c8f7ad6457c4c1583971f87f91e SHA512 2732ff380fc6d61124298ae3d9958d676fe6ca2887ee11df057d4efa6f4ae9c074a7e1920a6a3db1ffb21882432769967f4453d52a0344e581993984133a0e9b diff --git a/media-gfx/chafa/chafa-1.12.3.ebuild b/media-gfx/chafa/chafa-1.12.3.ebuild deleted file mode 100644 index 98ac22f2a0ca..000000000000 --- a/media-gfx/chafa/chafa-1.12.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer" -HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa" -SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv x86" -IUSE="+tools" - -RDEPEND=" - dev-libs/glib:2 - media-gfx/imagemagick:0= - tools? ( >=media-libs/freetype-2.0.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf \ - --disable-man \ - $(use_with tools) -} - -src_install() { - local DOCS=( AUTHORS NEWS README TODO ) - default - - use tools && doman docs/chafa.1 - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-gfx/chafa/chafa-1.12.4.ebuild b/media-gfx/chafa/chafa-1.12.4.ebuild index 9a2b941734b1..651857311f4a 100644 --- a/media-gfx/chafa/chafa-1.12.4.ebuild +++ b/media-gfx/chafa/chafa-1.12.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="+tools" RDEPEND=" diff --git a/media-gfx/colorhug-client/Manifest b/media-gfx/colorhug-client/Manifest deleted file mode 100644 index 4d492ff8b8ad..000000000000 --- a/media-gfx/colorhug-client/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST colorhug-client-0.2.8.tar.xz 886652 BLAKE2B 5a52cd3763225dd1ffc04f8ddd04c8e23b573660711b79f181f8dcf369be2f56cdea876fd37206124f8b9416c507d98493c00e3a02745795cb9eea18bd688c58 SHA512 99a012614b9364738a417e9cf8719811520f2ae2fab7dc1b1aa0ca4dfdbf3e3b2a06ed6763400a5ed34311797f14093af988dd6335d626b7e4a00c03d64c0356 diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild deleted file mode 100644 index 8113155736ce..000000000000 --- a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 xdg - -DESCRIPTION="Client tools for the ColorHug display colorimeter" -HOMEPAGE="http://www.hughski.com/" -SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -# Tests need valgrind, that needs glibc with debugging symbols -RESTRICT="test" - -RDEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.31.10:2 - >=dev-libs/libgusb-0.2.2 - media-libs/lcms:2 - >=media-libs/libcanberra-0.10[gtk3] - net-libs/libsoup:2.4 - >=x11-libs/gtk+-3.11.2:3 - >=x11-misc/colord-1.2.9:0= - >=x11-libs/colord-gtk-0.1.24" -DEPEND="${RDEPEND}" -# docbook stuff needed for man pages -BDEPEND=" - app-text/docbook-sgml-dtd:4.1 - app-text/docbook-sgml-utils - app-text/yelp-tools - >=dev-util/intltool-0.50 - >=sys-devel/gettext-0.17 - virtual/pkgconfig" - -src_configure() { - # introspection checked but not needed by anything - # Install completions manually to prevent dependency on bash-completion, bug #546166 - econf --disable-introspection --disable-bash-completion -} - -src_install() { - default - dobashcomp data/bash/colorhug-cmd -} diff --git a/media-gfx/colorhug-client/metadata.xml b/media-gfx/colorhug-client/metadata.xml deleted file mode 100644 index 4532d21566a6..000000000000 --- a/media-gfx/colorhug-client/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">hughski/colorhug-client</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index fe291bccc79d..725f9fcb6224 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,3 +1,2 @@ -DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63 -DIST converseen-0.9.9.6.tar.gz 290947 BLAKE2B 56772a2c1f55952d7531311fd1a915084810038677c91616e791cf99085cfb6548fd7d6aa86336ba3df2770c1ffd866523e9f96d3c0d572bc52246d81fb2b6cd SHA512 77b93752085f0f8ab086a30d8c327eb476756e1069736874ec914f99ac64b1fb5c8abd9a4ef7fc45d21edf7c1223c3c5e4e738755f6a71a997374622c98dc78e +DIST converseen-0.9.10.0.tar.gz 769693 BLAKE2B 651edf41b6cdf010fdae47d457f2459c4e99a1657302bc4facfbd70bd7d7b7b85842290b74ea76a396fa75ca5f5398234d309aae179704ce40f1dbb61195835c SHA512 c2ee7c59685879dffcb6f3f4ef9267cb611d358bec21ecd57b90bbc7fa86a07b4aa8dd855956970b35ec671c57b8bbc4d0620c2cb5629a36ca4305e47f4d3b59 DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208 diff --git a/media-gfx/converseen/converseen-0.9.9.6.ebuild b/media-gfx/converseen/converseen-0.9.10.0.ebuild index 17f9357eeb89..65c784520ec8 100644 --- a/media-gfx/converseen/converseen-0.9.9.6.ebuild +++ b/media-gfx/converseen/converseen-0.9.10.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake xdg-utils DESCRIPTION="Batch image converter and resizer based on ImageMagick" HOMEPAGE="https://converseen.fasterland.net/ @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug" # FIXME: graphicsmagick dependency does not work properly, failures when compiling @@ -43,4 +43,10 @@ pkg_postinst() { elog "the respective policies in /etc/ImageMagick-7/policy.xml." elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting" elog "for more information." + + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update } diff --git a/media-gfx/converseen/converseen-0.9.9.0.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild deleted file mode 100644 index 56b91c7a0cc6..000000000000 --- a/media-gfx/converseen/converseen-0.9.9.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Batch image converter and resizer based on ImageMagick" -HOMEPAGE="https://converseen.fasterland.net/ - https://github.com/Faster3ck/Converseen/" -SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug" - -# FIXME: graphicsmagick dependency does not work properly, failures when compiling -# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] ) -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-gfx/imagemagick:=[cxx] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/${P^}" - -PATCHES=( - "${FILESDIR}/${P}-gnuinstalldirs.patch" - "${FILESDIR}/${P}-appdata-path.patch" - "${FILESDIR}/${P}-no-update.patch" -) diff --git a/media-gfx/converseen/converseen-0.9.9.8.ebuild b/media-gfx/converseen/converseen-0.9.9.8.ebuild index c0754ac324ad..e33a03bbc62c 100644 --- a/media-gfx/converseen/converseen-0.9.9.8.ebuild +++ b/media-gfx/converseen/converseen-0.9.9.8.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug" # FIXME: graphicsmagick dependency does not work properly, failures when compiling diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch deleted file mode 100644 index 50ad7a01e8db..000000000000 --- a/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Tue, 9 Jan 2018 02:06:09 +0100 -Subject: [PATCH] Use GNUInstalldirs - -No need to reinvent the wheel, make use of standards provided by cmake. ---- - CMakeLists.txt | 40 +++++++++++++++++++++------------------- - 1 file changed, 21 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f135b66..4bd8764 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6) - SET(GUI "converseen")
- SET(QT_USE_QTNETWORK TRUE)
-
-+include(GNUInstallDirs)
-+
- ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
-
- SET(converseen_UIS
-@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI} -
- TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
-
--install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
--install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
--install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
--install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
--install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-+install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
-+install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
--- -2.30.1 - diff --git a/media-gfx/cropgui/cropgui-0.6-r1.ebuild b/media-gfx/cropgui/cropgui-0.6-r1.ebuild index a6ed3045eaea..d207157cdecc 100644 --- a/media-gfx/cropgui/cropgui-0.6-r1.ebuild +++ b/media-gfx/cropgui/cropgui-0.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10} ) inherit python-r1 desktop wrapper xdg-utils DESCRIPTION="GUI for lossless cropping of jpeg images" diff --git a/media-gfx/cropgui/cropgui-0.6-r2.ebuild b/media-gfx/cropgui/cropgui-0.6-r2.ebuild new file mode 100644 index 000000000000..8526868539b5 --- /dev/null +++ b/media-gfx/cropgui/cropgui-0.6-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11} ) +inherit python-r1 desktop wrapper xdg-utils + +DESCRIPTION="GUI for lossless cropping of jpeg images" +HOMEPAGE="https://emergent.unpythonic.net/01248401946" +SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]" + +install_cropgui_wrapper() { + python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade + make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py" + python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}" + rm "${ED}/usr/bin/${PN}.tmp" || die +} + +src_install() { + python_moduleinto "${PN}" + python_foreach_impl install_cropgui_wrapper + + domenu "${PN}.desktop" + doicon "${PN}.png" +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild b/media-gfx/cura/cura-4.13.1-r1.ebuild index 16827db993ac..2d88c216d7bf 100644 --- a/media-gfx/cura/cura-4.13.1-r1.ebuild +++ b/media-gfx/cura/cura-4.13.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,7 +52,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/shapely[${PYTHON_USEDEP}] dev-python/trimesh[${PYTHON_USEDEP}] usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/python-zeroconf[${PYTHON_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] ) ')" DEPEND="${RDEPEND}" diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest new file mode 100644 index 000000000000..038023e9dd0a --- /dev/null +++ b/media-gfx/curtail/Manifest @@ -0,0 +1 @@ +DIST curtail-1.3.1.tar.gz 176042 BLAKE2B 0757c3c3eed24fea8f1493021d30df40fd8c78dad3bfd7f63cfaa83f36d36f69c47ba4e41a53a7a4299d436fb978ae3fc31afa07b5a1c9d82a6400a17c104966 SHA512 47d1b3939eaeaa3d27c497318bc80d0b7cb1c2674d66ed17c8cc5e6206b3efce7867ff01542b40ee6a4b4127160f2baed084b5b99cf518f2438dcf53af425f89 diff --git a/media-gfx/curtail/curtail-1.3.1.ebuild b/media-gfx/curtail/curtail-1.3.1.ebuild new file mode 100644 index 000000000000..c0e081c90a01 --- /dev/null +++ b/media-gfx/curtail/curtail-1.3.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit gnome2-utils meson python-single-r1 xdg + +DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP" +HOMEPAGE="https://github.com/Huluti/Curtail/" +SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${P^} + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="test" # Just desktop / schema / appstream file validation (fails). + +RDEPEND=" + ${PYTHON_DEPS} + >=x11-libs/gtk+-3.20:3[introspection] + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') +" +BDEPEND=" + ${RDEPEND} + dev-libs/appstream-glib + dev-util/desktop-file-utils +" +RDEPEND+=" + media-gfx/jpegoptim + media-gfx/optipng + media-gfx/pngquant + media-libs/libwebp +" + +DOCS=( CHANGELOG.md README.md ) + +src_prepare() { + sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die + + default +} + +src_install() { + meson_src_install + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/curtail/metadata.xml b/media-gfx/curtail/metadata.xml new file mode 100644 index 000000000000..f46007665087 --- /dev/null +++ b/media-gfx/curtail/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription> + Curtail (previously ImCompressor) is an useful image compressor, supporting + PNG, JPEG and WebP file types. It support both lossless and lossy + compression modes with an option to whether keep or not metadata of images. + It is inspired by Trimage and Image-Optimizer. + </longdescription> + <upstream> + <changelog>https://raw.githubusercontent.com/Huluti/Curtail/master/CHANGELOG.md</changelog> + <bugs-to>https://github.com/Huluti/Curtail/issues/</bugs-to> + <remote-id type="github">Huluti/Curtail</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 7aff2c667aa5..13913dd738a1 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,3 +1,6 @@ DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729 +DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618 SHA512 789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c SHA512 e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846 +DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88 SHA512 a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531 +DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b SHA512 ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61 diff --git a/media-gfx/darktable/darktable-4.0.1.ebuild b/media-gfx/darktable/darktable-4.0.1-r1.ebuild index fcd47002d330..1597b944fbd4 100644 --- a/media-gfx/darktable/darktable-4.0.1.ebuild +++ b/media-gfx/darktable/darktable-4.0.1-r1.ebuild @@ -39,6 +39,16 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" +# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite] +# in BDEPEND. This has not been done *on purpose*, for the following reason: +# - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, +# in BDEPEND too +# - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which +# by default pull in sys-devel/clang +# - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op +# (and curiously enough, empirical observations suggest current versions of Portage are +# more likely to pull in Clang to build darktable with than to request enabling USE=graphite +# on GCC; that might be a bug though) BDEPEND="dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) @@ -47,14 +57,14 @@ DEPEND="dev-db/sqlite:3 dev-libs/icu:= dev-libs/json-glib dev-libs/libxml2:2 - >=dev-libs/pugixml-1.8:0= + >=dev-libs/pugixml-1.8:= gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:0=[xmp] + >=media-gfx/exiv2-0.25-r2:=[xmp] media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:0= + >=media-libs/lensfun-0.2.3:= media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= @@ -62,7 +72,7 @@ DEPEND="dev-db/sqlite:3 >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2:= ) - colord? ( x11-libs/colord-gtk:0= ) + colord? ( x11-libs/colord-gtk:= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) gamepad? ( media-libs/libsdl2 ) @@ -77,7 +87,7 @@ DEPEND="dev-db/sqlite:3 midi? ( media-libs/portmidi ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:= ) - webp? ( media-libs/libwebp:0= )" + webp? ( media-libs/libwebp:= )" RDEPEND="${DEPEND} kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" @@ -95,8 +105,11 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bug #695658 if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" + if ! test-flags-CC -floop-block &> /dev/null; then + eerror "Building ${PN} with GCC requires Graphite support." + eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler." + die "Selected compiler is sys-devel/gcc[-graphite]" + fi fi use openmp && tc-check-openmp diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild b/media-gfx/darktable/darktable-4.2.1.ebuild new file mode 100644 index 000000000000..0c74ea008ae7 --- /dev/null +++ b/media-gfx/darktable/darktable-4.2.1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) + +inherit cmake flag-o-matic lua-single toolchain-funcs xdg + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="https://www.darktable.org/" +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" + + LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" +else + DOC_PV=$(ver_cut 1-2) + MY_PV="${PV/_/}" + MY_P="${P/_/.}" + + SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( + https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf + l10n_uk? ( + https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf + -> ${PN}-usermanual-${DOC_PV}.uk.pdf + ) + )" + + KEYWORDS="amd64 ~arm64 -x86" + LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN zh-TW" +fi + +IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp + ${LANGS// / l10n_}" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite] +# in BDEPEND. This has not been done *on purpose*, for the following reason: +# - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, +# in BDEPEND too +# - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which +# by default pull in sys-devel/clang +# - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op +# (and curiously enough, empirical observations suggest current versions of Portage are +# more likely to pull in Clang to build darktable with than to request enabling USE=graphite +# on GCC; that might be a bug though) +BDEPEND="dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( >=dev-python/jsonschema-3.2.0 )" +DEPEND="dev-db/sqlite:3 + dev-libs/icu:= + dev-libs/json-glib + dev-libs/libxml2:2 + >=dev-libs/pugixml-1.8:= + gnome-base/librsvg:2 + >=media-gfx/exiv2-0.25-r2:=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + net-libs/libsoup:2.4 + net-misc/curl + sys-libs/zlib:= + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + x11-libs/pango + avif? ( >=media-libs/libavif-0.8.2:= ) + colord? ( x11-libs/colord-gtk:= ) + cups? ( net-print/cups ) + flickr? ( media-libs/flickcurl ) + gamepad? ( media-libs/libsdl2 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gmic? ( media-gfx/gmic ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + heif? ( media-libs/libheif:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + lua? ( ${LUA_DEPS} ) + midi? ( media-libs/portmidi ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:= ) + webp? ( media-libs/libwebp:= )" +RDEPEND="${DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch + "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch + "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch + "${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch +) + +S="${WORKDIR}/${P/_/~}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + # Bug #695658 + if tc-is-gcc; then + if ! test-flags-CC -floop-block &> /dev/null; then + eerror "Building ${PN} with GCC requires Graphite support." + eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler." + die "Selected compiler is sys-devel/gcc[-graphite]" + fi + fi + + use openmp && tc-check-openmp + fi +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use lua && lua-single_pkg_setup +} + +src_prepare() { + use cpu_flags_x86_avx && append-flags -mavx + use cpu_flags_x86_sse3 && append-flags -msse3 + + sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CURVE_TOOLS=$(usex tools) + -DBUILD_NOISE_TOOLS=$(usex tools) + -DBUILD_PRINT=$(usex cups) + -DCUSTOM_CFLAGS=ON + -DDONT_USE_INTERNAL_LUA=ON + -DRAWSPEED_ENABLE_LTO=$(usex lto) + -DRAWSPEED_ENABLE_WERROR=OFF + -DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl) + -DTESTBUILD_OPENCL_PROGRAMS=OFF + -DUSE_AVIF=$(usex avif) + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_FLICKR=$(usex flickr) + -DUSE_GMIC=$(usex gmic) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_LUA=$(usex lua) + -DUSE_MAP=$(usex geolocation) + -DUSE_NLS=$(usex nls) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENEXR=$(usex openexr) + -DUSE_OPENJPEG=$(usex jpeg2k) + -DUSE_OPENMP=$(usex openmp) + -DUSE_PORTMIDI=$(usex midi) + -DUSE_SDL2=$(usex gamepad) + -DUSE_WEBP=$(usex webp) + -DWANT_JSON_VALIDATION=$(usex test) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # This USE flag is masked for -9999 + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf + + if use nls; then + for lang in ${LANGS} ; do + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi + done + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + elog + elog "When updating a major version," + elog "please bear in mind that your edits will be preserved during this process," + elog "but it will not be possible to downgrade any more." + elog + ewarn "It will not be possible to downgrade!" + ewarn +} diff --git a/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch new file mode 100644 index 000000000000..f6985f609fbd --- /dev/null +++ b/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch @@ -0,0 +1,44 @@ +Binary files darktable-4.2.0.orig/.DefineOptions.cmake.swp and darktable-4.2.0/.DefineOptions.cmake.swp differ +diff -ru darktable-4.2.0.orig/DefineOptions.cmake darktable-4.2.0/DefineOptions.cmake +--- darktable-4.2.0.orig/DefineOptions.cmake 2022-12-21 20:32:43.490671000 +0100 ++++ darktable-4.2.0/DefineOptions.cmake 2022-12-21 20:33:13.413673557 +0100 +@@ -41,6 +41,7 @@ + option(USE_ICU "Use ICU - International Components for Unicode." ON) + option(USE_GAME "Build 1st April easter egg game" ON) + option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF) ++option(USE_SDL2 "Enable SDL2 support" ON) + + if (USE_OPENCL) + option(TESTBUILD_OPENCL_PROGRAMS "Test-compile opencl programs (needs llvm and clang 3.9+)" ON) +Only in darktable-4.2.0/src/libs: .CMakeLists.txt.swp +diff -ru darktable-4.2.0.orig/src/libs/CMakeLists.txt darktable-4.2.0/src/libs/CMakeLists.txt +--- darktable-4.2.0.orig/src/libs/CMakeLists.txt 2022-12-21 20:32:43.485670999 +0100 ++++ darktable-4.2.0/src/libs/CMakeLists.txt 2022-12-21 20:34:59.240682599 +0100 +@@ -84,6 +84,7 @@ + add_library(timeline MODULE "tools/timeline.c") + add_library(image_infos MODULE "tools/image_infos.c") + ++if (USE_PORTMIDI) + if(PortMidi_FOUND) + add_definitions("-DHAVE_PORTMIDI") + include_directories(${PortMidi_INCLUDE_DIR}) +@@ -91,8 +92,10 @@ + add_library(midi MODULE "tools/midi.c") + target_link_libraries (midi ${PortMidi_LIBRARY}) + endif() ++endif() + +-find_package(SDL2) ++if (USE_SDL2) ++find_package(SDL2 REQUIRED) + if(SDL2_FOUND) + add_definitions("-DHAVE_SDL") + set(MODULES ${MODULES} gamepad) +@@ -104,6 +107,7 @@ + target_link_libraries(gamepad ${SDL2_LIBRARIES}) + endif() + endif() ++endif() + + if(BUILD_BATTERY_INDICATOR) + add_library(battery_indicator MODULE "tools/battery_indicator.c") diff --git a/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch new file mode 100644 index 000000000000..33ad7f647752 --- /dev/null +++ b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch @@ -0,0 +1,22 @@ +--- a/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake ++++ b/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake +@@ -2,7 +2,7 @@ + + unset(RAWSPEED_CACHELINESIZE) + +-if(BINARY_PACKAGE_BUILD) ++if(BINARY_PACKAGE_BUILD OR RAWSPEED_MUSL_SYSTEM) + message(STATUS "Performing binary package build, using hardcoded value.") + else() + try_run(RAWSPEED_CACHELINESIZE_EXITCODE RAWSPEED_CACHELINESIZE_COMPILED +--- a/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp ++++ b/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp +@@ -4,7 +4,7 @@ + #include <unistd.h> // for _POSIX_C_SOURCE, sysconf, _SC_PAGESIZE + #endif + +-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(__APPLE__) ++#if defined(_SC_PAGESIZE) + + int main() { + long val = ::sysconf(_SC_PAGESIZE); diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml index bf52d8de9b94..c20058315b0b 100644 --- a/media-gfx/darktable/metadata.xml +++ b/media-gfx/darktable/metadata.xml @@ -15,7 +15,6 @@ <flag name="gamepad">Support using game controllers as input devices</flag> <flag name="geolocation">Enable geotagging support</flag> <flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag> <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag> <flag name="lto">Enable link-time optimisations in the RawSpeed library</flag> <flag name="midi">Support using MIDI input devices such as Behringer X-Touch Mini, Arturia Beatstep or Korg nanoKONTROL2, as input devices</flag> diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 6703c14f46c2..5586cc5e3cd7 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1 +1,2 @@ -DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc +DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27 +DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B 222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863 SHA512 6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6 diff --git a/media-gfx/digikam/digikam-7.10.0.ebuild b/media-gfx/digikam/digikam-7.10.0.ebuild new file mode 100644 index 000000000000..3e705737e624 --- /dev/null +++ b/media-gfx/digikam/digikam-7.10.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.88.0 +QTMIN=5.15.5 +inherit ecm kde.org toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_URI="mirror://kde/unstable/${PN}/" + else + SRC_URI="mirror://kde/stable/${PN}/${PV}/" + fi + SRC_URI+="digiKam-${PV/_/-}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +SLOT="5" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop X" + +# 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/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[mysql?] + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${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:=[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:= + addressbook? ( + =kde-apps/akonadi-contacts-22*: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:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=kde-apps/marble-19.04.3:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + ) + opengl? ( + >=dev-qt/qtopengl-${QTMIN}:5 + virtual/opengl + ) + panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) + scanner? ( >=kde-apps/libksane-19.04.3:5 ) + semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server(+)] ) + panorama? ( media-gfx/hugin ) +" +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" + +PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) + +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_TESTING=OFF # bug 698192 + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited + -DENABLE_QWEBENGINE=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake_use_find_package calendar KF5CalendarCore) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif Libheif) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + $(cmake_use_find_package marble Marble) + -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) + -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/media-gfx/digikam/digikam-7.8.0-r1.ebuild b/media-gfx/digikam/digikam-7.9.0-r1.ebuild index 27e1478148f2..72affdeb5cb8 100644 --- a/media-gfx/digikam/digikam-7.8.0-r1.ebuild +++ b/media-gfx/digikam/digikam-7.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="digiKam-${PV/_/-}.tar.xz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~x86" S="${WORKDIR}/${PN}-${PV/_/-}" fi @@ -57,9 +57,9 @@ COMMON_DEPEND=" media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/liblqr - media-libs/libpng:0= + media-libs/libpng:= >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:0 + media-libs/tiff:= addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-frameworks/kcontacts-${KFMIN}:5 @@ -109,7 +109,7 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index f9e911779429..6487230a6588 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -13,7 +13,6 @@ </upstream> <use> <flag name="addressbook">Enable akonadi contact integration</flag> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag> <flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag> <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag> <flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag> diff --git a/media-gfx/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest new file mode 100644 index 000000000000..9eff15b5ee37 --- /dev/null +++ b/media-gfx/displaycal-py3/Manifest @@ -0,0 +1 @@ +DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5 diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild new file mode 100644 index 000000000000..0aef7b5146ef --- /dev/null +++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 xdg + +MY_PN="DisplayCAL" +MY_P="${MY_PN}-${PV}" + +SRC_URI="https://github.com/eoyilmaz/displaycal-py3/releases/download/${PV}/${MY_P}.tar.gz" +KEYWORDS="~amd64" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Modernize the DisplayCAL code including Python 3 support" +HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3" + +LICENSE="GPL-3" +SLOT="0" +IUSE="" + +RESTRICT="test" + +DEPEND=" + dev-python/build[${PYTHON_USEDEP}] + dev-python/certifi:0[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pychromecast[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/zeroconf[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}] + media-gfx/argyllcms + x11-libs/libXxf86vm" + +RDEPEND="${DEPEND}" + +src_prepare() { + # Fix QA warning + sed -e 's/license_file/license_files/g' -i setup.cfg || die + + # Remove x-world MIME + sed -i 's|x-world/x-vrml;||g' \ + misc/displaycal-vrml-to-x3d-converter.desktop || die + + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + + # Use Gentoo package name for doc folder + mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${P}" || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/displaycal-py3/metadata.xml b/media-gfx/displaycal-py3/metadata.xml new file mode 100644 index 000000000000..6ee5175df506 --- /dev/null +++ b/media-gfx/displaycal-py3/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sarnex@gentoo.org</email> + <name>Nick Sarnie</name> + </maintainer> + <upstream> + <remote-id type="github">eoyilmaz/displaycal-py3</remote-id> + </upstream> + <longdescription> + This project intended to modernize the DisplayCAL code including Python 3 support. + Florian Höch, the original developer, did an incredible job of creating and maintaining DisplayCAL for all these years. + But, it seems that, during the pandemic, very understandably, he lost his passion to the project. + Now, it is time for us, the DisplayCAL community, to contribute back to this great tool. + </longdescription> +</pkgmetadata> diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild deleted file mode 100644 index 01b00f7ac852..000000000000 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Image Blending with Multiresolution Splines" -HOMEPAGE="http://enblend.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+ FDL-1.2+" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" - -REQUIRED_USE="tcmalloc? ( !debug )" - -BDEPEND=" - sys-apps/help2man - virtual/pkgconfig - doc? ( - dev-lang/perl - dev-perl/Readonly - dev-tex/hevea - gnome-base/librsvg - media-gfx/graphviz - media-gfx/transfig - sci-visualization/gnuplot[gd] - virtual/imagemagick-tools - virtual/latex-base - ) -" -RDEPEND=" - media-libs/lcms:2 - media-libs/openexr:= - media-libs/tiff:0 - media-libs/vigra[openexr] - sci-libs/gsl:= - debug? ( dev-libs/dmalloc ) - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND="${RDEPEND} - dev-libs/boost - media-libs/libpng:0 - virtual/jpeg:0 -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-gcc-10.patch -) - -src_prepare() { - cmake_src_prepare - - sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) - -DENABLE_DMALLOC=$(usex debug) - -DDOC=$(usex doc) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_TCMALLOC=$(usex tcmalloc) - ) - if use doc; then - mycmakeargs+=( - -DINSTALL_HTML_DOC=ON - -DINSTALL_PDF_DOC=ON - ) - fi - - cmake_src_configure -} - -src_compile() { - # To allow icon resizing with renderers (no way to disable) - addpredict /dev/dri - - # To compile fonts in the temp directory - export VARTEXFONTS="${T}/fonts" - - # forcing -j1 as every parallel compilation process needs about 1 GB RAM. - cmake_src_compile -j1 -} diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r2.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild index 18ebf6ae01c7..2871a62a8325 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r2.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" REQUIRED_USE="tcmalloc? ( !debug )" @@ -33,7 +33,7 @@ BDEPEND=" " RDEPEND=" media-libs/lcms:2 - media-libs/tiff:0 + media-libs/tiff:= media-libs/vigra[openexr] sci-libs/gsl:= debug? ( dev-libs/dmalloc ) @@ -49,6 +49,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch "${FILESDIR}"/${P}-cmake.patch "${FILESDIR}"/${P}-gcc-10.patch + "${FILESDIR}"/${P}-doc-scaleable-fonts.patch ) src_prepare() { diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch new file mode 100644 index 000000000000..638cd8c1ecbb --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch @@ -0,0 +1,16 @@ +Use scaleable fonts. + +Bug: https://bugs.gentoo.org/888025 + +diff -Naur enblend-4.2.0_p20161007.org/doc/static-preamble.tex enblend-4.2.0_p20161007/doc/static-preamble.tex +--- enblend-4.2.0_p20161007.org/doc/static-preamble.tex 2016-09-24 11:29:40.000000000 +0200 ++++ enblend-4.2.0_p20161007/doc/static-preamble.tex 2022-12-27 07:30:42.966176272 +0100 +@@ -5,6 +5,8 @@ + \RequirePackage[l2tabu, orthodox]{nag} + + ++\usepackage[T1]{fontenc} ++\usepackage{lmodern} % scaleable fonts + \usepackage{amsmath} % align, align* + \usepackage{bold-extra} % Bold typewriter for programming language keywords + \usepackage{color} % \colorbox diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0-r2.ebuild index 0dca334b8484..f9cac710c4b3 100644 --- a/media-gfx/entangle/entangle-3.0.ebuild +++ b/media-gfx/entangle/entangle-3.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome2-utils meson python-single-r1 xdg-utils @@ -27,9 +27,9 @@ DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 - >=media-libs/libraw-0.9.0 + >=media-libs/libraw-0.9.0:= >=x11-libs/gdk-pixbuf-2.12.0:2 - >=x11-libs/gtk+-3.22:3[introspection] + >=x11-libs/gtk+-3.22:3[X,introspection] >=x11-libs/libXext-1.3.0 >=x11-libs/pango-1.40.11 x11-themes/adwaita-icon-theme diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest index 3467a3748b47..56028714af99 100644 --- a/media-gfx/eog-plugins/Manifest +++ b/media-gfx/eog-plugins/Manifest @@ -1,2 +1,2 @@ -DIST eog-plugins-42.1.tar.xz 131656 BLAKE2B e561e7b31daf950c1e1c1e1038bf40101b658583160439f7fd9050b52da2f6dd943105e1e1eeaefff7ed2aa759f8b96aad0a65130daba038733967db37158bfc SHA512 4688cb9cce044137717521a3ff2f769f960f12ec8b3f711971f276334f91915c8a3142aff2feb3d24d2eeb86223f040e9b699a1136e7fc7e96202a06b1cda1a8 -DIST eog-plugins-42.2.tar.xz 131708 BLAKE2B 7df06ca7d4d10e068b6d758ec3c29fe8cb7a2037755bab55536f1cd3581790f7a1288a9530f256df3d2adbf6d7f8c893907fa962be8adb77510cab8e9684298c SHA512 7508231c1a6b365acfedd73b37911d5ac4194e6b5c4f5d80be27529ec749774d61ddc75288f8678d879f0cc2d9117a5f725092efe30403b5b3e145c77fa3030d +DIST eog-plugins-42.3.tar.xz 134284 BLAKE2B 903ee1af89d48c46ab12d1330b4605cd78db573d59d5fc6ba34c27a8b017ce90c2af0b55009e5ecec61229dbdd8852bc4ecc5b10e6a2d2391c06e8244f7b24da SHA512 af680fe7cc83d3b3ae6782127edf90cf2a89093030f15d22fe5ff81eb165a493dc487b32a41383c36b72ce188c8f49b3f52ca3b991d24faa9667b0317bff414f +DIST eog-plugins-44.0.tar.xz 134544 BLAKE2B db384d949f2a63cb0fcdf1bdfb8ed4c5c97af88d21079af5de7560b3c3bab231a6361ae459727a9b9f31b49e63f7cd227f465a1a7b8e2bc55e8d7a08f0335ed9 SHA512 2955830aa60a3518869ec1af7a9f0c455277b0a571cb14a5e5926b52b80ed0443e91f28e270feffcf26066e1e9b6080c9a457b55175051c20838c8b80e2da195 diff --git a/media-gfx/eog-plugins/eog-plugins-42.2.ebuild b/media-gfx/eog-plugins/eog-plugins-42.3.ebuild index 38881c4bd791..8ba171be1b8b 100644 --- a/media-gfx/eog-plugins/eog-plugins-42.2.ebuild +++ b/media-gfx/eog-plugins/eog-plugins-42.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org meson python-single-r1 @@ -51,10 +51,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PV}-build-Use-correct-variables.patch -) - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild b/media-gfx/eog-plugins/eog-plugins-44.0.ebuild index 606145157af2..1a40b2451460 100644 --- a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild +++ b/media-gfx/eog-plugins/eog-plugins-44.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org meson python-single-r1 @@ -11,9 +11,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.or LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" -IUSE="+exif map picasa +python" +IUSE="+exif map picasa +python test" +RESTRICT="!test? ( test )" REQUIRED_USE=" map? ( exif ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -21,8 +22,8 @@ REQUIRED_USE=" RDEPEND=" >=dev-libs/glib-2.53.4:2 - >=dev-libs/libpeas-1.14.1:= - >=media-gfx/eog-41.0 + >=dev-libs/libpeas-1.14.1 + >=media-gfx/eog-41.0:1 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] @@ -43,7 +44,8 @@ RDEPEND=" x11-libs/pango[introspection] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-libs/appstream-glib )" BDEPEND=" >=sys-devel/gettext-0.19.7 virtual/pkgconfig diff --git a/media-gfx/eog-plugins/files/42.2-build-Use-correct-variables.patch b/media-gfx/eog-plugins/files/42.2-build-Use-correct-variables.patch deleted file mode 100644 index 5bf08c190392..000000000000 --- a/media-gfx/eog-plugins/files/42.2-build-Use-correct-variables.patch +++ /dev/null @@ -1,79 +0,0 @@ -https://gitlab.gnome.org/GNOME/eog-plugins/-/merge_requests/8 - -From 00d734931a911e072c22b60028f361ee3f6cad14 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sat, 24 Sep 2022 11:25:25 -0400 -Subject: [PATCH] build: Use correct variables - -Bug: https://bugs.gentoo.org/858089 ---- - plugins/fit-to-width/meson.build | 2 +- - plugins/light-theme/meson.build | 2 +- - plugins/map/meson.build | 4 ++-- - plugins/send-by-mail/meson.build | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/plugins/fit-to-width/meson.build b/plugins/fit-to-width/meson.build -index 37732d1..e9654c0 100644 ---- a/plugins/fit-to-width/meson.build -+++ b/plugins/fit-to-width/meson.build -@@ -46,7 +46,7 @@ if appstream_util.found() - args: [ - 'validate', - '--nonet', -- exifdisplay_appdata.full_path(), -+ fittowidth_appdata.full_path(), - ] - ) - endif -diff --git a/plugins/light-theme/meson.build b/plugins/light-theme/meson.build -index 044b08a..fb86cdc 100644 ---- a/plugins/light-theme/meson.build -+++ b/plugins/light-theme/meson.build -@@ -46,7 +46,7 @@ if appstream_util.found() - args: [ - 'validate', - '--nonet', -- exifdisplay_appdata.full_path(), -+ lighttheme_appdata.full_path(), - ] - ) - endif -diff --git a/plugins/map/meson.build b/plugins/map/meson.build -index d969e96..c8f5c41 100644 ---- a/plugins/map/meson.build -+++ b/plugins/map/meson.build -@@ -36,7 +36,7 @@ i18n.merge_file( - install_dir: pluginlibdir, - ) - --exifdisplay_appdata = i18n.merge_file( -+map_appdata = i18n.merge_file( - input: 'eog-map.appdata.xml.in', - output: '@BASENAME@', - po_dir: src_root / 'po', -@@ -52,7 +52,7 @@ if appstream_util.found() - args: [ - 'validate', - '--nonet', -- exifdisplay_appdata.full_path(), -+ map_appdata.full_path(), - ] - ) - endif -diff --git a/plugins/send-by-mail/meson.build b/plugins/send-by-mail/meson.build -index f7eb0fb..7bba7a1 100644 ---- a/plugins/send-by-mail/meson.build -+++ b/plugins/send-by-mail/meson.build -@@ -47,7 +47,7 @@ if appstream_util.found() - args: [ - 'validate', - '--nonet', -- exifdisplay_appdata.full_path(), -+ sendbymail_appdata.full_path(), - ] - ) - endif --- -2.35.1 - diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index e7b948b4acae..107a56462e40 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,3 +1,3 @@ -DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45 -DIST eog-43.0.tar.xz 4461552 BLAKE2B 3afc0da472e9b57d6cde097c0aad08d2880ba596eb94cf8091fa99b802a2c11ee87e04b617f65e31bf11bf8885c92023dbb422ad58c2a768995eb5676b993d30 SHA512 ee9de8469f408a247577e71854cb45e0a8058f8ffd3cc42bbead67994862179d24bf9fbf7d8e18ba20ac13b3a11479053b87abe7da07358f5816d0f94b1f4f8d -DIST eog-43.1.tar.xz 4649476 BLAKE2B 0c7225f8f7fd60ff66469c43a0d11c15fa26956cf22706ee5d2a8c06597a8b4ef51a7d3754cde968bf2f98301d5f59326db05213217c7012fe193c57f0ce04ef SHA512 10fd4f6ad07d5a0c13931cb47c3a16d208eb6aa107f288e32fa0f1fd711d17893be9d9980fa64fa530047da131ef4e10d729421ac46d3549a9ab731be45479bc +DIST eog-43.2.tar.xz 4655416 BLAKE2B 9909fc3da58541191b25959be20e53987f5633c97e003b0c97c4029a7cd6084d3675d75584664a023ca45897982d3cfe2668b6dc94a34b22a249b15a87307470 SHA512 aa3bb2e2684140f6a35770f6f6b80f64f09ff0f36f25ddc561c9cbbf6f22fdb4bbb1a48392a29d59dcf4852c224146ac847c62c8196e9198b34e7015bf4bb760 +DIST eog-44.0.tar.xz 4655396 BLAKE2B 96cedcd03bf29c5052566b6a52b901d30f6d4d8a1950caa20b99cb0df2f97da8422c4884def724f441cf01f071d0caadd803e7e7cfa2b6ed2d3073c66cd825d2 SHA512 8bd54b53100c0a8e596dec070f8a711fbc2a0caf396afb5b2d8ba45f86215c1823736a3b898d0460ac91204d1cf1a492ec993e66a025af167e3dc4aec3149b2d +DIST eog-44.beta.tar.xz 4654948 BLAKE2B 30965b2d0f7fb6e82e6f151e0e64cb8c9898129d1a4918427b828a4bef413bed1b51bf24a79d34148cd7755649d992ab294c3de24e8bc5c5a97ec150a832220a SHA512 ba9732a99e2ab68c32c898cff8c2edecc585eb1bf16756164dd0fff94a5552e93f8cbf63cf8cea5cc36a3b1785cfc77ef7573892f5a653b897d9b13118b03bab diff --git a/media-gfx/eog/eog-42.3-r1.ebuild b/media-gfx/eog/eog-43.2.ebuild index c0a5a6d07ec7..c9c7375b023b 100644 --- a/media-gfx/eog/eog-42.3-r1.ebuild +++ b/media-gfx/eog/eog-43.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,13 +12,16 @@ LICENSE="GPL-2+" SLOT="1" IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" -REQUIRED_USE="exif? ( jpeg )" +REQUIRED_USE=" + exif? ( jpeg ) + gtk-doc? ( introspection ) +" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.53.4:2 - >=dev-libs/libpeas-0.7.4:=[gtk] + >=dev-libs/libpeas-0.7.4[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 diff --git a/media-gfx/eog/eog-43.1-r1.ebuild b/media-gfx/eog/eog-44.0.ebuild index 0f56b0305794..01a9802618ea 100644 --- a/media-gfx/eog/eog-43.1-r1.ebuild +++ b/media-gfx/eog/eog-44.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-gfx/eog/eog-43.0-r1.ebuild b/media-gfx/eog/eog-44_beta.ebuild index b86ba98ce7f4..9e22758fd120 100644 --- a/media-gfx/eog/eog-43.0-r1.ebuild +++ b/media-gfx/eog/eog-44_beta.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,6 +7,8 @@ inherit gnome.org gnome2-utils meson xdg DESCRIPTION="The Eye of GNOME image viewer" HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog" +SRC_URI="https://download.gnome.org/sources/${PN}/44/${PN}-44.beta.tar.xz" +S="${WORKDIR}/${PN}-44.beta" LICENSE="GPL-2+" SLOT="1" @@ -21,7 +23,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" RDEPEND=" >=dev-libs/glib-2.53.4:2 - >=dev-libs/libpeas-0.7.4:=[gtk] + >=dev-libs/libpeas-0.7.4[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index 90ff7e5297da..32215237d814 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,2 +1 @@ -DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951 DIST eom-1.26.0.tar.xz 2493104 BLAKE2B 3a2e018e90514a5ee7c05bd981d1a129900ae2ba5b1c513da85e6ede2b2f5b253133c14766787a44f0e372da99b13922f3aaa6e2447e6d4d901a604689c03cd8 SHA512 efc5a1ce5c21ad74108c63827fa60f2cd8517888d8e155d7c9934f5490e61b2cf73bae3b42f8d6b69ce1d5c4658d0c74f2ab19e90f40173d55354276bbe5d824 diff --git a/media-gfx/eom/eom-1.24.2-r1.ebuild b/media-gfx/eom/eom-1.24.2-r1.ebuild deleted file mode 100644 index a962248d6942..000000000000 --- a/media-gfx/eom/eom-1.24.2-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" -fi - -DESCRIPTION="The MATE image viewer" -LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" -SLOT="0" - -IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.52:2 - >=dev-libs/libpeas-1.8.0[gtk] - >=dev-libs/libxml2-2:2 - gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 - sys-libs/zlib - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - exif? ( - >=media-libs/libexif-0.6.14 - media-libs/libjpeg-turbo:= - ) - imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - lcms? ( media-libs/lcms:2 ) - svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( >=media-libs/exempi-1.99.5:2= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/libintl - !!media-gfx/mate-image-viewer -" - -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" ) - -src_configure() { - mate_src_configure \ - --enable-thumbnailer \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(usex imagemagick \ - --without-gdk-pixbuf-thumbnailer \ - --with-gdk-pixbuf-thumbnailer \ - ) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.26.0-r1.ebuild b/media-gfx/eom/eom-1.26.0-r1.ebuild index ea35e9e5a2fc..6fa8009c9ab0 100644 --- a/media-gfx/eom/eom-1.26.0-r1.ebuild +++ b/media-gfx/eom/eom-1.26.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi DESCRIPTION="The MATE image viewer" diff --git a/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch deleted file mode 100644 index ced5dbcdd9fa..000000000000 --- a/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3b76a9f57ea65a7ebd22395eb5d3fda9cc929e8c Mon Sep 17 00:00:00 2001 -From: NP-Hardass <np.hardass@gmail.com> -Date: Tue, 4 Aug 2020 19:35:28 -0400 -Subject: [PATCH] eom-metadata-reader: add gdk/gdk.h include to resolve #258 - -be4fa2808c4e1a36c2c9b58c1267a54cdda6e495, enable wayland support - -added "defined(GDK_WINDOWING_x11)" macros without the accompanying gdk -headers ---- - src/eom-metadata-reader.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c -index cd796f0..2c93a14 100644 ---- a/src/eom-metadata-reader.c -+++ b/src/eom-metadata-reader.c -@@ -23,6 +23,8 @@ - #include <config.h> - #endif - -+#include <gdk/gdk.h> -+ - #include "eom-metadata-reader.h" - #include "eom-metadata-reader-jpg.h" - #include "eom-metadata-reader-png.h" --- -2.26.2 - diff --git a/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild deleted file mode 100644 index 700070540cde..000000000000 --- a/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit lua-single toolchain-funcs - -DESCRIPTION="A fast, modern and generic image processing library" -HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/" -SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X" -REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )" - -RDEPEND=" - x11-libs/agg[truetype] - sys-libs/zlib - expat? ( dev-libs/expat ) - jpeg? ( virtual/jpeg ) - lua? ( ${LUA_DEPS} ) - openexr? ( media-libs/openexr:= ) - php? ( dev-lang/php:* ) - perl? ( dev-lang/perl ) - png? ( >=media-libs/libpng-1.2.43 ) - ruby? ( dev-lang/ruby:* ) - tiff? ( media-libs/tiff ) - truetype? ( >=media-libs/freetype-2 ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - )" -DEPEND=" - ${RDEPEND} - swig? ( dev-lang/swig ) -" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-g++.patch - "${FILESDIR}"/${P}-dcraw.patch - "${FILESDIR}"/${P}-php.patch -) - -src_prepare() { - default - - # Respect user CFLAGS/CXXFLAGS. - sed -i \ - -e '/C\(XX\)\?FLAGS =/s/-O2//' \ - -e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \ - Makefile || die - - # Show commands. Use qualified CC/CXX. - sed -i \ - -e '/^Q =/d' \ - -e '/^\t@echo /d' \ - -e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \ - build/bottom.make || die - - # The copied string fits exactly. Use memcpy to reflect that a null - # terminator is not needed. - sed -i \ - -e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \ - codecs/tga.cc || die - - # openexr vers 3 - sed -i \ - -e 's:Int64:uint64_t:g' \ - codecs/openexr.cc || die -} - -src_configure() { - # evas -> enlightenment overlay - # bardecode -> protected by custom license - # libungif -> not supported anymore - # python -> allegedly not python3, but python2 only - - ./configure \ - --prefix=/usr \ - --libdir=/usr/$(get_libdir) \ - $(use_with X x11) \ - $(use_with truetype freetype) \ - --without-evas \ - $(use_with jpeg libjpeg) \ - $(use_with tiff libtiff) \ - $(use_with png libpng) \ - --without-libgif \ - --without-jasper \ - $(use_with openexr) \ - $(use_with expat) \ - --without-lcms \ - --without-bardecode \ - $(use_with lua) \ - $(use_with swig) \ - $(use_with perl) \ - --without-python \ - $(use_with php) \ - $(use_with ruby) || die -} diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild index f166ddcf3d83..134a56faca8d 100644 --- a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild +++ b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild @@ -28,13 +28,13 @@ RDEPEND=" x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) - jpeg? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) lua? ( ${LUA_DEPS} ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext diff --git a/media-gfx/exif/metadata.xml b/media-gfx/exif/metadata.xml index 6d57bccd5148..149da4e1037f 100644 --- a/media-gfx/exif/metadata.xml +++ b/media-gfx/exif/metadata.xml @@ -4,5 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">libexif</remote-id> + <remote-id type="github">libexif/exif</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index a9c896be4e08..30159e1ec4d9 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1 +1 @@ -DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491 +DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4 diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.6.ebuild index 3154998224c7..40332eff2db4 100644 --- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,12 +7,12 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" inherit git-r3 else - SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" + SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" S="${WORKDIR}/${P}-Source" fi -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake-multilib python-any-r1 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" @@ -50,7 +50,7 @@ BDEPEND=" DOCS=( README.md doc/ChangeLog doc/cmd.txt ) -PATCHES=( "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch ) +PATCHES=( "${FILESDIR}"/${P}-jxl-mime.patch ) pkg_setup() { use doc && python-any-r1_pkg_setup diff --git a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch deleted file mode 100644 index 3fa70d739f4a..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1) -https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2) - -This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2). -Easier and it makes the file same as upstream. - -diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp ---- b/unitTests/test_futils.cpp -+++ b/unitTests/test_futils.cpp -@@ -42,21 +42,8 @@ - std::string tmpFile("tmp.dat"); - std::ofstream auxFile(tmpFile.c_str()); - auxFile.close(); --#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__) -- const char * expectedString = "No error (errno = 0)"; --#elif defined(__APPLE__) -- const char * expectedString = "Undefined error: 0 (errno = 0)"; --#elif defined(__sun__) -- const char * expectedString = "Error 0 (errno = 0)"; --#elif defined(__FreeBSD__) -- const char * expectedString = "No error: 0 (errno = 0)"; --#elif defined(__NetBSD__) -- const char * expectedString = "Undefined error: 0 (errno = 0)"; --#else -- const char * expectedString = "Success (errno = 0)"; --#endif - std::remove(tmpFile.c_str()); -- ASSERT_STREQ(expectedString, strError().c_str()); -+ ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos); - } - - TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile) -@@ -68,22 +55,7 @@ - TEST(strError, doNotRecognizeUnknownError) - { - errno = 9999; --#if defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__) -- const char * expectedString = "Unknown error 9999 (errno = 9999)"; --#elif defined(_WIN32) -- const char * expectedString = "Unknown error (errno = 9999)"; --#elif defined(__APPLE__) -- const char * expectedString = "Unknown error: 9999 (errno = 9999)"; --#elif defined(__sun__) -- const char * expectedString = "Unknown error (errno = 9999)"; --#elif defined(__FreeBSD__) -- const char * expectedString = "Unknown error: 9999 (errno = 9999)"; --#elif defined(__NetBSD__) -- const char * expectedString = "Unknown error: 9999 (errno = 9999)"; --#else -- const char * expectedString = "Unknown error 9999 (errno = 9999)"; --#endif -- ASSERT_STREQ(expectedString, strError().c_str()); -+ ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos); - } - - TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist) diff --git a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch new file mode 100644 index 000000000000..b23e38736dca --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch @@ -0,0 +1,69 @@ +From 8f889c132ec48d8be7e155fc6d84254ffbb527df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv> +Date: Sun, 1 Aug 2021 13:56:48 +0200 +Subject: [PATCH 1/3] Corrected JPEG XL file type + +--- + src/bmffimage.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp +index 3d7c23e936..2440b4afd4 100644 +--- a/src/bmffimage.cpp ++++ b/src/bmffimage.cpp +@@ -56,7 +56,8 @@ + #define TAG_heix 0x68656978 /**< "heix" HEIC */ + #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */ + #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */ +-#define TAG_jxl 0x4a584c20 /**< "JXL " JPEG XL */ ++#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */ ++#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */ + #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */ + #define TAG_meta 0x6d657461 /**< "meta" Metadata */ + #define TAG_mdat 0x6d646174 /**< "mdat" Media data */ + +From 1d095cf75132e548213d740efc402b77178b2add Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv> +Date: Thu, 5 Aug 2021 10:04:51 +0200 +Subject: [PATCH 2/3] Removed tag handled separately + +--- + src/bmffimage.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp +index 2440b4afd4..9964a42bc2 100644 +--- a/src/bmffimage.cpp ++++ b/src/bmffimage.cpp +@@ -56,7 +56,6 @@ + #define TAG_heix 0x68656978 /**< "heix" HEIC */ + #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */ + #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */ +-#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */ + #define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */ + #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */ + #define TAG_meta 0x6d657461 /**< "meta" Metadata */ + +From af0954ca0cce961d9ea95e728d964f0717d34bfd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= + <miloskomarcevic@aim.com> +Date: Thu, 12 Aug 2021 16:19:06 +0200 +Subject: [PATCH 3/3] Update test for image/jxl + +--- + tests/bugfixes/github/test_issue_1503.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/bugfixes/github/test_issue_1503.py b/tests/bugfixes/github/test_issue_1503.py +index 51c0769135..3f88d26805 100644 +--- a/tests/bugfixes/github/test_issue_1503.py ++++ b/tests/bugfixes/github/test_issue_1503.py +@@ -33,7 +33,7 @@ class issue_1503_jxl_bmff(metaclass=system_tests.CaseMeta): + Xmp.photoshop.DateCreated XmpText 10 2004-06-21 + ""","""File name : $filename + File size : 32892 Bytes +-MIME type : image/generic ++MIME type : image/jxl + Image size : 200 x 130 + Thumbnail : image/jpeg, 4196 Bytes + Camera make : NIKON CORPORATION diff --git a/media-gfx/fbida/fbida-2.14-r3.ebuild b/media-gfx/fbida/fbida-2.14-r6.ebuild index f2955cd4adc6..3620d12eb513 100644 --- a/media-gfx/fbida/fbida-2.14-r3.ebuild +++ b/media-gfx/fbida/fbida-2.14-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) @@ -25,9 +25,9 @@ CDEPEND=" app-text/poppler media-libs/libepoxy media-libs/libexif - virtual/jpeg:* + media-libs/libjpeg-turbo:= virtual/ttf-fonts - x11-libs/cairo[opengl] + x11-libs/cairo curl? ( net-misc/curl ) fbcon? ( app-text/poppler[cairo] @@ -37,10 +37,10 @@ CDEPEND=" ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) - png? ( media-libs/libpng:* ) + png? ( media-libs/libpng:= ) scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff:* ) - webp? ( media-libs/libwebp ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:= ) X? ( >=x11-libs/motif-2.3:0[xft] x11-libs/libX11 diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index c8b7ba52c583..bd5faf774dc9 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,14 +23,14 @@ CDEPEND=" media-libs/giflib:= media-libs/libepoxy media-libs/libexif - media-libs/libpng:* - media-libs/libwebp + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libwebp:= media-libs/mesa[X(+)] - media-libs/tiff:* + media-libs/tiff:= net-misc/curl - virtual/jpeg:* virtual/ttf-fonts - x11-libs/cairo[opengl] + x11-libs/cairo x11-libs/libX11 x11-libs/libXpm x11-libs/libXt diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index 7a45937a9e40..d65a6c16b2c0 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,3 +1 @@ -DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3 DIST feh-3.9.1.tar.bz2 2108873 BLAKE2B af559837224a90e403015648717cb9aa516d18bceb0a49a0635b471435370209c80b77a7a87f66b22c99615d44be0832a0d03152aabde72917417e5f992a5d8a SHA512 78682ec80df6b6655dbc18774ee95b3d68f1711a50129a9befb8adfb8c1a74aeede2493a35955687cdc2aa079978927727dac02543643418ef8deefa0d8c6d05 -DIST feh-3.9.tar.bz2 2111997 BLAKE2B 853812e580eda808acbe4bc38325ac387b66eaf90b54da7e94980bd785d0001fa3f8d2507e2a435d5f533cc215bf8e28419b57b436d85c32b8e609b12c3a191a SHA512 0d217bdc9f78c8a4a40684ccc798986465c46282eef39a6792791763a5683ddc9a2ca277dc10c23bfe55aa11b415f5ff66b4ded2fe2a7a946660ccd07a4edc50 diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild deleted file mode 100644 index 92720f85d06b..000000000000 --- a/media-gfx/feh/feh-3.7.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="https://feh.finalrewind.org/" -SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86" -IUSE="debug curl exif test xinerama inotify" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - media-libs/imlib2[gif,jpeg,png] - )" - -PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - PREFIX="${EPREFIX}"/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - inotify=$(use_feh inotify) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" DESTDIR="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/feh/feh-3.9-r1.ebuild b/media-gfx/feh/feh-3.9.1-r1.ebuild index b05cfb8585a7..ccf4a73ffa70 100644 --- a/media-gfx/feh/feh-3.9-r1.ebuild +++ b/media-gfx/feh/feh-3.9.1-r1.ebuild @@ -12,9 +12,10 @@ LICENSE="feh" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" IUSE="debug curl exif test xinerama inotify" -RESTRICT="!test? ( test )" +RESTRICT="test" # Tests are broken. -COMMON_DEPEND="media-libs/imlib2[X] +COMMON_DEPEND=" + media-libs/imlib2[X,text(+)] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest deleted file mode 100644 index a9d84d33ea7e..000000000000 --- a/media-gfx/fim/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306 diff --git a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch b/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch deleted file mode 100644 index 74ba50aa5155..000000000000 --- a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN fim-0.4-rc3.orig/src/FbiStuffPdf.cpp fim-0.4-rc3/src/FbiStuffPdf.cpp ---- fim-0.4-rc3.orig/src/FbiStuffPdf.cpp 2014-12-22 23:54:29.000000000 +0100 -+++ fim-0.4-rc3/src/FbiStuffPdf.cpp 2015-05-18 21:13:07.058115455 +0200 -@@ -199,7 +199,7 @@ - if (!ds->od) - { - GBool bitmapTopDown = gTrue; -- ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown,gFalse/*antialias*/); -+ ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown); - if (ds->od) - #ifdef POPPLER_VERSION /* as of 0.20.2, from poppler/poppler-config.h */ - /* FIXME: this is an incomplete fix (triggered on 20120719's email on fim-devel); diff --git a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch deleted file mode 100644 index dd34f80cbaa4..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/723462 ---- a/src/fim.cpp -+++ b/src/fim.cpp -@@ -343,8 +343,8 @@ - .P - .nf - Shift+D delete image -- R rotate 90° clockwise -- L rotate 90° counter-clock wise -+ R rotate 90 degree clockwise -+ L rotate 90 degree counter-clock wise - .fi - .P - The delete function actually wants a capital letter 'D', thus you have diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch deleted file mode 100644 index 3e0c3067a310..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/670020 - ---- a/src/FbiStuffJpeg.cpp -+++ b/src/FbiStuffJpeg.cpp -@@ -115,7 +115,7 @@ - cinfo->src->bytes_in_buffer = h->tsize; - }*/ - --static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) -+static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) - { - FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n"); - exit(1); ---- a/src/FramebufferDevice.h -+++ b/src/FramebufferDevice.h -@@ -37,8 +37,8 @@ - #include "DisplayDevice.h" - - /* these are required by FbiStuffJpeg.cpp */ --#define FIM_FBI_TRUE 1 --#define FIM_FBI_FALSE 0 -+#define FIM_FBI_TRUE TRUE -+#define FIM_FBI_FALSE FALSE - - #ifndef FIM_WITH_NO_FRAMEBUFFER - diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch deleted file mode 100644 index 1887196f7cbf..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076 - ---- trunk/src/FbiStuffJpeg.cpp -+++ trunk/src/FbiStuffJpeg.cpp -@@ -179,7 +179,7 @@ - - if(nsp) - /* std::cout << "|" << title << "|\n", */ -- nsp->setVariable(string("EXIF_") + title,value); -+ nsp->setVariable(string("EXIF_") + string(title),value); - } - - static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data) diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch deleted file mode 100644 index 0f1e6beb6feb..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521 - ---- trunk/configure.ac -+++ trunk/configure.ac -@@ -1128,15 +1128,17 @@ - fim_handle_sdl='no' - fi - else --dnl if test x$fim_cv_want_static == x1 ; then -- LIBSDL_CONFIG_FLAGS=--static-libs --dnl else --dnl LIBSDL_CONFIG_FLAGS=--libs --dnl fi - AC_MSG_NOTICE([Activating LIBSDL.]) - fim_handle_sdl='yes' - LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags` - CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS" -+ LIBSDL_CONFIG_FLAGS=--static-libs -+ if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then -+ LIBSDL_CONFIG_FLAGS=--static-libs -+ else -+ LIBSDL_CONFIG_FLAGS=--libs -+ fi -+ AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.]) - LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`" - # finish this ! - #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o" diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild deleted file mode 100644 index 777a28a7dd61..000000000000 --- a/media-gfx/fim/fim-0.5_rc3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim" -HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved" -SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2" -S="${WORKDIR}"/${P/_rc/-rc} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pcx pdf png postscript readline sdl static svg tiff xfig" - -RDEPEND="media-fonts/terminus-font - aalib? ( media-libs/aalib[slang] ) - dia? ( app-office/dia ) - djvu? ( app-text/djvu ) - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib ) - graphicsmagick? ( media-gfx/graphicsmagick ) - imagemagick? ( virtual/imagemagick-tools ) - jpeg? ( virtual/jpeg:0 ) - pdf? ( >=app-text/poppler-0.31 ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/libspectre ) - readline? ( sys-libs/readline:0= ) - sdl? ( media-libs/libsdl ) - svg? ( media-gfx/inkscape ) - tiff? ( media-libs/tiff:0 ) - xfig? ( media-gfx/xfig )" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison - sys-devel/flex" - -PATCHES=( - "${FILESDIR}/${PN}-0.4_rc3-poppler031.patch" - "${FILESDIR}/${PN}-0.5_rc3-jpeg.patch" - "${FILESDIR}/${PN}-0.5_rc3-libsdl.patch" - "${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch" - "${FILESDIR}/${PN}-0.5_rc3-deg-symbol.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable aalib aa) \ - $(use_enable bmp) \ - $(use_enable dia) \ - $(use_enable djvu) \ - $(use_enable exif) \ - $(use_enable fbcon framebuffer) \ - $(use_enable gif) \ - $(use_enable graphicsmagick) \ - $(use_enable imagemagick convert) \ - $(use_enable jpeg) \ - $(use_enable pcx) \ - $(use_enable pdf poppler) \ - $(use_enable png) \ - $(use_enable postscript ps) \ - $(use_enable readline) \ - $(use_enable sdl) \ - $(use_enable static) \ - $(use_enable svg inkscape) \ - $(use_enable tiff) \ - $(use_enable xfig) \ - --disable-hardcoded-font \ - --disable-imlib2 \ - --disable-jasper \ - --disable-matrices-rendering \ - --disable-xcftopnm \ - --enable-fimrc \ - --enable-history \ - --enable-loader-string-specification \ - --enable-mark-and-dump \ - --enable-output-console \ - --enable-raw-bits-rendering \ - --enable-resize-optimizations \ - --enable-scan-consolefonts \ - --enable-screen \ - --enable-scripting \ - --enable-seek-magic \ - --enable-stdin-image-reading \ - --enable-unicode \ - --enable-warnings \ - --enable-windows \ - --with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz -} - -src_compile() { - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install -} diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml deleted file mode 100644 index dd480381374c..000000000000 --- a/media-gfx/fim/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="bmp">Enable BMP file support</flag> - <flag name="dia">Enable DIA file support via <pkg>app-office/dia</pkg></flag> - <flag name="imagemagick">Use convert from <pkg>media-gfx/imagemagick</pkg> as fallback file opener</flag> - <flag name="pcx">Enable PCX file support</flag> - <flag name="xfig">Enable FIG file support via <pkg>media-gfx/xfig</pkg></flag> - </use> -</pkgmetadata> diff --git a/media-gfx/flam3/metadata.xml b/media-gfx/flam3/metadata.xml index c3405c90ba2b..19126d823337 100644 --- a/media-gfx/flam3/metadata.xml +++ b/media-gfx/flam3/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="google-code">flam3</remote-id> + <remote-id type="github">scottdraves/flam3</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild b/media-gfx/flameshot/flameshot-12.1.0.ebuild index eaeba5e61c70..fa3545cbb409 100644 --- a/media-gfx/flameshot/flameshot-12.1.0.ebuild +++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" DEPEND=" dev-qt/qtcore:5 diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 7544371e98cd..b350e2764565 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,2 +1,2 @@ -DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c +DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418 diff --git a/media-gfx/fontforge/fontforge-20220308.ebuild b/media-gfx/fontforge/fontforge-20220308-r1.ebuild index 6d26634be395..bf9f7d2ae49e 100644 --- a/media-gfx/fontforge/fontforge-20220308.ebuild +++ b/media-gfx/fontforge/fontforge-20220308-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit python-single-r1 xdg cmake DESCRIPTION="postscript font editor and converter" @@ -23,18 +23,18 @@ RDEPEND=" dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) + gif? ( media-libs/giflib:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] - x11-libs/libX11:0= - x11-libs/libXi:0= + x11-libs/libX11:= + x11-libs/libXi:= ) ) python? ( ${PYTHON_DEPS} ) diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild index 115b5c5540a9..c8d28d29388a 100644 --- a/media-gfx/fontforge/fontforge-20201107.ebuild +++ b/media-gfx/fontforge/fontforge-20230101.ebuild @@ -1,45 +1,43 @@ -# Copyright 2004-2021 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 xdg cmake DESCRIPTION="postscript font editor and converter" HOMEPAGE="https://fontforge.org/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz" +SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.xz" LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X" RESTRICT="!test? ( test )" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - dev-libs/glib:2 + >=dev-libs/glib-2.67:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) + gif? ( media-libs/giflib:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] - x11-libs/libX11:0= - x11-libs/libXi:0= + x11-libs/libX11:= + x11-libs/libXi:= ) ) python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) - unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) " DEPEND="${RDEPEND} @@ -57,7 +55,7 @@ PATCHES=( ) pkg_setup() { - : + use python && python-single-r1_pkg_setup } src_configure() { @@ -69,7 +67,6 @@ src_configure() { -DENABLE_LIBREADLINE=$(usex readline ON OFF) -DENABLE_LIBSPIRO=OFF # No package in Gentoo -DENABLE_LIBTIFF=$(usex tiff ON OFF) - -DENABLE_LIBUNINAMESLIST=$(usex unicode ON OFF) -DENABLE_MAINTAINER_TOOLS=OFF -DENABLE_PYTHON_EXTENSION=$(usex python ON OFF) -DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF) diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 20c12e33f599..cce6c28e6bfe 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,4 +1,4 @@ -DIST fotoxx-22.20.tar.gz 8687337 BLAKE2B 013a1f154ea9971c5ff5c33f3ab62bcec9a364f0d47a65648b251966a0b798e00dd80ced399bcfb3657cf2e95534d1e694dc2d2c36066502ddc3b50a645cdba0 SHA512 c9b6cb298546ab121be6ef2c907ce51e4a4060a52829ed1ef51475ae1e542c7cb39037402381969519907a2a66bd8f741452786ff3a25f30fbbd22b24032a436 -DIST fotoxx-22.31.tar.gz 8647063 BLAKE2B ae636f9e2993cab3fa5cd8c432a051b42d23fa1a500c14cdfc13c1854c576ee60b25780e7bab4fa46734fab8de5839e4d0d639d759ff12cd2a52f5c8d704bdfe SHA512 06da8d87e5ff59cd32575720ffba7422d858e8bce6e126af61cdd30891c4a1f8f4a3b1429ae732adfe25b6373af2782abde2fefa2c9fb5c147458ad82270c20d DIST fotoxx-22.35.tar.gz 8675173 BLAKE2B 0d0c709da603a59f432b184b0477cc3a65166c39209c5ccd440cbb317d1c835cf9b2a64870b10bff07debc4617585ed976f8a2157ee1a600861c2edab9ad023f SHA512 aceec8172da1c2c40c422ac194ab870a39cc33d6e1f484fc5fd7292145636ef546fa400023bbcc403d7e2ad108eef6d1c696cce7983c39088fede3a8538801c4 -DIST fotoxx-22.40.tar.gz 8704952 BLAKE2B 355cd57402d3008b3b39a20bdca0cf5bd597aacf7db3dc2c379ddcc20c80ff961c0dbdf8241dd3c2161fa8d3e59618a40907dc6f4037c83089d4c1ae369f2d34 SHA512 28f4761747a144c11eb8b1b10bfc174a3a29f95a95c35f800d33c21bc12c6fa3c8b69adf714419b9ecf188c2dc7408032af44f53e2385b38b333bcb67452f9ea +DIST fotoxx-23.0.tar.gz 9258345 BLAKE2B 96510f43c2b8a289191a1194adf13b255d29ebd8aae4e286f2fcc180bb1ecefe5df7ab9251a55e83010a527d455117ddd99dea7df189a38bc82e5b233806307e SHA512 b40025f90561c10ebb107edf26863be154c0b699c811275f2de71f9da417921704fb2215266d725a7f84b19327da54b3f9be2d00db6dfb9738739a2e9ffc1903 +DIST fotoxx-23.1.tar.gz 9198469 BLAKE2B a14064c1b240badcfe5c24970528956e2f7acfbcb6720c7f376447bb65b26db7f50ceedbe3ad8c36d7439e56dae074d4e6feee315a746e911a1d2fb9b77dabcd SHA512 5adf8501bb5ce232668b8dd551ccfac591f23dbb33dec4c303b37b1f4f7fd6c43dab67f3dc38a8647260b32e51f9778cb6dcaba5aaa91a2565d1f810afca7353 +DIST fotoxx-23.2-source.tar.gz 9233622 BLAKE2B 425c6f20210c62d08ee14f53436f3256e829a6fa3453047fe07ee0357fa277cdfe37340a6c19d0c39c2885b5ab6478d4791eb00631447f0b8d6ee53436750d5b SHA512 6193c99f11034609fdc052cf29184835644c76fd37270d8a8e9a76524d7bec7ea6ddc8e0c0ad7874d6997eba5c8c81f0f1a355a06a1220600380931aab10759b diff --git a/media-gfx/fotoxx/fotoxx-22.20.ebuild b/media-gfx/fotoxx/fotoxx-22.35-r1.ebuild index 33ba46fbbfd4..13462861777e 100644 --- a/media-gfx/fotoxx/fotoxx-22.20.ebuild +++ b/media-gfx/fotoxx/fotoxx-22.35-r1.ebuild @@ -24,8 +24,8 @@ DEPEND=" media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= - media-libs/libpng:0 - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3" RDEPEND=" diff --git a/media-gfx/fotoxx/fotoxx-22.35.ebuild b/media-gfx/fotoxx/fotoxx-23.0.ebuild index 33ba46fbbfd4..c7e883054f20 100644 --- a/media-gfx/fotoxx/fotoxx-22.35.ebuild +++ b/media-gfx/fotoxx/fotoxx-23.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,8 +24,8 @@ DEPEND=" media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= - media-libs/libpng:0 - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3" RDEPEND=" diff --git a/media-gfx/fotoxx/fotoxx-22.40.ebuild b/media-gfx/fotoxx/fotoxx-23.1.ebuild index 5819421d21bf..cd7aa63620f7 100644 --- a/media-gfx/fotoxx/fotoxx-22.40.ebuild +++ b/media-gfx/fotoxx/fotoxx-23.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,8 +24,8 @@ DEPEND=" media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= - media-libs/libpng:0 - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3" RDEPEND=" diff --git a/media-gfx/fotoxx/fotoxx-22.31.ebuild b/media-gfx/fotoxx/fotoxx-23.2.ebuild index 5819421d21bf..6fef1f8c11cb 100644 --- a/media-gfx/fotoxx/fotoxx-22.31.ebuild +++ b/media-gfx/fotoxx/fotoxx-23.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit optfeature xdg-utils DESCRIPTION="Program for improving image files made with a digital camera" HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html" -SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz" +SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz" LICENSE="GPL-3+" SLOT="0" @@ -24,8 +24,8 @@ DEPEND=" media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= - media-libs/libpng:0 - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3" RDEPEND=" @@ -44,6 +44,7 @@ HTML_DOCS=() src_prepare() { sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die + sed -i -e "/^Icon/ s/\.png$//" fotoxx.desktop || die default } diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index ae9dfbc8a37d..0973d9d48798 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1 +1 @@ -DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9 SHA512 ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827 +DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d diff --git a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch new file mode 100644 index 000000000000..44d49ca3bf94 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch @@ -0,0 +1,22 @@ +https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 + +From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001 +From: wmayer <wmayer@users.sourceforge.net> +Date: Sat, 11 Feb 2023 17:47:49 +0100 +Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with + parameters (e.g .desktop file has /usr/bin/freecad --single-instance) + +--- a/src/Base/Interpreter.cpp ++++ b/src/Base/Interpreter.cpp +@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[]) + { + PyStatus status; + PyConfig config; +- PyConfig_InitPythonConfig(&config); ++ PyConfig_InitIsolatedConfig(&config); + + status = PyConfig_SetBytesArgv(&config, argc, argv); + if (PyStatus_Exception(status)) { +-- +2.39.1 + diff --git a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch new file mode 100644 index 000000000000..402c84ee4d28 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch @@ -0,0 +1,93 @@ +https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83 + +From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001 +From: Uwe <donovaly@users.noreply.github.com> +Date: Wed, 17 Aug 2022 12:32:02 +0200 +Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen + +- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174 +- also fix compiler warnings about unsafe bool handling +--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp ++++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +@@ -50,7 +50,9 @@ + + #include <utilities.h> + ++#include <BRepBndLib.hxx> + #include <BRepBuilderAPI_Copy.hxx> ++#include <BRepMesh_IncrementalMesh.hxx> + #include <BRep_Tool.hxx> + #include <Bnd_B3d.hxx> + #include <NCollection_Map.hxx> +@@ -66,6 +68,7 @@ + #include <TopTools_DataMapOfShapeShape.hxx> + #include <TopTools_MapOfShape.hxx> + #include <TopoDS.hxx> ++#include <TopoDS_Solid.hxx> + + #ifdef _MSC_VER + #pragma warning(disable : 4067) +@@ -3027,7 +3030,7 @@ bool NETGENPlugin_Mesher::Compute() + } + } + } +- if (!err && mparams.secondorder > 0) ++ if (!err && mparams.secondorder) + { + try + { +@@ -3302,7 +3305,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) + // calculate total nb of segments and length of edges + double fullLen = 0.0; + int fullNbSeg = 0; +- int entity = mparams.secondorder > 0 ? SMDSEntity_Quad_Edge : SMDSEntity_Edge; ++ int entity = mparams.secondorder ? SMDSEntity_Quad_Edge : SMDSEntity_Edge; + TopTools_DataMapOfShapeInteger Edge2NbSeg; + for (TopExp_Explorer exp(_shape, TopAbs_EDGE); exp.More(); exp.Next()) + { +@@ -3340,7 +3343,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) + { + vector<int>& aVec = aResMap[_mesh->GetSubMesh(Edge2NbSegIt.Key())]; + if ( aVec[ entity ] > 1 && aVec[ SMDSEntity_Node ] == 0 ) +- aVec[SMDSEntity_Node] = mparams.secondorder > 0 ? 2*aVec[ entity ]-1 : aVec[ entity ]-1; ++ aVec[SMDSEntity_Node] = mparams.secondorder ? 2*aVec[ entity ]-1 : aVec[ entity ]-1; + + fullNbSeg += aVec[ entity ]; + Edge2NbSeg( Edge2NbSegIt.Key() ) = aVec[ entity ]; +@@ -3386,7 +3389,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) + int nbNodes = tooManyElems ? hugeNb : (( nbFaces*3 - (nb1d-1)*2 ) / 6 + 1 ); + + vector<int> aVec(SMDSEntity_Last, 0); +- if( mparams.secondorder > 0 ) { ++ if (mparams.secondorder) { + int nb1d_in = (nbFaces*3 - nb1d) / 2; + aVec[SMDSEntity_Node] = nbNodes + nb1d_in; + aVec[SMDSEntity_Quad_Triangle] = nbFaces; +@@ -3428,11 +3431,11 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) + if ( tooManyElems ) // avoid FPE + { + aVec[SMDSEntity_Node] = hugeNb; +- aVec[ mparams.secondorder > 0 ? SMDSEntity_Quad_Tetra : SMDSEntity_Tetra] = hugeNb; ++ aVec[ mparams.secondorder ? SMDSEntity_Quad_Tetra : SMDSEntity_Tetra] = hugeNb; + } + else + { +- if( mparams.secondorder > 0 ) { ++ if (mparams.secondorder) { + aVec[SMDSEntity_Node] = nb1d_in/3 + 1 + nb1d_in; + aVec[SMDSEntity_Quad_Tetra] = nbVols; + } +--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp ++++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp +@@ -39,6 +39,8 @@ + #include <StdMeshers_MaxElementArea.hxx> + #include <StdMeshers_QuadranglePreference.hxx> + #include <StdMeshers_ViscousLayers2D.hxx> ++#include <TopExp.hxx> ++#include <TopExp_Explorer.hxx> + + #include <Precision.hxx> + #include <Standard_ErrorHandler.hxx> +-- +2.39.1 + diff --git a/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch b/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch new file mode 100644 index 000000000000..5455c0ee2992 --- /dev/null +++ b/media-gfx/freecad/files/freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch @@ -0,0 +1,24 @@ +From cb77c7d937c259224699273fee1ba5907588fa4c Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 12 Feb 2023 19:54:13 +0100 +Subject: [PATCH] tests/src/Qt: only build test for BUILD_GUI=ON + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/tests/src/Qt/CMakeLists.txt ++++ b/tests/src/Qt/CMakeLists.txt +@@ -30,6 +30,7 @@ endfunction() + set(CMAKE_AUTOMOC ON) + + # Qt Test ++if(BUILD_GUI) + include_directories( + ${QtGui_INCLUDE_DIRS} + ${QtTest_INCLUDE_DIRS} +@@ -46,3 +47,4 @@ set (InventorBuilder_LIBS + SETUP_TESTS( + InventorBuilder + ) ++endif() +-- +2.39.1 + diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild b/media-gfx/freecad/freecad-0.20.2-r1.ebuild new file mode 100644 index 000000000000..4099ed239e45 --- /dev/null +++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild @@ -0,0 +1,324 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit check-reqs cmake optfeature python-single-r1 xdg + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + S="${WORKDIR}/freecad-${PV}" +else + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# examples are licensed CC-BY-SA (without note of specific version) +LICENSE="LGPL-2 CC-BY-SA-4.0" +SLOT="0" +IUSE="debug designer +gui test" + +FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" +FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material + openscad part-design path points raytracing robot show surface + techdraw tux" + +for module in ${FREECAD_STABLE_MODULES}; do + IUSE="${IUSE} +${module}" +done +for module in ${FREECAD_EXPERIMENTAL_MODULES}; do + IUSE="${IUSE} ${module}" +done +unset module + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/OpenNI2[opengl(+)] + dev-libs/boost:= + dev-libs/libspnav[X] + dev-libs/xerces-c[icu] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + media-libs/freetype + media-libs/qhull:= + sci-libs/flann[openmp] + sci-libs/hdf5:=[fortran,zlib] + >=sci-libs/med-4.0.0-r1 + <sci-libs/opencascade-7.7.0:=[json,vtk] + sci-libs/orocos_kdl:= + sys-libs/zlib + virtual/libusb:1 + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( sci-libs/vtk:=[qt5,rendering] ) + gui? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + >=media-libs/coin-4.0.0 + virtual/glu + virtual/opengl + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] + dev-python/shiboken2[${PYTHON_USEDEP}] + ') + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( media-gfx/openscad ) + pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) + fem? ( dev-python/ply[${PYTHON_USEDEP}] ) + ') +" +DEPEND=" + ${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + dev-qt/qttest:5 + ) +" +BDEPEND=" + app-text/dos2unix + dev-lang/swig + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + dev-qt/qttest:5 + ) +" + +# To get required dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +# We set the following requirements by default: +# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. +# +# Additionally, we auto-enable mesh_part, flat_mesh and smesh +# Fem actually needs smesh, but as long as we don't have a smesh package, we enable +# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't +# reflected by the REQUIRES_MODS macro, but at +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. +# +# The increase in auto-enabled workbenches is due to their need in parts of the +# test suite when compiled with a minimal set of USE flags. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + designer? ( gui ) + inspection? ( points ) + path? ( robot ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch + "${FILESDIR}"/${PN}-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch + "${FILESDIR}"/${PN}-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch +) + +DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup + [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" +} + +src_prepare() { + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + + find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ARCH=ON + -DBUILD_ASSEMBLY=OFF # deprecated + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_COMPLETE=OFF # deprecated + -DBUILD_DRAFT=ON + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_DRAWING=ON + -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=$(usex netgen) + -DBUILD_FLAT_MESH=ON + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_FREETYPE=ON # automagic dep + -DBUILD_GUI=$(usex gui) + -DBUILD_IDF=$(usex idf) + -DBUILD_IMAGE=$(usex image) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there + -DBUILD_MATERIAL=$(usex material) + -DBUILD_MESH=ON + -DBUILD_MESH_PART=ON + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=$(usex part-design) + -DBUILD_PATH=$(usex path) + -DBUILD_POINTS=$(usex points) + -DBUILD_QT5=ON # OFF means to use Qt4 + -DBUILD_RAYTRACING=$(usex raytracing) + -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SHOW=$(usex show) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SMESH=ON + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -DBUILD_TUX=$(usex tux) + -DBUILD_VR=OFF + -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WITH_CONDA=OFF + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -DFREECAD_QT_VERSION="5" + + -DFREECAD_USE_EXTERNAL_KDL=ON + -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo + -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree + -DFREECAD_USE_FREETYPE=ON + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + ) + + if use debug; then + # BUILD_SANDBOX currently broken, see + # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + ) + fi + + cmake_src_configure +} + +# We use the FreeCADCmd binary instead of the FreeCAD binary here +# for two reasons: +# 1. It works out of the box with USE=-gui as well, not needing a guard +# 2. We don't need virtualx.eclass and it's dependencies +# The exported environment variables are needed, so freecad does know +# where to save it's temporary files, and where to look and write it's +# configuration. Without those, there are sandbox violation, when it +# tries to create /var/lib/portage/home/.FreeCAD directory. +src_test() { + pushd "${BUILD_DIR}" > /dev/null || die + export FREECAD_USER_HOME="${HOME}" + export FREECAD_USER_DATA="${T}" + export FREECAD_USER_TEMP="${T}" + nonfatal ./bin/FreeCADCmd --run-test 0 + popd > /dev/null || die +} + +src_install() { + cmake_src_install + + dobin src/Tools/freecad-thumbnailer + + if use gui; then + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" + fi + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + # ToDo: check opencv, pysolar (::science), elmerfem (::science) + # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" + optfeature_header "Computational utilities" + optfeature "BLAS library" sci-libs/openblas + optfeature "Statistical computation with Python" dev-python/pandas + optfeature "Use scientific computation with Python" dev-python/scipy + optfeature "Use symbolic math with Python" dev-python/sympy + optfeature_header "Imaging, Plotting and Rendering utilities" + optfeature "Dependency graphs" media-gfx/graphviz + optfeature "PBR Rendering" media-gfx/povray + optfeature_header "Import / Export" + optfeature "Interact with git repositories" dev-python/GitPython + optfeature "Work with COLLADA documents" dev-python/pycollada + optfeature "YAML importer and emitter" dev-python/pyyaml + optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "Importing and exporting geospatial data formats" sci-libs/gdal + optfeature "Working with projection data" sci-libs/proj + optfeature_header "Meshing and FEM" + optfeature "FEM mesh generator" sci-libs/gmsh + optfeature "Triangulating meshes" sci-libs/gts + optfeature "Visualization" sci-visualization/paraview +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-0.20.1.ebuild b/media-gfx/freecad/freecad-0.20.2.ebuild index 40c90979cd7e..c34c4c9425e3 100644 --- a/media-gfx/freecad/freecad-0.20.1.ebuild +++ b/media-gfx/freecad/freecad-0.20.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit check-reqs cmake optfeature python-single-r1 xdg @@ -26,7 +26,7 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer headless test" +IUSE="debug designer +gui test" FREECAD_EXPERIMENTAL_MODULES="cloud pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material @@ -46,6 +46,7 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} dev-libs/OpenNI2[opengl(+)] + dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 @@ -65,7 +66,7 @@ RDEPEND=" media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] + >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib @@ -76,11 +77,10 @@ RDEPEND=" dev-libs/openssl:= net-misc/curl ) - fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + fem? ( sci-libs/vtk:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) - pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] ) + pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] @@ -94,10 +94,12 @@ RDEPEND=" DEPEND=" ${RDEPEND} >=dev-cpp/eigen-3.3.1:3 + test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') ) " BDEPEND=" app-text/dos2unix dev-lang/swig + test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') ) " # To get required dependencies: @@ -159,7 +161,7 @@ src_configure() { -DBUILD_FLAT_MESH=ON -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex !headless) + -DBUILD_GUI=$(usex gui) -DBUILD_IDF=$(usex idf) -DBUILD_IMAGE=$(usex image) -DBUILD_IMPORT=ON # import module for various file formats @@ -197,6 +199,8 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF + -DFREECAD_QT_VERSION="5" + -DFREECAD_USE_EXTERNAL_KDL=ON -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree @@ -235,7 +239,7 @@ src_configure() { # We use the FreeCADCmd binary instead of the FreeCAD binary here # for two reasons: -# 1. It works out of the box with USE=headless as well, not needing a guard +# 1. It works out of the box with USE=-gui as well, not needing a guard # 2. We don't need virtualx.eclass and it's dependencies # The exported environment variables are needed, so freecad does know # where to save it's temporary files, and where to look and write it's @@ -255,7 +259,7 @@ src_install() { dobin src/Tools/freecad-thumbnailer - if ! use headless; then + if use gui; then dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" fi diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 7a29fc5538d5..b9d1e7ae4206 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit check-reqs cmake optfeature python-single-r1 xdg @@ -28,7 +28,7 @@ LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" IUSE="debug designer +gui test" -FREECAD_EXPERIMENTAL_MODULES="cloud pcl" +FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material openscad part-design path points raytracing robot show surface techdraw tux" @@ -46,47 +46,54 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} dev-libs/OpenNI2[opengl(+)] + dev-libs/boost:= + dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] - dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5 dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 dev-qt/qtxml:5 - >=media-libs/coin-4.0.0 + dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] - sci-libs/opencascade:=[json,vtk(+)] + >=sci-libs/med-4.0.0-r1 + sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib - virtual/glu virtual/libusb:1 - virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) - fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + fem? ( sci-libs/vtk:=[qt5,rendering] ) + gui? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + >=media-libs/coin-4.0.0 + virtual/glu + virtual/opengl + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] + dev-python/shiboken2[${PYTHON_USEDEP}] + ') + ) + netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] ) + pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken2[${PYTHON_USEDEP}] addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') @@ -94,10 +101,18 @@ RDEPEND=" DEPEND=" ${RDEPEND} >=dev-cpp/eigen-3.3.1:3 + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + dev-qt/qttest:5 + ) " BDEPEND=" app-text/dos2unix dev-lang/swig + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + dev-qt/qttest:5 + ) " # To get required dependencies: @@ -115,6 +130,7 @@ BDEPEND=" # test suite when compiled with a minimal set of USE flags. REQUIRED_USE=" ${PYTHON_REQUIRED_USE} + designer? ( gui ) inspection? ( points ) path? ( robot ) " @@ -122,9 +138,10 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch + "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch ) -DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) +DOCS=( CODE_OF_CONDUCT.md README.md ) CHECKREQS_DISK_BUILD="2G" @@ -155,7 +172,7 @@ src_configure() { -DBUILD_DRAWING=ON -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=OFF + -DBUILD_FEM_NETGEN=$(usex netgen) -DBUILD_FLAT_MESH=ON -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory -DBUILD_FREETYPE=ON # automagic dep @@ -263,6 +280,9 @@ src_install() { fi dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well python_optimize @@ -275,7 +295,7 @@ pkg_postinst() { einfo "AddonManager." # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, netgen, z88 (no pkgs), calculix-ccx (::waebbl) + # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) einfo "There are a lot of additional tools, for which FreeCAD has builtin" einfo "support. Some of them are available in Gentoo. Take a look at" einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index 6e0770f45ea8..17e33f46262b 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -33,10 +33,6 @@ The Python modules are available, without their GUI parts though, if this is unset. </flag> - <flag name="headless"> - Build FreeCAD without a GUI, usable for server-side instances. - The Python modules are still available, without their GUI parts though. - </flag> <flag name="idf"> Build the IDF module to provide file exchange capabilities with IDF files @@ -52,6 +48,9 @@ <flag name="material"> Build the material module and workbench to work with materials </flag> + <flag name="netgen"> + Build support for the netgen mesher through <pkg>media-gfx/netgen</pkg>. + </flag> <flag name="openscad"> Build the OpenSCAD module for interoperability with OpenSCAD and repairing Constructive Solid Geometry (CSG) history diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest index 1b660d38f522..a6e39429b3f2 100644 --- a/media-gfx/frogr/Manifest +++ b/media-gfx/frogr/Manifest @@ -1 +1 @@ -DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4 +DIST frogr-1.7.tar.xz 2247476 BLAKE2B 16b5c546b61234310390f4dadee0094e671f141121023833123e57de7f90666a38a117dedece0cba53a1500e8bce20e79dd690c598e010327a32aee7b11afe1a SHA512 73531186dbe3fdb4b937d54c02b471b444bac059de4ea02913b5fef255816af0b0ef89bbb449e443ee5b50f0d156960efe190f5988a1a50f8ecfe2eb1e10b89f diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch deleted file mode 100644 index cb72250ae72f..000000000000 --- a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5 -https://bugs.gentoo.org/831497 - -From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Mon, 24 Jan 2022 12:22:25 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:32:0: ERROR: Function does not take positional arguments. -data/meson.build:42:0: ERROR: Function does not take positional arguments. ---- a/data/meson.build -+++ b/data/meson.build -@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir)) - generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in', - output: 'org.gnome.frogr.desktop.in', - configuration: data_conf) --i18n.merge_file('desktop', -+i18n.merge_file( - input: generated_desktop, - output: 'org.gnome.frogr.desktop', - install: true, -@@ -39,7 +39,7 @@ i18n.merge_file('desktop', - - # Appdata XML file - appdatadir = join_paths(datadir, 'metainfo') --i18n.merge_file('appdata', -+i18n.merge_file( - input: 'org.gnome.frogr.appdata.xml.in', - output: 'org.gnome.frogr.appdata.xml', - install: true, -GitLab diff --git a/media-gfx/frogr/files/frogr-1.5-warning-level.patch b/media-gfx/frogr/files/frogr-1.5-warning-level.patch deleted file mode 100644 index 68020c3e16b8..000000000000 --- a/media-gfx/frogr/files/frogr-1.5-warning-level.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 623d7e397baff3a8ab1695e190b13bc60153b64c Mon Sep 17 00:00:00 2001 -From: Mario Sanchez Prada <msanchez@gnome.org> -Date: Mon, 7 Dec 2020 22:26:34 +0100 -Subject: [PATCH] Use meson's "warning_level" build option instead of - "warnlevel" - -The correct option's name is "warning_level", so change it for it -to actually be effective while building. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 37f76d7..87e4de3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,7 @@ project('frogr', 'c', - version: '1.5', - license: 'GPL3', - default_options: [ -- 'warnlevel=2', -+ 'warning_level=2', - 'werror=true' - ]) - --- -GitLab - diff --git a/media-gfx/frogr/frogr-1.5-r1.ebuild b/media-gfx/frogr/frogr-1.7.ebuild index 75bd15003391..dcf134553b9d 100644 --- a/media-gfx/frogr/frogr-1.5-r1.ebuild +++ b/media-gfx/frogr/frogr-1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,33 +15,31 @@ KEYWORDS="~amd64" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 - >=x11-libs/gtk+-3.16:3[introspection] - >=media-libs/libexif-0.6.14 + >=dev-libs/libgcrypt-1.5:= >=dev-libs/libxml2-2.6.8:2 media-libs/gstreamer:1.0 + >=media-libs/libexif-0.6.14 >=net-libs/libsoup-2.34:2.4 - >=dev-libs/libgcrypt-1.5:* + >=x11-libs/gtk+-3.16:3[introspection] + x11-libs/gdk-pixbuf:2 " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" BDEPEND=" + dev-util/itstool >=sys-devel/gettext-0.19.7 virtual/pkgconfig " # TODO add a useflag for enable-video or header-bar??? -PATCHES=( - "${FILESDIR}/frogr-1.5-warning-level.patch" - "${FILESDIR}/frogr-1.5-meson-0.61-build.patch" -) - pkg_postinst() { xdg_pkg_postinst - gnome2_icon_cache_update + xdg_icon_cache_update gnome2_schemas_update } pkg_postrm() { xdg_pkg_postrm - gnome2_icon_cache_update + xdg_icon_cache_update gnome2_schemas_update } diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml index 1e1e3db44283..63a6a3cb5736 100644 --- a/media-gfx/frogr/metadata.xml +++ b/media-gfx/frogr/metadata.xml @@ -1,10 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> <longdescription> Frogr is a small application for the GNOME desktop that allows users to manage their accounts in the Flickr image hosting website. It supports all the basic Flickr features. </longdescription> + <maintainer type="person" proxied="yes"> + <email>cfuga@cfuga.mx</email> + <name>Cristian Othón Martínez Vera</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/frogr</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild index 4d5b5b986aec..497e93cb39b3 100644 --- a/media-gfx/geeqie/geeqie-1.7.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild @@ -21,13 +21,13 @@ RDEPEND=" doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( ${LUA_DEPS} ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" DEPEND="${RDEPEND}" diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild index 7dcf1197b2ae..f16b53d0df1e 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild @@ -23,7 +23,7 @@ RDEPEND="gnome-extra/zenity exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) @@ -31,10 +31,10 @@ RDEPEND="gnome-extra/zenity map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20 ) + raw? ( >=media-libs/libraw-0.20:= ) spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:0 ) - webp? ( >=media-libs/libwebp-0.6.1 ) + tiff? ( media-libs/tiff:= ) + webp? ( >=media-libs/libwebp-0.6.1:= ) zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index 9d85f853281b..c6f4c4adff37 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -24,7 +24,7 @@ RDEPEND="gnome-extra/zenity exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) @@ -32,10 +32,10 @@ RDEPEND="gnome-extra/zenity map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20 ) + raw? ( >=media-libs/libraw-0.20:= ) spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:0 ) - webp? ( >=media-libs/libwebp-0.6.1 ) + tiff? ( media-libs/tiff:= ) + webp? ( >=media-libs/libwebp-0.6.1:= ) zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 459105e7b023..fe79e449c2dc 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -9,7 +9,6 @@ <use> <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> <flag name="gpu-accel">Enable GPU acceleration support - experimental</flag> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag> <flag name="jpegxl">Enable support for JPEG XL image format</flag> <flag name="map">Enable items GPS map display</flag> </use> diff --git a/media-gfx/gifsicle/metadata.xml b/media-gfx/gifsicle/metadata.xml index 85e4ed814fa2..6dd383abcf14 100644 --- a/media-gfx/gifsicle/metadata.xml +++ b/media-gfx/gifsicle/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">kohler/gifsicle</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 5258bad42d5f..0e9d4056507f 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,3 +1,3 @@ DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1 -DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917 +DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204 diff --git a/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch b/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch new file mode 100644 index 000000000000..8bc50cbcf18e --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch @@ -0,0 +1,15 @@ +Issue: https://bugs.gentoo.org/875413 +Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/8807 +Upstream patch: https://gitlab.gnome.org/GNOME/gimp/-/commit/543f9e37e69b4e57b5e44092542c95bb2052f047 + +--- a/plug-ins/common/file-dicom.c ++++ b/plug-ins/common/file-dicom.c +@@ -602,7 +602,7 @@ load_image (const gchar *filename, + (gchar *) value, samples_per_pixel); + g_free (dicominfo); + fclose (DICOM); +- return NULL; ++ return -1; + } + + break; diff --git a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch deleted file mode 100644 index 672a9ef7217e..000000000000 --- a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch +++ /dev/null @@ -1,78 +0,0 @@ -Upstream issue: "GIMP fails to build with libheif >= 1.13.0" -https://gitlab.gnome.org/GNOME/gimp/-/issues/8570 - -From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com> -Date: Sat, 3 Sep 2022 13:19:33 +0200 -Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+ - ---- - plug-ins/common/file-heif.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c -index 76bc41f44d..36899bcf5f 100644 ---- a/plug-ins/common/file-heif.c -+++ b/plug-ins/common/file-heif.c -@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat - HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3 - } HeifpluginExportFormat; - --typedef struct _Heif Heif; --typedef struct _HeifClass HeifClass; -+typedef struct _GimpHeif GimpHeif; -+typedef struct _GimpHeifClass GimpHeifClass; - --struct _Heif -+struct _GimpHeif - { - GimpPlugIn parent_instance; - }; - --struct _HeifClass -+struct _GimpHeifClass - { - GimpPlugInClass parent_class; - }; - - --#define HEIF_TYPE (heif_get_type ()) --#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif)) -+#define GIMP_HEIF_TYPE (gimp_heif_get_type ()) -+#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif)) - --GType heif_get_type (void) G_GNUC_CONST; -+GType gimp_heif_get_type (void) G_GNUC_CONST; - - static GList * heif_init_procedures (GimpPlugIn *plug_in); - static GimpProcedure * heif_create_procedure (GimpPlugIn *plug_in, -@@ -123,14 +123,14 @@ static gboolean save_dialog (GimpProcedure *procedure, - GimpImage *image); - - --G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN) -+G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN) - --GIMP_MAIN (HEIF_TYPE) -+GIMP_MAIN (GIMP_HEIF_TYPE) - DEFINE_STD_SET_I18N - - - static void --heif_class_init (HeifClass *klass) -+gimp_heif_class_init (GimpHeifClass *klass) - { - GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass); - -@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass) - } - - static void --heif_init (Heif *heif) -+gimp_heif_init (GimpHeif *heif) - { - } - --- -GitLab - diff --git a/media-gfx/gimp/gimp-2.10.32-r1.ebuild b/media-gfx/gimp/gimp-2.10.32-r4.ebuild index c4ab0e971612..b1a59ff2e607 100644 --- a/media-gfx/gimp/gimp-2.10.32-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.32-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,16 +12,16 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" RESTRICT="!test? ( test )" COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 - >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 @@ -35,10 +35,10 @@ COMMON_DEPEND=" >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 - media-libs/libjpeg-turbo + media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:0 + >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 @@ -83,6 +83,7 @@ DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) PATCHES=( "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) + "${FILESDIR}/${PN}-2.10_fix_file-dicom-return-value.patch" # Bug 875413 (duplicates 886481, 887587) ) src_prepare() { diff --git a/media-gfx/gimp/gimp-2.10.34-r1.ebuild b/media-gfx/gimp/gimp-2.10.34-r1.ebuild new file mode 100644 index 000000000000..d8d1639a7cdc --- /dev/null +++ b/media-gfx/gimp/gimp-2.10.34-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME2_EAUTORECONF=yes +WANT_AUTOMAKE= + +inherit autotools gnome2 toolchain-funcs virtualx + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="https://www.gimp.org/" +SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" +LICENSE="GPL-3+ LGPL-3+" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + >=app-text/poppler-0.50[cairo] + >=app-text/poppler-data-0.4.7 + >=dev-libs/glib-2.56.2:2 + >=dev-libs/json-glib-1.2.6 + dev-libs/libxml2:2 + dev-libs/libxslt + >=gnome-base/librsvg-2.40.6:2 + >=media-gfx/mypaint-brushes-2.0.2:= + >=media-libs/babl-0.1.98 + >=media-libs/fontconfig-2.12.4 + >=media-libs/freetype-2.1.7 + >=media-libs/gegl-0.4.40:0.4[cairo] + >=media-libs/gexiv2-0.10.6 + >=media-libs/harfbuzz-0.9.19:= + >=media-libs/lcms-2.8:2 + media-libs/libjpeg-turbo:= + >=media-libs/libmypaint-1.6.1:= + >=media-libs/libpng-1.6.25:0= + >=media-libs/tiff-3.5.7:= + net-libs/glib-networking[ssl] + sys-libs/zlib + >=x11-libs/cairo-1.12.2 + >=x11-libs/gdk-pixbuf-2.31:2 + >=x11-libs/gtk+-2.24.32:2 + x11-libs/libXcursor + >=x11-libs/pango-1.29.4 + aalib? ( media-libs/aalib ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) + heif? ( >=media-libs/libheif-1.9.1:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) + jpegxl? ( >=media-libs/libjxl-0.7.0:= ) + mng? ( media-libs/libmng:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + postscript? ( app-text/ghostscript-gpl:= ) + udev? ( dev-libs/libgudev:= ) + unwind? ( >=sys-libs/libunwind-1.1.0:= ) + webp? ( >=media-libs/libwebp-0.6.0:= ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + xpm? ( x11-libs/libXpm ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-themes/hicolor-icon-theme + gnome? ( gnome-base/gvfs ) +" + +DEPEND=" + ${COMMON_DEPEND} + >=dev-lang/perl-5.10.0 + dev-libs/appstream-glib + dev-util/gtk-update-icon-cache + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.19 + >=sys-devel/libtool-2.2 + virtual/pkgconfig +" + +DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) + +PATCHES=( + "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) +) + +src_prepare() { + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 + + sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 + sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 + + gnome2_src_prepare # calls eautoreconf + + sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 + grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test + + export CC_FOR_BUILD="$(tc-getBUILD_CC)" +} + +_adjust_sandbox() { + # Bugs #569738 and #591214 + local nv + for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do + # We do not check for existence as they may show up later + # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 + addwrite "${nv}" + done + + addwrite /dev/dri/ # bugs #574038 and #684886 + addwrite /dev/ati/ # bug #589198 + addwrite /proc/mtrr # bug #589198 +} + +src_configure() { + _adjust_sandbox + + local myconf=( + GEGL="${EPREFIX}"/usr/bin/gegl-0.4 + GDBUS_CODEGEN="${EPREFIX}"/bin/false + + --enable-default-binary + + --disable-check-update + --disable-python + --enable-mp + --with-appdata-test + --with-bug-report-url=https://bugs.gentoo.org/ + --with-xmc + --without-libbacktrace + --without-webkit + --without-xvfb-run + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable debug) + $(use_enable vector-icons) + $(use_with aalib aa) + $(use_with alsa) + $(use_with !aqua x) + $(use_with heif libheif) + $(use_with jpeg2k jpeg2000) + $(use_with jpegxl) + $(use_with mng libmng) + $(use_with openexr) + $(use_with postscript gs) + $(use_with udev gudev) + $(use_with unwind libunwind) + $(use_with webp) + $(use_with wmf) + $(use_with xpm libxpm) + ) + + gnome2_src_configure "${myconf[@]}" +} + +src_compile() { + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 + gnome2_src_compile +} + +# for https://bugs.gentoo.org/664938 +_rename_plugins() { + einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' + local prename=gimp-org- + ( + cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die + for plugin_slash in $(ls -d1 */); do + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" + mv ${plugin}/{,${prename}}${plugin} || die + mv {,${prename}}${plugin} || die + fi + done + ) +} + +src_test() { + virtx emake check +} + +src_install() { + gnome2_src_install + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die + + find "${D}" -name '*.la' -type f -delete || die + + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) + local gimp_app_version=$(ver_cut 1-2) + mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die + + # Remove gimp devel-docs html files if user doesn't need it + if ! use doc; then + rm -r "${ED}"/usr/share/gtk-doc || die + fi + + _rename_plugins || die +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/media-gfx/gimp/gimp-2.99.12-r1.ebuild b/media-gfx/gimp/gimp-2.99.12-r1.ebuild deleted file mode 100644 index d15a4aafe829..000000000000 --- a/media-gfx/gimp/gimp-2.99.12-r1.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..11} ) -VALA_MIN_API_VERSION="0.50" -VALA_USE_DEPEND=vapigen - -inherit lua-single meson python-single-r1 vala xdg - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="GPL-3+ LGPL-3+" -SLOT="0/3" - -IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RESTRICT="!test? ( test )" - -# media-libs/{babl,gegl} are required to be built with USE="introspection" -# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} -COMMON_DEPEND=" - >=app-text/poppler-0.90.1[cairo] - >=app-text/poppler-data-0.4.9 - >=dev-libs/appstream-glib-0.7.16 - >=dev-libs/atk-2.34.1 - >=dev-libs/glib-2.68.0:2 - >=dev-libs/json-glib-1.4.4 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.21:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.96[introspection,lcms,vala?] - >=media-libs/fontconfig-2.12.6 - >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] - >=media-libs/gexiv2-0.14.0 - >=media-libs/harfbuzz-2.6.5:= - >=media-libs/lcms-2.9:2 - media-libs/libjpeg-turbo - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - >=x11-libs/cairo-1.16.0 - >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] - >=x11-libs/gtk+-3.24.16:3[introspection] - >=x11-libs/pango-1.44.7 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - heif? ( >=media-libs/libheif-1.9.1:= ) - javascript? ( dev-libs/gjs ) - jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) - jpegxl? ( >=media-libs/libjxl-0.6.1:= ) - lua? ( - ${LUA_DEPS} - $(lua_gen_cond_dep ' - dev-lua/lgi[${LUA_USEDEP}] - ') - ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-2.3.0:= ) - postscript? ( app-text/ghostscript-gpl:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] - ') - ) - udev? ( >=dev-libs/libgudev-167:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - X? ( x11-libs/libXcursor ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - test? ( x11-misc/xvfb-run ) - vala? ( $(vala_depend) ) -" - -# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now -BDEPEND=" - >=dev-lang/perl-5.30.3 - dev-util/gdbus-codegen - >=sys-devel/gettext-0.21 - doc? ( - app-text/yelp-tools - dev-libs/gobject-introspection[doctool] - dev-util/gi-docgen - ) - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) - -PATCHES=( "${FILESDIR}/${P}_fix_libheif-1.13_build.patch" ) - -pkg_setup() { - use lua && lua-single_pkg_setup - - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794 - - # Fix (typo) MMX and SSE support detection - sed -i -e "s/'-mmx'/'-mmmx'/" -e "s/'-sse'/'-msse'/" meson.build || die - - # Fix Gimp and GimpUI devel doc installation paths - sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die - sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die - - # Fix pygimp.interp python implementation path. - # Meson @PYTHON_PATH@ use sandbox path e.g.: - # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3' - sed -i -e 's:@PYTHON_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - use vala && vala_setup - - local emesonargs=( - -Denable-default-bin=true - - -Dcheck-update=no - -Denable-multiproc=true - -Dappdata-test=disabled - -Dbug-report-url=https://bugs.gentoo.org/ - -Dlibbacktrace=false - -Dwebkit-unmaintained=false - $(meson_feature aalib aa) - $(meson_feature alsa) - $(meson_feature doc gi-docgen) - $(meson_feature heif) - $(meson_feature jpeg2k jpeg2000) - $(meson_feature jpegxl jpeg-xl) - $(meson_feature mng) - $(meson_feature openexr) - $(meson_feature postscript ghostscript) - $(meson_feature test headless-tests) - $(meson_feature udev gudev) - $(meson_feature vala vala-plugins) - $(meson_feature webp) - $(meson_feature wmf) - $(meson_feature X xcursor) - $(meson_feature xpm) - $(meson_use doc g-ir-doc) - $(meson_use javascript) - $(meson_use lua) - $(meson_use python) - $(meson_use unwind libunwind) - $(meson_use vector-icons) - ) - - meson_src_configure -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - meson_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prename=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || exit 1 - mv {,${prename}}${plugin} || exit 1 - fi - done - ) -} - -src_install() { - meson_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die - - # Create symlinks for Gimp exec in /usr/bin - dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp - dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console - dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter - dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard - dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool - - _rename_plugins || die -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/gimp/gimp-2.99.14.ebuild b/media-gfx/gimp/gimp-2.99.14-r1.ebuild index 3b46b2c60b3c..2383b1a4a81c 100644 --- a/media-gfx/gimp/gimp-2.99.14.ebuild +++ b/media-gfx/gimp/gimp-2.99.14-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..11} ) -VALA_MIN_API_VERSION="0.50" +PYTHON_COMPAT=( python3_{9..11} ) VALA_USE_DEPEND=vapigen inherit lua-single meson python-single-r1 vala xdg @@ -45,10 +44,10 @@ COMMON_DEPEND=" >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.13.1:2 - media-libs/libjpeg-turbo + media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:0 + >=media-libs/tiff-4.1.0:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 20c37382e07c..a098440168e3 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..11} ) -VALA_MIN_API_VERSION="0.50" +PYTHON_COMPAT=( python3_{9..11} ) VALA_USE_DEPEND=vapigen inherit git-r3 lua-single meson python-single-r1 vala xdg @@ -45,10 +44,10 @@ COMMON_DEPEND=" >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.13.1:2 - media-libs/libjpeg-turbo + media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:0 + >=media-libs/libpng-1.6.37:= + >=media-libs/tiff-4.1.0:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml index a6a6e9603073..bce698d08f71 100644 --- a/media-gfx/gimp/metadata.xml +++ b/media-gfx/gimp/metadata.xml @@ -10,8 +10,10 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag> <flag name="jpegxl">Enable support for JPEG XL image format</flag> <flag name="vector-icons">Enable support for vector icons (experimental)</flag> </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gimp</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index faa5c8711243..01aac4b89f1e 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,2 +1,3 @@ -DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 +DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b +DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch deleted file mode 100644 index 04cfa560f193..000000000000 --- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch +++ /dev/null @@ -1,16 +0,0 @@ -A GCC-specific setting from years ago. gcc-9 quietly ignores it (the -resulting binaries appear to be the same whether -fno-ipa-sra has been -specified or not), clang fails on it as not recognised. -Just get rid of it altogether. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,7 +100,7 @@ - if(APPLE) - list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive) - else() -- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive) -+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive) - endif() - - if(NOT "${PRERELEASE_TAG}" STREQUAL "") diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch deleted file mode 100644 index e97ef6bf6138..000000000000 --- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch ---- a/cmake/FindCImg.cmake -+++ b/cmake/FindCImg.cmake -@@ -147,7 +147,10 @@ if(ENABLE_JPEG) - endif() - - if(ENABLE_OPENEXR) -- find_package(OpenEXR) -+ find_package(OpenEXR CONFIG) -+ if(NOT TARGET OpenEXR::OpenEXR) -+ find_package(OpenEXR) -+ endif() - - if(OpenEXR_FOUND) - list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr") ---- a/src/Makefile -+++ b/src/Makefile -@@ -307,8 +307,8 @@ - - # Enable native support of EXR image files, using the OpenEXR library. - # (http://www.openexr.com/) --OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR) --OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) -+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath) -+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath) - - # Enable Fast Fourier Transforms, using the FFTW3 library. - # (http://www.fftw.org/) diff --git a/media-gfx/gmic/files/gmic-3.2.0-grep38.patch b/media-gfx/gmic/files/gmic-3.2.0-grep38.patch new file mode 100644 index 000000000000..e25a809fdeea --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.2.0-grep38.patch @@ -0,0 +1,27 @@ +Starting with version 3.8, grep no longer quietly ignores backslashes +preceding a white-space character. + +--- a/src/Makefile ++++ b/src/Makefile +@@ -89,16 +89,16 @@ + WGET = wget --no-check-certificate --quiet -O + PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins + BASH_COMPLETIONSDIR = $(shell pkg-config --variable completionsdir bash-completion || echo $(PREFIX)/share/bash-completion/completions) +-VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3) +-VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1) +-VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1) +-VERSION3 = $(shell grep 'gmic_version\ ' gmic.h | tail -c2 | head -c1) ++VERSION = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c3) ++VERSION1 = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c1) ++VERSION2 = $(shell grep 'gmic_version ' gmic.h | tail -c3 | head -c1) ++VERSION3 = $(shell grep 'gmic_version ' gmic.h | tail -c2 | head -c1) + SVERSION=$(VERSION1).$(VERSION2).$(VERSION3) + SRC_PATH=$(shell pwd) + + # Check that versions of files 'CImg.h' and 'gmic.h' match. + ifneq (,$(wildcard CImg.h)) +-CIMG_VERSION = $(shell grep 'cimg_version\ ' CImg.h | tail -c4 | head -c3) ++CIMG_VERSION = $(shell grep 'cimg_version ' CImg.h | tail -c4 | head -c3) + else + CIMG_VERSION = $(VERSION) + endif diff --git a/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch new file mode 100644 index 000000000000..6cab84226e98 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch @@ -0,0 +1,133 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -230,6 +230,7 @@ + + # Enable parallelization in CImg, using OpenMP. + # (http://www.openmp.org/) ++ifeq ($(GMIC_USE_OPENMP),yes) + ifdef IS_CLANG + OPENMP_CFLAGS = -I/usr/lib/gcc/x86_64-linux-gnu/9/include -Dcimg_use_openmp -fopenmp=libomp + OPENMP_LIBS = +@@ -237,6 +238,7 @@ + OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp + OPENMP_LIBS = -lgomp + endif ++endif + + # Enable software debugging. + # (Use address sanitizer and thus slows down the code) +@@ -258,9 +260,13 @@ + # Enable image display, using X11 (Unix). + # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too) + ifneq ($(OS),Darwin) ++ifeq ($(GMIC_USE_X11),yes) + X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr + X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr) + else ++X11_CFLAGS = -Dcimg_display=0 ++endif ++else + ifeq (,$(wildcard /usr/X11)) + X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr + X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr) +@@ -272,8 +278,10 @@ + + # Enable faster X11 display, using XShm extension. + # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml) ++ifeq ($(GMIC_USE_XSHM),yes) + XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm) + XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(PREFIX)/X11R6/lib) -lXext ++endif + + # Enable image display, using GDI32 (Windows). + GDI32_CFLAGS = -Dcimg_display=2 +@@ -282,8 +290,10 @@ + # Enable native support of PNG image files, using the PNG library. + # (http://www.libpng.org/pub/png/libpng.html) + ifneq ($(OS),Darwin) ++ifeq ($(GMIC_USE_PNG),yes) + PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng) + PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz) ++endif + else + ifeq (,$(wildcard /tmp/skl)) + PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng) +@@ -296,56 +306,76 @@ + + # Enable native support of JPEG image files, using the JPEG library. + # (http://libjpeg.sourceforge.net/) ++ifeq ($(GMIC_USE_JPEG),yes) + JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg) + JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg) ++endif + + # Enable native support of TIFF image files, using the TIFF library. + # (http://www.libtiff.org/) ++ifeq ($(GMIC_USE_TIFF),yes) + TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4) + TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff) ++endif + + # Enable native support for loading HEIC/AVIF image files, using the libheif library. + # ( https://github.com/strukturag/libheif ) ++ifeq ($(GMIC_USE_HEIF),yes) + HEIF_CFLAGS = -Dcimg_use_heif + HEIF_LIBS = -lheif ++endif + + # Enable native support of MINC2 image files, using the MINC2 library. + # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) ++ifeq ($(GMIC_USE_MINC2),yes) + MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include + MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib ++endif + + # Enable native support for downloading files from the network. + # ( http://curl.haxx.se/libcurl/ ) ++ifeq ($(GMIC_USE_CURL),yes) + CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl) + CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl) ++endif + + # Enable native support of webcams and video streaming, using the OpenCV library. + # (https://opencv.org/) ++ifeq ($(GMIC_USE_OPENCV),yes) + OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4 + OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio) ++endif + + # Enable support of most classical image file formats, using the GraphicsMagick++ library. + # (http://www.graphicsmagick.org/Magick++/) ++ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes) + MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(PREFIX)/$(INCLUDE)/GraphicsMagick) + MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++) ++endif + + # Enable native support of EXR image files, using the OpenEXR library. + # (http://www.openexr.com/) +-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(PREFIX)/$(INCLUDE)/OpenEXR) +-OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) ++ifeq ($(GMIC_USE_EXR),yes) ++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath) ++OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath) ++endif + + # Enable Fast Fourier Transforms, using the FFTW3 library. + # (http://www.fftw.org/) ++ifeq ($(GMIC_USE_FFTW),yes) + FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3) + FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3) + ifneq ($(OS),Windows) + FFTW_LIBS += -lfftw3_threads + endif ++endif + + # Enable native support of the BOARD library. + # (https://github.com/c-koi/libboard) ++ifeq ($(GMIC_USE_BOARD),yes) + BOARD_CFLAGS = -Dcimg_use_board + BOARD_LIBS = -lboard ++endif + + GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) + GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) diff --git a/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch new file mode 100644 index 000000000000..85db75fbb4c4 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -188,7 +188,7 @@ + ifndef NO_SRIPDLIB + MANDATORY_CFLAGS += -std=c++11 -pedantic + endif +-MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) -Wl,-rpath,. ++MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) + ifdef IS_GCC + MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label + GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5) diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild deleted file mode 100644 index 013dbdbdad9b..000000000000 --- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake bash-completion-r1 toolchain-funcs - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/dtschump/gmic.git" - inherit git-r3 -else - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib" -REQUIRED_USE=" - gimp? ( png zlib fftw X ) - qt5? ( png zlib fftw X ) -" - -MIN_QT_VER="5.2.0" -QT_DEPEND=" - >=dev-qt/qtcore-${MIN_QT_VER}:5= - >=dev-qt/qtgui-${MIN_QT_VER}:5= - >=dev-qt/qtnetwork-${MIN_QT_VER}:5= - >=dev-qt/qtwidgets-${MIN_QT_VER}:5= -" -DEPEND=" - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0=[threads] ) - gimp? ( - media-gfx/gimp:0/2 - ${QT_DEPEND} - ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - png? ( media-libs/libpng:0= ) - qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) -" -BDEPEND=" - virtual/pkgconfig - gimp? ( dev-qt/linguist-tools:5 ) - qt5? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch - "${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use qt5; then - # respect user flags - sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ - -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ - -i gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - # Bug #753377 - local PATCHES=() - cmake_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=no - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(usex cli) - -DCUSTOM_CFLAGS=ON - -DENABLE_CURL=$(usex curl) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_DYNAMIC_LINKING=ON - ) - - cmake_src_configure - - # configure gmic-qt frontends - local CMAKE_USE_DIR="${S}/gmic-qt" - mycmakeargs=( - -DENABLE_DYNAMIC_LINKING=ON - -DENABLE_CURL=$(usex curl) - -DGMIC_LIB_PATH="${BUILD_DIR}" - -DGMIC_PATH="${S}/src" - ) - - if use gimp; then - mycmakeargs+=( -DGMIC_QT_HOST=gimp ) - BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure - fi -} - -src_compile() { - cmake_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_src_install - - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} - - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" - insinto "${PLUGINDIR}" - doins resources/gmic_cluts.gmz - - # install gmic-qt frontends - if use gimp; then - exeinto "${PLUGINDIR}" - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt - fi - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt -} - -pkg_postinst() { - if [[ -n "${REPLACING_VERSIONS}" ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -le "3.0.0"; then - einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface." - einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead." - break - fi - done - fi -} diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6-r1.ebuild index 85bb406d8cc0..900c5180f8da 100644 --- a/media-gfx/gmic/gmic-3.1.6.ebuild +++ b/media-gfx/gmic/gmic-3.1.6-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="GREYC's Magic Image Converter" @@ -39,22 +39,22 @@ DEPEND=" media-gfx/gimp:0/2 ${QT_DEPEND} ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) jpeg? ( media-libs/libjpeg-turbo:= ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) + opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) - png? ( media-libs/libpng:0= ) + png? ( media-libs/libpng:= ) qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 x11-libs/libXext )" RDEPEND="${DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) + ffmpeg? ( media-video/ffmpeg:= ) " BDEPEND=" virtual/pkgconfig diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild new file mode 100644 index 000000000000..e37b2cb59f90 --- /dev/null +++ b/media-gfx/gmic/gmic-3.2.0.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="GREYC's Magic Image Converter" +HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" +SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" + +LICENSE="CeCILL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X" + +REQUIRED_USE=" + gimp? ( png fftw X ) + qt5? ( png fftw X ) +" + +MIN_QT_VER="5.2.0" +QT_DEPEND=" + >=dev-qt/qtcore-${MIN_QT_VER}:5 + >=dev-qt/qtgui-${MIN_QT_VER}:5 + >=dev-qt/qtnetwork-${MIN_QT_VER}:5 + >=dev-qt/qtwidgets-${MIN_QT_VER}:5 +" +DEPEND=" + sys-libs/zlib:0= + curl? ( net-misc/curl ) + fftw? ( sci-libs/fftw:3.0=[threads] ) + gimp? ( + media-gfx/gimp:0/2 + ${QT_DEPEND} + ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) + openexr? ( + dev-libs/imath:= + media-libs/openexr:= + ) + png? ( media-libs/libpng:= ) + qt5? ( ${QT_DEPEND} ) + tiff? ( media-libs/tiff:= ) + X? ( + x11-libs/libX11 + x11-libs/libXext + )" +RDEPEND="${DEPEND} + ffmpeg? ( media-video/ffmpeg:= ) +" +BDEPEND=" + virtual/pkgconfig + gimp? ( + dev-qt/linguist-tools:5 + media-gfx/gimp:0/2 + ) + qt5? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.6-ar_so.patch + "${FILESDIR}"/${PN}-3.2.0-grep38.patch + "${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch + "${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +gmic_emake() { + local mymakeargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + STRIP="/bin/true" + LIB="$(get_libdir)" + OPT_CFLAGS="${CXXFLAGS}" + OPT_LIBS="${LDFLAGS}" + GMIC_USE_CURL=$(usex curl) + GMIC_USE_EXR=$(usex openexr) + GMIC_USE_FFTW=$(usex fftw) + GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) + GMIC_USE_JPEG=$(usex jpeg) + GMIC_USE_OPENCV=$(usex opencv) + GMIC_USE_OPENMP=$(usex openmp) + GMIC_USE_PNG=$(usex png) + GMIC_USE_TIFF=$(usex tiff) + GMIC_USE_X11=$(usex X) + QMAKE="qmake5" + ) + + # Possibly unnecessary since 3.2.0, just in case though. + tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) + + emake -j1 -C src \ + "${mymakeargs[@]}" \ + $@ +} + +src_compile() { + gmic_emake lib libc + use cli && gmic_emake cli_shared + use gimp && gmic_emake gimp_shared + use qt5 && gmic_emake gmic_qt_shared +} + +src_install() { + # See below for why this has to name a directory even if USE=-gimp + local gimp_plugindir="/deleteme" + if use gimp; then + if type gimptool &>/dev/null; then + gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins" + elif type gimptool-2.0 &>/dev/null; then + gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" + elif type gimptool-2.99 &>/dev/null; then + gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins" + else + die "Cannot find GIMP plugin directory" + fi + fi + + gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install + + # Upstream build scripts create PLUGINDIR and write some files to it + # regardless of whether the GIMP plug-in has been built or not, or even + # when they haven't been able to execute gimptool to get the base path. + use gimp || rm -rf "${ED}/${gimp_plugindir}" + + # These are already gzipped in the source tarballs + find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die +} diff --git a/media-gfx/gmic/gmic-3.2.2.ebuild b/media-gfx/gmic/gmic-3.2.2.ebuild new file mode 100644 index 000000000000..3c824f3eee11 --- /dev/null +++ b/media-gfx/gmic/gmic-3.2.2.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="GREYC's Magic Image Converter" +HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" +SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" + +LICENSE="CeCILL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X" + +REQUIRED_USE=" + gimp? ( png fftw X ) + qt5? ( png fftw X ) +" + +MIN_QT_VER="5.2.0" +QT_DEPEND=" + >=dev-qt/qtcore-${MIN_QT_VER}:5 + >=dev-qt/qtgui-${MIN_QT_VER}:5 + >=dev-qt/qtnetwork-${MIN_QT_VER}:5 + >=dev-qt/qtwidgets-${MIN_QT_VER}:5 +" +DEPEND=" + sys-libs/zlib:0= + curl? ( net-misc/curl ) + fftw? ( sci-libs/fftw:3.0=[threads] ) + gimp? ( + media-gfx/gimp:0/2 + ${QT_DEPEND} + ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) + openexr? ( + dev-libs/imath:= + media-libs/openexr:= + ) + png? ( media-libs/libpng:= ) + qt5? ( ${QT_DEPEND} ) + tiff? ( media-libs/tiff:= ) + X? ( + x11-libs/libX11 + x11-libs/libXext + )" +RDEPEND="${DEPEND} + ffmpeg? ( media-video/ffmpeg:= ) +" +BDEPEND=" + virtual/pkgconfig + gimp? ( + dev-qt/linguist-tools:5 + media-gfx/gimp:0/2 + ) + qt5? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.6-ar_so.patch + "${FILESDIR}"/${PN}-3.2.0-grep38.patch + "${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch + "${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +gmic_emake() { + local mymakeargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + STRIP="/bin/true" + LIB="$(get_libdir)" + OPT_CFLAGS="${CXXFLAGS}" + OPT_LIBS="${LDFLAGS}" + GMIC_USE_CURL=$(usex curl) + GMIC_USE_EXR=$(usex openexr) + GMIC_USE_FFTW=$(usex fftw) + GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) + GMIC_USE_JPEG=$(usex jpeg) + GMIC_USE_OPENCV=$(usex opencv) + GMIC_USE_OPENMP=$(usex openmp) + GMIC_USE_PNG=$(usex png) + GMIC_USE_TIFF=$(usex tiff) + GMIC_USE_X11=$(usex X) + QMAKE="qmake5" + ) + + # Possibly unnecessary since 3.2.0, just in case though. + tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) + + emake -j1 -C src \ + "${mymakeargs[@]}" \ + $@ +} + +src_compile() { + gmic_emake lib + gmic_emake libc + use cli && gmic_emake cli_shared + use gimp && gmic_emake gimp_shared + use qt5 && gmic_emake gmic_qt_shared +} + +src_install() { + # See below for why this has to name a directory even if USE=-gimp + local gimp_plugindir="/deleteme" + if use gimp; then + if type gimptool &>/dev/null; then + gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins" + elif type gimptool-2.0 &>/dev/null; then + gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" + elif type gimptool-2.99 &>/dev/null; then + gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins" + else + die "Cannot find GIMP plugin directory" + fi + fi + + gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install + + # Upstream build scripts create PLUGINDIR and write some files to it + # regardless of whether the GIMP plug-in has been built or not, or even + # when they haven't been able to execute gimptool to get the base path. + use gimp || rm -rf "${ED}/${gimp_plugindir}" + + # These are already gzipped in the source tarballs + find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die +} diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest index 2c7eb33475e4..3f5b8b8f6263 100644 --- a/media-gfx/gnofract4d/Manifest +++ b/media-gfx/gnofract4d/Manifest @@ -1,2 +1,3 @@ DIST gnofract4d-4.3_p20211108.tar.gz 18271921 BLAKE2B b73fef616b8a91827edd514ec128bcb6d63a8fc8f1433989e31bd9f11711a9568a61358dcca23846bff461ef6a8addeae68cc5ab5f4ae29b6e9b2857bdbad2b8 SHA512 0d95f31ac9b1b82bfd459ac896c73bfcffb3b256750093cdccee976839112fcaeb42260c0eb48ef4f30dc0504f5b84cc425f6568997c05639993354756f9ef75 DIST gnofract4d-4.3_p20221114.tar.gz 18275321 BLAKE2B 029babc09810aa2a2fe0a627144bd347cb363666a9412cce067c2ce505fd8d554a3e12058ab74ccc5d1ff29587e96276026e685ee586e3961c92f72b30fe72d5 SHA512 d45183c0dc77959210b512ecfb35a8487ebf103ec5d46f815f4a2e05655ed5cc2f5fd1399f644fd919a459ffdb54dfe32a7745991dd37f527f5b79747aa22618 +DIST gnofract4d-4.3_p20221125.tar.gz 18275177 BLAKE2B 24fcd71818a98a3137b485046f295b523884d05ece694e37cf871e1fdaba7b26ac870675895a7a361e5d1fe142b0ae68c720c6e39615226951e8e1af6f57c848 SHA512 75d8d12441a0e2024f0ef125fee5cbe8dcc10c4c48ba366d5529644ae743928b998f85369aafc6e737cb994a82ebdcbe941e11c916c0d0996e785a146469e359 diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild index ecae03d9d543..b343a1f5dbdb 100644 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 optfeature virtualx xdg diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild index 35a84519af89..81ee6be4edfc 100644 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20221114.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125.ebuild new file mode 100644 index 000000000000..8fc1f112c6e4 --- /dev/null +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 optfeature virtualx xdg + +COMMIT="f90eb2a9c25e3f3aef65e8d4dce7d73bcb795b2d" + +DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" +HOMEPAGE="https://fract4d.github.io/gnofract4d/" +SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + media-libs/libjpeg-turbo:0= + media-libs/libpng:0=" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3[introspection]" +BDEPEND=" + virtual/pkgconfig + test? ( + media-video/ffmpeg[vpx,zlib] + )" + +distutils_enable_tests pytest + +S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die + + distutils-r1_src_prepare +} + +python_test() { + ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die + local EPYTEST_IGNORE=( + # test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow + test_regress.py + ) + TMPDIR="${T}" virtx epytest +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "creating videos" media-video/ffmpeg[vpx,zlib] +} diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest index 4cf0b855a105..2c4a7d6079e7 100644 --- a/media-gfx/gnome-font-viewer/Manifest +++ b/media-gfx/gnome-font-viewer/Manifest @@ -1,3 +1,4 @@ DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50 -DIST gnome-font-viewer-42.0.tar.xz 287644 BLAKE2B 273328298187c1b77882638bb292ca9340a1dc57c917d9888abeadfe8ea01c27d0f59d382823b262323000da81457fb821aafa9b1ba50792ee75ce3dd8de4ee7 SHA512 231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec DIST gnome-font-viewer-43.0.tar.xz 291800 BLAKE2B 8d47eed603a932c47ccbd88f75b87e3df6850b89854b30ce1b75979867f5a75c8db97387833f118fc27e8f6c54c838523d6ab7f72813b9040d9100a3f46760ca SHA512 9d93cee4e62802640722294a0db7b5947d417e393a95aca9017b9904708037fbf353e35d891181c8acdb5615ed9c20ec03c26b197bb982196122bf9cb0a37fd5 +DIST gnome-font-viewer-44.0.tar.xz 299644 BLAKE2B 9eceda601332601a3918331c0b4dae1f588ec88d9c28323694291f22e9add115ccfd70ef8c2d3b1a410bcf7c7443810abdb58a156927c235fb895412dea54213 SHA512 f2da77fadbd76eaaf661cb518043ebad6f964a90f1cede5b58160a3aa08a0fe42a9972bc4871725dc7ae16eb4199329ef2ea08734b8017306e61341e51c37bea +DIST gnome-font-viewer-44.rc.tar.xz 299360 BLAKE2B c627b79623caa8d1fac031cafdc31d9ffc0b9af4f15e4b14b10c5bcbaf5fc0c3f80ed65bd4d8fd336109162f5e0cb5b0131db18b2c6fdc9512560965490fee5c SHA512 2a20e3d46f43a787b32668c84f191de91c69e20536f0f603aee0453989ca8cfeb5d8309b5c98a6a8af38018bf024fe1bbb5636b4d2bb5fc301f19db11c7fc5af diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild index 3b3d7ec9f33e..e7d86275e6fe 100644 --- a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,16 +9,17 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" DEPEND=" >=dev-libs/glib-2.56.0:2 >=gui-libs/gtk-4.5.0:4 - >=gui-libs/libadwaita-1.0.0:1= + >=gui-libs/libadwaita-1.2.0:1 >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:4= + dev-libs/fribidi " RDEPEND="${DEPEND}" BDEPEND=" diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-44_rc.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-44_rc.ebuild new file mode 100644 index 000000000000..b8d97dca407e --- /dev/null +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-44_rc.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson xdg + +DESCRIPTION="Font viewer utility for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer" +SRC_URI="https://download.gnome.org/sources/${PN}/44/${PN}-44.rc.tar.xz" +S="${WORKDIR}/${PN}-44.rc" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=gui-libs/gtk-4.5.0:4 + >=gui-libs/libadwaita-1.2.0:1= + >=media-libs/harfbuzz-0.9.9:= + media-libs/fontconfig:1.0 + media-libs/freetype:2 + gnome-base/gnome-desktop:4= + dev-libs/fribidi +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxml2:2 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" diff --git a/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild index 902f521cec1d..0561ef46bfc9 100644 --- a/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg diff --git a/media-gfx/gnome-photos/gnome-photos-43.0.ebuild b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild index 8546609fd357..b12d1a32a456 100644 --- a/media-gfx/gnome-photos/gnome-photos-43.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest deleted file mode 100644 index 56d9ba59d1ab..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch deleted file mode 100644 index 8fddadb435ab..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e769ad77617a3456f0f4aee9418ef6bdbab40403 Mon Sep 17 00:00:00 2001 -From: Anton Keks <anton@codeborne.com> -Date: Thu, 2 Jan 2014 23:14:55 +0200 -Subject: [PATCH 1/8] fix deprecation warnings - ---- - src/raw-thumbnailer.c | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/src/raw-thumbnailer.c b/src/raw-thumbnailer.c -index d638102..b32bc49 100644 ---- a/src/raw-thumbnailer.c -+++ b/src/raw-thumbnailer.c -@@ -64,7 +64,7 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size) - } - else { - small = pixbuf; -- gdk_pixbuf_ref (small); -+ g_object_ref (small); - } - - a_width = g_strdup_printf ("%d", width); -@@ -88,14 +88,11 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size) - g_free(a_height); - - if (small) { -- gdk_pixbuf_unref (small); -+ g_object_unref (small); - } - return; - } - -- -- -- - static const GOptionEntry entries[] = { - { "jpeg", 'j', 0, G_OPTION_ARG_NONE, &jpeg_output, "Output the thumbnail as a JPEG instead of PNG", NULL }, - { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL }, -@@ -107,8 +104,6 @@ static const GOptionEntry entries[] = { - { NULL } - }; - -- -- - int main (int argc, char ** argv) - { - const char *output_name; -@@ -121,7 +116,6 @@ int main (int argc, char ** argv) - - context = g_option_context_new ("Thumbnail camera RAW files."); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -- g_type_init (); - - if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) { - g_print ("couldn't parse command-line options: %s\n", err->message); -@@ -161,4 +155,3 @@ int main (int argc, char ** argv) - return 0; - } - -- --- -2.12.2 - diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch deleted file mode 100644 index def91cb3fb39..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5a03b1a9ffece1d38cc0cf91c599975b9f2b028e Mon Sep 17 00:00:00 2001 -From: Anton Keks <anton@codeborne.com> -Date: Thu, 2 Jan 2014 23:44:03 +0200 -Subject: [PATCH 1/7] downscale thumbnail if requested size is smaller than it - is, do not hardcode 128 - ---- - src/raw-thumbnailer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/raw-thumbnailer.c b/src/raw-thumbnailer.c -index b32bc49..135dbe3 100644 ---- a/src/raw-thumbnailer.c -+++ b/src/raw-thumbnailer.c -@@ -47,7 +47,7 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size) - height = gdk_pixbuf_get_height (pixbuf); - width = gdk_pixbuf_get_width (pixbuf); - -- if (size <= 128) { -+ if (size < height || size < width) { - int d_width, d_height; - - if (width > height) { -@@ -143,7 +143,7 @@ int main (int argc, char ** argv) - - char* inputfname = g_filename_from_uri (uri, NULL, NULL); - g_free(uri); -- -+ - pixbuf = or_gdkpixbuf_extract_rotated_thumbnail(inputfname, output_size); - g_free(inputfname); - --- -2.12.2 - diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch deleted file mode 100644 index 50e5433809a0..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5cc4ad36b9f25f6973ae48166595d201f215a012 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sun, 16 Apr 2017 16:50:00 +0200 -Subject: [PATCH] Update pkgconfig name of libopenraw - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0f637b5..26dbf5a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GNOME, gdk-pixbuf-2.0 gio-2.0 glib-2.0) - AC_SUBST(GNOME_CFLAGS) - AC_SUBST(GNOME_LIBS) - --PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= 0.0.9) -+PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-0.1 >= 0.1.0) - AC_SUBST(OPENRAW_CFLAGS) - AC_SUBST(OPENRAW_LIBS) - --- -2.12.2 - diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild deleted file mode 100644 index 45f4ea3f8cc7..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 - -MY_P="${PN/gnome-}-${PV}" - -DESCRIPTION="A lightweight and fast raw image thumbnailer for GNOME" -HOMEPAGE="https://libopenraw.pages.freedesktop.org/raw-thumbnailer/" -SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=" - >=media-libs/libopenraw-0.1.0:=[gtk] - >=x11-libs/gdk-pixbuf-2:2 - >=dev-libs/glib-2.26:2 - !media-gfx/raw-thumbnailer -" -DEPEND="${RDEPEND} - dev-util/intltool - gnome-base/gnome-common - sys-devel/gettext - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-deprecation-warning.patch - "${FILESDIR}"/${P}-fix-downscale.patch - "${FILESDIR}"/${P}-libopenraw-0.1.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/media-gfx/gnome-raw-thumbnailer/metadata.xml b/media-gfx/gnome-raw-thumbnailer/metadata.xml deleted file mode 100644 index 5be4d9a9688f..000000000000 --- a/media-gfx/gnome-raw-thumbnailer/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="gnome-gitlab">Archive/gnome-raw-thumbnailer</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch b/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch new file mode 100644 index 000000000000..e21d38b311e9 --- /dev/null +++ b/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch @@ -0,0 +1,77 @@ +https://bugs.gentoo.org/896212 +https://github.com/gphoto/gphoto2/pull/569 +https://github.com/gphoto/gphoto2/commit/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e +https://github.com/gphoto/gphoto2/commit/366930ccc1a261c3eb883da2bf3c655162ccd75f + +From ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 12:59:46 -0700 +Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs + +This is not a plain old datatype in every libc, e.g. with musl this +would fail in type conversion + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static unsigned int ++static pthread_t + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout, + } + + static void +-stop_timeout_func (Camera __unused__ *camera, unsigned int id, ++stop_timeout_func (Camera __unused__ *camera, pthread_t id, + void __unused__ *data) + { + pthread_t tid = id; + + +From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 22:58:37 -0800 +Subject: [PATCH] Match prototypes of callbacks with libgphoto + +In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e +we tried to fix by using pthread_t but it also needs to make changes in +libgphoto and these changes can be invasive, therefore lets revert to +older types and to fix musl problem fix it via type casts + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static pthread_t ++static unsigned int + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, + + pthread_create (&tid, NULL, thread_func, td); + +- return (tid); ++ return (unsigned int)tid; + } + + static void +-stop_timeout_func (Camera __unused__ *camera, pthread_t id, ++stop_timeout_func (Camera __unused__ *camera, unsigned int id, + void __unused__ *data) + { +- pthread_t tid = id; ++ pthread_t tid = (pthread_t)id; + + pthread_cancel (tid); + pthread_join (tid, NULL); + diff --git a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild new file mode 100644 index 000000000000..451c24940a8e --- /dev/null +++ b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Free, redistributable digital camera software application" +HOMEPAGE="http://www.gphoto.org/" +SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="aalib ncurses nls readline" + +# aalib -> needs libjpeg +RDEPEND=" + >=dev-libs/popt-1.6.1 + >=media-libs/libexif-0.6.9 + >=media-libs/libgphoto2-2.5.17:=[exif] + aalib? ( + media-libs/aalib + media-libs/libjpeg-turbo + ) + ncurses? ( dev-libs/cdk:= ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.14.1 ) +" + +PATCHES=( + "${FILESDIR}"/${P}-clang-16.patch +) + +src_prepare() { + default + # Leave GCC debug builds under user control + sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \ + -i configure{.ac,} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_with aalib) \ + $(use_with aalib jpeg) \ + $(use_with ncurses cdk) \ + $(use_enable nls) \ + $(use_with readline) +} diff --git a/media-gfx/gpicview/files/gpicview-fix-animated-gifs.patch b/media-gfx/gpicview/files/gpicview-fix-animated-gifs.patch new file mode 100644 index 000000000000..88867fbe31ad --- /dev/null +++ b/media-gfx/gpicview/files/gpicview-fix-animated-gifs.patch @@ -0,0 +1,13 @@ +diff --git a/src/image-view.c b/src/image-view.c +index b367f2a..1368620 100644 +--- a/src/image-view.c ++++ b/src/image-view.c +@@ -343,7 +343,7 @@ void image_view_clear( ImageView* iv ) + + void image_view_set_pixbuf( ImageView* iv, GdkPixbuf* pixbuf ) + { +- if( pixbuf != iv->pix ) ++ + { + image_view_clear( iv ); + if( G_LIKELY(pixbuf) ) diff --git a/media-gfx/gpicview/files/gpicview-main_win_open-dummy-return.patch b/media-gfx/gpicview/files/gpicview-main_win_open-dummy-return.patch new file mode 100644 index 000000000000..0f4e3bde251c --- /dev/null +++ b/media-gfx/gpicview/files/gpicview-main_win_open-dummy-return.patch @@ -0,0 +1,13 @@ +diff --git a/src/main-win.c b/src/main-win.c +index 32f6433..bf5feba 100644 +--- a/src/main-win.c ++++ b/src/main-win.c +@@ -378,7 +378,7 @@ gboolean main_win_open( MainWin* mw, const char* file_path, ZoomMode zoom ) + image_list_sort_by_name( mw->img_list, GTK_SORT_DESCENDING ); + if (image_list_get_first(mw->img_list)) + main_win_open(mw, image_list_get_current_file_path(mw->img_list), zoom); +- return; ++ return 1; + } + + diff --git a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild new file mode 100644 index 000000000000..36eaa0fd8f83 --- /dev/null +++ b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="A Simple and Fast Image Viewer for X" +HOMEPAGE="http://lxde.sourceforge.net/gpicview" +SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86" + +RDEPEND="media-libs/libjpeg-turbo + x11-libs/gtk+:3[X]" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" + "${FILESDIR}/${PN}-main_win_open-dummy-return.patch" + "${FILESDIR}/${PN}-fix-animated-gifs.patch" +) + +src_configure() { + econf --enable-gtk3 +} diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 59c65f0fe9f1..b9635f463150 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,2 +1,2 @@ -DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a -DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09 +DIST GraphicsMagick-1.3.40.tar.xz 5507792 BLAKE2B 2052eb34931f07c902a9c68192ebe4d36137cd23219b1598bae2fa78c5c8bfd1efadf9fd430ed4fee8dc903e50ffabe5a9c76bf55966b85b6f303b2decdca6ee SHA512 e64902aa2a8702d03d188350bd4252a2263e431611f9a70f38cd8beede8a38cc91bb4de3603fedf15420ebbba488f609f218e9b45e356b9f8dc8e4a75f380ee5 +DIST GraphicsMagick-1.3.40.tar.xz.asc 228 BLAKE2B 70eaaa0cd30cfe23ac6dc5e8edc026c57eea7b1a608e83da3408f6fa9fc2cceeb8190e4e9015f321ee688f2a32689d244d69bc61764a99ab0f99ada72143a575 SHA512 82c628e4a260a690c7b1941321881a97d54b4c9580dcbfd8ae786a1774dc43c46e8542488ca875346446858e7475847c440cfca572315a5fe123315b187a240a diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch deleted file mode 100644 index 69d5fd50a1bf..000000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Sam James <sam@gentoo.org> -# Date 1659168362 -3600 -# Sat Jul 30 09:06:02 2022 +0100 -# Node ID aa77bc8461ee15501a0298dafd53c97447aa30d0 -# Parent 0a06f497d58839e4100b3be46bbdcd14d8147d75 -configure: fix bashism - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Fixes configure warnings/errors like: -``` -checking for gs... /usr/sbin/gs -./configure: 31719: test: #: unexpected operator -checking for Windows fonts directory (location of arial.ttf)... /usr/share/fonts/corefonts/ -``` - ---- a/configure.ac -+++ b/configure.ac -@@ -3148,7 +3148,7 @@ have_ralcgm='no' ; if test "$CGMDecodeD - AM_CONDITIONAL([HasPSDelegate],[test "$have_gs" = 'yes']) - - # Tests for programs only used while in maintainer mode --if test "$MAINT" == '' ; then -+if test "$MAINT" = '' ; then - # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found. - AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html]) - diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r3.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild index ed1b6d6f78e8..8171180c0101 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r3.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,10 +16,10 @@ else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc inherit verify-sig SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )" + SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi @@ -47,7 +47,7 @@ RDEPEND=" postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 @@ -67,7 +67,6 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.3.36-flags.patch "${FILESDIR}"/${PN}-1.3.19-perl.patch - "${FILESDIR}"/${P}-configure-bashism.patch ) pkg_pretend() { diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index e67843f1b019..4e497a4945c2 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,10 +16,10 @@ else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc inherit verify-sig SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )" + SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi @@ -47,7 +47,7 @@ RDEPEND=" postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml index b4e26041b649..6e01d2bf1b1f 100644 --- a/media-gfx/graphicsmagick/metadata.xml +++ b/media-gfx/graphicsmagick/metadata.xml @@ -21,7 +21,6 @@ <use> <flag name="fpx">Enable FlashPix support with <pkg>media-libs/libfpx</pkg></flag> <flag name="dynamic-loading">Compile graphicsmagick with dynamically loadable modules</flag> - <flag name="heif">Add HEIF/HEIC image support</flag> <flag name="jpegxl">Enable support for JPEG XL image format</flag> <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag> <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag> diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch index a7e5804319d7..c55f67c44f55 100644 --- a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch +++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch @@ -1,45 +1,26 @@ -https://bugs.gentoo.org/829690 - -See https://github.com/silnrsi/graphite/pull/44. - -Drop -nodefaultlibs: -- graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious - goal; -- this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared, - but it wouldn't be surprising if it broke other exotic targets too. --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}" - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set_target_properties(graphite2 PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" -- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" -+ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}" - LINKER_LANGUAGE C) - if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86") - add_definitions(-mfpmath=sse -msse2) -@@ -135,7 +135,6 @@ endif() - if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set_target_properties(graphite2 PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" -- LINK_FLAGS "-nodefaultlibs" - LINKER_LANGUAGE C) - if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86") - add_definitions(-mfpmath=sse -msse2) +@@ -125,7 +125,7 @@ + LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}") + else() + set_target_properties(graphite2 PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + + if (GRAPHITE2_SANITIZERS) + target_link_libraries(graphite2 c gcc_s) --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt -@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - set_target_properties(graphite2-base PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions" - COMPILE_DEFINITIONS "GRAPHITE2_NTRACING" -- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" -+ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}" - LINKER_LANGUAGE C) - set_target_properties(graphite2-file PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions" - COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}" -- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" -+ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}" - LINKER_LANGUAGE C) - endif() +@@ -51,9 +51,9 @@ + LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}") + else() + set_target_properties(graphite2-base PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + set_target_properties(graphite2-file PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + endif() + set_target_properties(graphite2-base PROPERTIES + diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch new file mode 100644 index 000000000000..e4413d1f9a61 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch @@ -0,0 +1,17 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -127,12 +127,7 @@ + set_target_properties(graphite2 PROPERTIES + LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") + +- if (GRAPHITE2_SANITIZERS) +- target_link_libraries(graphite2 c gcc_s) +- else() +- target_link_libraries(graphite2 c gcc) +- endif() +- ++ target_link_libraries(graphite2 c gcc_s) + if (BUILD_SHARED_LIBS) + nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) + endif () + diff --git a/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch deleted file mode 100644 index b162ca9aa6f9..000000000000 --- a/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://src.fedoraproject.org/rpms/graphite2/raw/41fb7c104c8f9293254abaa91bbda1daafb458cd/f/graphite-arm-nodefaultlibs.patch -https://bugs.gentoo.org/829690 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -120,11 +120,7 @@ - if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") - target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) - else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") -- if (GRAPHITE2_SANITIZERS) -- target_link_libraries(graphite2 c gcc_s) -- else () -- target_link_libraries(graphite2 c gcc) -- endif () -+ target_link_libraries(graphite2 c gcc_s) - endif() - include(Graphite) - if (BUILD_SHARED_LIBS) - diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild index a139b30e4cc0..bd232f30b6d7 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" @@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="perl test" RESTRICT="!test? ( test )" diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild index 26c1304fa62e..78b29ae66f3f 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" @@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="perl test" RESTRICT="!test? ( test )" @@ -39,10 +39,11 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" - "${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch" "${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch" "${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch" + "${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch" "${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch" + "${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch" ) pkg_setup() { @@ -51,7 +52,7 @@ pkg_setup() { } python_check_deps() { - has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" + python_has_version "dev-python/fonttools[${PYTHON_USEDEP}]" } src_prepare() { diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index 08bfe0385ce1..823b18d27daa 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,4 +1,2 @@ -DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7 -DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c SHA512 78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee -DIST graphviz-7.0.0.tar.xz 21486172 BLAKE2B f52a75b5938ba3a6fbad3efe9d0ca6413145f9355c3ad1c8dc39253e8db36e9862c70c4dc910afd05e601e5787640b5b4a3dd09c1527cc3bd39a97ef281a7215 SHA512 dfead861d2f6ad1ebc9e3e4bd30684e02005cc7a2b78dab3ad45a11a401e08aeb1b6f7d8ea7ad7655230275ab6c10fd791434489e4ba09ae6905970230a974dc -DIST graphviz-7.0.2.tar.xz 21485860 BLAKE2B 5a99bbe6748b01706faade8b17ec34c8ec2d645a8b9cbda6fd3d595f9720358df279de883a556206709ece76dcd44b7b4fe105b5645493480a204c05a2d9585f SHA512 cff40066f80d29a8ca19f8c12410c293b58ef4abf03f2c3b36472a856bc39e6a2bf6badfad4f036e45e430b7d2fec40d5d1fdb0b47778b1857a46b2b07700d98 +DIST graphviz-7.0.5.tar.xz 21484456 BLAKE2B 82fd4e97e946aaf603eeeda2d9e0628c46b5268323121262bb5b84c3b0d8bb78f35b695100c15e4a879d3b92324ae1b17e888b709be72e608e951f6f81dafe48 SHA512 2e4b4d5847503403f1bba6967095c8a24f68eedc852ffc532d397437c45d2a77f9791a2fef82fdbc7e18fd0556088fe4c2f240f1b6c276e5f12a5b68c003f4d4 +DIST graphviz-7.1.0.tar.xz 21477976 BLAKE2B d99a3dcf2b502e92df44552b0b2f8971b4dc13afd642a8ccb7d6c8e34c81c49fd7bc49971a38f71c80c5c4b6c7ef6ffe75dcf2b8954da57cb8f606eb14388786 SHA512 9ff5facadd923300f47f569c568620371e75b7518661bb0f375ada9b0b82189033cec6c124d5691c875e292cef28c51230c6d6c44365c6e4a9e3dcf5b4dd1ee9 diff --git a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch deleted file mode 100644 index 8e409a9b5776..000000000000 --- a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001 -From: Mark Hansen <markhansen@google.com> -Date: Mon, 26 Sep 2022 20:43:39 +1000 -Subject: [PATCH] Stop using now-hidden gs_error_names symbol - -GhostScript hid their gs_error_names symbol as part of a global by-default hiding of non-API symbols. - -It will probably take a while for GhostScript to get a public API for these symbols back into a release, so let's stop using the symbol for now, until then. - -Fixes #2280 ---- - plugin/gs/gvloadimage_gs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c -index e909c6f32..d852663af 100644 ---- a/plugin/gs/gvloadimage_gs.c -+++ b/plugin/gs/gvloadimage_gs.c -@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err) - else - errsrc = "Ghostscript internal error"; - -- job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n", -- name, funstr, err, gs_error_names[-err - 1], errsrc); -+ job->common->errorfn("%s: %s() returned: %d (%s)\n", -+ name, funstr, err, errsrc); - } - - static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void *instance) --- -GitLab diff --git a/media-gfx/graphviz/graphviz-6.0.1-r2.ebuild b/media-gfx/graphviz/graphviz-6.0.1-r2.ebuild deleted file mode 100644 index a6a2752bc806..000000000000 --- a/media-gfx/graphviz/graphviz-6.0.1-r2.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -# Unfortunately upstream uses an "artifact" store for the pre-generated -# tarball now, which makes predictable URLs impossible. -SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" - -REQUIRED_USE=" - !cairo? ( !X !gtk2 !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:= - sys-libs/zlib - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg(+)] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk2? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:= ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - sys-apps/groff - ) - guile? ( - dev-lang/swig - dev-scheme/guile - ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig )" - -# Dependency description / Maintainer info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Directly depends on gtk-2 and gdk-pixbuf. -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, gvedit, gvpr, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -PATCHES=( - # backport - "${FILESDIR}"/${P}-private-ghostscript-symbols.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf=( - # Speeds up the libltdl configure - --cache-file="${S}"/config.cache - --enable-ltdl - $(use_enable doc man-pdfs) - $(use_with cairo pangocairo) - $(use_with examples demos '$(docdir)/examples') - $(use_with devil) - $(use_with gtk2 gdk) - $(use_with gtk2 gdk-pixbuf) - $(use_with gtk2) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_with svg rsvg) - $(use_with webp) - $(use_with X x) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # New/experimental features, to be tested, disable for now - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings - $(use_enable guile) - $(use_enable perl) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-java - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use python && python_optimize \ - "${D}"$(python_get_sitedir) \ - "${ED}"/usr/$(get_libdir)/graphviz/python3 -} - -pkg_postinst() { - # We need to register all plugins before they become usable - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/graphviz/graphviz-7.0.2.ebuild b/media-gfx/graphviz/graphviz-7.0.2.ebuild deleted file mode 100644 index af33ee99a65d..000000000000 --- a/media-gfx/graphviz/graphviz-7.0.2.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -# Unfortunately upstream uses an "artifact" store for the pre-generated -# tarball now, which makes predictable URLs impossible. -SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" - -REQUIRED_USE=" - !cairo? ( !X !gtk2 !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:= - sys-libs/zlib - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg(+)] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk2? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:= ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - sys-apps/groff - ) - guile? ( - dev-lang/swig - dev-scheme/guile - ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig )" - -# Dependency description / Maintainer info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Directly depends on gtk-2 and gdk-pixbuf. -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, gvedit, gvpr, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf=( - # Speeds up the libltdl configure - --cache-file="${S}"/config.cache - --enable-ltdl - $(use_enable doc man-pdfs) - $(use_with cairo pangocairo) - $(use_with examples demos '$(docdir)/examples') - $(use_with devil) - $(use_with gtk2 gdk) - $(use_with gtk2 gdk-pixbuf) - $(use_with gtk2) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_with svg rsvg) - $(use_with webp) - $(use_with X x) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # New/experimental features, to be tested, disable for now - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings - $(use_enable guile) - $(use_enable perl) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-java - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use python && python_optimize \ - "${D}"$(python_get_sitedir) \ - "${ED}"/usr/$(get_libdir)/graphviz/python3 -} - -pkg_postinst() { - # We need to register all plugins before they become usable - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/graphviz/graphviz-5.0.1-r1.ebuild b/media-gfx/graphviz/graphviz-7.0.5.ebuild index bdab7d9db9a0..32844d9a8c29 100644 --- a/media-gfx/graphviz/graphviz-5.0.1-r1.ebuild +++ b/media-gfx/graphviz/graphviz-7.0.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 DESCRIPTION="Open Source Graph Visualization Software" @@ -28,12 +28,12 @@ RESTRICT="test" RDEPEND=" >=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl:0 + dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:0= + >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( @@ -60,7 +60,7 @@ RDEPEND=" ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:0= ) + tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} diff --git a/media-gfx/graphviz/graphviz-7.0.0.ebuild b/media-gfx/graphviz/graphviz-7.1.0.ebuild index af33ee99a65d..c8246638065f 100644 --- a/media-gfx/graphviz/graphviz-7.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-7.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 DESCRIPTION="Open Source Graph Visualization Software" diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index e5d167bac855..c3205f889513 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -1,3 +1,3 @@ DIST gscan2pdf-2.12.5.tar.xz 502636 BLAKE2B 5fb92a4e5dfdbd985119058ed86ca015a58e97fd73edae4d46279e482351f9b5514045a60bb67ca2bfb58fa1e4315bc03ca67a2f2e3ed0cd2c941d8ae755fdfa SHA512 eeeec0940ef4a40b8cb7e961758e9688c94d980842ab36c4e52384099d1e28773f2967a75eb7c024ab713b880c2538d8395021bfabd68cffa7b334fdd35d773b -DIST gscan2pdf-2.12.8.tar.xz 503940 BLAKE2B 16433addec7306cab60a258b58b0239fb0eeea5b0a98ea24fda0de65d9f1901feca9093ab7a6f7fedfb6740abf4e59a16cdeac2d3d7de5141320c55855be7c79 SHA512 18d4bd12580d20b29e0086d1df541a2c044f03b98d8e7c8a91b87540622160aa5a9c2d13a888d5f557d1d975b5dc7a6ae8fd0f2c9be254e60d8a979c979e6040 DIST gscan2pdf-2.13.0.tar.xz 503876 BLAKE2B 784b52d9e06fe8a112b2e4d6ce281c037f1e834154e0d19ee9112b4027e2075971d52114f7f6d197bee024aabd84a2263fa98ba08e4cade6129dd0a0a4d2a104 SHA512 81a72d2241cf32dfdf628ab991476e435812e9f04f54c8fe311d0c7ef5e77e6d38091523aa4bf610382d76e1e4f5049cd5ba96c68f6d796298f9e2a584ff0d5d +DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1 diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.8.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild index 6915a1cf48b4..aa305e28fcbd 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-2.12.8.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -65,7 +65,7 @@ BDEPEND=" media-gfx/sane-frontends )" -PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t ) +PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod,169_import_scan}.t ) mydoc="History" diff --git a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch new file mode 100644 index 000000000000..4fef16dc9843 --- /dev/null +++ b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch @@ -0,0 +1,55 @@ +https://bugs.gentoo.org/887769 +https://gitlab.gnome.org/GNOME/gthumb/-/merge_requests/42 + +From 2133520496afd179702953a5d07aa99b5209f9cf Mon Sep 17 00:00:00 2001 +From: Chris Mayo <aklhfex@gmail.com> +Date: Wed, 21 Dec 2022 19:21:12 +0000 +Subject: [PATCH] raw: make compatible with LibRaw 0.21.0 release + +Memory error callback removed +https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L127 + +Typo in LIBRAW_OPTIONS_* flag names fixed +https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L170 +--- a/extensions/raw_files/gth-metadata-provider-raw.c ++++ b/extensions/raw_files/gth-metadata-provider-raw.c +@@ -62,7 +62,11 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self, + if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data))) + return; + ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); ++#else + raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++#endif + if (raw_data == NULL) + goto fatal_error; + +--- a/extensions/raw_files/main.c ++++ b/extensions/raw_files/main.c +@@ -213,7 +213,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, + size_t size; + GthImage *image = NULL; + ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); ++#else + raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++#endif + if (raw_data == NULL) { + _libraw_set_gerror (error, errno); + goto fatal_error; +@@ -300,7 +304,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, + if ((original_width != NULL) && (original_height != NULL)) { + libraw_close (raw_data); + ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); ++#else + raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++#endif + if (raw_data == NULL) + goto fatal_error; + +-- +GitLab diff --git a/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild index 6ad398e059de..8783d95b37ae 100644 --- a/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild +++ b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org gnome2-utils meson python-any-r1 xdg DESCRIPTION="Image viewer and browser for Gnome" @@ -42,7 +42,7 @@ RDEPEND=" svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) jpegxl? ( >=media-libs/libjxl-0.3.0 ) - heif? ( >=media-libs/libheif-1.11:0= ) + heif? ( >=media-libs/libheif-1.11:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 @@ -50,7 +50,7 @@ RDEPEND=" ) sys-libs/zlib - media-libs/libjpeg-turbo:0= + media-libs/libjpeg-turbo:= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4 @@ -69,6 +69,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PV}-link-with-x11.patch + "${FILESDIR}"/${PV}-libraw-0.21.patch ) src_configure() { diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml index 0a4898672ea5..646debfccd65 100644 --- a/media-gfx/gthumb/metadata.xml +++ b/media-gfx/gthumb/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag> <flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag> <flag name="jpegxl">Support for JPEG XL image format</flag> <flag name="slideshow">Enable slideshow plugin</flag> diff --git a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4-r3.ebuild index 82bdb6b2b16f..592438d2897e 100644 --- a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild +++ b/media-gfx/hp2xx/hp2xx-3.4.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="jpeg png tiff X" RDEPEND=" - jpeg? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= sys-libs/zlib diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 15ba9e83bbf6..f845f64e758e 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1 +1 @@ -DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853 +DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97 diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild index 742e8a51342c..eb099f3d2f2e 100644 --- a/media-gfx/hugin/hugin-2021.0.0.ebuild +++ b/media-gfx/hugin/hugin-2022.0.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 wxwidgets cmake xdg DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2" LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" @@ -20,7 +20,6 @@ LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" CDEPEND=" - !!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread @@ -28,16 +27,16 @@ CDEPEND=" media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= - media-libs/openexr:0= - media-libs/tiff:0 + 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/jpeg:0 virtual/opengl x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] lapack? ( virtual/blas virtual/lapack ) diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index b581777198f5..9411d0ca3b31 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit mercurial python-single-r1 wxwidgets cmake xdg @@ -22,7 +22,6 @@ LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" CDEPEND=" - !!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread @@ -30,16 +29,16 @@ CDEPEND=" media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= + media-libs/libjpeg-turbo:= + >=media-libs/libpano13-2.9.19_beta1:= + media-libs/libpng:= media-libs/openexr:= - media-libs/tiff:0 + 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/jpeg:0 virtual/opengl x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] lapack? ( virtual/blas virtual/lapack ) diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index d6a1cc7db3b5..6c0a323628c1 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1,4 +1,3 @@ -DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e -DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf -DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242 -DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834 +DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051 +DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2 +DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7 diff --git a/media-gfx/hydrus/hydrus-496-r1.ebuild b/media-gfx/hydrus/hydrus-496-r1.ebuild deleted file mode 100644 index 1ecb76ea0b7b..000000000000 --- a/media-gfx/hydrus/hydrus-496-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite" - -DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material" - -inherit python-single-r1 desktop docs optfeature - -DESCRIPTION="A booru-like media organizer for the desktop" -HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" -else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - - KEYWORDS="~amd64" -fi - -# hydrus itself is WTFPL -# icons included are CC-BY-2.5 -LICENSE="WTFPL-2 CC-BY-2.5" -SLOT="0" -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -# RDEPEND is sorted as such: -# - No specific requirements -# - Specific version or slot -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/cbor2[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/cloudscraper[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},lcms] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}] - dev-python/python-mpv[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] - media-video/ffmpeg - - >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - ${RDEPEND} - $(python_gen_cond_dep ' - test? ( - dev-python/httmock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) - ') -" - -PATCHES=( - "${FILESDIR}/userpath-in-local-share.patch" -) - -src_prepare() { - default - - # Contains pre-built binaries for other systems and a broken swf renderer for linux - rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Python requirements files, not needed - rm requirements_*.txt || die -} - -src_compile() { - python_optimize "${S}" - docs_compile -} - -src_test() { - # The tests use unittest, but are run with a custom runner script. - # QT_QPA_PLATFORM is required to make them run without X - local -x QT_QPA_PLATFORM=offscreen - "${EPYTHON}" "${S}/test.py" || die "Tests failed" -} - -src_install() { - local doc="${EPREFIX}/usr/share/doc/${PF}" - elog "Hydrus includes an excellent manual, that can either be viewed at" - elog "${doc}/html/help/index.html" - elog "or accessed through the hydrus help menu." - - mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die - - local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/) - einstalldocs - - # Files only needed for testing - rm test.py hydrus/hydrus_test.py || die - rm -r hydrus/test/ static/testing/ || die - - # ${DOCS[@]} files are copied into doc - # ${S}/docs/ is the markdown source code for documentation - # .gitignore/.github files aren't needed for the program to work, same with mkdocs files - rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die - if use doc; then - # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation - rm -r "${S}/_build" || die - # The program expects to find documentation here, so add a symlink to doc - dosym "${doc}/html" /opt/hydrus/help - fi - - insinto /opt/hydrus - doins -r "${S}"/. - - exeinto /usr/bin - python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die) - python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die) - - make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ - "AudioVideo;FileTools;Graphics;Network;" -} - -pkg_postinst() { - optfeature "automatic port forwarding support" "net-libs/miniupnpc" - optfeature "bandwidth charts support" "dev-python/pyside2[charts]" - optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" -} diff --git a/media-gfx/hydrus/hydrus-501-r1.ebuild b/media-gfx/hydrus/hydrus-501-r1.ebuild deleted file mode 100644 index 1ecb76ea0b7b..000000000000 --- a/media-gfx/hydrus/hydrus-501-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite" - -DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material" - -inherit python-single-r1 desktop docs optfeature - -DESCRIPTION="A booru-like media organizer for the desktop" -HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" -else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - - KEYWORDS="~amd64" -fi - -# hydrus itself is WTFPL -# icons included are CC-BY-2.5 -LICENSE="WTFPL-2 CC-BY-2.5" -SLOT="0" -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -# RDEPEND is sorted as such: -# - No specific requirements -# - Specific version or slot -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/cbor2[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/cloudscraper[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},lcms] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}] - dev-python/python-mpv[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] - media-video/ffmpeg - - >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - ${RDEPEND} - $(python_gen_cond_dep ' - test? ( - dev-python/httmock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) - ') -" - -PATCHES=( - "${FILESDIR}/userpath-in-local-share.patch" -) - -src_prepare() { - default - - # Contains pre-built binaries for other systems and a broken swf renderer for linux - rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Python requirements files, not needed - rm requirements_*.txt || die -} - -src_compile() { - python_optimize "${S}" - docs_compile -} - -src_test() { - # The tests use unittest, but are run with a custom runner script. - # QT_QPA_PLATFORM is required to make them run without X - local -x QT_QPA_PLATFORM=offscreen - "${EPYTHON}" "${S}/test.py" || die "Tests failed" -} - -src_install() { - local doc="${EPREFIX}/usr/share/doc/${PF}" - elog "Hydrus includes an excellent manual, that can either be viewed at" - elog "${doc}/html/help/index.html" - elog "or accessed through the hydrus help menu." - - mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die - - local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/) - einstalldocs - - # Files only needed for testing - rm test.py hydrus/hydrus_test.py || die - rm -r hydrus/test/ static/testing/ || die - - # ${DOCS[@]} files are copied into doc - # ${S}/docs/ is the markdown source code for documentation - # .gitignore/.github files aren't needed for the program to work, same with mkdocs files - rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die - if use doc; then - # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation - rm -r "${S}/_build" || die - # The program expects to find documentation here, so add a symlink to doc - dosym "${doc}/html" /opt/hydrus/help - fi - - insinto /opt/hydrus - doins -r "${S}"/. - - exeinto /usr/bin - python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die) - python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die) - - make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ - "AudioVideo;FileTools;Graphics;Network;" -} - -pkg_postinst() { - optfeature "automatic port forwarding support" "net-libs/miniupnpc" - optfeature "bandwidth charts support" "dev-python/pyside2[charts]" - optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" -} diff --git a/media-gfx/hydrus/hydrus-495-r1.ebuild b/media-gfx/hydrus/hydrus-518.ebuild index 1ecb76ea0b7b..072c47dfe381 100644 --- a/media-gfx/hydrus/hydrus-495-r1.ebuild +++ b/media-gfx/hydrus/hydrus-518.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material" +DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex" inherit python-single-r1 desktop docs optfeature @@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" + SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch" else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch + " KEYWORDS="~amd64" fi @@ -69,13 +73,13 @@ BDEPEND=" test? ( dev-python/httmock[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] ) ') " PATCHES=( "${FILESDIR}/userpath-in-local-share.patch" + "${DISTDIR}/${PN}-3.11-test-fixes.patch" ) src_prepare() { @@ -83,10 +87,12 @@ src_prepare() { # Contains pre-built binaries for other systems and a broken swf renderer for linux rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Python requirements files, not needed - rm requirements_*.txt || die + # Build files used for CI and development, not actually needed + rm -r static/build_files static/requirements || die + # Python requirements file, not needed + rm requirements.txt || die + # Remove unneeded additional scripts + rm *.command *.sh *.bat || die } src_compile() { diff --git a/media-gfx/hydrus/hydrus-497-r1.ebuild b/media-gfx/hydrus/hydrus-519.ebuild index 1ecb76ea0b7b..57ab39e51e10 100644 --- a/media-gfx/hydrus/hydrus-497-r1.ebuild +++ b/media-gfx/hydrus/hydrus-519.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material" +DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex" inherit python-single-r1 desktop docs optfeature @@ -69,7 +69,6 @@ BDEPEND=" test? ( dev-python/httmock[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] ) ') " @@ -83,10 +82,12 @@ src_prepare() { # Contains pre-built binaries for other systems and a broken swf renderer for linux rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Python requirements files, not needed - rm requirements_*.txt || die + # Build files used for CI and development, not actually needed + rm -r static/build_files static/requirements || die + # Python requirements file, not needed + rm requirements.txt || die + # Remove unneeded additional scripts + rm *.command *.sh *.bat || die } src_compile() { diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index 1ecb76ea0b7b..57ab39e51e10 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material" +DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex" inherit python-single-r1 desktop docs optfeature @@ -69,7 +69,6 @@ BDEPEND=" test? ( dev-python/httmock[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] ) ') " @@ -83,10 +82,12 @@ src_prepare() { # Contains pre-built binaries for other systems and a broken swf renderer for linux rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Python requirements files, not needed - rm requirements_*.txt || die + # Build files used for CI and development, not actually needed + rm -r static/build_files static/requirements || die + # Python requirements file, not needed + rm requirements.txt || die + # Remove unneeded additional scripts + rm *.command *.sh *.bat || die } src_compile() { diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest index 69d88eb11a25..90630bfa10bb 100644 --- a/media-gfx/igal/Manifest +++ b/media-gfx/igal/Manifest @@ -1,2 +1 @@ DIST igal-3.1.tar.gz 29372 BLAKE2B bb83a13b082d4d94b0ff186ef34e9c670b5a49ba74ccd40675db6820931132697b886e58db9da7e620322fdb29a59437acd817d6ef69ea4cebdaa408d1fbe567 SHA512 28f036a5450d05c2d795355f52e0e3f5720d94e5e9d82d4b6bd53ff8ce5ea08352e3ec85ddbcca754e986a06fd205b1667b102981484c783add4496c50c102fe -DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild deleted file mode 100644 index 233dd6c64dce..000000000000 --- a/media-gfx/igal/igal-2.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P=${PN}2-${PV} - -DESCRIPTION="Static HTML image gallery generator" -HOMEPAGE="https://igal.trexler.at" -SRC_URI="https://${PN}.trexler.at/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -RDEPEND=" - dev-lang/perl - virtual/imagemagick-tools - virtual/jpeg" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -e "s:/usr/local/lib/igal2:/usr/share/igal2:g" \ - -i igal2 -i igal2.1 || die - sed -i -e "s:/usr/local/bin/igal2:/usr/bin/igal2:" \ - utilities/igal2.sh || die -} - -src_compile() { :; } - -src_install() { - dobin igal2 utilities/igal2.sh - dosym igal2 /usr/bin/igal - doman igal2.1 - dodoc ChangeLog README - insinto /usr/share/igal2 - doins *.html tile.png igal2.css -} diff --git a/media-gfx/igal/igal-3.1.ebuild b/media-gfx/igal/igal-3.1.ebuild index 6323fc514432..51e87714b979 100644 --- a/media-gfx/igal/igal-3.1.ebuild +++ b/media-gfx/igal/igal-3.1.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-lang/perl diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml index ea3db2787b18..39c6f34b0f9c 100644 --- a/media-gfx/igal/metadata.xml +++ b/media-gfx/igal/metadata.xml @@ -7,4 +7,7 @@ picture show (static HTML slides, thumbnails and index page) with just one command line invocation in a Linux or Unix environment. </longdescription> + <upstream> + <remote-id type="github">solbu/igal2</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index b337013dc7d1..17dea0f3b042 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,4 +1,5 @@ -DIST ImageMagick-6.9.12-59.tar.xz 9178096 BLAKE2B 3ee13cf1bc0af33b720cce1d310bbdc1d6c08e17510b4d1d166228f6d84d15be0d1388b19153b1e21dee971d65f3a061ef19bc577c02218a49d2814538ec60c8 SHA512 c9ba09852543c6a00c041c7f7e27a24eae0f34bf8f9db1077fd34ccd9eb6d5a94787301d38b1e34636474cbc50830cdc812dbcd01b613f36063107346ec60213 DIST ImageMagick-6.9.12-64.tar.xz 9174728 BLAKE2B 8d6f4b6d5b8c2bd6aae3ac38ee5662c5eecfc94e98f8c5e7497b28fec69a9e1fc8b6a4f88bd794b0ed1649db88c8cd9836a335ee17ada27b11361488f4e23566 SHA512 307dd4ed4505b977282cc08065fd735200ce39e9a391d3b0faa47dedc788900c21cbf6b9bbd71cac0c9fafea6cc9b6f22a22f7c50a1764067fcf901d06e89025 -DIST ImageMagick-7.1.0-44.tar.xz 10363636 BLAKE2B 547ec39391588bf609ab11e7353ec6b55773e40162ada486619c769b97989f728e7fa235fe23e6e8b0d0f8db500bcd273d6851fcb7f99a68a7177f1b67fc68a9 SHA512 e8467963b7243560901fcdd8a28b6dcca8052565f87848390852cf6deafad918d612d59e349a46ab90b159c0af8578b16cc982fae195dc8ef8ed95568e0cf05e +DIST ImageMagick-6.9.12-76.tar.xz 9227560 BLAKE2B 69353e23281852669a2775e28c972ffefe11a2d50f1ef386fb36e1968d2ade61bfd8dd6495b4fce91763beb907f93c1744f338a2b7d94c1586b9726d815d5295 SHA512 cfcbfa7556ec08e4a5b4420d8c594cca6e5a679b94cea8f3c9d07b0534b6bf854fd671ff118d51e0f90c3449c29363bd16db21db7c526b749c3470a161c49245 +DIST ImageMagick-6.9.12-77.tar.xz 9220608 BLAKE2B 11050da1710f381084f6758f0665270974c1913e164a0f4b1ee51433948fcf3b4c60c6b7cf5bc4be4958ef863bb14cb3311b08a1aff60907dc595c31eadcc67f SHA512 ab6ad08496f955af28ed16669690fa07222ea741c62a4f98e1ae2b80a916557263d1ccbe66b3470c5edd3f0422bf626149560ae3574f76425ede69910b48faa2 DIST ImageMagick-7.1.0-48.tar.xz 10353180 BLAKE2B 49abad77414b8ad0a692aefae2199050f48161c9c891ae9120692cba27eb9d491808068a5d1d49556f0fb6bad78d9b8bcc91d96da3762d10b84acfc3db664eff SHA512 c161a08765ceea358e9a186d95b5466aef36ff6a07dea976fd40ad36d583baa0bc4bede704b78947ceb02d6bebecd74b0084bd997380f3b1b3507012e3a361e5 +DIST ImageMagick-7.1.0-62.tar.xz 10359080 BLAKE2B 6f0c91f81cd7c43017b3b58b5bea032ef8ccdbbede05b1963e647d39813153d20f11cc24d3b7b50d5455a6c3075e765f468bdcf2b88725b2f37d139a2326956c SHA512 db299bc84585b1f37d6fb5bfbc08264b19f4aa1b3e3dc28f14606310c5150ad103b8456d0856c1fae1efed137e0b02eb2beeccb504dfa39a10cb2aaacbfe47d3 diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.59.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.64-r1.ebuild index c48b8bad5814..c13ee2fd0d41 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.12.59.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.12.64-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,7 +53,7 @@ RDEPEND=" pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) + postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.64.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.76.ebuild index 20654ea8d565..e059d3f73ad6 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.12.64.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.12.76.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,7 +53,7 @@ RDEPEND=" pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) + postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild new file mode 100644 index 000000000000..b8d2fa1c3ff7 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-58" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # Apply hardening, bug #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^<policymap>$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + # for Darwin modules + elibtoolize + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --with-gcc-arch=no-automagic + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in ${HOME} for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + # bug #472766 + doins "${T}"/99${PN} + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.44.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.48-r1.ebuild index cc4f195cd371..967edf3e9d9d 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.0.44.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.48-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,7 +53,7 @@ RDEPEND=" pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) + postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.48.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.62.ebuild index 45768f836f09..48d378b31d11 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.0.48.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.62.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}/${MY_P}" @@ -23,7 +23,9 @@ DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" -SLOT="0/7.1.0-43" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-43" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) @@ -53,7 +55,7 @@ RDEPEND=" pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) + postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 45768f836f09..516ae1cca24a 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,9 @@ DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" -SLOT="0/7.1.0-43" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-43" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) @@ -53,7 +55,7 @@ RDEPEND=" pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) + postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml index 20c1759c99ee..591c4245c3f7 100644 --- a/media-gfx/imagemagick/metadata.xml +++ b/media-gfx/imagemagick/metadata.xml @@ -12,7 +12,6 @@ <use> <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag> <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag> <flag name="hdri">Enable High Dynamic Range Images formats</flag> <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag> <flag name="opencl">Enable OpenCL support</flag> diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest index 217dbc167e68..35ac654c914e 100644 --- a/media-gfx/img2pdf/Manifest +++ b/media-gfx/img2pdf/Manifest @@ -1,2 +1 @@ -DIST img2pdf-0.4.3.tar.gz 98656 BLAKE2B ec7be83fa7fc38f94c7770a2566a49a39e5fd0abb715de74fc3f65d59087cecdd009f4284e647facaf6ae019a118b4bedf7ce8d4a09b8479a299c8404a8940d5 SHA512 00755788c7380e44733c5a309428894b6689e93d4d7cca8f84681d12977848971a6b1a7c92c7203258a529894e7a0debb5beaeb6b375de769a0d600ea8d65423 DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9 diff --git a/media-gfx/img2pdf/img2pdf-0.4.3.ebuild b/media-gfx/img2pdf/img2pdf-0.4.3.ebuild deleted file mode 100644 index 7900354a9775..000000000000 --- a/media-gfx/img2pdf/img2pdf-0.4.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Losslessly convert raster images to PDF" -HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gui" - -# pytest-xdist isn't really required but it helps speed up tests -BDEPEND=" - test? ( - app-text/ghostscript-gpl - app-text/mupdf - app-text/poppler[cairo,png,tiff] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pdfrw[${PYTHON_USEDEP}] - dev-python/pillow[tiff,${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff] - media-libs/exiftool - media-libs/netpbm[jpeg] - ) -" -RDEPEND=" - dev-python/pikepdf[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - gui? ( $(python_gen_impl_dep tk) ) -" - -# gif animation test fails -PATCHES=( "${FILESDIR}"/${P}-test-gif-animation.patch ) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_python_prepare_all - - # Remove gui executable if there's no demand/support for it. - if ! use gui; then - sed -i '/gui_scripts/d' setup.py || die - fi - - # gif animation test fails - rm src/tests/input/animation.gif src/tests/output/animation.gif.pdf || die "rm animation gif failes" -} - -python_test() { - epytest -n auto -} diff --git a/media-gfx/img2pdf/img2pdf-0.4.4.ebuild b/media-gfx/img2pdf/img2pdf-0.4.4.ebuild index 660c7a1e5801..1b42b2bc863c 100644 --- a/media-gfx/img2pdf/img2pdf-0.4.4.ebuild +++ b/media-gfx/img2pdf/img2pdf-0.4.4.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Losslessly convert raster images to PDF" HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-3+" SLOT="0" diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index a6bf38bedfbc..e0446825429c 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1,2 +1 @@ -DIST imv-4.3.1.tar.gz 79123 BLAKE2B 9c818a5a29457313c3d0ed1a8558555b2069aec837939dc1d2b71668ec2fd39867c8ad4fcf8605243ded96e27d346af4307d83c8854538981b62c968e9ec0ede SHA512 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6 -DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f +DIST imv-4.4.0.tar.gz 80360 BLAKE2B c598bb270ed57562f1c1b9a56f42676a7c8390c976ed74405228da572b000a85bf69e51f1bbfa6d554a481debc092995fe5222ba1e8b0b029b72395a8b8f329b SHA512 ddc0740022183a5467a0815ca623d2204b26449fee14b00c3468d06dbba3b5c3314b04a582bbac6075205f8d58cc24f157e283ce1ce3d34ecf0a9bdc497ab7f1 diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch deleted file mode 100644 index d71067130c27..000000000000 --- a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://lists.sr.ht/~exec64/imv-devel/patches/35908 ---- a/src/console.c -+++ b/src/console.c -@@ -54,3 +54,3 @@ - if (buffer[position] != 0) { -- return position + grapheme_next_character_break(buffer + position, SIZE_MAX); -+ return position + grapheme_next_character_break_utf8(buffer + position, SIZE_MAX); - } else { -@@ -87,3 +87,3 @@ - do { -- step = grapheme_next_character_break(buffer + result, SIZE_MAX); -+ step = grapheme_next_character_break_utf8(buffer + result, SIZE_MAX); - if (result + step >= position) diff --git a/media-gfx/imv/imv-4.3.1.ebuild b/media-gfx/imv/imv-4.3.1.ebuild deleted file mode 100644 index 009e461175ce..000000000000 --- a/media-gfx/imv/imv-4.3.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/" -else - SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-v${PV}" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://sr.ht/~exec64/imv/" - -LICENSE="MIT-with-advertising" -SLOT="0" -IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland" -REQUIRED_USE="|| ( X wayland )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/inih - media-libs/libglvnd[X?] - x11-libs/cairo - x11-libs/libxkbcommon[X?] - x11-libs/pango - X? ( - x11-libs/libX11 - x11-libs/libxcb:= - ) - freeimage? ( media-libs/freeimage ) - gif? ( media-libs/libnsgif ) - heif? ( media-libs/libheif:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:= ) - svg? ( >=gnome-base/librsvg-2.44:2 ) - tiff? ( media-libs/tiff ) - wayland? ( dev-libs/wayland ) - !sys-apps/renameutils" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - test? ( dev-util/cmocka )" -BDEPEND=" - app-text/asciidoc - wayland? ( dev-util/wayland-scanner )" - -src_prepare() { - default - - # if wayland-only, don't automagic on libGL and force libOpenGL - if ! use X; then - sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die - fi - - # glu isn't used by anything - sed -i "/dependency('glu')/d" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature freeimage) - $(meson_feature gif libnsgif) - $(meson_feature heif libheif) - $(meson_feature jpeg libjpeg) - $(meson_feature png libpng) - $(meson_feature svg librsvg) - $(meson_feature test) - $(meson_feature tiff libtiff) - -Dwindows=$(usex X $(usex wayland all x11) wayland) - ) - - meson_src_configure -} diff --git a/media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild b/media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild deleted file mode 100644 index e66667860c5f..000000000000 --- a/media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/" -else - IMV_HASH=4448fb6104d67e3dfff3e71babe257992fce556 - SRC_URI="https://git.sr.ht/~exec64/imv/archive/${IMV_HASH}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${IMV_HASH}" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://sr.ht/~exec64/imv/" - -LICENSE="MIT-with-advertising" -SLOT="0" -IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland" -REQUIRED_USE="|| ( X wayland )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/inih - media-libs/libglvnd[X?] - x11-libs/cairo - x11-libs/libxkbcommon[X?] - x11-libs/pango - X? ( - x11-libs/libX11 - x11-libs/libxcb:= - ) - freeimage? ( media-libs/freeimage ) - gif? ( media-libs/libnsgif ) - heif? ( media-libs/libheif:= ) - icu? ( dev-libs/icu:= ) - !icu? ( >=dev-libs/libgrapheme-2:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:= ) - svg? ( >=gnome-base/librsvg-2.44:2 ) - tiff? ( media-libs/tiff ) - wayland? ( dev-libs/wayland ) - !sys-apps/renameutils" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - test? ( dev-util/cmocka )" -BDEPEND=" - app-text/asciidoc - wayland? ( dev-util/wayland-scanner )" - -PATCHES=( - "${FILESDIR}"/${P}-animated-gif.patch - "${FILESDIR}"/${P}-libgrapheme2.patch -) - -src_prepare() { - default - - # if wayland-only, don't automagic on libGL and force libOpenGL - if ! use X; then - sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die - fi - - # glu isn't used by anything - sed -i "/dependency('glu')/d" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature freeimage) - $(meson_feature gif libnsgif) - $(meson_feature heif libheif) - $(meson_feature jpeg libjpeg) - $(meson_feature png libpng) - $(meson_feature svg librsvg) - $(meson_feature test) - $(meson_feature tiff libtiff) - -Dunicode=$(usex icu{,} grapheme) - -Dwindows=$(usex X $(usex wayland all x11) wayland) - ) - - meson_src_configure -} diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-4.4.0.ebuild index 2c68adf92af7..37149c58e56a 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-4.4.0.ebuild @@ -1,24 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit meson xdg -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/" -else - SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-v${PV}" - KEYWORDS="~amd64 ~x86" -fi - DESCRIPTION="Minimal image viewer designed for tiling window manager users" HOMEPAGE="https://sr.ht/~exec64/imv/" +SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" LICENSE="MIT-with-advertising" SLOT="0" +KEYWORDS="amd64 x86" IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland" REQUIRED_USE="|| ( X wayland )" RESTRICT="!test? ( test )" @@ -42,7 +36,7 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils" DEPEND=" @@ -55,7 +49,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.3.1_p20211221-animated-gif.patch - "${FILESDIR}"/${PN}-4.3.1_p20211221-libgrapheme2.patch ) src_prepare() { diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index e2594cc6bdd2..8b185754e66c 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag> - <flag name="heif">Add HEIF/HEIC image support</flag> </use> <upstream> <remote-id type="sourcehut">~exec64/imv</remote-id> diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index e27b5a4f3503..6e703ca5b40b 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1 +1,2 @@ DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521 +DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild index 64ce94f2bd58..2caaf0b3ba7a 100644 --- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild +++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE="xml(+)" MY_P="${P/_/}" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="SVG based generic vector-drawing program" diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild new file mode 100644 index 000000000000..5a3d412e1fa3 --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" +MY_P="${P/_/}" +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg +openmp postscript readline spell svg2 test visio wpg X" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( virtual/imagemagick-tools ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.54.1:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/boost:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + net-libs/libsoup:2.4 + sci-libs/gsl:= + >=x11-libs/pango-1.44 + x11-libs/gtk+:3[X?] + X? ( x11-libs/libX11 ) + $(python_gen_cond_dep ' + dev-python/cachecontrol[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/lockfile[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( media-libs/libjpeg-turbo:= ) + readline? ( sys-libs/readline:= ) + spell? ( app-text/gspell ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON + -DBUILD_TESTING=$(usex test) + -DWITH_LIBCDR=$(usex cdr) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=ON + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + -DWITH_X11=$(usex X) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # render_text*: needs patched Cairo / maybe upstream changes + # not yet in a release. + # test_lpe/test_lpe64: precision differences b/c of new GCC? + # cli_export-png-color-mode-gray-8_png_check_output: ditto? + -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" + ) + + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + local extdir="${ED}"/usr/share/${PN}/extensions + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi + + # Empty directory causes sandbox issues, see bug #761915 + rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." +} diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index cfc5f2381840..336e101cff8b 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" MY_P="${P/_/}" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index 7d427ef68dad..f5a32443fc24 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> <email>dilfridge@gentoo.org</email> <name>Andreas K. Hüttel</name> </maintainer> diff --git a/media-gfx/iscan-plugin-network-nt/Manifest b/media-gfx/iscan-plugin-network-nt/Manifest deleted file mode 100644 index 2cc81b369bfb..000000000000 --- a/media-gfx/iscan-plugin-network-nt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST imagescan-bundle-centos-8-3.62.0.x64.rpm.tar.gz 11111201 BLAKE2B 51b868569fa049f8bc35a911245895c0fe0c5e0060b129c1c84a39cddd0aa4344ea024b6896dadc535438bcfc0be74337348533adf1b2be8866aad4e30bcb41a SHA512 11af49d20fc8e828c25dc6e912d1dbefebcba9835b1ebe922bc57c30dd0d13b79508a1bb01ad260c721d865fd393a41bc2bf41dc84b42efb22512a28cc9542f3 diff --git a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild deleted file mode 100644 index aeba3f796a7d..000000000000 --- a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info rpm - -DESCRIPTION="Network scanning plugin for EPSON scanners (nonfree)" - -HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -# This is distributed as part of the "bundle driver"; since we already have the -# opensource part separately we just install the nonfree part here. - -ISCAN_VERSION="3.62.0" - -SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-8-${ISCAN_VERSION}.x64.rpm.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="media-gfx/iscan" -RESTRICT="bindist mirror strip" -# https://bugs.gentoo.org/364129#c15 -CONFIG_CHECK="~SYN_COOKIES" -S=${WORKDIR} - -QA_PREBUILT="/usr/libexec/utsushi/networkscan" - -src_unpack() { - default - rpm_unpack ./imagescan-bundle-centos-8-${ISCAN_VERSION}.x64.rpm/plugins/imagescan-plugin-networkscan-${PV}-1epson4centos8.x86_64.rpm -} - -src_install() { - exeinto /usr/libexec/utsushi - doexe usr/libexec/utsushi/networkscan - - gunzip usr/share/doc/imagescan-plugin-networkscan/*.gz - dodoc usr/share/doc/imagescan-plugin-networkscan/* -} diff --git a/media-gfx/iscan-plugin-network-nt/metadata.xml b/media-gfx/iscan-plugin-network-nt/metadata.xml deleted file mode 100644 index 71a5bee94e5a..000000000000 --- a/media-gfx/iscan-plugin-network-nt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>dilfridge@gentoo.org</email> - <name>Andreas K. Huettel</name> - </maintainer> -</pkgmetadata> diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r3.ebuild index c1eb390986e3..9b5dab52d145 100644 --- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild +++ b/media-gfx/iscan/iscan-2.30.4.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,9 +42,9 @@ DEPEND=" gimp? ( media-gfx/gimp:0/2 ) X? ( dev-libs/glib:2 + media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= - virtual/jpeg:= x11-libs/gtk+:2 ) " diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0-r1.ebuild index b47d4d45f4ae..21dc24242f01 100644 --- a/media-gfx/iscan/iscan-3.65.0.ebuild +++ b/media-gfx/iscan/iscan-3.65.0-r1.ebuild @@ -27,8 +27,8 @@ BDEPEND=" RDEPEND=" dev-libs/boost:= media-gfx/sane-backends - media-libs/tiff - virtual/jpeg + media-libs/libjpeg-turbo:= + media-libs/tiff:= virtual/libusb:1 graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) diff --git a/media-gfx/jpegoptim/metadata.xml b/media-gfx/jpegoptim/metadata.xml index 85e4ed814fa2..95b4643b8aee 100644 --- a/media-gfx/jpegoptim/metadata.xml +++ b/media-gfx/jpegoptim/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">tjko/jpegoptim</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest index 2b79a4acf672..0458083a4372 100644 --- a/media-gfx/kcoloredit/Manifest +++ b/media-gfx/kcoloredit/Manifest @@ -1 +1 @@ -DIST kcoloredit-2.0.0_p20171121.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554 +DIST kcoloredit-2.0.0_p20171121-50ac0509.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554 diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild index bd4bb3311025..3d430cd3f019 100644 --- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild +++ b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04 -EGIT_BRANCH="frameworks" +KDE_ORG_CATEGORY=unmaintained +KDE_ORG_COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04 ECM_HANDBOOK="forceoptional" KFMIN=5.60.0 QTMIN=5.12.3 @@ -12,7 +12,6 @@ inherit ecm kde.org DESCRIPTION="Tool for editing color palettes" HOMEPAGE="https://userbase.kde.org/KColorEdit" -SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -38,5 +37,3 @@ DEPEND=" RDEPEND="${DEPEND} !media-gfx/kcoloredit:4 " - -S="${WORKDIR}/${PN}-${COMMIT}" diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest index 01361a428b43..84cc035bcb3b 100644 --- a/media-gfx/kgeotag/Manifest +++ b/media-gfx/kgeotag/Manifest @@ -1 +1 @@ -DIST kgeotag-1.3.1.tar.xz 365648 BLAKE2B 7d3ac33f2439072700582dbd4bfd0091728b8546865521b6a1e69a34f3a3180854026fdac67a74f053095788c3d0d1fdff94b3c923d7393b6bc453497aff5b64 SHA512 62cbf568e749a8345e8d145d0850381fcb3140bea10b02626c609c4f1bf0d0fafac23b82a796e0e4c8b293c9fcf65b2ad7c66b7354822426e56826e5b25df46e +DIST kgeotag-1.4.0.tar.xz 393112 BLAKE2B 3d699b086e49482f48aef05d5b67a7db809b6c1aebf3e9336f587b50858bd99216282cdc4924362551469f8c78769501cb66e66ed8a2fd704286e30f4d3151a8 SHA512 024204f2ac9df0659ad781f31d91daba6b4177f6fe2aa4219fcf91e68051e443a03efb8a3c9a9e081b126b46304dd6be935836f43d859079a070cbf46cbfac97 diff --git a/media-gfx/kgeotag/kgeotag-1.3.1.ebuild b/media-gfx/kgeotag/kgeotag-1.4.0.ebuild index 1de4cece25cc..fb25701dab4a 100644 --- a/media-gfx/kgeotag/kgeotag-1.3.1.ebuild +++ b/media-gfx/kgeotag/kgeotag-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -34,6 +34,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -DOCS=( ChangeLog.rst README.md ) +DOCS=( CHANGELOG.rst README.md ) -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.3.1-cmake.patch" ) diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index ca16381908bb..919e8102a3e9 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1 +1,2 @@ +DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63 SHA512 6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623 SHA512 e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild new file mode 100644 index 000000000000..944340901949 --- /dev/null +++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.82.0 +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Tool for indexing, searching, and viewing images" +HOMEPAGE="https://www.kphotoalbum.org/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" +SLOT="5" +IUSE="map phonon +raw share +vlc" + +REQUIRED_USE="|| ( phonon vlc )" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[jpeg] + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}: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/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/libjpeg-turbo:= + map? ( kde-apps/marble:5 ) + phonon? ( >=media-libs/phonon-4.11.0 ) + raw? ( kde-apps/libkdcraw:5 ) + share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) + vlc? ( media-video/vlc:= ) +" +RDEPEND="${DEPEND} + media-video/ffmpeg +" + +DOCS=( CHANGELOG.{md,old} README.md ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited + $(cmake_use_find_package map Marble) + $(cmake_use_find_package phonon Phonon4Qt5) + $(cmake_use_find_package raw KF5KDcraw) + $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package vlc LIBVLC) + ) + + ecm_src_configure +} diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild index 4f3157a6a7d6..a722a776175c 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://kphotoalbum.org/" +HOMEPAGE="https://www.kphotoalbum.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 73835b4c9c6e..5bc573c625ab 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,2 +1 @@ -DIST krita-5.1.1.tar.xz 185119812 BLAKE2B c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a SHA512 6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14 -DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd SHA512 4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88 +DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1 diff --git a/media-gfx/krita/krita-5.1.1.ebuild b/media-gfx/krita/krita-5.1.1.ebuild deleted file mode 100644 index fe5ac2ec59ae..000000000000 --- a/media-gfx/krita/krita-5.1.1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{8..11} ) -KFMIN=5.82.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" - -LICENSE="GPL-3" -SLOT="5" -IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# bug 630508 -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/quazip:0=[qt5(+)] - $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - ') - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/lcms - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - color-management? ( >=media-libs/opencolorio-2.0.0 ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 ) - heif? ( >=media-libs/libheif-1.11:= ) - mypaint-brush-engine? ( media-libs/libmypaint:= ) - openexr? ( media-libs/openexr:= ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) - webp? ( >=media-libs/libwebp-1.2.0:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" - -PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch ) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - -DENABLE_UPDATERS=OFF - -DFETCH_TRANSLATIONS=OFF - -DKRITA_ENABLE_PCH=OFF # big mess. - -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged - -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged - $(cmake_use_find_package color-management OpenColorIO) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package heif HEIF) - $(cmake_use_find_package jpegxl JPEGXL) - $(cmake_use_find_package mypaint-brush-engine LibMyPaint) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package webp WebP) - ) - - ecm_src_configure -} diff --git a/media-gfx/krita/krita-5.1.3-r1.ebuild b/media-gfx/krita/krita-5.1.5.ebuild index 6bca4884e8e3..c7ffd26bfae8 100644 --- a/media-gfx/krita/krita-5.1.3-r1.ebuild +++ b/media-gfx/krita/krita-5.1.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) KFMIN=5.82.0 QTMIN=5.15.5 VIRTUALX_REQUIRED="test" @@ -12,7 +12,7 @@ inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" @@ -59,8 +59,8 @@ RDEPEND="${PYTHON_DEPS} media-gfx/exiv2:= media-libs/lcms media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/tiff:0 + media-libs/libpng:= + media-libs/tiff:= sys-libs/zlib virtual/opengl x11-libs/libX11 @@ -99,7 +99,6 @@ src_configure() { local mycmakeargs=( -DENABLE_UPDATERS=OFF - -DFETCH_TRANSLATIONS=OFF -DKRITA_ENABLE_PCH=OFF # big mess. -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index 27c873d15e6a..99adf7a4786d 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -10,7 +10,6 @@ </upstream> <use> <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> - <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag> <flag name="jpegxl">Support for JPEG XL image format</flag> <flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag> <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag> diff --git a/media-gfx/kuickshow/kuickshow-0.10.2.ebuild b/media-gfx/kuickshow/kuickshow-0.10.2.ebuild index ef6840410a0f..9c17093582a3 100644 --- a/media-gfx/kuickshow/kuickshow-0.10.2.ebuild +++ b/media-gfx/kuickshow/kuickshow-0.10.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=5.76.0 @@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="5" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="" DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index 0ddf0faf5181..5b003cef95d8 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -4,33 +4,53 @@ DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bytemuck-1.12.1.crate 38293 BLAKE2B f714ba0b4b0d693c5b26a3bcbe9de8c1496851a298bb70770e6284ed68caea61d7b8c14d67ed0e8b6d9146e76f791192fcfe11e897146203d5acf536b9721e67 SHA512 50626367364cf0cb33658f6cbb99675f1191ed3e7ad447bd7d2c24f360bd3524ebe1b2d1fcc7d78d1a0692408da8d95795b54efee91a87c55e8b54711a968790 +DIST bytemuck-1.13.0.crate 41703 BLAKE2B f24b786d2209921f2de16209d3b397fa1d62f637efd8f0a92c6d7d3734fa447ae3f1c5499e85a16e30e39bd132c00c59517ae0886d1fab8da4aaf2150a3fc0d2 SHA512 e2e8164c9b14d8ec44879f3efb91f3ac3918e092d22d73152166b926c8b85e854c7b925b53feb173b572e9260100d9c584dbb80a377944b2415d485dd1d20876 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985 +DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3 DIST crossbeam-epoch-0.9.10.crate 46918 BLAKE2B 86f33064dde615408435cd4cd8ffc878ccd7aca997440eb85705aaf71209288f2d7cd4a8a2ee8261d30d5d4e10addad1852ecce32826850fbca883430f4f0e26 SHA512 c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03 +DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555 SHA512 a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf DIST crossbeam-utils-0.8.11.crate 40887 BLAKE2B 6cf3c4e28243515f06193ef746b18129f62832abde8153503571052f4965b38ce510b09d18e51e0f563bfc14818af13463d1e2d63716b98a91b55461f5186b25 SHA512 eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5 +DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2 +DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e DIST fallible_collections-0.4.5.crate 49236 BLAKE2B 1fcb36eb50e42e9d03823c8bb1a7b7d19dd40dbb7db632c44d079bf3755d72d2ce65007680fcdafab79a130df5ccb6c7471ffbf40bb39d3bda9557f4f897dea8 SHA512 4b59dcad7419b69d209a04f28a4ca19ca57c7e26642c13a932a310feb5d8171c17363ff15edb0ec03be8a5da3114f7e30dddba1721dd8db57945086ca5966906 +DIST fallible_collections-0.4.6.crate 49282 BLAKE2B 2f86f7de3c519db073157f13586394556c0c20a311677b110ba0858f87fd8daa9338b8217659325257fb2bec41b83c018671e074e2f53ef0d9607b49f1e00752 SHA512 0878e2c9ca4d7407fb7a77f7554d1fdb1ba1a42eb64905d35bd8966dd8aac0937da84bd1b84f03a1ab8a237447b439148d03595f23961f5648acc328fb7adf5c DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5 +DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1 +DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28 DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50 +DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4 DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8 DIST libimagequant-2.17.0.tar.gz 99343 BLAKE2B 3ffbd60fe438c1b9e604fb74e839cad2aab5fd771f9250f7594a2d6cbc1e1a8a68d46c726298a66ba15a3e40254a36067dd18023ef22c132bd827c319161a6fe SHA512 12b111f8293c0e37bd75481457b6c96b547a1e3bc1d33bc7a6bbbde6ada284d835c7f5958ef41af7a5a8d3e6fb2d1aa2f641b7d6f2fe2782202f3c760792f394 +DIST libimagequant-2.18.0.tar.gz 382092 BLAKE2B d1531dc01d06153c56434b7afda6cb4ce9f68de31a31d5db8afdf9f54c2da693bbe9b421bd316e37936da4c7d5dea45b1593644b452adf90c986c1d16f8ee1bd SHA512 ff2d4c2b901108525f403567ed2cc81dcda6e3600c58661de6324abb191ec04d954987e23b9c4d0e02cbec64ab905d717e3a0e1aecc6e1399ecc6126e889a356 DIST libimagequant-4.0.4.tar.gz 85226 BLAKE2B 5b17388c51241724711957ec03673931ba72c6ae22c1e45bd623f5f775a7b4b8ae75a23cdabdb4dea27d03eea8803cd84b6640652fd310dc0a79d3090f25ef0c SHA512 a8bf4eb260256ad154ffea283f63877bdc14a01daba29725f44beb1d26c4c11de9927546aa2dde86716fdde74009ef38929ab68bae40f53cef01c929d8d7f82c +DIST libimagequant-4.1.0.tar.gz 86121 BLAKE2B af7bd88443be346716583a1a4bdce9b15e7ec995664e2f5f8fae31f47247756ec152b42c776e020311d88bc9be0af8f081841e96aef37f1226219b189716a4a1 SHA512 16b6683b6e963b33fb8bc91f653a1129e44efd644c76cf88d1a85e59627c30b6135f550255d6883958aae49951961967af1b84c95b51fb9a2c2f1181c9ba3008 DIST lodepng-3.7.0.crate 47225 BLAKE2B a480dfdf42a0de7bb22e80fe652ed53aa92504a0c2d0b982bb7f625577ca632c7102bd731c6b42425e2ce44ca25d0aa51056a1537c006686a344dfc2f09747f4 SHA512 10688fe1ee6d906fa7679f6ea56ae71b5112fb7dc480cb562d626948df807646f0efe9fa21495c8a756d17aad321f95695808c5836cd91bb161d2716f6d5ed45 +DIST lodepng-3.7.2.crate 48504 BLAKE2B d1a79e8f0540152d031971f368316d791e85dddb05f789cdcc4b1d1b49bc07e881baaf74e041979d26f63b527b9664a3942e8b280be6327f487882cc363078ee SHA512 f8a9a7e9d7583881c933404dbabc341943485131b25dd778f235a89f27ae1d613ce5b45d825f546ea1919b3599f80641f8479a216c801da27d2feddd59e8847c DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f +DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157 DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5 +DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419 DIST noisy_float-0.2.0.crate 15564 BLAKE2B 12708b3af27234d16447ec2ac882ae0b8d31d01d9b25165206a1c289d0d5b514f659c380ca73ab08f6e236e62e844c70fc51fc0e3e7a629749e98e6ad09fc388 SHA512 98e7914d37e9c170753e999e349eb50603c4df5f9abc0c9803c150604e05848be24af318ca0370cc4902250aad2641b1393f2e75da15bf581737e44d3719cd38 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9 +DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32 +DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82 +DIST rayon-1.6.1.crate 166330 BLAKE2B 5bbc439e0c88780b8d80cb36d4b4164e698a1189bd140e8c84d9f6a466023de0cd69a1f24c4217d595ae9af1f61aca6829461648152116c6bebeef0f0e686e50 SHA512 2e03585170e59f4388359817d67a43cd10a2244382615ae39bf84210db03a6dfec3b75d8a23800b8faaa31f45e8df4c44fbc343f02e18dd3dc0572c207791e73 +DIST rayon-core-1.10.2.crate 70599 BLAKE2B 3ef458725d2df280b259da4cef179f795dd8c29fc1b9fef06c9f405e3818508f2abe3d0eef206c14c6e1222f9271033cd3f534c3a11d2815e06abae31ce36874 SHA512 2b94669689b3c354fb65d2530c7da88d9d8d8a31cb7ad100e526018864f23091ffc976f0239e2614a521d58df3dece355b636ca06d0484ab4f0c3afca660dd24 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5 DIST rgb-0.8.33.crate 16261 BLAKE2B 208e85e812051fec9a12a6c37edf1c4e2442fb283f49858dcf2c154272bf274eee2492e8349cdd64d0cb2cd9d13bd2e8513f447b1e95f193c1e861b43c316438 SHA512 e9f8ac0eb598e1b917604d2fd9ea14bbef65345397d88296583f7ae0e5b3e231cf8fcc592ad1d7a402d96b8e478c0e9e872ab36cb8ab4e2239469d227dd05fbf +DIST rgb-0.8.34.crate 16285 BLAKE2B 529d179db7b35948369eae985821cb943498c496a562c04faff62111de64b885fbdd30e299248314667484c6a76e2f62447779ea9531ccc33411a623370fad43 SHA512 2db90ed5e9fe4c28cddb1aba55daaaba01be93885815fd618cdb970df6c5a5c1ebd6af8550594ae57436df1ef631b1d6742e3f2309d665ef486b9c0d07f61da0 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 diff --git a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild index ee030f795c0b..6d059018082b 100644 --- a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild new file mode 100644 index 000000000000..5bba4b9dff92 --- /dev/null +++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers" +HOMEPAGE="https://pngquant.org/lib/" +SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cpu_flags_x86_sse2 openmp" + +PATCHES=( + "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch + "${FILESDIR}"/${PN}-2.15.1-fix-pkgconfig.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # Avoid always building static library + # (Fixes side-effect of compiling in src_install too) + sed -i \ + -e '/install.*STATICLIB/d' \ + -e 's/all: static shared/all: shared/' \ + Makefile || die +} + +src_configure() { + tc-export AR CC + + # Hand rolled configure script, so not all flags are supported. + ./configure \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + $(use_enable cpu_flags_x86_sse2 sse) \ + $(use_with openmp) \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" || die +} + +src_compile() { + emake shared imagequant.pc +} diff --git a/media-gfx/libimagequant/libimagequant-4.0.4.ebuild b/media-gfx/libimagequant/libimagequant-4.0.4.ebuild index d16cea05fab4..b584a1e2674a 100644 --- a/media-gfx/libimagequant/libimagequant-4.0.4.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,7 +50,7 @@ S="${WORKDIR}"/${P}/imagequant-sys LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.11 diff --git a/media-gfx/libimagequant/libimagequant-4.1.0.ebuild b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild new file mode 100644 index 000000000000..0d21043c4333 --- /dev/null +++ b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +adler-1.0.2 +ahash-0.7.6 +arrayvec-0.7.2 +autocfg-1.1.0 +bitflags-1.3.2 +bytemuck-1.13.0 +cc-1.0.79 +cfg-if-1.0.0 +crc32fast-1.3.2 +crossbeam-channel-0.5.6 +crossbeam-deque-0.8.2 +crossbeam-epoch-0.9.13 +crossbeam-utils-0.8.14 +either-1.8.1 +fallible_collections-0.4.6 +flate2-1.0.25 +getrandom-0.2.8 +hashbrown-0.12.3 +hermit-abi-0.2.6 +libc-0.2.139 +lodepng-3.7.2 +memoffset-0.7.1 +miniz_oxide-0.6.2 +noisy_float-0.2.0 +num_cpus-1.15.0 +num-traits-0.2.15 +once_cell-1.17.0 +rayon-1.6.1 +rayon-core-1.10.2 +rgb-0.8.34 +scopeguard-1.1.0 +thread_local-1.1.4 +version_check-0.9.4 +wasi-0.11.0+wasi-snapshot-preview1 +" + +inherit cargo + +DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers" +HOMEPAGE="https://pngquant.org/lib/" +SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" $(cargo_crate_uris)" +S="${WORKDIR}"/${P}/imagequant-sys + +LICENSE="GPL-3" +SLOT="0/0" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc" + +BDEPEND=" + >=dev-util/cargo-c-0.9.11 + >=virtual/rust-1.60 +" + +QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*" + +src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +src_install() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --destdir="${ED}" + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 2a3edced4862..293932e7bd13 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,2 +1,3 @@ DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c +DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6 diff --git a/media-gfx/librecad/librecad-2.1.3-r6.ebuild b/media-gfx/librecad/librecad-2.1.3-r6.ebuild deleted file mode 100644 index f068df1cafc4..000000000000 --- a/media-gfx/librecad/librecad-2.1.3-r6.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils - -DESCRIPTION="Generic 2D CAD program" -HOMEPAGE="https://www.librecad.org/" -SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="debug doc tools" - -RDEPEND=" - dev-cpp/muParser - dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/freetype:2 -" -DEPEND="${RDEPEND} - dev-qt/qthelp:5 - dev-qt/qtxml:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/LibreCAD-${PV}" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-gcc-9.patch" - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345 -) - -src_configure() { - eqmake5 -r -} - -src_install() { - dobin unix/librecad - use tools && dobin unix/ttf2lff - insinto /usr/share/${PN} - doins -r unix/resources/* - use doc && docinto html && dodoc -r librecad/support/doc/* - insinto /usr/share/metainfo - doins unix/appdata/librecad.appdata.xml - doicon librecad/res/main/${PN}.png - make_desktop_entry ${PN} LibreCAD ${PN} Graphics -} diff --git a/media-gfx/librecad/librecad-2.1.3-r7.ebuild b/media-gfx/librecad/librecad-2.1.3-r7.ebuild index 3f3a914a5304..3edea50eab0b 100644 --- a/media-gfx/librecad/librecad-2.1.3-r7.ebuild +++ b/media-gfx/librecad/librecad-2.1.3-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else https://github.com/Fat-Zer/librecad-gentoo-CVE-patches/archive/v${PV/_/}.tar.gz -> librecad-gentoo-CVE-patches-${PV}.tar.gz " S="${WORKDIR}/LibreCAD-${PV}" - KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild new file mode 100644 index 000000000000..092799ec110b --- /dev/null +++ b/media-gfx/librecad/librecad-2.2.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" + +inherit desktop edo plocale qmake-utils + +DESCRIPTION="Generic 2D CAD program" +HOMEPAGE="https://www.librecad.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" + inherit git-r3 +else + SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/LibreCAD-${PV}" + KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug doc tools" + +RDEPEND=" + dev-cpp/muParser + dev-libs/boost:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/freetype:2 +" +DEPEND="${RDEPEND} + dev-qt/qthelp:5 + dev-qt/qtxml:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 +" + +src_prepare() { + default + + # Stock script doesn't work correctly on gentoo (see bug #847394) + # and also it compiles all translations regardles of selected locales. + # To avoid this just comment out locale building and do it manually + sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die + + plocale_find_changes 'librecad/ts' 'librecad_' '.ts' +} + +src_configure() { + eqmake5 -r +} + +src_compile() { + default + + build_locale() { + local lrelease="$(qt5_get_bindir)/lrelease" + edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ + -qm "unix/resources/qm/librecad_${1}.qm" + edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ + -qm "unix/resources/qm/plugins_${1}.qm" + } + + plocale_for_each_locale build_locale + # We want the en locale to be always present. Otherwise it could + # be impossible to select the English command set which is quite crucial. + has en $(plocale_get_locales) || build_locale en +} + +src_install() { + dobin unix/librecad + use tools && dobin unix/ttf2lff + insinto /usr/share/${PN} + doins -r unix/resources/* + use doc && docinto html && dodoc -r librecad/support/doc/* + insinto /usr/share/metainfo + doins unix/appdata/org.librecad.librecad.appdata.xml + doicon librecad/res/main/${PN}.png + make_desktop_entry ${PN} LibreCAD ${PN} Graphics +} diff --git a/media-gfx/libredwg/libredwg-0.12.5-r1.ebuild b/media-gfx/libredwg/libredwg-0.12.5-r1.ebuild index 7a74d1e59946..5e2741282d80 100644 --- a/media-gfx/libredwg/libredwg-0.12.5-r1.ebuild +++ b/media-gfx/libredwg/libredwg-0.12.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DOCS_BUILDER="doxygen" # File is hardcoded to be run from ../ so we use this instead of DOCS_DIR DOCS_CONFIG_NAME="doc/Doxyfile" diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild index 7eea5081e050..1b286cc00976 100644 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="cpu_flags_x86_sse2 fits openmp test" RESTRICT="!test? ( test )" @@ -33,13 +33,13 @@ RDEPEND=" dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/lcms:2 - media-libs/libpng:0= + media-libs/libjpeg-turbo:= + media-libs/libpng:= media-libs/libraw:= >=media-libs/openexr-3:0= - media-libs/tiff:0 + media-libs/tiff:= sci-libs/fftw:3.0=[threads] sci-libs/gsl:= - virtual/jpeg:0 fits? ( sci-libs/cfitsio:= ) " DEPEND="${RDEPEND} diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 995ea81cb7e4..fd2ac9af3eba 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,2 +1 @@ -DIST lximage-qt-1.1.0.tar.xz 829056 BLAKE2B a44cb527d8fa3ac447944aa68f425ce2768455fc85460a944b745b033b119d6bee82ac4c33e4bce47aea0523817c09def71396cbb65ed1128b68dfef5ffd6f18 SHA512 8d64bb35a56c5f565c1dde7f74534440e4decb9c4435e46986b713dad5b6c87aec0f0d9cb927a73f2f0b94f7101957fe1660737559b30c68b1d93cecfdf2e187 DIST lximage-qt-1.2.0.tar.xz 837692 BLAKE2B a51ad797882d2725e488226954672df1d6a175237ba5d0f21930af135c92afb46648ba3965f5e65c026eceb324a1e109a08b8f9921dff27d3f6685d35e898da7 SHA512 aa7cbc9f9e2e0ea1ea0cda446887002e285a17b54adb0bd87def1fabc9ad9dd5d25c5c1db56785e67f4767c2da8d8db9b4e73a440c676f80d7094434357b86e1 diff --git a/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild deleted file mode 100644 index 0abc55383f9a..000000000000 --- a/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="$(ver_cut 1-2)" - -inherit cmake xdg-utils - -DESCRIPTION="Qt Image Viewer" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - 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 ~arm arm64 ~ppc64 ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.11.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtnetwork-5.15:5 - >=dev-qt/qtprintsupport-5.15:5 - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-5.15:5 - media-libs/libexif - =x11-libs/libfm-qt-${MY_PV}*:= - x11-libs/libX11 - x11-libs/libXfixes -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild index a961e786ccb1..9e7a14624a84 100644 --- a/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-1.2.0.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 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest index 7fbc55f9c0d9..98028943f4e4 100644 --- a/media-gfx/maim/Manifest +++ b/media-gfx/maim/Manifest @@ -1,2 +1 @@ -DIST maim-5.6.3.tar.gz 40217 BLAKE2B 90f6854d8e54b92f8c6e8d5b597ea287e85e622ad689f1b72361aa919d0ce57bf4f28f289fd0da51b30c1195977b70982837d8b4b81ec5597361bc6ed5f1ad0a SHA512 8e19bd4e89db117bcb74a9b9e35f3232cdd0ef3836a536d170f803d7159fbc4be415d20695e5e61942ff7714d990d027149cee20a689f797d25d01610cc1c3be DIST maim-5.7.4.tar.gz 41663 BLAKE2B beb6cb327ae0cf022a90c095bf56b307870d3d7bd281f0e060d9cf7d49ba604cf4cbdfd9270b0e185295f0e3d2a151fbb8ba69398034145a08fc2721cc93740e SHA512 f91ba00e436514d2d0eecc664c02dd45c53750045b5bc4abbc2cfbf64159085e83736e820c54fa819b4d82b0905a3cfe76a5227db49dd54238f655fd4899cd6c diff --git a/media-gfx/maim/maim-5.6.3.ebuild b/media-gfx/maim/maim-5.6.3.ebuild deleted file mode 100644 index 1e8914586a32..000000000000 --- a/media-gfx/maim/maim-5.6.3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Commandline tool to take screenshots of the desktop" -HOMEPAGE="https://github.com/naelstrof/maim" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/maim.git" -else - SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="icu" - -DEPEND=" - media-libs/libglvnd - media-libs/libpng:0= - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - >=x11-misc/slop-7.5:= - icu? ( dev-libs/icu:= )" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMAIM_UNICODE=$(usex icu) - ) - cmake_src_configure -} diff --git a/media-gfx/maim/maim-5.7.4.ebuild b/media-gfx/maim/maim-5.7.4.ebuild index c97126c54b14..b20fa8d524f9 100644 --- a/media-gfx/maim/maim-5.7.4.ebuild +++ b/media-gfx/maim/maim-5.7.4.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/naelstrof/maim.git" else SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-3+ MIT" diff --git a/media-gfx/maim/maim-9999.ebuild b/media-gfx/maim/maim-9999.ebuild deleted file mode 100644 index 561201c54d12..000000000000 --- a/media-gfx/maim/maim-9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Commandline tool to take screenshots of the desktop" -HOMEPAGE="https://github.com/naelstrof/maim" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/maim.git" -else - SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="icu" - -DEPEND=" - media-libs/libglvnd - media-libs/libpng:0= - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - >=x11-misc/slop-7.5:= - icu? ( dev-libs/icu:= )" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMAIM_UNICODE=$(usex icu) - ) - cmake_src_configure -} 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..000000000000 --- 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 <cagelight@gmail.com> -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-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild deleted file mode 100644 index ae58d3bf6c72..000000000000 --- a/media-gfx/mandelbulber/mandelbulber-2.26-r1.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:0= - 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:0 ) -" -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 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/* - - domenu ${PN}2.desktop - - newicon -s 256 qt/icons/${PN}.png ${PN}2.png -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-gfx/mandelbulber/mandelbulber-2.28.ebuild b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild index d943dfa6a263..3b2b29b89171 100644 --- a/media-gfx/mandelbulber/mandelbulber-2.28.ebuild +++ b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild @@ -36,7 +36,7 @@ RDEPEND=" media-libs/openexr:= ) sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) " DEPEND="${RDEPEND} dev-qt/designer:5 diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest index c39b8398fb36..f4865b74d651 100644 --- a/media-gfx/mcomix/Manifest +++ b/media-gfx/mcomix/Manifest @@ -1,2 +1,3 @@ DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64fd32e10f4cb3f5b1a4815dee29a1a1b576798bddaeb41534ab66cb301825ddcd39b0b01252e1bbe37e0384b9 SHA512 fb908f19b98364e8a765c26fe6b2d7e0b147210b4406a421ae7f010ffdf1987520899ffe2343a26bcdb0bf6b6c9cc5f5ec866f72adb49fb16f0911dd42289a0d +DIST mcomix-2.1.0.tar.gz 517070 BLAKE2B 71aa67b48ac4cc09f12516312a07c1688e3d9ba086e0af8fab0f22549814fc82841b30965b7ac4e90192086338414c50d253af2d37b158fea8fc2358cee3d3db SHA512 385654c48192c20e285a053a8a90f1e792d58f7adbb0960745f31703d2ff5906f5e5bfd868ebaa08dd27314543a761a255503e5d586edd1baa064ffcea0205ca diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild index 3eb914de3d1d..f2a5bb362ccb 100644 --- a/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild +++ b/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit desktop python-r1 xdg # Hash used for this version diff --git a/media-gfx/mcomix/mcomix-2.0.2-r1.ebuild b/media-gfx/mcomix/mcomix-2.0.2-r1.ebuild index 8a55da1c0833..76304676162c 100644 --- a/media-gfx/mcomix/mcomix-2.0.2-r1.ebuild +++ b/media-gfx/mcomix/mcomix-2.0.2-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 optfeature xdg DESCRIPTION="GTK image viewer for comic book archives" diff --git a/media-gfx/mcomix/mcomix-2.1.0.ebuild b/media-gfx/mcomix/mcomix-2.1.0.ebuild new file mode 100644 index 000000000000..76304676162c --- /dev/null +++ b/media-gfx/mcomix/mcomix-2.1.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 optfeature xdg + +DESCRIPTION="GTK image viewer for comic book archives" +HOMEPAGE="http://mcomix.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}] + media-libs/libjpeg-turbo:0 + x11-libs/gtk+:3[introspection]" +BDEPEND="sys-devel/gettext" +# Most tests are quite old and do not run +RESTRICT="test" + +src_prepare() { + default + + # Uncompress man page + gunzip mcomix.1.gz || die + sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "RAR (.cbr) archives" app-arch/unrar + optfeature "7Zip archives" app-arch/p7zip + optfeature "LHA/LZA archives" app-arch/lha + optfeature "PDF files" app-text/mupdf +} diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild index bd865608137d..f55883401e44 100644 --- a/media-gfx/mcomix/mcomix-9999.ebuild +++ b/media-gfx/mcomix/mcomix-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 git-r3 optfeature xdg DESCRIPTION="GTK image viewer for comic book archives" diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild index 64652b5f63be..0b8ac9f4982c 100644 --- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild +++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P LICENSE="CC0-1.0" SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" src_prepare() { default diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch new file mode 100644 index 000000000000..7a652754204d --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch @@ -0,0 +1,92 @@ +https://github.com/mypaint/mypaint/pull/1193 + +From 032a155b72f2b021f66a994050d83f07342d04af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + <congdanhqx@gmail.com> +Date: Wed, 9 Nov 2022 11:24:33 +0700 +Subject: [PATCH] python: fix for Python 3.11 + +- python 3 always open in universal mode, U is default mode in 3.0, + and removed in 3.11 +- mypaint doesn't use ld?n?gettext, so bind_textdomain_codeset isn't + needed, that function is deprecated in 3.8 and is no-ops in 3.10 and + removed in 3.11 +--- a/lib/gettext_setup.py ++++ b/lib/gettext_setup.py +@@ -82,13 +82,11 @@ def init_gettext(localepath): + # yanked in over GI. + # https://bugzilla.gnome.org/show_bug.cgi?id=574520#c26 + bindtextdomain = None +- bind_textdomain_codeset = None + textdomain = None + + # Try the POSIX/Linux way first. + try: + bindtextdomain = locale.bindtextdomain +- bind_textdomain_codeset = locale.bind_textdomain_codeset + textdomain = locale.textdomain + except AttributeError: + logger.warning( +@@ -117,12 +115,6 @@ def init_gettext(localepath): + ctypes.c_char_p, + ) + bindtextdomain.restype = ctypes.c_char_p +- bind_textdomain_codeset = libintl.bind_textdomain_codeset +- bind_textdomain_codeset.argtypes = ( +- ctypes.c_char_p, +- ctypes.c_char_p, +- ) +- bind_textdomain_codeset.restype = ctypes.c_char_p + textdomain = libintl.textdomain + textdomain.argtypes = ( + ctypes.c_char_p, +@@ -177,35 +169,22 @@ def init_gettext(localepath): + # complete set from the same source. + # Required for translatable strings in GtkBuilder XML + # to be translated. +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + assert os.path.exists(path) + assert os.path.isdir(path) + if sys.platform == 'win32': + p = bindtextdomain(dom.encode('utf-8'), path.encode('utf-8')) +- c = bind_textdomain_codeset( +- dom.encode('utf-8'), codeset.encode('utf-8') +- ) + else: + p = bindtextdomain(dom, path) +- c = bind_textdomain_codeset(dom, codeset) + logger.debug("C bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "C bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) + # Call the implementations in Python's standard gettext module + # too. This has proper cross-platform support, but it only + # initializes the native Python "gettext" module. + # Required for marked strings in Python source to be translated. + # See http://docs.python.org/release/2.7/library/locale.html + p = gettext.bindtextdomain(dom, path) +- c = gettext.bind_textdomain_codeset(dom, codeset) + logger.debug("Python bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "Python bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + if sys.platform == 'win32': + d = textdomain(defaultdom.encode('utf-8')) + else: +--- a/setup.py ++++ b/setup.py +@@ -679,7 +679,7 @@ def _install_script(self, src, header): + self.announce("installing %s as %s" % (src, targ_basename), level=2) + if self.dry_run: + return [] +- with open(src, "rU") as in_fp: ++ with open(src, "r") as in_fp: + with open(targ, "w") as out_fp: + line = in_fp.readline().rstrip() + if line.startswith("#!"): + diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch b/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch new file mode 100644 index 000000000000..352e23aceb7d --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch @@ -0,0 +1,74 @@ +https://github.com/mypaint/mypaint/commit/1e97b4e1c0ea785b527ea63bf19f8554f3a25319 +https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847 + +From 1e97b4e1c0ea785b527ea63bf19f8554f3a25319 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Wed, 6 Apr 2022 22:55:21 +0200 +Subject: [PATCH] setup.py: + +Setuptools 54.1.0+ complains: + + lib/python3.9/site-packages/setuptools/dist.py:732: UserWarning: Usage of dash-separated 'install-data' will not be supported in future versions. Please use the underscore name 'install_data' instead + +https://github.com/pypa/setuptools/commit/a2e9ae4cb75f9b00ddf37713ec307e5f00869737 +--- a/setup.cfg ++++ b/setup.cfg +@@ -7,11 +7,11 @@ + + [install] + verbose=1 +-install-scripts=$base/bin +-install-platlib=$base/lib/mypaint +-install-purelib=$base/lib/mypaint +-install-data=$base/share +-install-headers=$base/include ++install_scripts=$base/bin ++install_platlib=$base/lib/mypaint ++install_purelib=$base/lib/mypaint ++install_data=$base/share ++install_headers=$base/include + + [nosetests] + with-doctest=1 + +From 423950bec96d6057eac70442de577364d784a847 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Wed, 6 Apr 2022 23:13:06 +0200 +Subject: [PATCH] setup.py: Ensure setuptools-compatible distutils are used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Setuptools is warning: + + lib/python3.9/site-packages/_distutils_hack/__init__.py:17: UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. + +And in fact, I am getting such errors: + + distutils.errors.DistutilsClassError: command class <class '__main__.Build'> must subclass Command + +Let’s do as asked. +--- a/setup.py ++++ b/setup.py +@@ -16,9 +16,6 @@ + import shutil + import functools + +-from distutils.command.build import build +-from distutils.command.clean import clean +- + from setuptools import setup + from setuptools import Extension + from setuptools import Command +@@ -26,6 +23,11 @@ + from setuptools.command.install import install + from setuptools.command.install_scripts import install_scripts + ++# setuptools must be imported first since they ensure ++# their distutils implementation will be used. ++from distutils.command.build import build ++from distutils.command.clean import clean ++ + # Constants + + diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild index 63497e65a90b..812d8ffc0745 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_SINGLE_IMPL=1 inherit desktop distutils-r1 xdg diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild new file mode 100644 index 000000000000..3321a34f933c --- /dev/null +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit desktop distutils-r1 xdg + +DESCRIPTION="Fast and easy graphics application for digital painters" +HOMEPAGE="http://mypaint.org/" +SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="openmp" +LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + ') + >=dev-libs/json-c-0.11:= + gnome-base/librsvg + media-gfx/mypaint-brushes:2.0 + media-libs/lcms:2 + >=media-libs/libmypaint-1.5.0[openmp?] + media-libs/libpng:= + sys-devel/gettext + sys-libs/libomp + x11-libs/gdk-pixbuf[jpeg] + x11-libs/gtk+:3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/swig + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-r1-build-system.patch + "${FILESDIR}"/${P}-GIL-hold.patch + "${FILESDIR}"/${P}-setuptools.patch + "${FILESDIR}"/${PN}-2.0.1-python3.11.patch +) + +distutils_enable_tests setup.py + +src_compile() { + # --disable-openmp can't be passed to setup.py build, + # only setup.py build_ext. + # Trying to call build_ext then build and such fails. + # + # We just override the environment instead for simplicity. + local openmp=$(usex openmp '-fopenmp' '-fno-openmp') + + OPENMP_CFLAG="${openmp}" OPENMP_LDFLAG="${openmp}" distutils-r1_src_compile +} + +src_install() { + distutils-r1_src_install + + newicon pixmaps/${PN}_logo.png ${PN}.png + + local lang= + for lang in ${LANGS}; do + if ! has ${lang} ${LINGUAS}; then + rm -rf "${ED}"/usr/share/locale/${lang} || die + fi + done +} diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest new file mode 100644 index 000000000000..ad756e9e2e50 --- /dev/null +++ b/media-gfx/netgen/Manifest @@ -0,0 +1 @@ +DIST netgen-6.2.2301.tar.gz 3394480 BLAKE2B 358b0cf7ff4d372a9ede8ab9b7df24435a75bcad880cc83607443707ae096f2bafa35d8cd581533917d1aae85a18ac0ca902876a1c68f11664a0a3ef1ae00593 SHA512 7aebbc5cc3e3227b455ac9c5538e1f0110d5621e6ca7315f6811733bd93e88ccca467296b7915894a45202ed375b45d9387a1d113a720d4199eff782afb43070 diff --git a/media-gfx/netgen/files/netgen-6.2.2204-disable-failing-tests.patch b/media-gfx/netgen/files/netgen-6.2.2204-disable-failing-tests.patch new file mode 100644 index 000000000000..a11df8e3d427 --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-disable-failing-tests.patch @@ -0,0 +1,19 @@ +From 21bfc56e76a448170dc4bb305c97b8f957b6e75d Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 14 Dec 2022 07:12:04 +0100 +Subject: [PATCH] disable failing tests + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/tests/catch/CMakeLists.txt ++++ b/tests/catch/CMakeLists.txt +@@ -34,7 +34,6 @@ add_unit_test(archive archive.cpp) + target_link_libraries(test_archive netgen_python) + add_unit_test(array array.cpp) + add_unit_test(ranges ranges.cpp) +-add_unit_test(symboltable symboltable.cpp) + add_unit_test(utils utils.cpp) + add_unit_test(version version.cpp) + +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2204-disable-python-tests.patch b/media-gfx/netgen/files/netgen-6.2.2204-disable-python-tests.patch new file mode 100644 index 000000000000..7a6def41898b --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-disable-python-tests.patch @@ -0,0 +1,17 @@ +From 2c402f3b552ce18483119de1d3a91fd457c9c170 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 14 Dec 2022 08:50:07 +0100 +Subject: [PATCH] disable python tests + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,4 @@ + add_subdirectory(catch) +-add_subdirectory(pytest) + + # this code goes here, because tests is the last add_subdirectory (otherwise it gets executed too early) + if(APPLE AND BUILD_FOR_CONDA) +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch b/media-gfx/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch new file mode 100644 index 000000000000..cf7b9d31ef07 --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch @@ -0,0 +1,21 @@ +From 53c45343f5a26841be10d930467e215da4a779f2 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 30 Oct 2022 15:17:55 +0100 +Subject: [PATCH] find Tk include directories + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -270,6 +270,9 @@ if (USE_GUI) + endif(APPLE) + find_package(OpenGL REQUIRED) + ++ include_directories(${TK_INCLUDE_PATH}/generic) ++ include_directories(${TK_INCLUDE_PATH}/unix) ++ + target_compile_definitions(netgen_gui INTERFACE -DTCL -DOPENGL -DUSE_TOGL_2 -DUSE_TCL_STUBS -DUSE_TK_STUBS) + target_include_directories(netgen_gui INTERFACE ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH}) + target_link_libraries(netgen_gui INTERFACE ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}) +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch b/media-gfx/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch new file mode 100644 index 000000000000..6f7a8bc3cd9a --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch @@ -0,0 +1,20 @@ +From 69d9c2da29adc9b7a209e78aae950d9834683f58 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Mon, 31 Oct 2022 13:07:05 +0100 +Subject: [PATCH] link against ffmpeg + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/ng/CMakeLists.txt ++++ b/ng/CMakeLists.txt +@@ -28,7 +28,7 @@ if(USE_GUI) + if(APPLE) + set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen) + endif(APPLE) +- target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY}) ++ target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY} ${FFMPEG_LIBRARIES}) + endif(NOT BUILD_FOR_CONDA) + + install(TARGETS nggui ${NG_INSTALL_DIR}) +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2204-use-system-catch.patch b/media-gfx/netgen/files/netgen-6.2.2204-use-system-catch.patch new file mode 100644 index 000000000000..1c08e49e7524 --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-use-system-catch.patch @@ -0,0 +1,40 @@ +From 6eaa13cc02ccd5f1bfa448fbcff3a1d9af8ba90a Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 14 Dec 2022 07:04:29 +0100 +Subject: [PATCH] use system catch + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -474,7 +474,7 @@ enable_testing() + include(CTest) + + if(ENABLE_UNIT_TESTS) +- include(${CMAKE_CURRENT_LIST_DIR}/cmake/external_projects/catch.cmake) ++ find_package(Catch2 REQUIRED) + endif(ENABLE_UNIT_TESTS) + + +--- a/tests/catch/CMakeLists.txt ++++ b/tests/catch/CMakeLists.txt +@@ -3,11 +3,15 @@ if(ENABLE_UNIT_TESTS) + add_custom_target(unit_tests) + + # Build catch_main test object +-include_directories(${CATCH_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../libsrc/include ${SPDLOG_INCLUDE_DIR}) ++if(TARGET Catch2::Catch2) ++ get_target_property(CATCH_INCLUDE_DIR Catch2::Catch2 INTERFACE_INCLUDE_DIRECTORIES) ++ include_directories(${CATCH_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../libsrc/include ${SPDLOG_INCLUDE_DIR}) ++else() ++ message(SEND_ERROR "Catch header files couldn't be found.") ++endif() + add_library(catch_main STATIC main.cpp) + set_target_properties(catch_main PROPERTIES CXX_STANDARD 17) + add_dependencies(unit_tests catch_main) +-add_dependencies(catch_main project_catch) + + # ensure the test targets are built before testing + add_test(NAME unit_tests_built COMMAND ${CMAKE_COMMAND} --build . --target unit_tests --config ${CMAKE_BUILD_TYPE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../.. ) +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2204-use-system-spdlog.patch b/media-gfx/netgen/files/netgen-6.2.2204-use-system-spdlog.patch new file mode 100644 index 000000000000..cbd45ca07f3f --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2204-use-system-spdlog.patch @@ -0,0 +1,40 @@ +From e20e1e2e2109f1ce6580587f63ad000ac6bdd877 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 13 Dec 2022 08:14:12 +0100 +Subject: [PATCH] use system spdlog + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -481,8 +481,13 @@ endif(ENABLE_UNIT_TESTS) + ####################################################################### + + if(USE_SPDLOG) +- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/external_projects/spdlog.cmake) +- include_directories(${SPDLOG_INCLUDE_DIR}) ++ find_package(spdlog REQUIRED CONFIG) ++ if(TARGET spdlog::spdlog) ++ get_target_property(SPDLOG_INCLUDE_DIR spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES) ++ include_directories(${SPDLOG_INCLUDE_DIR}) ++ else() ++ message(SEND_ERROR "You enabled USE_SPDLOG, but the spdlog package could not be found.") ++ endif() + endif(USE_SPDLOG) + + if(ENABLE_CPP_CORE_GUIDELINES_CHECK) +--- a/libsrc/core/CMakeLists.txt ++++ b/libsrc/core/CMakeLists.txt +@@ -50,10 +50,6 @@ endif(TRACE_MEMORY) + + if(USE_SPDLOG) + include_directories(${SPDLOG_INCLUDE_DIR}) +- install(DIRECTORY ${SPDLOG_INCLUDE_DIR} +- DESTINATION ${NG_INSTALL_DIR_INCLUDE} +- ) +- add_dependencies(ngcore project_spdlog) + target_compile_definitions(ngcore PUBLIC NETGEN_USE_SPDLOG) + if(DEBUG_LOG) + target_compile_definitions(ngcore PUBLIC NETGEN_LOG_DEBUG) +-- +2.38.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2301-find-libjpeg-turbo-library.patch b/media-gfx/netgen/files/netgen-6.2.2301-find-libjpeg-turbo-library.patch new file mode 100644 index 000000000000..3b01321f7ced --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2301-find-libjpeg-turbo-library.patch @@ -0,0 +1,34 @@ +From d8a654a61452c39e3e611493ad70b8c6e818130e Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 15 Feb 2023 12:28:00 +0100 +Subject: [PATCH] find libjpeg-turbo library + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/libsrc/visualization/CMakeLists.txt ++++ b/libsrc/visualization/CMakeLists.txt +@@ -7,7 +7,7 @@ target_sources(nggui PRIVATE + vssolution.cpp + visualpkg.cpp + ) +-target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} nglib) ++target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} nglib) + + install(FILES + meshdoc.hpp mvdraw.hpp visual_api.hpp +--- a/nglib/CMakeLists.txt ++++ b/nglib/CMakeLists.txt +@@ -7,6 +7,11 @@ endif(USE_OCC) + + target_link_libraries(nglib PUBLIC ngcore) + ++if(TARGET JPEG::JPEG) ++ get_target_property(JPEG_LIBRARIES JPEG::JPEG IMPORTED_LOCATION_RELEASE) ++else() ++ set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE}) ++endif() + target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns ) + + install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR}) +-- +2.39.1 + diff --git a/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch b/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch new file mode 100644 index 000000000000..b05d71221ca5 --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch @@ -0,0 +1,31 @@ +https://github.com/NGSolve/netgen/pull/123/commits/5ee4e43393936ab4c00feb58c48bc3a10e6bcbdb + +From 76276c5a3b0e70b27d44f7ce0a3ea064b23909da Mon Sep 17 00:00:00 2001 +From: Christopher Montgomery <monty@xiph.org> +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 19 Feb 2023 12:18:12 +0100 +Subject: [PATCH] fix nullptr deref in archive + +Hardened toolchains (eg, mainline Fedora) no longer tolerate null +derefs that were silently trapped/ignored in earlier versions. This +eliminates a nullptr deref in archive.hpp that was failing several +unit tests (and causing crashes) when trying to manipulate +default-constructed archive objects. + +Adapted original patch according the comment in the PR. + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/libsrc/core/archive.hpp ++++ b/libsrc/core/archive.hpp +@@ -225,7 +225,7 @@ namespace ngcore + (*this) & size; + if(Input()) + v.resize(size); +- Do(&v[0], size); ++ Do(v.data(), size); + return (*this); + } + +-- +2.39.2 + diff --git a/media-gfx/netgen/metadata.xml b/media-gfx/netgen/metadata.xml new file mode 100644 index 000000000000..3c583c643516 --- /dev/null +++ b/media-gfx/netgen/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project" proxied="proxy"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>waebbl-gentoo@posteo.net</email> + <name>Bernd Waibel</name> + </maintainer> + <use> + <flag name="logging">Enable logging through <pkg>dev-libs/spdlog</pkg></flag> + <flag name="opencascade">Enable OpenCASCADE support</flag> + </use> + <upstream> + <remote-id type="github">NGSolve/netgen</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-gfx/netgen/netgen-6.2.2301.ebuild b/media-gfx/netgen/netgen-6.2.2301.ebuild new file mode 100644 index 000000000000..bd9fbd4c967b --- /dev/null +++ b/media-gfx/netgen/netgen-6.2.2301.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10,11} ) +inherit cmake desktop python-single-r1 xdg + +DESCRIPTION="Automatic 3d tetrahedral mesh generator" +HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen" +SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86" + +IUSE="ffmpeg gui jpeg logging mpi opencascade python test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( gui ) + jpeg? ( gui ) + python? ( gui ) +" + +DEPEND=" + sys-libs/zlib + ffmpeg? ( media-video/ffmpeg:= ) + gui? ( + dev-lang/tcl:0/8.6 + dev-lang/tk:0/8.6 + media-libs/glu + virtual/opengl + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libxcb:= + ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + logging? ( dev-libs/spdlog:= ) + mpi? ( + sci-libs/metis + virtual/mpi + ) + opencascade? ( sci-libs/opencascade:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + ' + ) + mpi? ( + $(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' ) + ) + ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/lsb-release + virtual/pkgconfig + gui? ( virtual/imagemagick-tools[png] ) + test? ( + <dev-cpp/catch-3:0 + python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch" + "${FILESDIR}/${PN}-6.2.2204-link-against-ffmpeg.patch" + "${FILESDIR}/${PN}-6.2.2204-use-system-spdlog.patch" + "${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch" + "${FILESDIR}/${PN}-6.2.2204-disable-failing-tests.patch" + "${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch" + "${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch" + "${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # NOTE: need to manually check and update this string on version bumps! + # git describe --tags --match "v[0-9]*" --long --dirty + cat <<- EOF > "${S}/version.txt" || die + v${PV}-0-g26d12898 + EOF + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # currently not working in a sandbox, expects netgen to be installed + # see https://github.com/NGSolve/netgen/issues/132 + -DBUILD_STUB_FILES=OFF + -DENABLE_UNIT_TESTS=$(usex test) + -DINSTALL_PROFILES=OFF + -DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DNG_INSTALL_DIR_INCLUDE="include/${PN}" + -DNG_INSTALL_DIR_LIB="$(get_libdir)" + -DUSE_CCACHE=OFF + # doesn't build with this version + -DUSE_CGNS=OFF + -DUSE_GUI=$(usex gui) + -DUSE_INTERNAL_TCL=OFF + -DUSE_JPEG=$(usex jpeg) + -DUSE_MPEG=$(usex ffmpeg) + # respect users -march= choice + -DUSE_NATIVE_ARCH=OFF + -DUSE_MPI=$(usex mpi) + -DUSE_OCC=$(usex opencascade) + -DUSE_PYTHON=$(usex python) + -DUSE_SPDLOG=$(usex logging) + -DUSE_SUPERBUILD=OFF + ) + # no need to set this, if we only build the library + if use gui; then + mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" ) + fi + if use python; then + mycmakeargs+=( + -DPREFER_SYSTEM_PYBIND11=ON + # needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + fi + if use mpi && use python; then + mycmakeargs+=( -DUSE_MPI4PY=ON ) + else + mycmakeargs+=( -DUSE_MPI4PY=OFF ) + fi + cmake_src_configure +} + +src_install() { + cmake_src_install + use python && python_optimize + + local NETGENDIR="/usr/share/${PN}" + echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die + doenvd 99netgen + + if use gui; then + mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die + + convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die + newicon -s 32 "${S}"/${PN}-2.png ${PN}.png + newicon -s 16 "${S}"/${PN}-3.png ${PN}.png + make_desktop_entry ${PN} "Netgen" netgen Graphics + fi + + mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die + dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf + + use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die +} diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest deleted file mode 100644 index d0d25bc2d29b..000000000000 --- a/media-gfx/netpaint/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53 diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml deleted file mode 100644 index 65be4a236db7..000000000000 --- a/media-gfx/netpaint/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="project"> - <email>shell-tools@gentoo.org</email> - <name>Gentoo Shell Tools Project</name> - </maintainer> -</pkgmetadata> diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild deleted file mode 100644 index e44b6241f74d..000000000000 --- a/media-gfx/netpaint/netpaint-1.1.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -MY_PN="NetPaint" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="curses-based drawing tool" -HOMEPAGE="https://github.com/SyntheticDreams/NetPaint" -SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/urwid[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -src_prepare() { - default - mv netpaint.py netpaint || die - sed -e 's#netpaint\.py#netpaint#g;' \ - -i setup.py || die "can't patch setup.py" -} diff --git a/media-gfx/nomacs/nomacs-3.16.224-r3.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r5.ebuild index c507658d1a9f..6bba47db9342 100644 --- a/media-gfx/nomacs/nomacs-3.16.224-r3.ebuild +++ b/media-gfx/nomacs/nomacs-3.16.224-r5.ebuild @@ -34,7 +34,7 @@ RDEPEND=" raw? ( media-libs/libraw:= ) tiff? ( dev-qt/qtimageformats:5 - media-libs/tiff + media-libs/tiff:= ) zip? ( dev-libs/quazip:0=[qt5(+)] ) " diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest index 71e06c6c4845..e23c77a2c455 100644 --- a/media-gfx/opentoonz/Manifest +++ b/media-gfx/opentoonz/Manifest @@ -1 +1 @@ -DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649 +DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9 diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild index 21ad1ad85bc5..455a47d16a18 100644 --- a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake xdg-utils +inherit cmake flag-o-matic xdg-utils DESCRIPTION="An open-source full-featured 2D animation creation software" HOMEPAGE="https://github.com/opentoonz/opentoonz" @@ -29,6 +29,7 @@ RDEPEND=" >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 + >=dev-qt/qtserialport-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 @@ -38,19 +39,22 @@ RDEPEND=" media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= + media-libs/opencv:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" CMAKE_USE_DIR="${S}"/toonz/sources src_configure() { + # bug #859778 + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu" @@ -61,7 +65,7 @@ src_configure() { # The upstream uses their own modified libtiff # See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff cd thirdparty/tiff-4.0.3 || die - econf \ + CONFIG_SHELL="${BROOT}"/bin/bash econf \ --with-pic \ --disable-jbig \ --enable-static \ diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index 56fc94e70097..4ddf7d7dbf21 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,3 +1 @@ -DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86 -DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194 -DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b SHA512 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e +DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B 506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027 SHA512 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb diff --git a/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch b/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch new file mode 100644 index 000000000000..adc02e268a84 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-10.0.1-drop-failing-tests.patch @@ -0,0 +1,44 @@ +From b0b33e6e05317df8f930314cd866f7d46a7f1911 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 6 Dec 2022 07:26:09 +0100 +Subject: [PATCH] drop failing tests + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/openvdb/openvdb/unittest/TestLinearInterp.cc ++++ b/openvdb/openvdb/unittest/TestLinearInterp.cc +@@ -1032,5 +1032,4 @@ TestLinearInterp::testStencilsMatch() + EXPECT_EQ(val1, val2); + } + } +-TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); } + TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); } +--- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc ++++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc +@@ -222,8 +222,6 @@ TEST_F(TestPointRasterizeFrustum, testScaleByVoxelVolume) + EXPECT_EQ(Coord(0,0,0), iterV.getCoord()); + auto scaledSumV = (scale * velocities[0] + scale * velocities[1] + + scale * velocities[2] + scale * velocities[4]) / voxelVolume; +- EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + #endif + +@@ -603,7 +601,6 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization) + auto scaledSumV = (scale * velocities[0] + scale * velocities[1] + + scale * velocities[2] + scale * velocities[4]); + EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + + // explicitly specify Vec3f grid +@@ -627,7 +624,6 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization) + iterV = velocity->tree().cbeginLeaf()->cbeginValueOn(); + EXPECT_EQ(Coord(0,0,0), iter.getCoord()); + EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + + // rasterize float attribute into double grid +-- +2.38.1 + diff --git a/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch b/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch new file mode 100644 index 000000000000..00b29db2e17c --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-10.0.1-fix-linking-of-vdb_tool-with-OpenEXR.patch @@ -0,0 +1,26 @@ +From 2b6195c6dc479692aa5b7b07356d788b3dd21596 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Mon, 5 Dec 2022 07:19:51 +0100 +Subject: [PATCH] fix linking of vdb_tool with OpenEXR + +This patch is Gentoo specific. Ideally it should respect the OpenEXR version +being installed. Because we only support OpenEXR-3 for OpenVDB, the patch +works on Gentoo, but not on setups where OpenEXR-2 is still being used to +build OpenVDB. + +Bug: https://github.com/AcademySoftwareFoundation/openvdb/issues/1541 +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/openvdb_cmd/vdb_tool/CMakeLists.txt ++++ b/openvdb_cmd/vdb_tool/CMakeLists.txt +@@ -93,7 +93,7 @@ endif() + if(OPENVDB_TOOL_USE_EXR) + target_compile_definitions(vdb_tool_common INTERFACE "VDB_TOOL_USE_EXR") + find_package(OpenEXR REQUIRED) +- target_link_libraries(vdb_tool_common INTERFACE OpenEXR::IlmImf) ++ target_link_libraries(vdb_tool_common INTERFACE OpenEXR::OpenEXR) + endif() + + if(OPENVDB_TOOL_USE_ABC) +-- +2.38.1 + diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch deleted file mode 100644 index 13d0f45fabf4..000000000000 --- a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7558089b3dae599ffc80329da3a5c1decf882ca7 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Fri, 28 Feb 2020 17:01:25 +0100 -Subject: [PATCH] Fix multilib header source - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - cmake/FindIlmBase.cmake | 10 ++++++++-- - cmake/FindOpenEXR.cmake | 10 ++++++++-- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake -index f20f803..bb85019 100644 ---- a/cmake/FindIlmBase.cmake -+++ b/cmake |