From 0323397685757bbec6c2316fb7e681fd355881ec Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:48:29 +0200 Subject: [PATCH 01/13] libraw: update to 0.21.1. --- common/shlibs | 4 ++-- srcpkgs/libraw/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index df0384d3b218..16eefd439b2b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -915,8 +915,8 @@ libdiscid.so.0 libdiscid-0.2.2_1 librhythmbox-core.so.10 librhythmbox-3.4.1_1 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1 libgexiv2.so.2 libgexiv2-0.6.1_1 -libraw.so.20 libraw-0.20.2_1 -libraw_r.so.20 libraw-0.20.2_1 +libraw.so.23 libraw-0.21.0_1 +libraw_r.so.23 libraw-0.21.0_1 libdjvulibre.so.21 libdjvulibre-3.5.24_1 libgxps.so.2 libgxps-0.2.0_1 libt1.so.5 libt1-5.1.2_1 diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template index b5393b77b7e7..3e72337dfbdc 100644 --- a/srcpkgs/libraw/template +++ b/srcpkgs/libraw/template @@ -1,6 +1,6 @@ # Template file for 'libraw' pkgname=libraw -version=0.20.2 +version=0.21.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" @@ -11,7 +11,7 @@ license="LGPL-2.1-only, CDDL-1.0" homepage="https://www.libraw.org" changelog="https://github.com/LibRaw/LibRaw/raw/${version%.*}-stable/Changelog.txt" distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz" -checksum=dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 +checksum=630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd pre_configure() { autoreconf -fi From 3a3875e1e177c7cfbddc8ccdfa9ce7143e4a9336 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:39 +0200 Subject: [PATCH 02/13] efl: revbump for libraw 0.21 --- srcpkgs/efl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index c3ef8348c196..db34290abbe1 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.26.2 -revision=4 +revision=5 build_style=meson configure_args=" -Dbuild-examples=false From 567556af3e7662d24560570a3c2943732984fc62 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:40 +0200 Subject: [PATCH 03/13] gegl: revbump for libraw 0.21 --- srcpkgs/gegl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index ab5dcdae833b..ce14c44fc7f4 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,7 +1,7 @@ # Template file for 'gegl' pkgname=gegl version=0.4.44 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled From 97cc4786f80310552ea606fdd75c458561c2e15c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:40 +0200 Subject: [PATCH 04/13] gthumb: revbump for libraw 0.21 --- srcpkgs/gthumb/patches/libraw-0.21.patch | 67 ++++++++++++++++++++++++ srcpkgs/gthumb/template | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gthumb/patches/libraw-0.21.patch diff --git a/srcpkgs/gthumb/patches/libraw-0.21.patch b/srcpkgs/gthumb/patches/libraw-0.21.patch new file mode 100644 index 000000000000..ee1faf6b07cf --- /dev/null +++ b/srcpkgs/gthumb/patches/libraw-0.21.patch @@ -0,0 +1,67 @@ +From da0d3f22a5c3a141211d943e7d963d14090011ec Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Fri, 23 Dec 2022 17:37:03 +0100 +Subject: [PATCH] Fixed build with libraw 0.21 + +--- + extensions/raw_files/gth-metadata-provider-raw.c | 2 +- + extensions/raw_files/gth-metadata-provider-raw.h | 7 +++++++ + extensions/raw_files/main.c | 4 ++-- + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/extensions/raw_files/gth-metadata-provider-raw.c b/extensions/raw_files/gth-metadata-provider-raw.c +index 2d9f5020c..1aa8a727e 100644 +--- a/extensions/raw_files/gth-metadata-provider-raw.c ++++ b/extensions/raw_files/gth-metadata-provider-raw.c +@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self, + if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data))) + return; + +- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++ raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); + if (raw_data == NULL) + goto fatal_error; + +diff --git a/extensions/raw_files/gth-metadata-provider-raw.h b/extensions/raw_files/gth-metadata-provider-raw.h +index 6406c68bf..cf19434df 100644 +--- a/extensions/raw_files/gth-metadata-provider-raw.h ++++ b/extensions/raw_files/gth-metadata-provider-raw.h +@@ -25,6 +25,13 @@ + #include + #include + #include ++#include ++ ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK) ++#else ++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK) ++#endif + + #define GTH_TYPE_METADATA_PROVIDER_RAW (gth_metadata_provider_raw_get_type ()) + #define GTH_METADATA_PROVIDER_RAW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_METADATA_PROVIDER_RAW, GthMetadataProviderRaw)) +diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c +index 25829c120..0673c2c75 100644 +--- a/extensions/raw_files/main.c ++++ b/extensions/raw_files/main.c +@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, + size_t size; + GthImage *image = NULL; + +- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++ raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); + if (raw_data == NULL) { + _libraw_set_gerror (error, errno); + goto fatal_error; +@@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, + if ((original_width != NULL) && (original_height != NULL)) { + libraw_close (raw_data); + +- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); ++ raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); + if (raw_data == NULL) + goto fatal_error; + +-- +GitLab + diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index 4da54add6ae8..7e8de5b6817a 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -1,7 +1,7 @@ # Template file for 'gthumb' pkgname=gthumb version=3.12.2 -revision=2 +revision=3 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel" makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel From 5bcc4875fe5427daf1408179505bfc240d1301dc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:40 +0200 Subject: [PATCH 05/13] io.elementary.photos: revbump for libraw 0.21 --- srcpkgs/io.elementary.photos/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 606b6ba2edc5..42237ef45750 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos version=2.7.5 -revision=2 +revision=3 build_style=meson hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel python3-scour" From 627825b18adfde2c67e7df622c775cdca3bc219f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:41 +0200 Subject: [PATCH 06/13] kimageformats: revbump for libraw 0.21 --- srcpkgs/kimageformats/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index f42919b9a60f..4e4a02383fd3 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,7 +1,7 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.105.0 -revision=1 +revision=2 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools From d4f3b7fe63af0898fb0245430b705f4db907deb5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:41 +0200 Subject: [PATCH 07/13] krita: revbump for libraw 0.21 --- srcpkgs/krita/patches/libraw-0.21.patch | 28 +++++++++++++++++++++++++ srcpkgs/krita/template | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/krita/patches/libraw-0.21.patch diff --git a/srcpkgs/krita/patches/libraw-0.21.patch b/srcpkgs/krita/patches/libraw-0.21.patch new file mode 100644 index 000000000000..fd2d40e5cc7b --- /dev/null +++ b/srcpkgs/krita/patches/libraw-0.21.patch @@ -0,0 +1,28 @@ +From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sun, 18 Dec 2022 16:28:38 +0100 +Subject: [PATCH] Fix build with libraw 0.21 + +--- + plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp +index dcaecc6fa71..71425f909c2 100644 +--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp ++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp +@@ -383,7 +383,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/srcpkgs/krita/template b/srcpkgs/krita/template index 1ca223394960..f070ef21bfb3 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=5.0.8 -revision=5 +revision=6 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 From 9082d503aae8809b740bc7d9ff7c5ea726bbec4f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:41 +0200 Subject: [PATCH 08/13] kstars: revbump for libraw 0.21 --- srcpkgs/kstars/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template index 661cbdcde170..bf5090b2f519 100644 --- a/srcpkgs/kstars/template +++ b/srcpkgs/kstars/template @@ -1,7 +1,7 @@ # Template file for 'kstars' pkgname=kstars version=3.6.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons kconfig" From 4d4f05a0c6091804b09d52e4e966f5f269f33ba2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:42 +0200 Subject: [PATCH 09/13] libkdcraw5: revbump for libraw 0.21 --- srcpkgs/libkdcraw5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template index 9287282dc3dc..27e416dca9f8 100644 --- a/srcpkgs/libkdcraw5/template +++ b/srcpkgs/libkdcraw5/template @@ -1,7 +1,7 @@ # Template file for 'libkdcraw5' pkgname=libkdcraw5 version=23.04.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools gettext" From fb5cee4d04f647f8010f55de9b8deaef86cb70c5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:42 +0200 Subject: [PATCH 10/13] nomacs: revbump for libraw 0.21 --- srcpkgs/nomacs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index ce4e7f7093da..57d3a1e98e84 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,7 +1,7 @@ # Template file for 'nomacs' pkgname=nomacs version=3.16.224 -revision=4 +revision=5 build_wrksrc=ImageLounge build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1 From a4f0ce8a395249d2bc11910fa3f7f771ce821901 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:43 +0200 Subject: [PATCH 11/13] openimageio: revbump for libraw 0.21 --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 9b38ace50f7e..c2d36b4b3539 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=2.4.9.0 -revision=3 +revision=4 build_style=cmake build_helper=qemu configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 From 88e11fdb4d0496055070fd86bc326e9a0f0813ca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 1 Jun 2023 20:56:43 +0200 Subject: [PATCH 12/13] siril: revbump for libraw 0.21 --- srcpkgs/siril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index e88f30fb6178..84332f79d060 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,7 +1,7 @@ # Template file for 'siril' pkgname=siril version=0.9.12 -revision=9 +revision=10 build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel From d6903c87aa3730761c32703f16450354aa1b6e94 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Jun 2023 20:47:11 +0200 Subject: [PATCH 13/13] shotwell: revbump for libraw 0.21 --- srcpkgs/shotwell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 2e1dc4287794..60ee544de0be 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,7 +1,7 @@ # Template file for 'shotwell' pkgname=shotwell version=0.32.1 -revision=1 +revision=2 build_style=meson hostmakedepends="gcr-devel gettext glib-devel itstool libgee-devel libgexiv2-devel pkg-config vala-devel"