diff options
Diffstat (limited to 'media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch')
| -rw-r--r-- | media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch | 65 |
1 files changed, 35 insertions, 30 deletions
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 f6985f6..59ed001 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,44 +1,49 @@ -Binary files darktable-4.2.0.orig/.DefineOptions.cmake.swp and darktable-4.2.0/.DefineOptions.cmake.swp differ -diff -ru darktable-4.2.0.orig/DefineOptions.cmake darktable-4.2.0/DefineOptions.cmake ---- darktable-4.2.0.orig/DefineOptions.cmake 2022-12-21 20:32:43.490671000 +0100 -+++ darktable-4.2.0/DefineOptions.cmake 2022-12-21 20:33:13.413673557 +0100 -@@ -41,6 +41,7 @@ +From b1338eb12dd672ce373f61cec681af99d8b2c7df 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 + +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(-) + +diff --git a/DefineOptions.cmake b/DefineOptions.cmake +index 59ea1e3d5..24210473e 100644 +--- a/DefineOptions.cmake ++++ b/DefineOptions.cmake +@@ -42,6 +42,8 @@ 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(USE_SDL2 "Enable SDL2 support" ON) ++option(AUTODETECT_SDL2 "Autodetect SDL2 support" ON) ++option(USE_SDL2 "Enable SDL2 support" OFF) if (USE_OPENCL) option(TESTBUILD_OPENCL_PROGRAMS "Test-compile opencl programs (needs llvm and clang 3.9+)" ON) -Only in darktable-4.2.0/src/libs: .CMakeLists.txt.swp -diff -ru darktable-4.2.0.orig/src/libs/CMakeLists.txt darktable-4.2.0/src/libs/CMakeLists.txt ---- darktable-4.2.0.orig/src/libs/CMakeLists.txt 2022-12-21 20:32:43.485670999 +0100 -+++ darktable-4.2.0/src/libs/CMakeLists.txt 2022-12-21 20:34:59.240682599 +0100 -@@ -84,6 +84,7 @@ - add_library(timeline MODULE "tools/timeline.c") - add_library(image_infos MODULE "tools/image_infos.c") - -+if (USE_PORTMIDI) - if(PortMidi_FOUND) - add_definitions("-DHAVE_PORTMIDI") - include_directories(${PortMidi_INCLUDE_DIR}) -@@ -91,8 +92,10 @@ - add_library(midi MODULE "tools/midi.c") +diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt +index 20a5f0eff..50caf6f27 100644 +--- a/src/libs/CMakeLists.txt ++++ b/src/libs/CMakeLists.txt +@@ -92,7 +92,13 @@ if(PortMidi_FOUND) target_link_libraries (midi ${PortMidi_LIBRARY}) endif() -+endif() -find_package(SDL2) ++if (AUTODETECT_SDL2) ++ find_package(SDL2) ++endif() +if (USE_SDL2) -+find_package(SDL2 REQUIRED) ++ find_package(SDL2 REQUIRED) ++endif() ++ if(SDL2_FOUND) add_definitions("-DHAVE_SDL") set(MODULES ${MODULES} gamepad) -@@ -104,6 +107,7 @@ - target_link_libraries(gamepad ${SDL2_LIBRARIES}) - endif() - endif() -+endif() - - if(BUILD_BATTERY_INDICATOR) - add_library(battery_indicator MODULE "tools/battery_indicator.c") +-- +2.38.2 + |