From 9560f5c344d4f9b42463476870bdb8fc989f601a Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 8 Jan 2025 18:09:49 +0100
Subject: [PATCH] opencv3, revbump for tiff4 (#11619)

---
 media-libs/opencv/opencv3-3.4.3.recipe        | 13 +++----
 .../opencv/patches/opencv3-3.4.3.patchset     | 36 +++++++++++++++++--
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/media-libs/opencv/opencv3-3.4.3.recipe b/media-libs/opencv/opencv3-3.4.3.recipe
index 432f39f77..491c81b01 100644
--- a/media-libs/opencv/opencv3-3.4.3.recipe
+++ b/media-libs/opencv/opencv3-3.4.3.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2000-2016, Intel Corporation
 	2015-2016, OpenCV Foundation
 	2015-2016, Itseez Inc."
 LICENSE="BSD (3-clause)"
-REVISION="15"
+REVISION="16"
 SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="opencv-$portVersion.tar.gz"
 CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
@@ -109,9 +109,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:cblas$secondaryArchSuffix
 	devel:eigen$secondaryArchSuffix
-	devel:libavcodec$secondaryArchSuffix >= 58
-	devel:libavformat$secondaryArchSuffix >= 58
-	devel:libavutil$secondaryArchSuffix >= 56
+	ffmpeg${secondaryArchSuffix}_devel
+#	devel:libavcodec$secondaryArchSuffix >= 58
+#	devel:libavformat$secondaryArchSuffix >= 58
+#	devel:libavutil$secondaryArchSuffix >= 56
 #	devel:libcaffe$secondaryArchSuffix
 	devel:libexif$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
@@ -142,10 +143,10 @@ BUILD_REQUIRES="
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Test$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libswscale$secondaryArchSuffix >= 5
+#	devel:libswscale$secondaryArchSuffix >= 5
 #	devel:libswresample$secondaryArchSuffix >= 3
 #	devel:libtesseract$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix >= 5
+	devel:libtiff$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix >= 7
 	devel:libz$secondaryArchSuffix
 	"
diff --git a/media-libs/opencv/patches/opencv3-3.4.3.patchset b/media-libs/opencv/patches/opencv3-3.4.3.patchset
index a0da692b1..475de5a92 100644
--- a/media-libs/opencv/patches/opencv3-3.4.3.patchset
+++ b/media-libs/opencv/patches/opencv3-3.4.3.patchset
@@ -1,4 +1,4 @@
-From b695400ff3c362b221fe86b845203f017607296a Mon Sep 17 00:00:00 2001
+From 80218b1cc6b1cd17ae80ce2160cfb1f7210eb943 Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sat, 24 Feb 2024 09:42:21 +0100
 Subject: Disable warnings/werror filling the screen output/failing the build
@@ -28,5 +28,37 @@ index 30e4a00..ac22f23 100644
    if(ENABLE_NOISY_WARNINGS)
      add_extra_compiler_option(-Wcast-align)
 -- 
-2.43.2
+2.45.2
+
+
+From 0df0430d2124a3169db8348c8765172f3851d014 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Wed, 8 Jan 2025 15:17:38 +0100
+Subject: import upstream patch
+
+
+diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+index b8b70fe..d03ce2e 100644
+--- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp
++++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+@@ -337,7 +337,7 @@ bool  Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer,
+ 
+     for( y = 0; y < yend - ystart; )
+     {
+-        jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
++        jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
+         uchar* dst = data + (y - yoffset) * step - xoffset;
+ 
+         if( xstep == 1 )
+@@ -401,7 +401,7 @@ bool  Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer,
+ 
+     for( y = 0; y < yend - ystart; )
+     {
+-        jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
++        jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
+         ushort* dst = data + (y - yoffset) * step - xoffset;
+ 
+         if( xstep == 1 )
+-- 
+2.45.2