gentoo auto-resync : 22:12:2022 - 01:55:45

4 files changed, 113 insertions, 1 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 92994cc5e18e..cbb79e1c96da 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,8 +1,10 @@
+AUX gegl-0.4.40-libraw-0.21.patch 936 BLAKE2B af0030e4d069f75751cbe7d9eef2e2ea4b26c685a13ee1d15939f89993ec21ecb436a1914a724c3308c36b3290061dcf645dcfe39575ad704bc9f5d8b86a4b22 SHA512 5481f781594c868e5191fedb15fdcdd1deb32e7c1db3484c0331531e4f38d5cc34e8a0e8b157feb11d9e6598926a11bd220cfc009bad19379021892af97db836
+AUX gegl-0.4.40-strict-prototypes.patch 2555 BLAKE2B a377756270ea1cae19a5d890305c1075144389937294c23ec0cff6454742551b6e3bba72bce97d429c39f56517451597a564a19805d2bc19fc08d675c2a9e558 SHA512 8e8e223414bbf8499b622213ac73bb4566cb6d1b4d982eb63785a79a45038392b36c30cb328a6e89ae218d40813479b0b7fbba6dd980f050055990832e51b2fd
 DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
 DIST gegl-0.4.38.tar.xz 5722188 BLAKE2B 8079326f50b18b4698e83f90a4fa8fd26722a3b6fd8d81a9cc1a735e765591e1b76a3dbbef37e7a793231becf265b28bd0bd235076e43ae00c4071d8986a2edf SHA512 367aa67019557b10a19536c56dfbf6687ade183585eeefec65ce12d3c72f5d78330e02ae0ff403609bb7579dc25340a7132b81d36bbf84327c658a96a2d04d4c
 DIST gegl-0.4.40.tar.xz 5784744 BLAKE2B c4466a76ec4f7939161e9ead6980b8a701f3fc459c40c3de3e09caa688aae12fb1f4a9979ca82e95011437f229532ba07012590d00aeb97b610b69968faa454f SHA512 99ace5f1b916e56f31483b60a38f885d0e09652c834122390bba4439d9bb1a137d84770e1518187330c44f3491e53393cfb8802ba9ede20658e1c8122e798888
 EBUILD gegl-0.4.36-r3.ebuild 4599 BLAKE2B c1e04c0fcfa76493d3e5dc501c4400a754dc78667862408ea2e309f8482738ad8b07de3d02b0f5e3bfb8261d73839d2103f16dbf9bbbe94965b8f9506db27785 SHA512 3350d0f98ebf2dac66b6659b8bc1a6528bf64072df9eacd4eb55de4133990d11d6c97056a8fb4acd8a8a34ff74fa4997b80acbed92ffa358a1bc63608206aa14
 EBUILD gegl-0.4.38-r1.ebuild 4693 BLAKE2B 62f7a02f2341c64d72296d81a899f7b03dd601a2ee5665bca3c31e96184d6d0fc09a95e915753650100832737979aa4d08c84f65077ff3511463061142c4092b SHA512 160dd2e08274c9d4dfe4f84c374a9f5d44a7b1dc86259891dc5532cfe85cce4d8b5dd9301448edeb66b19efb766473e86aeb4bfad1fed7e60487fa1486a6af48
-EBUILD gegl-0.4.40-r1.ebuild 4949 BLAKE2B 107eb892d89a3694e9159381432825fab11120b265aab27cd6665bca39bb9ddc6d693abd0411d6f42180e963ad3a94ffd5728aae44ea525b183e22a454529fa1 SHA512 6e2cff14a8f3c4f71acf8af04aee00ef1373f80d7c7560d6a892b805845e1cd45d854c9f2fde7b970131c572eeba054c260f1c9dda491bb96972eb4fed5180f9
+EBUILD gegl-0.4.40-r1.ebuild 5060 BLAKE2B 5ba0ade35b8c86dd5d1747d850d7e38ba482b42eee1ae851e1a39bfe6cd8fc76b2f77587f418a4b3e74e864225ec1be820d796a3944f97627224e265dacfc722 SHA512 4cd0a83581d327e01533ee7ff5e2630212b1f8a5b0d694f0bdf89b7031b2c4177afe072138a1db1c2fc5e031cfb8d88c9fe7fd02df14e68040a1affbb433d943
 EBUILD gegl-9999.ebuild 4728 BLAKE2B e9d14bff6af0009d3a57401bc94e5edcfd6a52c8e2a3bc9c7e6d611f9fc0ad734dec74b641f7d52b5d546e293adba4d04335168bda14377bd6797af4e3f129f0 SHA512 13c729974a1769f7ec55d69702338dd7f5f6176bb4f2b85f86fd2166a34b900ab1f832029b60cd117b3872386c6476efb6194476f93199d645ff34de45e6ee61
 MISC metadata.xml 680 BLAKE2B 6785a153412860b02b1ca6daa7c6e62f5f178c0a01346bd42dac8da5254ec9ada1c4aaab96944072216b414e5bdc5d8999fbb16dbe6c5127f8988873b07817e7 SHA512 c75bc64503925b586e6aaee3a38fceb793e0d9b3f17bb487fd72a32615ac24eb509e4efb7243d9606572507f41f98ba6b5fe8ac12ea23a87f012d69d24e92d5e
