build with meson

2 files changed, 16 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 388303e42ff0..052b7b9f448a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Fri May  5 14:43:06 UTC 2017
+# Thu May 31 07:42:55 UTC 2018
 pkgbase = mingw-w64-gst-rtsp-server-git
 	pkgdesc = RTSP server library based on GStreamer (mingw-w64)
-	pkgver = 1.12.0.r1.51cd530
+	pkgver = 1.14.0.r24.89e6ee7
 	pkgrel = 1
 	url = http://gstreamer.freedesktop.org/
 	arch = any
 	license = LGPL
-	makedepends = mingw-w64-configure
-	makedepends = mingw-w64-tools
+	makedepends = mingw-w64-meson
 	makedepends = git
 	depends = mingw-w64-gst-plugins-base-git
-	optdepends = mingw-w64-gst-rtsp-server-git-vslib: Visual Studio import lib
 	conflicts = mingw-w64-gst-rtsp-server
 	options = !strip
 	options = !buildflags
@@ -21,7 +19,3 @@ pkgbase = mingw-w64-gst-rtsp-server-git
 
 pkgname = mingw-w64-gst-rtsp-server-git
 
-pkgname = mingw-w64-gst-rtsp-server-git-vslib
-	pkgdesc = RTSP server library based on GStreamer import lib for Visual Studio (mingw-w64)
-	depends = mingw-w64-gst-rtsp-server-git=1.12.0.r1.51cd530
-
diff --git a/PKGBUILD b/PKGBUILD
index a956524d0967..d13a079600ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
-pkgbase=mingw-w64-gst-rtsp-server-git
-pkgname=('mingw-w64-gst-rtsp-server-git' 'mingw-w64-gst-rtsp-server-git-vslib')
-pkgver=1.12.0.r1.51cd530
+pkgname=mingw-w64-gst-rtsp-server-git
+pkgver=1.14.0.r24.89e6ee7
 pkgrel=1
 _gitname=gst-rtsp-server
 pkgdesc="RTSP server library based on GStreamer (mingw-w64)"
@@ -10,11 +9,10 @@ url="http://gstreamer.freedesktop.org/"
 license=('LGPL')
 depends=('mingw-w64-gst-plugins-base-git')
 options=('!strip' '!buildflags' 'staticlibs')
-makedepends=('mingw-w64-configure' 'mingw-w64-tools' 'git')
-optdepends=('mingw-w64-gst-rtsp-server-git-vslib: Visual Studio import lib')
+makedepends=('mingw-w64-meson' 'git')
 conflicts=('mingw-w64-gst-rtsp-server')
 
-source=("$_gitname::git://anongit.freedesktop.org/gstreamer/$_gitname")
+source=("${_gitname}::git://anongit.freedesktop.org/gstreamer/${_gitname}")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -22,69 +20,26 @@ pkgver() {
   printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
-prepare() {
-  cd $_gitname 
-  NOCONFIGURE=1 ./autogen.sh
-}
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-  cd "${srcdir}/$_gitname"
+  cd "${srcdir}/${_gitname}"
   for _arch in $_architectures; do
-    mkdir -p "build-${_arch}"
-    cd "build-${_arch}"
-    ${_arch}-configure \
-      --with-package-name="GStreamer RTSP Server Library (Arch Linux)" \
-      --with-package-origin="http://www.archlinux.org/" 
-
-    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-    cd ..
-  done
-}
-
-libs=('libgstrtspserver-1.0-0.dll')
-
-package_mingw-w64-gst-rtsp-server-git() {
-  cd "${srcdir}/$_gitname"
-
-  for _arch in ${_architectures}; do
-    cd "build-${_arch}"
-    make DESTDIR="${pkgdir}" install
-
-    rm "$pkgdir"/usr/$_arch/lib/gstreamer-1.0/*.a
-    rm "$pkgdir"/usr/$_arch/lib/gstreamer-1.0/*.la
-
-    # generate vs import lib
-    mkdir -p "$srcdir/$pkgname-vslib/${_arch}" && pushd "$srcdir/$pkgname-vslib/${_arch}"
-    DLL_PATH="$pkgdir"/usr/${_arch}/bin/
-    for dll in ${libs[@]};
-    do
-            gendef ${DLL_PATH}${dll}
-            ${_arch}-dlltool -d ${dll::-4}.def -l ${dll:3:-6}.lib -D ${DLL_PATH}
-    done
+    mkdir -p "build-${_arch}" && pushd build-${_arch}
+    ${_arch}-meson \
+      -D package-name="GStreamer (Arch Linux)" \
+      -D package-origin="http://www.archlinux.org/" ..
+    ninja
     popd
-
-    find "$pkgdir" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir" -name '*.dll' -o -name '*.a' -exec ${_arch}-strip -g {} \;
-
-    cd ..
   done
 }
 
-
-package_mingw-w64-gst-rtsp-server-git-vslib() {
-  pkgdesc="RTSP server library based on GStreamer import lib for Visual Studio (mingw-w64)"
-  depends=("mingw-w64-gst-rtsp-server-git=$pkgver")
-  unset optdepends
+package() {
+  cd "${srcdir}/${_gitname}"
 
   for _arch in ${_architectures}; do
-    LIB_PATH="$pkgdir"/usr/${_arch}/lib/
-    mkdir -p ${LIB_PATH}
-    cp "$srcdir/$pkgname/${_arch}/"{*.lib,*.def} "${LIB_PATH}"
+    DESTDIR="${pkgdir}" ninja -C "${srcdir}/${_gitname}/build-${_arch}" install
   done
 }