media-gfx/darktable: update SDL2 patch and ebuild

Signed-off-by: Markus Meier <maekke@gentoo.org>

3 files changed, 13 insertions, 22 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index d05b921..286e5fa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -3,7 +3,7 @@ AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f2673
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
 AUX darktable-4.0.1_libs-deps-automagic.patch 968 BLAKE2B e81e63814185d38cd850108492e656c4760b35b76b52424f06c9cf25ee5e33dba1ecd92507827451b1096e7caeb1793ca6877ae70f15d5b1e10c7c986a08bc0e SHA512 c36b21a0eb265a5da0fb75e766ec260bc9ab36d25503ff0d0406dca1cbb9cee04bed96ecb7f4ddb0f5ac2352a85577c458dd28affdd4d3bb5e3cac982022eef9
-AUX darktable-4.2.0_libs-deps-automagic.patch 1718 BLAKE2B bc59485cb6ecb4a7ca50005956dc9ff6e600c9aa31805d5499835b3ad0bd61f734e28ba116438c5eb5d91e34e7a0ac18ceb08bd1b3a1005b4211da8c62c3f0e8 SHA512 110669cf7a4687e07970313d02250d690aa48e320972af0bfd644f4258608f1a3a59e7f4e0e0e8b9bcb4da21fba320b725ed3422ef1dfa58ba30b1af0ef8eb91
+AUX darktable-4.2.0_libs-deps-automagic.patch 1465 BLAKE2B 587fd8c10cf92981e69c04afcef773b06d36287285ce4c8565b03318c91b0cf768ec6a7aae9e6882e4d930828ff584ece62fa0e305410bcb7bf2ec47eec944cd SHA512 9ea1c319e5c248c2161dbb5a87fe20bd289214538d36e12e4d11a65cb700bee978e88ca9eaebfbbef099ddc7998e684671a6621bb86490e82d4c7404a1c047ec
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466 SHA512 17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618 SHA512 789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
@@ -11,6 +11,6 @@ DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 6d73b690dfebc590971325242f
 DIST darktable-usermanual-4.2.en.pdf 26552260 BLAKE2B a090e6e9a3b714d04c2c65ae0c77afa74b2a26c5130731e83b9f5bfe25935391c3dbc21d408f13776975e8c2e794d232a54a54d6a932f0389cb2fc993c2fa159 SHA512 49ff878c4a82d91b88f1f9a28986616f382dc5b40d0a47e3a8cfb27efd79fdd7d8bf3c416d659fdb61ac505d75ed003587e51555389aaec5f9e35bb770f18eac
 DIST darktable-usermanual-4.2.uk.pdf 26472343 BLAKE2B d5d8446dead97693be168f4a426a56ce215bb6c3e2d931be19b515abbbe75265fbd17fa433fb3f14630d74323efcd40683694d7af6d3b4456888ec9965aba1ff SHA512 d348ce8edf1847cac6d20744dedd85351ff77b51ac717fe173ef28c9588dcddba06584aef8741661b2ba9652229b9a97ba2220764c957a0a9e645a9b8809f913
 EBUILD darktable-4.0.1-r1.ebuild 5778 BLAKE2B 67016be74606a3580c446135fb5059f82cd3e9ddd05f6b0acb9009b9b7e0e286d9ac73ccf1382511b35e13e03f0b438bc6bf94cbf55d6f8aaa6b54443533714a SHA512 e1debafcc7d037589843a1dc481dc3b2c3b7baf3ed7de27349bfa99fea96366f4926417c8e4929b62dfbfee7f8eba8d019c238654403d4269a7e0d304d1c93d6
-EBUILD darktable-4.2.0.ebuild 5748 BLAKE2B 9bee6c73dd1003050deb61d969369604abb15edced11c353b86932d4d530989927396c5c303eb1fd5e2a4e6c1234bd9339121fc0bd633b06afc51fd0a65a2256 SHA512 2a4d0ff8340af351a0d3970682f724cc90c30f15d69a0eb748dc3ab278e963ddadc0a2fe691d79e98fd4554ff66fb1c061c65dea409ac3e86bf97f814fd41fec
+EBUILD darktable-4.2.0.ebuild 5724 BLAKE2B 5d12ea6595dc77f11aae57d878b2ae94bf71fb14035c9c07feb2e64872ba234fc6146680d378dabe20cf1d82499c8c1f912f5a5f95ce2a6a8f7812bd734d2970 SHA512 b4eba1e3e1a022fe7f945e560c5012f3dd7e2ef4458cc8532982e4111a47138411d987e2ee98c0b9bb3309e4ba3e49ab5a48d5dbb25a652dac3663384e0d35be
 EBUILD darktable-9999.ebuild 4401 BLAKE2B c4c752f2bc76fcaa410cc1c9a36cb8d702871bf8ec5e1babe941559992f1c8573937333d47c6e77a7eb3af309b187616c1ffeec82ad65e0a6934e8e5ed4e02fe SHA512 6192579a10e23a478e36c5a13a1a9b6554dd042e27ec3e7e8d9d12680605214241abffc4651fb6bd9a6427104916eaadb8393d9da84b7162c9970ef1442febf8
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-4.2.0.ebuild b/media-gfx/darktable/darktable-4.2.0.ebuild
index 5e15751..7baf920 100644
--- a/media-gfx/darktable/darktable-4.2.0.ebuild
+++ b/media-gfx/darktable/darktable-4.2.0.ebuild
@@ -155,7 +155,6 @@ src_configure() {
 		-DUSE_OPENMP=$(usex openmp)
 		-DUSE_PORTMIDI=$(usex midi)
 		-DUSE_SDL2=$(usex gamepad)
-		-DAUTODETECT_SDL2=OFF
 		-DUSE_WEBP=$(usex webp)
 		-DWANT_JSON_VALIDATION=$(usex test)
 	)
diff --git a/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
index 59ed001..da90045 100644
--- a/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
+++ b/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
@@ -1,46 +1,38 @@
-From b1338eb12dd672ce373f61cec681af99d8b2c7df Mon Sep 17 00:00:00 2001
+From c89256437bcc4b35d413c8ae6d00a24b796caf04 Mon Sep 17 00:00:00 2001
 From: Markus Meier <maekke@gentoo.org>
 Date: Sat, 14 Jan 2023 14:56:46 +0100
-Subject: [PATCH] add and wire AUTODETECT_SDL2 and USE_SDL2 options
-
-AUTODETECT_SDL2 with default ON is there to keep current behavior
-USE_SDL2 to control SDL2 explicit behavior for distributions
+Subject: [PATCH] add USE_SDL2 option to control SDL2 package usage
 
 https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
 ---
- DefineOptions.cmake     | 2 ++
- src/libs/CMakeLists.txt | 8 +++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ DefineOptions.cmake     | 1 +
+ src/libs/CMakeLists.txt | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/DefineOptions.cmake b/DefineOptions.cmake
-index 59ea1e3d5..24210473e 100644
+index 59ea1e3d5..9266766f2 100644
 --- a/DefineOptions.cmake
 +++ b/DefineOptions.cmake
-@@ -42,6 +42,8 @@ option(USE_GMIC "Use G'MIC image processing framework." ON)
+@@ -42,6 +42,7 @@ option(USE_GMIC "Use G'MIC image processing framework." ON)
  option(USE_ICU "Use ICU - International Components for Unicode." ON)
  option(USE_GAME "Build 1st April easter egg game" ON)
  option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
-+option(AUTODETECT_SDL2 "Autodetect SDL2 support" ON)
-+option(USE_SDL2 "Enable SDL2 support" OFF)
++option(USE_SDL2 "Enable SDL2 support" ON)
  
  if (USE_OPENCL)
      option(TESTBUILD_OPENCL_PROGRAMS "Test-compile opencl programs (needs llvm and clang 3.9+)" ON)
 diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
-index 20a5f0eff..50caf6f27 100644
+index 20a5f0eff..9052ebda3 100644
 --- a/src/libs/CMakeLists.txt
 +++ b/src/libs/CMakeLists.txt
-@@ -92,7 +92,13 @@ if(PortMidi_FOUND)
+@@ -92,7 +92,9 @@ if(PortMidi_FOUND)
    target_link_libraries (midi ${PortMidi_LIBRARY})
  endif()
  
 -find_package(SDL2)
-+if (AUTODETECT_SDL2)
-+  find_package(SDL2)
-+endif()
 +if (USE_SDL2)
-+  find_package(SDL2 REQUIRED)
++  find_package(SDL2)
 +endif()
-+
  if(SDL2_FOUND)
    add_definitions("-DHAVE_SDL")
    set(MODULES ${MODULES} gamepad)