Accepting request 1309765 from devel:languages:lua

- Updated to 2.1.20250826 (1756211046)
  * FFI: Fix dangling CType references (again).
  * Avoid out-of-range PC for stack overflow error from snapshot restore.
  * x86/x64: Don't use undefined MUL/IMUL zero flag.
  * Windows: Add lua52compat option to msvcbuild.bat.
- Cherry-pick riscv64-support.patch to add RISC-V support
- Cherry-pick loong64-support.patch to add LoongArch support
- Increase _default_patch_fuzz to 2 to allow patches to apply

OBS-URL: https://build.opensuse.org/request/show/1309765
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=9

_scmsync.obsinfo

@@ -0,0 +1,5 @@
+mtime: 1759908582
+commit: e5b799710903889e0c62a445b2041aae54d6647f0e034e44f5da36645491291d
+url: https://src.opensuse.org/lua/luajit2.git
+revision: e5b799710903889e0c62a445b2041aae54d6647f0e034e44f5da36645491291d
+projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7305824ba27d29154f383c43e20c2049bd4fefff13bb22edd41e66c2635a84a
+size 256

luajit2-name.patch

@@ -1,20 +1,20 @@
-diff -Pdpru luajit2-2.1-20240314.orig/Makefile luajit2-2.1-20240314/Makefile
---- luajit2-2.1-20240314.orig/Makefile	2024-03-14 09:33:30.000000000 +0300
-+++ luajit2-2.1-20240314/Makefile	2024-05-10 06:41:04.539833148 +0300
-@@ -38,10 +38,10 @@ DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN=   $(DPREFIX)/bin
+diff -Pdpru luajit2-2.1-20250117.orig/Makefile luajit2-2.1-20250117/Makefile
+--- luajit2-2.1-20250117.orig/Makefile	2025-01-17 08:03:34.000000000 +0300
++++ luajit2-2.1-20250117/Makefile	2025-01-18 12:03:03.025681445 +0300
+@@ -39,10 +39,10 @@ INSTALL_BIN=   $(DPREFIX)/bin
  INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
- INSTALL_SHARE= $(DPREFIX)/share
+ INSTALL_SHARE_= $(PREFIX)/share
+ INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
 -INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
 +INSTALL_DEFINC= $(DPREFIX)/include/luajit2-$(MMVERSION)
  INSTALL_INC=   $(INSTALL_DEFINC)
  
--INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
-+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit2-$(MMVERSION)
- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+-export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
++export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit2-$(MMVERSION)
+ INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
  INSTALL_LMODD= $(INSTALL_SHARE)/lua
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
-@@ -50,23 +50,20 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
+@@ -51,23 +51,20 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
  INSTALL_MAN= $(INSTALL_SHARE)/man/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
@@ -47,7 +47,7 @@ diff -Pdpru luajit2-2.1-20240314.orig/Makefile luajit2-2.1-20240314/Makefile
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
  INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-@@ -78,20 +75,27 @@ RM= rm -f
+@@ -79,20 +76,27 @@ RM= rm -f
  MKDIR= mkdir -p
  RMDIR= rmdir 2>/dev/null
  SYMLINK= ln -sf
@@ -81,7 +81,7 @@ diff -Pdpru luajit2-2.1-20240314.orig/Makefile luajit2-2.1-20240314/Makefile
  FILE_MAN= luajit.1
  FILE_PC= luajit.pc
  FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
-@@ -129,25 +133,25 @@ install: $(INSTALL_DEP)
+@@ -131,25 +135,25 @@ install: $(INSTALL_DEP)
  	@echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ===="
  	$(MKDIR) $(INSTALL_DIRS)
  	cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
@@ -111,21 +111,21 @@ diff -Pdpru luajit2-2.1-20240314.orig/Makefile luajit2-2.1-20240314/Makefile
  	for file in $(FILES_JITLIB); do \
  	  $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
  	  done
-diff -Pdpru luajit2-2.1-20240314.orig/src/luaconf.h luajit2-2.1-20240314/src/luaconf.h
---- luajit2-2.1-20240314.orig/src/luaconf.h	2024-03-14 09:33:30.000000000 +0300
-+++ luajit2-2.1-20240314/src/luaconf.h	2024-05-10 06:38:55.054703618 +0300
-@@ -37,7 +37,7 @@
+diff -Pdpru luajit2-2.1-20250117.orig/src/luaconf.h luajit2-2.1-20250117/src/luaconf.h
+--- luajit2-2.1-20250117.orig/src/luaconf.h	2025-01-17 08:03:34.000000000 +0300
++++ luajit2-2.1-20250117/src/luaconf.h	2025-01-18 12:04:14.635265329 +0300
+@@ -50,7 +50,7 @@
  #endif
- #define LUA_LROOT	"/usr/local"
- #define LUA_LUADIR	"/lua/5.1/"
--#define LUA_LJDIR	"/luajit-2.1/"
-+#define LUA_LJDIR	"/luajit2-2.1/"
  
