diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 19:49:02 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 19:59:38 +0100 |
| commit | 78098dcdcada83ae1d861e02a7cb230de3e6c670 (patch) | |
| tree | a7f73e9993d9a25029c53b420f8b1173c1ca6d98 /kde-apps | |
| parent | x11-misc/xsnow: add sourceforge upstream metadata (diff) | |
| download | gentoo-78098dcdcada83ae1d861e02a7cb230de3e6c670.tar.gz gentoo-78098dcdcada83ae1d861e02a7cb230de3e6c670.tar.bz2 gentoo-78098dcdcada83ae1d861e02a7cb230de3e6c670.zip | |
kde-apps/libkdcraw: Fix build against >=media-libs/libraw-0.21.0
Closes: https://bugs.gentoo.org/887355
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch | 28 | ||||
| -rw-r--r-- | kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch new file mode 100644 index 000000000000..1c03556777f3 --- /dev/null +++ b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch @@ -0,0 +1,28 @@ +From 0843c601cbb9a9bb5774ed01b7d90e68fd17950a Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Sun, 18 Dec 2022 15:59:51 +0100 +Subject: [PATCH] Fix build with libraw 0.21 + +--- + src/kdcraw.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/kdcraw.cpp b/src/kdcraw.cpp +index 376a37d..1433c4b 100644 +--- a/src/kdcraw.cpp ++++ b/src/kdcraw.cpp +@@ -357,7 +357,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI + d->setProgress(0.3); + + raw.imgdata.params.output_bps = 16; ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ raw.imgdata.rawparams.shot_select = shotSelect; ++#else + raw.imgdata.params.shot_select = shotSelect; ++#endif + ret = raw.unpack(); + + if (ret != LIBRAW_SUCCESS) +-- +GitLab + diff --git a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild index 7cee686a58c3..1997ea10e90a 100644 --- a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild +++ b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild @@ -18,3 +18,5 @@ DEPEND=" >=media-libs/libraw-0.16:= " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-libraw-0.21.patch ) # bug 887355 |