Update ffi-experiments

Fixes namespace issues with libcrypto and switched to meson build
system.

2 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ac647425b57..5d18fd5a9169 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aegisub-dependency-control
 	pkgdesc = Package manager for scripts for the Aegisub subtitle editor
 	pkgver = 0.6.3
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/TypesettingTools/DependencyControl
 	arch = i686
 	arch = x86_64
@@ -9,13 +9,14 @@ pkgbase = aegisub-dependency-control
 	license = ISC
 	license = MIT
 	makedepends = moonscript
+	makedepends = meson
 	depends = aegisub
-	depends = curl
+	depends = libcurl.so
 	source = DependencyControl-0.6.3-alpha.tar.gz::https://github.com/TypesettingTools/DependencyControl/archive/v0.6.3-alpha.tar.gz
-	source = ffi-experiments-c325e1c6ad3b5a741ac4a18fd3ac3504cf9c8081.tar.gz::https://github.com/torque/ffi-experiments/archive/c325e1c6ad3b5a741ac4a18fd3ac3504cf9c8081.tar.gz
+	source = ffi-experiments-e8d9c915390aaa8ffa1d220f4696f4fe2ca6ae6e.tar.gz::https://github.com/TypesettingTools/ffi-experiments/archive/e8d9c915390aaa8ffa1d220f4696f4fe2ca6ae6e.tar.gz
 	source = luajson-1.3.3.tar.gz::https://github.com/harningt/luajson/archive/1.3.3.tar.gz
 	sha256sums = ac845ee6152db94c42ae80e2ccbede6571c27342c22819efa68c648327cdfdc2
-	sha256sums = b2491554eac19fa2ec2d9c83c8fc71c21ddc32c75c5bb0d700246743c6fc6c67
+	sha256sums = d48c3f3375e480daf3e7ab2a657a1daec208d086173116168363d5bd0bb372b4
 	sha256sums = 6a986efa210a912a04c8e6cae8f3b5e72172c02f974152e14818af6598a5e2db
 
 pkgname = aegisub-dependency-control
diff --git a/PKGBUILD b/PKGBUILD
index 3ea0ca3921f6..c8315f77ed1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,28 @@
 
 pkgname=aegisub-dependency-control
 pkgver=0.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Package manager for scripts for the Aegisub subtitle editor"
 arch=('i686' 'x86_64')
 url="https://github.com/TypesettingTools/DependencyControl"
 license=('MIT' 'ISC' 'MIT')
-depends=('aegisub' 'curl')
-makedepends=('moonscript')
+depends=('aegisub' 'libcurl.so')
+makedepends=('moonscript' 'meson')
 
 _depctrlver=${pkgver}-alpha
-_ffiexpver=c325e1c6ad3b5a741ac4a18fd3ac3504cf9c8081 # requireffi=0.1.2 PreciseTimer=0.1.5 BadMutex=0.1.3 DownloadManager=0.4.0
+_ffiexpver=e8d9c915390aaa8ffa1d220f4696f4fe2ca6ae6e # requireffi=0.1.2 PreciseTimer=0.1.6 BadMutex=0.1.3 DownloadManager=0.5.0
 _luajsonver=1.3.3
 source=("DependencyControl-${_depctrlver}.tar.gz::https://github.com/TypesettingTools/DependencyControl/archive/v${_depctrlver}.tar.gz" # github strips the 'v' in the actual archive
-        "ffi-experiments-${_ffiexpver}.tar.gz::https://github.com/torque/ffi-experiments/archive/${_ffiexpver}.tar.gz"
+        "ffi-experiments-${_ffiexpver}.tar.gz::https://github.com/TypesettingTools/ffi-experiments/archive/${_ffiexpver}.tar.gz"
         "luajson-${_luajsonver}.tar.gz::https://github.com/harningt/luajson/archive/${_luajsonver}.tar.gz")
 sha256sums=('ac845ee6152db94c42ae80e2ccbede6571c27342c22819efa68c648327cdfdc2'
-            'b2491554eac19fa2ec2d9c83c8fc71c21ddc32c75c5bb0d700246743c6fc6c67'
+            'd48c3f3375e480daf3e7ab2a657a1daec208d086173116168363d5bd0bb372b4'
             '6a986efa210a912a04c8e6cae8f3b5e72172c02f974152e14818af6598a5e2db')
 
 build() {
     cd "${srcdir}/ffi-experiments-${_ffiexpver}"
-    make all lua
+    meson build
+    ninja -C build all lua
 }
 
 package() {
@@ -38,13 +39,13 @@ package() {
 
     # ffiexp
     cd "${srcdir}/ffi-experiments-${_ffiexpver}"
-    install -D -m644 build/BadMutex.lua          "${pkgdir}${prefix}/include/BM/BadMutex.lua"
-    install -D -m644 build/libBadMutex.so        "${pkgdir}${prefix}/include/BM/BadMutex/libBadMutex.so"
-    install -D -m644 build/DownloadManager.lua   "${pkgdir}${prefix}/include/DM/DownloadManager.lua"
-    install -D -m644 build/libDownloadManager.so "${pkgdir}${prefix}/include/DM/DownloadManager/libDownloadManager.so"
-    install -D -m644 build/PreciseTimer.lua      "${pkgdir}${prefix}/include/PT/PreciseTimer.lua"
-    install -D -m644 build/libPreciseTimer.so    "${pkgdir}${prefix}/include/PT/PreciseTimer/libPreciseTimer.so"
-    install -D -m644 build/requireffi.lua        "${pkgdir}${prefix}/include/requireffi/requireffi.lua"
+    install -D -m644 build/bad-mutex/BadMutex.lua                 "${pkgdir}${prefix}/include/BM/BadMutex.lua"
+    install -D -m644 build/bad-mutex/libBadMutex.so               "${pkgdir}${prefix}/include/BM/BadMutex/libBadMutex.so"
+    install -D -m644 build/download-manager/DownloadManager.lua   "${pkgdir}${prefix}/include/DM/DownloadManager.lua"
+    install -D -m644 build/download-manager/libDownloadManager.so "${pkgdir}${prefix}/include/DM/DownloadManager/libDownloadManager.so"
+    install -D -m644 build/precise-timer/PreciseTimer.lua         "${pkgdir}${prefix}/include/PT/PreciseTimer.lua"
+    install -D -m644 build/precise-timer/libPreciseTimer.so       "${pkgdir}${prefix}/include/PT/PreciseTimer/libPreciseTimer.so"
+    install -D -m644 build/requireffi/requireffi.lua              "${pkgdir}${prefix}/include/requireffi/requireffi.lua"
 
     install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE_ffi-experiments"