gst-rtsp-server: Merge changes from AUR

2 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4354919e6ba6..3c84f542345d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gst-rtsp-server
 	pkgdesc = RTSP server library based on GStreamer
-	pkgver = 1.16.2
-	pkgrel = 2
+	pkgver = 1.18.4
+	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html
 	arch = i686
 	arch = x86_64
@@ -10,15 +10,14 @@ pkgbase = gst-rtsp-server
 	license = LGPL
 	makedepends = meson
 	makedepends = gobject-introspection
-	depends = gst-plugins-base>=1.16.2
-	depends = gst-plugins-bad>=1.16.2
+	depends = gst-plugins-base>=1.18.4
+	depends = gst-plugins-bad>=1.18.4
+	provides = libgstrtspserver-1.0.so
 	provides = libgstrtspclientsink.so
-	provides = libgstrtspserver-1.0.so=0-64
-	conflicts = libgstrtspclientsink.so
-	source = https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.16.2.tar.xz
-	source = https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.16.2.tar.xz.asc
+	source = https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.4.tar.xz
+	source = https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.4.tar.xz.asc
 	validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
-	sha256sums = de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e
+	sha256sums = a46bb8de40b971a048580279d2660e616796f871ad3ed00c8a95fe4d273a6c94
 	sha256sums = SKIP
 
 pkgname = gst-rtsp-server
diff --git a/PKGBUILD b/PKGBUILD
index 4add29af850c..8f10f71275eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
 # Maintainer: Anton Leontiev <scileont /at/ gmail dot com>
 # Co-Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=gst-rtsp-server
-pkgver=1.16.2
-pkgrel=2
+pkgver=1.18.4
+pkgrel=1
 pkgdesc="RTSP server library based on GStreamer"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h')
 url="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 license=('LGPL')
 makedepends=('meson' 'gobject-introspection')
 depends=("gst-plugins-base>=$pkgver" "gst-plugins-bad>=$pkgver")
-provides=('libgstrtspclientsink.so' 'libgstrtspserver-1.0.so=0-64')
-conflicts=('libgstrtspclientsink.so')
+provides=('libgstrtspserver-1.0.so' 'libgstrtspclientsink.so')
 source=("https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc})
-sha256sums=('de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e'
+sha256sums=('a46bb8de40b971a048580279d2660e616796f871ad3ed00c8a95fe4d273a6c94'
             'SKIP')
 validpgpkeys=('D637032E45B8C6585B9456565D2EEE6F6F349D7C')
               # Tim-Philipp Müller <tim@centricular.com>
 
 build() {
-	arch-meson "$pkgname-$pkgver" build
-	ninja -C build
+	arch-meson "$pkgname-$pkgver" build \
+		-D doc=disabled \
+		-D gobject-cast-checks=disabled \
+		-D package-name="GStreamer RTSP Server (Arch Linux)" \
+		-D package-origin="https://aur.archlinux.org/"
+	meson compile -C build
 }
 
 check() {
-	ninja -C build test
+	meson test -C build --print-errorlogs
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 	install -Dm755 build/examples/test-mp4 "$pkgdir/usr/bin/gst-rtsp-mp4"
 	install -Dm755 build/examples/test-launch "$pkgdir/usr/bin/gst-rtsp-launch"
 	install -Dm755 build/examples/test-netclock "$pkgdir/usr/bin/gst-rtsp-netclock"