Merge pull request #1829 from beefcurtains/spice

Upgrade spice to standard opus codec

srcpkgs/celt051-devel

@@ -1 +0,0 @@
-celt051

srcpkgs/celt051/patches/musl-fix-gnuc-prereq.patch

@@ -1,20 +0,0 @@
---- libcelt/ecintrin.h
-+++ libcelt/ecintrin.h
-@@ -52,8 +52,7 @@
- /*Count leading zeros.
-   This macro should only be used for implementing ec_ilog(), if it is defined.
-   All other code should use EC_ILOG() instead.*/
--#ifdef __GNUC_PREREQ
--#if __GNUC_PREREQ(3,4)
-+#if defined(__GNUC__) && ((__GNUC__<<16)+__GNUC_MINOR__) >= 0x304
- # if INT_MAX>=2147483647
- #  define EC_CLZ0 sizeof(unsigned)*CHAR_BIT
- #  define EC_CLZ(_x) (__builtin_clz(_x))
-@@ -61,7 +60,6 @@
- #  define EC_CLZ0 sizeof(unsigned long)*CHAR_BIT
- #  define EC_CLZ(_x) (__builtin_clzl(_x))
- # endif
--#endif
- #endif
-
- #if defined(EC_CLZ)

srcpkgs/celt051/template

@@ -1,26 +0,0 @@
-# Template file for 'celt051'
-pkgname=celt051
-version=0.5.1.3
-revision=7
-wrksrc="celt-${version}"
-build_style=gnu-configure
-configure_args="--with-ogg=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libogg-devel"
-short_desc="An audio codec for use in low-delay speech and audio communication"
-homepage="http://www.celt-codec.org/"
-license="BSD"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://downloads.us.xiph.org/releases/celt/celt-${version}.tar.gz"
-checksum=fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e
-
-celt051-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}

srcpkgs/spice-gtk/template

@@ -1,15 +1,16 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.28
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-vala $(vopt_enable gir introspection)
  --enable-smartcard=no --enable-usbredir --enable-polkit=yes --enable-pie=yes
- --enable-lz4=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids"
+ --enable-lz4=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids
+ --disable-celt051"
 hostmakedepends="pkg-config libtool intltool vala-devel glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="acl-devel lz4-devel dbus-glib-devel vala-devel pixman-devel
- celt051-devel libressl-devel libsasl-devel gtk+3-devel pulseaudio-devel
+ opus-devel libressl-devel libsasl-devel gtk+3-devel pulseaudio-devel
  libjpeg-turbo-devel polkit-devel libsoup-devel usbredir-devel"
 depends="hwids"
 homepage="http://spice-space.org"

srcpkgs/spice/template

@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.12.5
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --disable-smartcard
- --with-sasl --disable-static --enable-xinerama"
+ --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python-parsing"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel celt051-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel"
 short_desc="Implements the SPICE protocol"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"