* [PR PATCH] fotoxx: remove unused libraw build dep
@ 2023-06-02 18:31 paper42
2023-06-02 18:56 ` [PR PATCH] [Updated] libraw: update to 0.21.1 paper42
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: paper42 @ 2023-06-02 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libraw-0.21
https://github.com/void-linux/void-packages/pull/44230
fotoxx: remove unused libraw build dep
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44230.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libraw-0.21-44230.patch --]
[-- Type: text/x-diff, Size: 16475 bytes --]
From 41a819c9f3935b5319398101243c647dcd7a163e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:26:23 +0200
Subject: [PATCH 01/14] fotoxx: remove unused libraw build dep
---
srcpkgs/fotoxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 881aa8f3891d..ffee06a684f6 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="pkg-config"
-makedepends="libchamplain-devel libraw-devel"
+makedepends="libchamplain-devel"
depends="desktop-file-utils exiftool xdg-utils dcraw"
short_desc="Free open source program for image editing and collection management"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
From d81e6e85df4cb9a86be5509400aa5f1ff4b27ef6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:48:29 +0200
Subject: [PATCH 02/14] 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 253f4034090535c78d06b5d0ca5738e2167ac814 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:39 +0200
Subject: [PATCH 03/14] 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 377a119676dd46ffec2b62426ebffcf2d4369d92 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 04/14] 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 aaf86acd70edf282b00b94f47a7f1276c5997079 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 05/14] 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 <paobac@src.gnome.org>
+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 <glib.h>
+ #include <glib-object.h>
+ #include <gthumb.h>
++#include <libraw.h>
++
++#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 80dee2478770b8fc26a8a7dea5c127bc474fa962 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 06/14] 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 c3fa4786e234d721631f0e2593694bc985cd716e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 07/14] 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 4de26d1b89f1b8ef05e7b2435831f31bed320828 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 08/14] 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 <arojas@archlinux.org>
+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 d1d6e4a4c7b06267a424796dbd2a23596c7a2080 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 09/14] 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 09dd66eb3f666025cc5c172af4e3f07372e02018 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 10/14] 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 d6faf066a7f0f3b5c03d1aceec04acde27fde67d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 11/14] 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 f5baa7a09d71838d9e13785a788ceac42838062a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 12/14] 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 512e2ce689bc3fd25782c16f9edcc002a2cb89fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 13/14] 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 d100aaed2c7436ac4dd0f3a536640d3387e284d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 14/14] shotwell: update to 0.32.1.
---
srcpkgs/shotwell/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 0a5f0718780c..2e1dc4287794 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,15 @@
# Template file for 'shotwell'
pkgname=shotwell
-version=0.31.5
+version=0.32.1
revision=1
build_style=meson
hostmakedepends="gcr-devel gettext glib-devel itstool
- libgee08-devel libgexiv2-devel pkg-config vala-devel"
+ libgee-devel libgexiv2-devel pkg-config vala-devel"
makedepends="gst-plugins-base1-devel libgdata-devel
- libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
+ libgee-devel libgexiv2-devel libgphoto2-devel libgudev-devel
libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +17,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
+checksum=4ac4517416ad8aa23b44e75c34bd6e16bab7363fa20991bb09bacdfab3f763ce
lib32disabled=yes
post_extract() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] libraw: update to 0.21.1
2023-06-02 18:31 [PR PATCH] fotoxx: remove unused libraw build dep paper42
@ 2023-06-02 18:56 ` paper42
2023-06-02 20:09 ` paper42
2023-06-03 14:21 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2023-06-02 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libraw-0.21
https://github.com/void-linux/void-packages/pull/44230
libraw: update to 0.21.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44230.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libraw-0.21-44230.patch --]
[-- Type: text/x-diff, Size: 14588 bytes --]
From 0323397685757bbec6c2316fb7e681fd355881ec Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <paobac@src.gnome.org>
+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 <glib.h>
+ #include <glib-object.h>
+ #include <gthumb.h>
++#include <libraw.h>
++
++#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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <arojas@archlinux.org>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] libraw: update to 0.21.1
2023-06-02 18:31 [PR PATCH] fotoxx: remove unused libraw build dep paper42
2023-06-02 18:56 ` [PR PATCH] [Updated] libraw: update to 0.21.1 paper42
@ 2023-06-02 20:09 ` paper42
2023-06-03 14:21 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2023-06-02 20:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libraw-0.21
https://github.com/void-linux/void-packages/pull/44230
libraw: update to 0.21.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44230.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libraw-0.21-44230.patch --]
[-- Type: text/x-diff, Size: 14838 bytes --]
From 970a08238e861ad5ada490fed22219772b36d2cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 6ffa10d63e250ffc6a0c33390679bef96d316775 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 7fbec4bcad0029c062fb06b14c9d40a0a3826c3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 06d2cc86eb3062c63b1dddedf44f14a0e51206a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <paobac@src.gnome.org>
+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 <glib.h>
+ #include <glib-object.h>
+ #include <gthumb.h>
++#include <libraw.h>
++
++#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 e0f78547004f3619250813bfe2e370d37fe7a7b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 e20f0e78d4977b210ae4a93aa4e262538bdfd12d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 ede9a47bff83735b39d473de620f3c8a71187b0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <arojas@archlinux.org>
+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 b7842698c7367b3851bbcfabee0561897b4c53fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 08/13] kstars: revbump for libraw 0.21
---
srcpkgs/kstars/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 661cbdcde170..29d6ae2f997c 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"
@@ -19,3 +19,4 @@ license="GPL-2.0-or-later"
homepage="https://edu.kde.org/kstars/"
distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=c1dbf64ce38f201dd5446dd732ce7c8bf1ef30367dc2f11102105036c949db91
+make_check=no # FIXME
From 1b04c95ace495f85b534db42823f2618b604a70d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 e551b29b2c30087f5acebfd1261e26e69814c6b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 6a9d0e00e25ab0ed0a64c0a1c6975fd336cd0d10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 0ab6529d9b0f189b162dc3c663150fa6dea3c05a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 7e8375b1d3c10419b7f00ce2fe18db8a08e81244 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: libraw: update to 0.21.1
2023-06-02 18:31 [PR PATCH] fotoxx: remove unused libraw build dep paper42
2023-06-02 18:56 ` [PR PATCH] [Updated] libraw: update to 0.21.1 paper42
2023-06-02 20:09 ` paper42
@ 2023-06-03 14:21 ` paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2023-06-03 14:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There's a merged pull request on the void-packages repository
libraw: update to 0.21.1
https://github.com/void-linux/void-packages/pull/44230
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-03 14:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 18:31 [PR PATCH] fotoxx: remove unused libraw build dep paper42
2023-06-02 18:56 ` [PR PATCH] [Updated] libraw: update to 0.21.1 paper42
2023-06-02 20:09 ` paper42
2023-06-03 14:21 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).