Update rockspec

Author: rolandlo

.github/workflows/ci.yml

@@ -30,18 +30,21 @@ jobs:
           sudo apt install --no-install-recommends libvips-dev
         fi
 
-    - name: Lua dependencies
+    - name: Install lua-vips
       run: |
-        make dev
-        if [[ ${{ matrix.luaVersion }} == 5.* ]]; then make ffi; fi
+        if [[ ${{ matrix.luaVersion }} == luajit* ]]; then
+          luarocks config --scope system rocks_provided.luaffi-tkl 2.1-1
+        fi
+        luarocks make
 
     - name: Lint with luacheck
       run: |
+        luarocks install luacheck
         luacheck -q .
 
     - name: Busted tests
       run: |
-        busted -o gtest -v spec
+        luarocks test spec/ -- -o gtest -v spec
 
 
   windows:
@@ -86,17 +89,23 @@ jobs:
           luarocks config --scope system lua_interpreter ${{ matrix.lua.exe }}.exe
           luarocks config --scope system variables.LUA_DIR /mingw64/bin
           luarocks config --scope system variables.LUA_INCDIR ${{ matrix.lua.incdir }}
-          make dev
-          if [[ ${{ matrix.lua.exe }} != luajit ]]; then make ffi; fi
+          if [[ ${{ matrix.lua.exe }} == luajit ]]; then
+            luarocks config --scope system rocks_provided.luaffi-tkl 2.1-1
+          fi
 
       - name: Add to PATH
         run: |
           echo $RUNNER_TEMP/msys64/mingw64/bin:$HOME/.luarocks/bin >> $GITHUB_PATH
 
+      - name: Install lua-vips
+        run: |
+          luarocks make
+
       - name: Lint with luacheck
         run: |
+          luarocks install luacheck
           luacheck.bat -q .
 
       - name: Busted tests
         run: |
-          busted.bat --lua=${{ matrix.lua.exe }} -o gtest -v spec
+          luarocks test spec -- --lua=${{ matrix.lua.exe }} -o gtest -v

Makefile

@@ -1,5 +1,6 @@
 package = "lua-vips"
 version = "1.1-10"
+rockspec_format = "3.0"
 
 source = {
    url = "git://github.com/libvips/lua-vips.git"
@@ -8,16 +9,28 @@ source = {
 description = {
    summary = "A fast image processing library with low memory needs.",
    detailed = [[
-      This LuaJIT rock implements a binding for the libvips image 
-      processing library. It is usually faster and needs less memory than 
-      similar libraries. 
+      This rock implements a binding for the libvips image processing library.
+      It is usually faster and needs less memory than similar libraries.
+
+      For use with standard Lua, the dependency luaffi-tkl is used as a drop-in
+      replacement for LuaJIT's ffi module.
    ]],
    homepage = "https://github.com/libvips/lua-vips",
-   license = "MIT" 
+   license = "MIT",
+   labels = { "image" }
 }
 
 dependencies = {
-    "lua >= 5.1", -- "luajit >= 2.0.0"
+    "lua >= 5.1, < 5.5",   -- standard Lua or LuaJIT >= 2.0
+    "luaffi-tkl >= 1.0"    -- provided by VM with LuaJIT, use `luarocks config rocks_provided.luaffi-tkl 2.1-1` in that case
+}
+
+test_dependencies = {
+   "busted"
+}
+
+test = {
+   type = "busted"
 }
 
 build = {