- #ifdef LUA_ROOT
- #define LUA_JROOT	LUA_ROOT
-diff -Pdpru luajit2-2.1-20240314.orig/src/Makefile luajit2-2.1-20240314/src/Makefile
---- luajit2-2.1-20240314.orig/src/Makefile	2024-03-14 09:33:30.000000000 +0300
-+++ luajit2-2.1-20240314/src/Makefile	2024-05-10 06:41:13.089951754 +0300
+ #ifndef LUA_LJDIR
+-#define LUA_LJDIR	LUA_JROOT "/share/luajit-2.1"
++#define LUA_LJDIR	LUA_JROOT "/share/luajit2-2.1"
+ #endif
+ 
+ #define LUA_JPATH	";" LUA_LJDIR "/?.lua"
+diff -Pdpru luajit2-2.1-20250117.orig/src/Makefile luajit2-2.1-20250117/src/Makefile
+--- luajit2-2.1-20250117.orig/src/Makefile	2025-01-17 08:03:34.000000000 +0300
++++ luajit2-2.1-20250117/src/Makefile	2025-01-18 12:09:11.660041483 +0300
 @@ -214,11 +214,11 @@ TARGET_AR= $(CROSS)ar rcus
  TARGET_STRIP= $(CROSS)strip
  
@@ -141,7 +141,7 @@ diff -Pdpru luajit2-2.1-20240314.orig/src/Makefile luajit2-2.1-20240314/src/Make
  TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
  TARGET_DYNXLDOPTS=
  
-@@ -541,9 +541,9 @@ LIB_VMDEF= jit/vmdef.lua
+@@ -544,9 +544,9 @@ LIB_VMDEF= jit/vmdef.lua
  LIB_VMDEFP= $(LIB_VMDEF)
  
  LUAJIT_O= luajit.o

luajit2.changes

@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Wed Oct  8 07:29:03 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Updated to 2.1.20250826 (1756211046)
+  * FFI: Fix dangling CType references (again).
+  * Avoid out-of-range PC for stack overflow error from snapshot restore.
+  * x86/x64: Don't use undefined MUL/IMUL zero flag.
+  * Windows: Add lua52compat option to msvcbuild.bat.
+- Cherry-pick riscv64-support.patch to add RISC-V support
+- Cherry-pick loong64-support.patch to add LoongArch support
+- Increase _default_patch_fuzz to 2 to allow patches to apply
+
+-------------------------------------------------------------------
+Fri Jul 11 14:07:00 UTC 2025 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 2.1.20250529 (1748495995).
+  * https://github.com/openresty/luajit2/compare/v2.1-20250117...v2.1-20250529
+
+-------------------------------------------------------------------
+Sat Jan 18 10:16:26 UTC 2025 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 2.1.20250117 (1737090214).
+  * Changed file luajit2-name.patch.
+  * https://github.com/openresty/luajit2/compare/v2.1-20241203...v2.1-20250117
+  * Fixed recording of BC_VARG.
+
+-------------------------------------------------------------------
+Sat Nov 23 13:05:56 UTC 2024 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 2.1.20241113 (2.1.1731486438).
+  * Upstream doesn't provide a ChangeLog.
+
+-------------------------------------------------------------------
+Thu Nov  7 08:00:47 UTC 2024 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 2.1.20241104 (2.1.1728714540).
+  * FFI: Added missing coercion when recording 64-bit bit.*().
+  * ARM64: Used ldr literal to load FP constants.
+
+-------------------------------------------------------------------
+Wed Aug 28 03:54:34 UTC 2024 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 2.1.20240815 (2.1.1723681758).
+  * Changed file luajit2-name.patch.
+  * Added ppc64le support.
+
 -------------------------------------------------------------------
 Fri May 10 04:09:49 UTC 2024 - Илья Индиго <ilya@ilya.top>
 

luajit2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package luajit2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,13 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
+%global _default_patch_fuzz 2
 %define abi_ver 5.1
 %define so_ver 2
 %define lib_ver 5_1-%{so_ver}
 %define major 2.1
-%define minor 20240314
-%define upstream 1710398010
+%define minor 20250826
+%define upstream 1756211046
 Name:           luajit2
 Version:        %{major}.%{minor}
 Release:        0
@@ -31,6 +31,8 @@ URL:            https://github.com/openresty/%{name}
 Source0:        https://github.com/openresty/%{name}/archive/refs/tags/v%{major}-%{minor}.tar.gz#/%{name}-%{major}-%{minor}.tar.gz
 Source1:        baselibs.conf
 Patch0:         %{name}-name.patch
+Patch1:         https://patch-diff.githubusercontent.com/raw/openresty/luajit2/pull/236.patch#/riscv64-support.patch#/riscv64-support.patch
+Patch2:         https://github.com/openresty/luajit2/pull/245/commits/8e40aca7b3a919456b15698273e9b00e9250e769.patch#/loong64-support.patch
 BuildRequires:  pkgconfig
 Requires:       lib%{name}-%{lib_ver} = %{version}
 
@@ -75,8 +77,7 @@ Devel files for %{name} package.
 	PREFIX=%{_prefix} \
 	MULTILIB=%{_lib}
 
-%post -n lib%{name}-%{lib_ver} -p /sbin/ldconfig
-%postun -n lib%{name}-%{lib_ver} -p /sbin/ldconfig
+%ldconfig_scriptlets -n lib%{name}-%{lib_ver}
 
 %files
 %{_bindir}/%{name}