lua-mpack: Update to 1.0.7

msys2 · Nov 3, 2018 · 83ade61 · 83ade61
1 parent 2a8c344
commit 83ade61
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 11 deletions.
diff --git a/mingw-w64-libmpack/01-make.patch b/mingw-w64-libmpack/01-make.patch
@@ -0,0 +1,11 @@
+--- libmpack-1.0.5/Makefile.orig	2018-11-03 10:22:50.698751500 +0300
++++ libmpack-1.0.5/Makefile	2018-11-03 10:25:25.616612300 +0300
+@@ -149,7 +150,7 @@
+ $(LIB): $(OBJ)
+ 	@echo link $^ =\> $@
+ 	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(XLDFLAGS) $(LDFLAGS) \
+-		-rpath '$(LIBDIR)' \
++		-rpath '$(LIBDIR)' -no-undefined \
+ 		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o $@ $^
+
+ $(TEXE): $(LIB) $(TOBJ)
diff --git a/mingw-w64-libmpack/PKGBUILD b/mingw-w64-libmpack/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>
+
+_realname=libmpack
+pkgbase=mingw-w64-lua-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+pkgdesc="Simple implementation of msgpack in C (mingw-w64)"
+pkgver=1.0.5
+pkgrel=1
+arch=('any')
+url='https://github.com/libmpack/libmpack'
+license=('MIT')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libmpack/libmpack/archive/${pkgver}.tar.gz"
+        01-make.patch)
+sha256sums=('4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956'
+            'bb39a2523be0c0633c0c256fd5cb4acf4ddf774fc28f062faeb9e18943307358')
+
+prepare() {
+  cd libmpack-${pkgver}
+  patch -p1 -i ${srcdir}/01-make.patch
+}
+
+build() {
+  cd libmpack-${pkgver}
+  make
+}
+
+package() {
+  cd libmpack-${pkgver}
+  make -j1 DESTDIR="${pkgdir}/" PREFIX=${MINGW_PREFIX} install
+  install -Dm644 LICENSE-MIT "${pkgdir}${MINGW_PREFIX}/share/licenses/libmpack/LICENSE"
+}
diff --git a/mingw-w64-lua-mpack/PKGBUILD b/mingw-w64-lua-mpack/PKGBUILD
@@ -4,40 +4,40 @@ _realname=mpack
 pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lua-${_realname}")
-pkgver=1.0.4
+pkgver=1.0.7
 pkgrel=1
 arch=('any')
 url='https://github.com/libmpack/libmpack'
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-lua51"
              "${MINGW_PACKAGE_PREFIX}-lua"
              "${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-libmpack"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
-
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libmpack/libmpack/archive/${pkgver}.tar.gz")
-sha256sums=('0a5d69f3966b31d14faddbd81db53b543fb092c711250ecb0aa5e22d060aa080')
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libmpack/libmpack-lua/archive/${pkgver}.tar.gz")
+sha256sums=('2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a')
 
 build() {
-  cd libmpack-${pkgver}
-  gcc -O2 -fPIC $(pkg-config --cflags lua) -shared -o mpack.dll binding/lua/lmpack.c $(pkg-config --libs lua)
-  gcc -O2 -fPIC $(pkg-config --cflags lua5.1) -shared -o mpack.dll.5.1 binding/lua/lmpack.c $(pkg-config --libs lua5.1)
+  cd libmpack-lua-${pkgver}
+  gcc -O2 -fPIC -DMPACK_USE_SYSTEM $(pkg-config --cflags lua) -shared -o mpack.dll lmpack.c $(pkg-config --libs lua) -lmpack
+  gcc -O2 -fPIC -DMPACK_USE_SYSTEM $(pkg-config --cflags lua5.1) -shared -o mpack.dll.5.1 lmpack.c $(pkg-config --libs lua5.1) -lmpack
 }
 
 package_mingw-w64-lua-mpack() {
   pkgdesc='Msgpack serialization library for Lua (mingw-w64)'
-  depends=("${MINGW_PACKAGE_PREFIX}-lua")
+  depends=("${MINGW_PACKAGE_PREFIX}-lua" "${MINGW_PACKAGE_PREFIX}-libmpack")
 
-  cd libmpack-${pkgver}
+  cd libmpack-lua-${pkgver}
   local luaver=$(pkg-config lua --modversion | sed -r 's/^([0-9]+[.][0-9]+)[.][0-9]+$/\1/')
   install -Dm755 mpack.dll "${pkgdir}${MINGW_PREFIX}/lib/lua/${luaver}/mpack.dll"
   install -Dm644 LICENSE-MIT "${pkgdir}${MINGW_PREFIX}/share/licenses/lua-lmpack/LICENSE"
 }
 
 package_mingw-w64-lua51-mpack() {
   pkgdesc='Msgpack serialization library for Lua 5.1 (mingw-w64)'
-  depends=("${MINGW_PACKAGE_PREFIX}-lua51")
+  depends=("${MINGW_PACKAGE_PREFIX}-lua51" "${MINGW_PACKAGE_PREFIX}-libmpack")
 
-  cd libmpack-${pkgver}
+  cd libmpack-lua-${pkgver}
   install -Dm755 mpack.dll.5.1 "${pkgdir}${MINGW_PREFIX}/lib/lua/5.1/mpack.dll"
   install -Dm644 LICENSE-MIT "${pkgdir}${MINGW_PREFIX}/share/licenses/lua51-mpack/LICENSE"
 }