diff --git a/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
new file mode 100644
index 000000000000..84d80d96503c
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/887421
+https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
+
+From ef71b865a301514fcd13f50d421942f7b6b92d5e Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 21 Dec 2022 19:32:02 +0000
+Subject: [PATCH] raw-load: make compatible with LibRaw 0.21.0
+
+imgdata.params.shot_select moved to imgdata.rawparams.shot_select
+https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L182
+--- a/operations/external/raw-load.c
++++ b/operations/external/raw-load.c
+@@ -114,7 +114,11 @@ prepare (GeglOperation *operation)
+         g_warning ("raw-load: Error Initializing raw library");
+       else
+         {
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++          p->LibRaw->rawparams.shot_select = o->image_num;
++#else
+           p->LibRaw->params.shot_select = o->image_num;
++#endif
+     
+           p->LibRaw->params.aber[0] = 1.0;
+           p->LibRaw->params.aber[2] = 1.0;
+-- 
+GitLab
diff --git a/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch b/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
new file mode 100644
index 000000000000..6982afa4d7b0
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/883313
+https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/132
+--- a/gegl/graph/gegl-region-generic.c
++++ b/gegl/graph/gegl-region-generic.c
+@@ -910,7 +910,7 @@ miRegionOp (GeglRegion       *newReg,
+           top = MAX (r1->y1, ybot);
+           bot = MIN (r1->y2, r2->y1);
+ 
+-          if ((top != bot) && (nonOverlap1Fn != (void (*)())NULL))
++          if ((top != bot) && (nonOverlap1Fn != (void (*)(void))NULL))
+             {
+               (*nonOverlap1Fn)(newReg, r1, r1BandEnd, top, bot);
+             }
+@@ -922,7 +922,7 @@ miRegionOp (GeglRegion       *newReg,
+           top = MAX (r2->y1, ybot);
+           bot = MIN (r2->y2, r1->y1);
+ 
+-          if ((top != bot) && (nonOverlap2Fn != (void (*)())NULL))
++          if ((top != bot) && (nonOverlap2Fn != (void (*)(void))NULL))
+             {
+               (*nonOverlap2Fn)(newReg, r2, r2BandEnd, top, bot);
+             }
+--- a/operations/common/ctx/ctx.h
++++ b/operations/common/ctx/ctx.h
+@@ -6047,7 +6047,6 @@ int _ctx_is_rasterizer (Ctx *ctx);
+ 
+ int ctx_color (Ctx *ctx, const char *string);
+ typedef struct _CtxState CtxState;
+-CtxColor *ctx_color_new ();
+ CtxState *ctx_get_state (Ctx *ctx);
+ void ctx_color_get_rgba (CtxState *state, CtxColor *color, float *out);
+ void ctx_color_set_rgba (CtxState *state, CtxColor *color, float r, float g, float b, float a);
+@@ -11081,7 +11080,6 @@ static void
+ ctx_matrix_set (CtxMatrix *matrix, float a, float b, float c, float d, float e, float f, float g, float h, float i);
+ 
+ 
+-static void ctx_font_setup ();
+ static float ctx_state_get (CtxState *state, uint32_t hash);
+ 
+ #if CTX_RASTERIZER
+@@ -40708,9 +40706,9 @@ static void ctx_events_deinit (Ctx *ctx)
+ #if CTX_TERMINAL_EVENTS
+ 
+ 
+-static int mice_has_event ();
+-static char *mice_get_event ();
+-static void mice_destroy ();
++static int mice_has_event (void);
++static char *mice_get_event (void);
++static void mice_destroy (void);
+ static int mice_get_fd (EvSource *ev_source);
+ static void mice_set_coord (EvSource *ev_source, double x, double y);
+ 
+@@ -40759,13 +40757,13 @@ static int mmm_evsource_mice_init ()
+   return 0;
+ }
+ 
+-static void mice_destroy ()
++static void mice_destroy (void)
+ {
+   if (mrg_mice_this->fd != -1)
+     close (mrg_mice_this->fd);
+ }
+ 
+-static int mice_has_event ()
++static int mice_has_event (void)
+ {
+   struct timeval tv;
+   int retval;
+@@ -40783,7 +40781,7 @@ static int mice_has_event ()
+   return 0;
+ }
+ 
+-static char *mice_get_event ()
++static char *mice_get_event (void)
+ {
+   const char *ret = "pm";
+   double relx, rely;
+
diff --git a/media-libs/gegl/gegl-0.4.40-r1.ebuild b/media-libs/gegl/gegl-0.4.40-r1.ebuild
index a99b95054c29..a84d7725a292 100644
--- a/media-libs/gegl/gegl-0.4.40-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.40-r1.ebuild
@@ -76,6 +76,11 @@ BDEPEND="
 
 DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
+	"${FILESDIR}"/${PN}-0.4.40-libraw-0.21.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }