Merge branch 'meson'

4 files changed, 70 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 298219545193..6f32fa9fb1d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,27 @@
 # Generated by mksrcinfo v8
-# Tue Feb 13 14:12:00 UTC 2018
+# Tue Apr 23 18:16:17 UTC 2019
 pkgbase = mingw-w64-orc
 	pkgdesc = Optimized Inner Loop Runtime Compiler (mingw-w64)
-	pkgver = 0.4.28
+	pkgver = 0.4.29
 	pkgrel = 1
-	url = https://cgit.freedesktop.org/gstreamer/orc/
+	url = https://gitlab.freedesktop.org/gstreamer/orc
 	arch = any
 	license = custom
 	makedepends = mingw-w64-gcc
-	makedepends = mingw-w64-configure
+	makedepends = mingw-w64-meson
+	makedepends = wine
 	makedepends = git
 	depends = mingw-w64-crt
 	options = !strip
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	source = git+https://anongit.freedesktop.org/git/gstreamer/orc#commit=31cb4bfc51de81b5c2569abdcff830b83c74499c
+	source = git+https://gitlab.freedesktop.org/gstreamer/orc.git#commit=3d3889025bdbd9ca54565edfb3936c5a29316cff
+	source = meson_i686-w64-mingw32
+	source = meson_x86_64-w64-mingw32
 	sha256sums = SKIP
+	sha256sums = 3eed78156a85a6b8238cd9b64d37df1a0dd8ec9816e71c2ed7a70874289f8e2e
+	sha256sums = a07b08deafafabf9196dbc0583093fff8be9c45e29f73f7c286d5fc99492434d
 
 pkgname = mingw-w64-orc
 
diff --git a/PKGBUILD b/PKGBUILD
index be8b9578302d..6917c318bf3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,59 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgname=mingw-w64-orc
-pkgver=0.4.28
+pkgver=0.4.29
 pkgrel=1
 pkgdesc="Optimized Inner Loop Runtime Compiler (mingw-w64)"
 arch=('any')
 license=('custom')
-url="https://cgit.freedesktop.org/gstreamer/orc/"
+url="https://gitlab.freedesktop.org/gstreamer/orc"
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-gcc' 'mingw-w64-configure' 'git')
+makedepends=('mingw-w64-gcc' 'mingw-w64-meson' 'wine' 'git')
 options=('!strip' '!buildflags' '!libtool' 'staticlibs')
 #source=(https://gstreamer.freedesktop.org/data/src/orc/orc-${pkgver}.tar.xz{,.asc}
-_commit=31cb4bfc51de81b5c2569abdcff830b83c74499c  # tags/orc-0.4.28^0
-source=("git+https://anongit.freedesktop.org/git/gstreamer/orc#commit=$_commit")
+_commit=3d3889025bdbd9ca54565edfb3936c5a29316cff  # tags/0.4.29^0
+source=("git+https://gitlab.freedesktop.org/gstreamer/orc.git#commit=$_commit"
+        meson_i686-w64-mingw32
+        meson_x86_64-w64-mingw32)
 validpgpkeys=('7F4BC7CC3CA06F97336BBFEB0668CC1486C2D7B5') #Sebastian Dröge
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '3eed78156a85a6b8238cd9b64d37df1a0dd8ec9816e71c2ed7a70874289f8e2e'
+            'a07b08deafafabf9196dbc0583093fff8be9c45e29f73f7c286d5fc99492434d')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd "${srcdir}/orc/"
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
   for _arch in ${_architectures}; do
     #mkdir -p "${srcdir}/orc-$pkgver/build-${_arch}" && cd "${srcdir}/orc-$pkgver/build-${_arch}"
     mkdir -p "${srcdir}/orc/build-${_arch}" && cd "${srcdir}/orc/build-${_arch}"
 
-    unset LDFLAGS CPPFLAGS
-    ${_arch}-configure --disable-gtk-doc
-    make
+    ${_arch}-meson \
+          "${srcdir}/orc"
+    ninja
   done
 }
 
-package() {
+check() {
   for _arch in ${_architectures}; do
     #cd "${srcdir}/orc-$pkgver/build-${_arch}"
     cd "${srcdir}/orc/build-${_arch}"
 
-    make DESTDIR="$pkgdir" install
+    # Copy dlls necessary to run most tests
+    cp "${srcdir}/orc/build-${_arch}/orc/liborc"*.dll .
+    cp "${srcdir}/orc/build-${_arch}/orc-test/liborc-test"*.dll .
+
+    meson test
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    #cd "${srcdir}/orc-$pkgver/build-${_arch}"
+    cd "${srcdir}/orc/build-${_arch}"
+    DESTDIR="$pkgdir" ninja -C . install
     #install -Dm644 "${srcdir}/orc-$pkgver/COPYING" "$pkgdir/usr/${_arch}/share/licenses/orc/COPYING"
     install -Dm644 "${srcdir}/orc/COPYING" "$pkgdir/usr/${_arch}/share/licenses/orc/COPYING"
 
-    ${_arch}-strip -s ${pkgdir}/usr/${_arch}/bin/*.exe
-    ${_arch}-strip -x -g ${pkgdir}/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
+    #${_arch}-strip -s ${pkgdir}/usr/${_arch}/bin/*.exe
+    #${_arch}-strip -x -g ${pkgdir}/usr/${_arch}/bin/*.dll
+    #${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
   done
 }
diff --git a/meson_i686-w64-mingw32 b/meson_i686-w64-mingw32
new file mode 100644
index 000000000000..609505526108
--- /dev/null
+++ b/meson_i686-w64-mingw32
@@ -0,0 +1,15 @@
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
+
+[binaries]
+c = '/usr/bin/i686-w64-mingw32-gcc'
+cpp = '/usr/bin/i686-w64-mingw32-g++'
+ar = '/usr/bin/i686-w64-mingw32-ar'
+strip = '/usr/bin/i686-w64-mingw32-strip'
+exe_wrapper = 'wine'
+
+[properties]
+has_function_posix_memalign = false
diff --git a/meson_x86_64-w64-mingw32 b/meson_x86_64-w64-mingw32
new file mode 100644
index 000000000000..ed891810e1d2
--- /dev/null
+++ b/meson_x86_64-w64-mingw32
@@ -0,0 +1,15 @@
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[binaries]
+c = '/usr/bin/x86_64-w64-mingw32-gcc'
+cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ar = '/usr/bin/x86_64-w64-mingw32-ar'
+strip = '/usr/bin/x86_64-w64-mingw32-strip'
+exe_wrapper = 'wine'
+
+[properties]
+has_function_posix_memalign = false