Merge branch 'sr.2019.08.29' into 'master'

Add experimental/patchelf, user/spice-gtk; merge user/dejagnu into system/

See merge request adelie/packages!329

4 files changed, 110 insertions, 47 deletions

diff --git a/experimental/patchelf/APKBUILD b/experimental/patchelf/APKBUILD
new file mode 100644
index 000000000..55a81e777
--- /dev/null
+++ b/experimental/patchelf/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Max Rees <maxcrees@me.com>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=patchelf
+pkgver=0.10
+pkgrel=0
+pkgdesc="Utility to modify the dynamic linker and RPATH of ELF executables"
+url="https://nixos.org/patchelf.html"
+arch="all"
+license="GPL-3.0+"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://nixos.org/releases/patchelf/patchelf-$pkgver/patchelf-$pkgver.tar.bz2"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501  patchelf-0.10.tar.bz2"
diff --git a/system/dejagnu/APKBUILD b/system/dejagnu/APKBUILD
index a09fec2b1..897f75d8f 100644
--- a/system/dejagnu/APKBUILD
+++ b/system/dejagnu/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dejagnu
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=0
-pkgdesc="A framework for testing other programs"
+pkgdesc="Framework for testing other programs"
 url="https://www.gnu.org/software/dejagnu/"
 arch="noarch"
 license="GPL-3.0+"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,14 +23,12 @@ build() {
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
 check() {
-	cd "$builddir"
 	make check
 }
 
-sha512sums="887aa7c8b8698fe193f393b75479aad2c0724d6baa52e6f7172c48172f6546956c5f932afb574ba38b7c79e630981eeaf1d6d3c9edb3862ab5f39c5c09dce682  dejagnu-1.6.1.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042  dejagnu-1.6.2.tar.gz"
diff --git a/user/dejagnu/APKBUILD b/user/dejagnu/APKBUILD
deleted file mode 100644
index 53018f36f..000000000
--- a/user/dejagnu/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=dejagnu
-pkgver=1.6.2
-pkgrel=0
-pkgdesc="Framework for testing other programs"
-url="https://www.gnu.org/software/dejagnu/"
-arch="noarch"
-license="GPL-3.0+"
-depends="expect"
-makedepends="$depends tcl>=8.5"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042  dejagnu-1.6.2.tar.gz"
diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD
new file mode 100644
index 000000000..c613828bc
--- /dev/null
+++ b/user/spice-gtk/APKBUILD
@@ -0,0 +1,69 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=spice-gtk
+pkgver=0.37
+pkgrel=0
+pkgdesc="A GTK+ widget for SPICE clients"
+url="https://www.spice-space.org/"
+arch="all"
+# suid: ACL helper for USB redirection
+options="suid"
+license="LGPL-2.1+ AND LGPL-2.0+ AND BSD-3-Clause AND MIT AND GPL-3.0+ AND LGPL-2.0-only AND GPL-2.0+"
+depends="gst-plugins-good"
+depends_dev="gobject-introspection-dev gtk+3.0-dev"
+makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev
+	gst-plugins-base-dev gstreamer-dev gstreamer-tools json-glib-dev
+	libjpeg-turbo-dev libusb-dev libxrandr-dev lz4-dev openssl-dev
+	opus-dev polkit-dev polkit-dev spice-protocol usbredir-dev
+	usbutils zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang spicy
+	spice-glib:glib"
+source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	# Note: pulseaudio support is disabled because it's deprecated.
+	# Audio is still supported through gstreamer.
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--with-gtk=3.0 \
+		--with-audio=gstreamer \
+		--disable-celt051 \
+		--disable-werror \
+		--enable-lz4 \
+		--enable-opus \
+		--enable-smartcard=no \
+		--enable-usbredir=yes \
+		--enable-polkit=yes \
+		--enable-pulse=no
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make -j1 DESTDIR="$pkgdir" install
+}
+
+spicy() {
+	pkgdesc="SPICE client (remote virtual machine access)"
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+glib() {
+	pkgdesc="$pkgdesc (GLib libraries)"
+	mkdir -p "$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/lib/girepository-1.0/
+	mv "$pkgdir"/usr/lib/*-glib-*.so* \
+		"$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/girepository-1.0/SpiceClientGLib-*.typelib \
+		"$subpkgdir"/usr/lib/girepository-1.0/
+}
+
+sha512sums="a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029  spice-gtk-0.37.tar.bz2"