From f5ef7f2371babf22c2c3fad17108692b09e4c98e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 May 2024 00:00:17 +0100 Subject: gentoo auto-resync : 02:05:2024 - 00:00:17 --- media-gfx/Manifest.gz | Bin 38005 -> 37996 bytes media-gfx/digikam/Manifest | 3 +- media-gfx/digikam/digikam-8.3.0-r1.ebuild | 156 +++++++++++++++++++++ media-gfx/digikam/metadata.xml | 1 + media-gfx/gthumb/Manifest | 2 +- media-gfx/gthumb/gthumb-3.12.6.ebuild | 2 +- media-gfx/jhead/Manifest | 4 - .../files/jhead-3.06.0.1-CVE-2021-34055.patch | 108 -------------- .../jhead-3.06.0.1-mkstemp-fix-makefile.patch | 52 ------- media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 27 ---- 10 files changed, 161 insertions(+), 194 deletions(-) create mode 100644 media-gfx/digikam/digikam-8.3.0-r1.ebuild delete mode 100644 media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch delete mode 100644 media-gfx/jhead/files/jhead-3.06.0.1-mkstemp-fix-makefile.patch delete mode 100644 media-gfx/jhead/jhead-3.06.0.1-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index a4b884b7f97f..2ef49348e9a3 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 3d5ede0fbe13..1ecb6ba0c237 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,6 @@ AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158 AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd +EBUILD digikam-8.3.0-r1.ebuild 4382 BLAKE2B 6d3f7d2f49fee949904bfccbbc2fce8f08afb31d8831b91142b2b478dc04df2e8c7911cb306f92c16b5475eb7b7768ddad42f9463ca6583d4ae247a2a9f6e6d4 SHA512 6fbcb1c0f132e5d6d495ddf971789023eca2423ab5b295f6f064a08932b505f5f9ff346087cf68661356308a244f724ba88b26fb03e9e805a1829475e1e1edcc EBUILD digikam-8.3.0.ebuild 4193 BLAKE2B bdaf2e8e960067f18bc85513a2ed3ca17f235d86de490b8f53cc969ea25f115804a0f659dc19d6756ea1085692e917e1caf26d1e8e569295be4cb2941949d2ea SHA512 7dac2a6e459ca160c1b7cad2955b725123714cf7cc1f5a9a88666c378d7b8c5fd083e8712262de5c20ac599677b425d4ffa4810a7c5abe891eb52f51917f25d6 -MISC metadata.xml 922 BLAKE2B 230932621f619b704122e3c1e4dbfe090bfad7f7722e41fb8d0b7bd6dd124d7d72139852ed016e34e099877c995cfdb0fb460194535824d2f0c13426dd65296c SHA512 457f3ec2b0479f8f686e3bf0b9f771f8bee205bd661a86226238ae9a3b557c52ec462663d45617872a83ce3717e74bcdbe74d5c2f9e4ab391bcb76a72082aec4 +MISC metadata.xml 987 BLAKE2B c06da5014c71156e7cbffc5e57d530287b881c793dffa8c6c7f563518cb7572c6de245066c7700767e27f36c4d4745277c1f6d01188f02a0e4da0ff125e8abde SHA512 9c3a8d4c11de1a12b386ef1ceeeb3dcf67c29a19a4eea20d8d442ba9997f267ef1c96a9cb38e11bf49c44dea427879683dae38f656e9654a50cfcdd849983c20 diff --git a/media-gfx/digikam/digikam-8.3.0-r1.ebuild b/media-gfx/digikam/digikam-8.3.0-r1.ebuild new file mode 100644 index 000000000000..207fe74e47ff --- /dev/null +++ b/media-gfx/digikam/digikam-8.3.0-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm kde.org toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + TARNAME="digiKam-${PV/_/-}-1" + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz" + else + SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz" + fi + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +SLOT="5" +IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun +mediaplayer mysql opengl openmp +panorama scanner semantic-desktop spell" + +# bug 366505 +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/expat + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[mysql?] + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=media-gfx/exiv2-0.27.1:=[xmp] + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/liblqr + media-libs/libpng:= + >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] + media-libs/tiff:= + x11-libs/libX11 + addressbook? ( + >=kde-apps/akonadi-contacts-23.08.3:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + ) + calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) + gphoto2? ( media-libs/libgphoto2:= ) + heif? ( + media-libs/libheif:= + media-libs/x265:= + ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + opengl? ( + >=dev-qt/qtopengl-${QTMIN}:5 + virtual/opengl + ) + mediaplayer? ( + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtopengl-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[widgets] + media-video/ffmpeg:= + || ( + media-libs/portaudio + media-sound/pulseaudio + ) + ) + panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) + scanner? ( >=kde-apps/libksane-23.08.3:5 ) + semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) + spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost + addressbook? ( >=kde-apps/akonadi-23.08.3:5 ) +" +RDEPEND="${COMMON_DEPEND} + media-libs/exiftool + mysql? ( virtual/mysql[server(+)] ) + panorama? ( media-gfx/hugin ) +" +BDEPEND=" + sys-devel/gettext + panorama? ( + app-alternatives/lex + app-alternatives/yacc + ) +" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-cmake-addressbook.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_WITH_QT6=OFF # KF6 not stable upstream yet + -DBUILD_TESTING=OFF # bug 698192 + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 + -DENABLE_QWEBENGINE=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake_use_find_package calendar KF5CalendarCore) + -DENABLE_GEOLOCATION=$(usex geolocation) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif Libheif) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake_use_find_package opengl OpenGL) + $(cmake_use_find_package panorama KF5ThreadWeaver) + $(cmake_use_find_package scanner KF5Sane) + $(cmake_use_find_package spell KF5Sonnet) + -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) + ) + + ecm_src_configure +} diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 0a9720425415..13d34044a893 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -15,6 +15,7 @@ Enable akonadi contact integration Enable support for additional image formats such as XCF, FITS, HEIC etc. + Enable integrated video player Enable support for media-libs/lensfun Build the panorama plugin which requires media-gfx/hugin Enable kde-frameworks/kfilemetadata support diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 672d29372652..2d82b799d628 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -5,5 +5,5 @@ DIST gthumb-3.12.6.tar.xz 7616560 BLAKE2B b1ccf4c76bc0edc5e8f60027357c8e48327fff EBUILD gthumb-3.12.3.ebuild 2617 BLAKE2B 082d1dae7261dc526dad6f2c6694b1fae79a84d9777518e0340e9399d832b2a92f9acc13bebf657fb460bfa4197e3273b45b5cdc30d538e5085a020d9047a3c9 SHA512 b19863634dc2c6c38c693eec3fbd315f4dabe4c759ece8630f45ac6bd80a48890e28b47537472aee8f60e09ec1329062435bb92baac255a719caba16d4c53fd9 EBUILD gthumb-3.12.4.ebuild 2621 BLAKE2B 8112e5577c316fcea6f09103831de0952f956e9770ecda50dfbd78bc072940ed467a39f572dab6a2766400047148445087a47fd7b3b8638ce41bd91c641a5a9f SHA512 ca6bb57df38bd085fa21049361d78a2dea93e1da980584fb172c8c3f92d3cedbcdcb6424599563a17792824f8d8174e4a2490dba5df14b0a8d258dd3fd65b1e8 EBUILD gthumb-3.12.5.ebuild 2593 BLAKE2B 39546c5b8b908dc93d9f0d9e586d96e302c4daca8fb706270a53c26850071401c15d04528b39deefcda9ecc8bcfa898af1ad5b98e9b248c505d28d2c0971de31 SHA512 ab1d91b5e33840e5fb26c4b96e2c48d423bed8d5d86a848f115adc82959df53d2363b732a09f90872a777741505e9ada48b00f798e4ff4e52f5ac01a26d00a87 -EBUILD gthumb-3.12.6.ebuild 2592 BLAKE2B a30ff8a7767c0773932a95408277156ea4bfbd5996ca305b8b667266821eee296ea8a7b89bb49cc98afa03a3c113cd403874aec9466ca5131a78e35bba8c600d SHA512 baad8a2c1506d7a55b985bb462e909de6c4de0045f6d11cd2ee3b430001183cee71ef97cf5a4ad8e11ff3b95ddeef553afa112665bce7b33e058167332f56a01 +EBUILD gthumb-3.12.6.ebuild 2591 BLAKE2B 1c0228bc83a954378977fa91d12a8a149af30719b811c3c88994047a1099056b67522d02180f5b06b1df864b30c302248d15f2201b09c0d5694a30f925a0c848 SHA512 fc7008dfc14db7733a08fec7564bcbd7b88cef2cc9ac276bcdf6edcecded0b5990a5986e9f21b872fec820765c34a3114fb54371b30433d7f1111cb0b2d82d3f MISC metadata.xml 422 BLAKE2B 7d64079a62a7643024e096edf47d5605ef25c0ea566d2496763f6b18e254c19594317492b77d38f2e841b15160138a958d80d0fce0d399cf527ca53dbe438038 SHA512 d1894107a2dfdb5609c163e90322aece9b49fefc7f3f0f9bd2a4cf25688ab3f63d445ae0cdb688f8ef1defe5b1de9ab5430bfeb7c61fe737bafbfeb9e97b12d2 diff --git a/media-gfx/gthumb/gthumb-3.12.6.ebuild b/media-gfx/gthumb/gthumb-3.12.6.ebuild index 56d00179eb19..718683c42b47 100644 --- a/media-gfx/gthumb/gthumb-3.12.6.ebuild +++ b/media-gfx/gthumb/gthumb-3.12.6.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="cdr colord exif keyring gstreamer heif jpegxl lcms raw slideshow svg tiff webkit webp" # libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest index efff78429e85..f1e186fb9347 100644 --- a/media-gfx/jhead/Manifest +++ b/media-gfx/jhead/Manifest @@ -1,8 +1,4 @@ -AUX jhead-3.06.0.1-CVE-2021-34055.patch 3779 BLAKE2B dfecaac2276d5b9c3fb85f0826bf814f468ba18d78baa2b1a979393cc08d24d00c639462ef470f1c4d3c4889add34a89941798b896971e8b868538ea691af253 SHA512 8d586c3805574b9b2332ddda0693c93052cbf7bc4930694e485bd7a3d85a2255f86d5222d99da851d3d81491ad61ddca4810c23d528f41b1b0784145f4f50dd9 -AUX jhead-3.06.0.1-mkstemp-fix-makefile.patch 1575 BLAKE2B a3f7defa7fdcb547d0f9ed2d06c690effabd4435769fadd26cc26c939dda7ec865eb4ff9ffaf5cd6e817caa759d1bcdb741c6b2105b32d1954703d595d0c16a0 SHA512 36b15c3b557be1bfbfffec5e821389cdf9fa9549d5d8b60d5e30edf4177b29f4f34895763f722b7e5b5510ff7f1b46f6c35f13345750a408f2d500ddd4687144 AUX jhead-3.08-fix-makefile.patch 1240 BLAKE2B 7c1d01268cafda6b02322d715dcc45bb2c1c258fd14375d3729e40d0d345d0c1febeef647ad39925989793d64504dfc34ca6906da7ef93594690bf82b3e51a14 SHA512 a45615f414b1cf5e8fbd13929f2821fb298d82a817f6665d86076b1173bfd24268a99f8f011f6c8d4cd8007f23f289edda9144d241a78f21084f4aa658dfccf5 -DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B 100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2 SHA512 7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9 DIST jhead-3.08.tgz 1146535 BLAKE2B 8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740 SHA512 eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5 -EBUILD jhead-3.06.0.1-r1.ebuild 637 BLAKE2B 8fd59cbf2e4dc7bcb4676d6df6d436da7d1cceded921a42eca30e2542dde041f0c293a25bc8789e72a1b13f33803afbbf96048129ba54f1bd87af6e9a70cc56a SHA512 dd6ba53a3e898c1f3784596a66770026259c08525232347ba44c3c76f33024347af74930fdca82803f06da843391df353965ce8d64ab214eb67d1b7963d80a47 EBUILD jhead-3.08.ebuild 780 BLAKE2B 9a7cccc666587cab49d18824c8723c254d750f135dfd567a3f392692b0ab3d9cf8135ccc65741540bc12687f9155bee17c531d0fd4303f399319ea33a72a4d04 SHA512 ca596e1f2fdc3d3b0c4cece087bcff4c35b048dfac421366ba355474e196628c8d1d9da7dbc1428616c230afa70533027624a37ba2c7c1fe4df35fd97c283a63 MISC metadata.xml 351 BLAKE2B 2fa507a18a19bd866b01af6618c21a3f3b37bd250fb9cbf3a253ae9e94cb6dae961a5f337c083511d7e939380175c613864e087cb22c75b6e5662900168ebabe SHA512 9e77e681d0453ec4ee2ffb3888b3867f0445fb4617a68e36902e1ee37ac56e0d04576c3a20447ee1a8fece62896c119b24ab5073f37c8e62f1c2ec00cf82a8da diff --git a/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch b/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch deleted file mode 100644 index 1669eb6f089f..000000000000 --- a/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch +++ /dev/null @@ -1,108 +0,0 @@ -From f4f57913fff5de97da347a22558bbb74a1166369 Mon Sep 17 00:00:00 2001 -From: matthias wandel -Date: Wed, 1 Sep 2021 18:59:15 -0300 -Subject: [PATCH] If exif header is complete garbage, don't keep it. Fixes - issue 36 - -(cherry picked from commit c761620767ae72e5d61c697a73de262aebe0b591) ---- - exif.c | 12 +++++++----- - jhead.h | 2 +- - jpgfile.c | 5 ++++- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/exif.c b/exif.c -index ba066b5..d250a8d 100755 ---- a/exif.c -+++ b/exif.c -@@ -1005,7 +1005,7 @@ void Clear_EXIF () - // Process a EXIF marker - // Describes all the drivel that most digital cameras include... - //-------------------------------------------------------------------------- --void process_EXIF (unsigned char * ExifSection, int length) -+int process_EXIF (unsigned char * ExifSection, int length) - { - int FirstOffset; - -@@ -1020,7 +1020,7 @@ void process_EXIF (unsigned char * ExifSection, int length) - static uchar ExifHeader[] = "Exif\0\0"; - if (memcmp(ExifSection+2, ExifHeader,6)){ - ErrNonfatal("Incorrect Exif header",0,0); -- return; -+ return 0; - } - } - -@@ -1033,21 +1033,21 @@ void process_EXIF (unsigned char * ExifSection, int length) - MotorolaOrder = 1; - }else{ - ErrNonfatal("Invalid Exif alignment marker.",0,0); -- return; -+ return 0; - } - } - - // Check the next value for correctness. - if (Get16u(ExifSection+10) != 0x2a){ - ErrNonfatal("Invalid Exif start (1)",0,0); -- return; -+ return 0; - } - - FirstOffset = (int)Get32u(ExifSection+12); - if (FirstOffset < 8 || FirstOffset > 16){ - if (FirstOffset < 16 || FirstOffset > length-16 || length < 16){ - ErrNonfatal("invalid offset for first Exif IFD value",0,0); -- return; -+ return 0; - } - // Usually set to 8, but other values valid too. - ErrNonfatal("Suspicious offset of first Exif IFD value",0,0); -@@ -1086,6 +1086,7 @@ void process_EXIF (unsigned char * ExifSection, int length) - ImageInfo.FocalLength35mmEquiv = (int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*36 + 0.5); - } - } -+ return 1; - } - - -@@ -1235,6 +1236,7 @@ void create_EXIF(void) - const char * ClearOrientation(void) - { - int a; -+ - if (NumOrientations == 0) return NULL; - - for (a=0;a