aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-05-16 17:30:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-05-16 18:50:20 +0000
commit4ae906aa9ac5b576ee5a7696f0a77a0367baa3c4 (patch)
treee16dbb013629fa90888be35923252d03c75137ac
parent8990a56d0c5629c774c2eb8fb604206b4534bcad (diff)
downloadalpine_aports-4ae906aa9ac5b576ee5a7696f0a77a0367baa3c4.tar.bz2
alpine_aports-4ae906aa9ac5b576ee5a7696f0a77a0367baa3c4.tar.xz
alpine_aports-4ae906aa9ac5b576ee5a7696f0a77a0367baa3c4.zip
main/spice-protocol: upgrade to 0.12.11
-rw-r--r--main/spice-protocol/APKBUILD12
-rw-r--r--main/spice-protocol/portable-membarrier.patch19
2 files changed, 4 insertions, 27 deletions
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
index 1e62917d8c..85a5ec9207 100644
--- a/main/spice-protocol/APKBUILD
+++ b/main/spice-protocol/APKBUILD
@@ -1,7 +1,7 @@
1# Contributor: Natanael Copa <ncopa@alpinelinux.org> 1# Contributor: Natanael Copa <ncopa@alpinelinux.org>
2# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 2# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
3pkgname=spice-protocol 3pkgname=spice-protocol
4pkgver=0.12.10 4pkgver=0.12.11
5pkgrel=0 5pkgrel=0
6pkgdesc="Spice protocol header files" 6pkgdesc="Spice protocol header files"
7url="http://www.spice-space.org/" 7url="http://www.spice-space.org/"
@@ -13,7 +13,6 @@ makedepends="$depends_dev"
13install="" 13install=""
14subpackages="" 14subpackages=""
15source="http://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.bz2 15source="http://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.bz2
16 portable-membarrier.patch
17 " 16 "
18 17
19_builddir="$srcdir"/spice-protocol-$pkgver 18_builddir="$srcdir"/spice-protocol-$pkgver
@@ -43,9 +42,6 @@ package() {
43 || return 1 42 || return 1
44} 43}
45 44
46md5sums="1fb9d0dcdd42dce1b476ae8aa7569bcc spice-protocol-0.12.10.tar.bz2 45md5sums="422bf0bc1eb34c8af3479a78b28e969b spice-protocol-0.12.11.tar.bz2"
47ea0d68301fd623caab0b25aba6031d0d portable-membarrier.patch" 46sha256sums="22bae438bfb6c3245b195755c3f55e72c1f2bfae6f39c905b576fcb6c79b6330 spice-protocol-0.12.11.tar.bz2"
48sha256sums="788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb spice-protocol-0.12.10.tar.bz2 47sha512sums="748217f8e3e5d13e14429d6a963737ecbe545b1fc700efb875e74a83b9a8f98d9d8a8917a65ba3c49f69b478af7a995e708689033663e6354692c50c39f108f3 spice-protocol-0.12.11.tar.bz2"
494def9cbc322b0745c8134a124d7f85e2c4d6e54c4c1e4008f44e68422a58f5d2 portable-membarrier.patch"
50sha512sums="4f6545ced78a4eedf6adca3f10d536a57205626e631d7cf380be4ea08ca2e1fbbe32566e59c2ce1900a7f057a6dab044483b8423885280cbf142b253d8e03711 spice-protocol-0.12.10.tar.bz2
51434b9cc8eed945de181259ae041eb97ee324f4aab54683b14594f9adfbab0ed2dabaaaf15fd696588f3e506809ea6fef86c43e3ac9b05fdd87df242c19b2765c portable-membarrier.patch"
diff --git a/main/spice-protocol/portable-membarrier.patch b/main/spice-protocol/portable-membarrier.patch
deleted file mode 100644
index 20a5ee3318..0000000000
--- a/main/spice-protocol/portable-membarrier.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1See also: https://bugs.freedesktop.org/show_bug.cgi?id=86997
2
3diff -ru spice-protocol-0.12.7/spice/barrier.h spice-0.12.5/spice-common/spice-protocol/spice/barrier.h
4--- spice-protocol-0.12.7/spice/barrier.h 2013-12-10 20:42:54.000000000 -0200
5+++ spice-protocol-0.12.7/spice/barrier.h 2014-12-04 13:45:54.593329844 -0200
6@@ -34,12 +34,7 @@
7
8 #ifdef __GNUC__
9
10-#ifdef __i386__
11-#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
12-#else
13-//mfence
14-#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%rsp)": : :"memory")
15-#endif
16+#define spice_mb() __sync_synchronize()
17
18 #else
19