diff options
| author |   Markus Meier <maekke@gentoo.org> | 2023-01-19 20:08:45 +0100 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2023-01-19 20:08:45 +0100 |
| commit | f0b3359ca147faab6aae25cdc700e17741245060 (patch) | |
| tree | 3ae500df7c0dc4339db81c0f7ed93077e40f38f4 | |
| parent | media-libs/lensfun: fix Manifest (diff) | |
| download | maekke-f0b3359ca147faab6aae25cdc700e17741245060.tar.gz maekke-f0b3359ca147faab6aae25cdc700e17741245060.tar.bz2 maekke-f0b3359ca147faab6aae25cdc700e17741245060.zip | |
media-gfx/darktable: update files/darktable-4.2.0_libs-deps-automagic.patch
Signed-off-by: Markus Meier <maekke@gentoo.org>
| -rw-r--r-- | media-gfx/darktable/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch | 40 |
2 files changed, 30 insertions, 12 deletions
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 286e5fa..ec3e787 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 1465 BLAKE2B 587fd8c10cf92981e69c04afcef773b06d36287285ce4c8565b03318c91b0cf768ec6a7aae9e6882e4d930828ff584ece62fa0e305410bcb7bf2ec47eec944cd SHA512 9ea1c319e5c248c2161dbb5a87fe20bd289214538d36e12e4d11a65cb700bee978e88ca9eaebfbbef099ddc7998e684671a6621bb86490e82d4c7404a1c047ec +AUX darktable-4.2.0_libs-deps-automagic.patch 2081 BLAKE2B f19c24deb2e4678ce32ecd92fbfffece3f73ebe9df52a0a0274ab31fd4e102b9403420c64c4907ceb06383090421029263c71b8ae98913211ce6b661f6fc59bd SHA512 2840a4828b713f92677eef3f5c9d962f8c019481791702ea34cf2d16093aee1b0175250d5491e4c6087206ea467b95c1b97835a3f4674abf00542c2cb3eff755 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 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 da90045..3776de0 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,13 +1,13 @@ -From c89256437bcc4b35d413c8ae6d00a24b796caf04 Mon Sep 17 00:00:00 2001 +From 1e2eea45ba79412ed2d7a80dbc8388ccec93af09 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 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 | 1 + - src/libs/CMakeLists.txt | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) + DefineOptions.cmake | 1 + + src/libs/CMakeLists.txt | 22 ++++++++++++---------- + 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/DefineOptions.cmake b/DefineOptions.cmake index 59ea1e3d5..9266766f2 100644 @@ -22,20 +22,38 @@ index 59ea1e3d5..9266766f2 100644 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..9052ebda3 100644 +index 20a5f0eff..272968061 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt -@@ -92,7 +92,9 @@ if(PortMidi_FOUND) +@@ -92,16 +92,18 @@ if(PortMidi_FOUND) target_link_libraries (midi ${PortMidi_LIBRARY}) endif() -find_package(SDL2) -+if (USE_SDL2) +-if(SDL2_FOUND) +- add_definitions("-DHAVE_SDL") +- set(MODULES ${MODULES} gamepad) +- add_library(gamepad MODULE "tools/gamepad.c") +- if(TARGET SDL2::SDL2) +- target_link_libraries(gamepad SDL2::SDL2) +- else() +- include_directories(${SDL2_INCLUDE_DIRS}) +- target_link_libraries(gamepad ${SDL2_LIBRARIES}) ++if(USE_SDL2) + find_package(SDL2) -+endif() - if(SDL2_FOUND) - add_definitions("-DHAVE_SDL") - set(MODULES ${MODULES} gamepad) ++ if(SDL2_FOUND) ++ add_definitions("-DHAVE_SDL") ++ set(MODULES ${MODULES} gamepad) ++ add_library(gamepad MODULE "tools/gamepad.c") ++ if(TARGET SDL2::SDL2) ++ target_link_libraries(gamepad SDL2::SDL2) ++ else() ++ include_directories(${SDL2_INCLUDE_DIRS}) ++ target_link_libraries(gamepad ${SDL2_LIBRARIES}) ++ endif() + endif() + endif() + -- 2.38.2 |