public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom spot Callaway <spotaws@amazon.com>
To: git-commits@fedoraproject.org
Subject: [rpms/darktable] f43: lua 5.5
Date: Tue, 01 Sep 2026 08:50:14 GMT	[thread overview]
Message-ID: <178825261403.1.14239805962096805017.rpms-darktable-bfb9b88e02ec@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/darktable
Branch : f43
Commit : bfb9b88e02ecbc3bfb08bd65128da8d30c59fc5b
Author : Tom spot Callaway <spotaws@amazon.com>
Date   : 2026-02-27T15:18:37-05:00
Stats  : +90/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/darktable/c/bfb9b88e02ecbc3bfb08bd65128da8d30c59fc5b?branch=f43

Log:
lua 5.5

---
diff --git a/darktable-5.4.1-lua-5.5.patch b/darktable-5.4.1-lua-5.5.patch
new file mode 100644
index 0000000..fd5ef0e
--- /dev/null
+++ b/darktable-5.4.1-lua-5.5.patch
@@ -0,0 +1,88 @@
+diff -up darktable-5.4.1/src/CMakeLists.txt.lua55 darktable-5.4.1/src/CMakeLists.txt
+--- darktable-5.4.1/src/CMakeLists.txt.lua55	2026-02-27 15:08:42.755695468 -0500
++++ darktable-5.4.1/src/CMakeLists.txt	2026-02-27 15:08:49.905193366 -0500
+@@ -706,14 +706,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
+ # Build external deps
+ #
+ if(USE_LUA)
+-  find_package(Lua54 5.4)
+-  if(Lua54_FOUND)
++  find_package(Lua55 5.5)
++  if(Lua55_FOUND)
+     message(STATUS "Lua support: Enabled")
+-    include_directories(SYSTEM ${Lua54_INCLUDE_DIRS})
+-    list(APPEND LIBS ${Lua54_LDFLAGS})
++    include_directories(SYSTEM ${Lua55_INCLUDE_DIRS})
++    list(APPEND LIBS ${Lua55_LDFLAGS})
+   else()
+     if(DONT_USE_INTERNAL_LUA)
+-      message(STATUS "Lua support: System library for lua 5.4 not found (to use darktable's version use -DDONT_USE_INTERNAL_LUA=Off)")
++      message(STATUS "Lua support: System library for lua 5.5 not found (to use darktable's version use -DDONT_USE_INTERNAL_LUA=Off)")
+       set(USE_LUA OFF)
+     else(DONT_USE_INTERNAL_LUA)
+       message(STATUS "Lua support: System library not found (using darktable's version)")
+@@ -775,9 +775,9 @@ else(USE_LUA)
+ endif(USE_LUA)
+ 
+ if(USE_LUA)
+-  if(NOT Lua54_FOUND)
++  if(NOT Lua55_FOUND)
+     list(APPEND LIB_DEPS lua) # 2nd half of the ugliness :/
+-  endif(NOT Lua54_FOUND)
++  endif(NOT Lua55_FOUND)
+   # liblautoc for lua automated interface generation
+   add_library(lautoc_static STATIC IMPORTED)
+   set_target_properties(lautoc_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LuaAutoC/liblautoc.a POSITION_INDEPENDENT_CODE True)
+diff -up darktable-5.4.1/cmake/modules/FindLua55.cmake.lua55 darktable-5.4.1/cmake/modules/FindLua55.cmake
+--- darktable-5.4.1/cmake/modules/FindLua55.cmake.lua55	2026-02-27 15:13:49.037575029 -0500
++++ darktable-5.4.1/cmake/modules/FindLua55.cmake	2026-02-27 15:12:59.942533739 -0500
+@@ -0,0 +1,49 @@
++SET(Lua_VERSION_TOO_HIGH 5.6)
++
++include(Prebuilt)
++include(LibFindMacros)
++
++libfind_pkg_search_module(Lua55 lua55 lua5.5 lua-5.5 lua)
++
++if(Lua55_FIND_VERSION)
++  cmake_minimum_required(VERSION 3.10.0)
++  set(Lua55_FAILED_VERSION_CHECK true)
++
++  if(Lua55_FIND_VERSION_EXACT)
++    if(Lua55_VERSION VERSION_EQUAL Lua55_FIND_VERSION)
++      set(Lua55_FAILED_VERSION_CHECK false)
++    endif()
++  else()
++    if(Lua55_VERSION VERSION_EQUAL   Lua55_FIND_VERSION OR
++       Lua55_VERSION VERSION_GREATER Lua55_FIND_VERSION AND
++       Lua55_VERSION VERSION_LESS Lua_VERSION_TOO_HIGH)
++      set(Lua55_FAILED_VERSION_CHECK false)
++    endif()
++  endif()
++
++  if(Lua55_FAILED_VERSION_CHECK)
++    if(Lua55_FIND_REQUIRED AND NOT Lua55_FIND_QUIETLY)
++        if(Lua55_FIND_VERSION_EXACT)
++            message(FATAL_ERROR "Lua5.5 version check failed.  Version ${Lua55_VERSION} was found, version ${Lua55_FIND_VERSION} is needed exactly.")
++        else(Lua55_FIND_VERSION_EXACT)
++            message(FATAL_ERROR "Lua5.5 version check failed.  Version ${Lua55_VERSION} was found, at least version ${Lua55_FIND_VERSION} is required")
++        endif(Lua55_FIND_VERSION_EXACT)
++    endif(Lua55_FIND_REQUIRED AND NOT Lua55_FIND_QUIETLY)
++
++    set(Lua55_FOUND false)
++  endif(Lua55_FAILED_VERSION_CHECK)
++
++endif(Lua55_FIND_VERSION)
++
++if(Lua55_FOUND)
++  set(Lua55 ON CACHE BOOL "Build with lua5.5 support.")
++  if(APPLE)
++    foreach(i ${Lua55_LIBRARIES})
++      find_library(_lua55_LIBRARY NAMES ${i} HINTS ${Lua55_LIBRARY_DIRS})
++      list(APPEND Lua55_LIBRARIES_FULL ${_lua55_LIBRARY})
++      unset(_lua55_LIBRARY CACHE)
++    endforeach(i)
++    set(Lua55_LIBRARIES ${Lua55_LIBRARIES_FULL})
++    unset(Lua55_LIBRARIES_FULL CACHE)
++  endif()
++endif(Lua55_FOUND)

diff --git a/darktable.spec b/darktable.spec
index 977d1f0..40a4db0 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -20,6 +20,8 @@ Source0: https://github.com/darktable-org/darktable/releases/download/release-%{
 
 Patch0: 0001-Add-5.4.1-in-appdata.patch
 
+Patch1: darktable-5.4.1-lua-5.5.patch
+
 BuildRequires: cairo-devel
 # clang is optional (OpenCL kernel build test)
 BuildRequires: clang >= 7

                 reply	other threads:[~2026-09-01  8:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178825261403.1.14239805962096805017.rpms-darktable-bfb9b88e02ec@fedoraproject.org \
    --to=spotaws@amazon.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox