From: Stuart Cardall <developer@it-offshore.co.uk>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH 6/7] community/xpra: update to 0.17.4
Date: Mon, 22 Aug 2016 05:16:03 +0000
Message-Id: <20160822051604.48580-7-developer@it-offshore.co.uk>
In-Reply-To: <20160822051604.48580-1-developer@it-offshore.co.uk>
References: <20160822051604.48580-1-developer@it-offshore.co.uk>
Precedence: list

---
 community/xpra/APKBUILD              | 15 ++++++++++-----
 community/xpra/build-ffmpeg3.1.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 community/xpra/build-ffmpeg3.1.patch

diff --git a/community/xpra/APKBUILD b/community/xpra/APKBUILD
index 557700b..ae3801d 100644
--- a/community/xpra/APKBUILD
+++ b/community/xpra/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=xpra
-pkgver=0.17.1
+pkgver=0.17.4
 pkgrel=1
 pkgdesc="Xpra is 'screen for X' & allows you to run X programs, usually on a remote host over SSH or encrypted tcp."
 url="http://xpra.org"
@@ -13,7 +13,9 @@ depends_dev="python-dev cython-dev libx11-dev libxtst-dev libxcomposite-dev libx
 		py-gobject-dev py-gtk-dev libxkbfile-dev gtk+2.0-dev x264-dev x265-dev libvpx-dev ffmpeg-dev libwebp-dev"
 makedepends="$depends_dev cython linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
-source="http://xpra.org/src/$pkgname-$pkgver.tar.xz"
+source="http://xpra.org/src/$pkgname-$pkgver.tar.xz
+	build-ffmpeg3.1.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -47,6 +49,9 @@ tests() {
 	cp -rf tests "$subpkgdir"/usr/share/xpra/
 }
 
-md5sums="d83910c4e8c3799822f5fe90f6d8e928  xpra-0.17.1.tar.xz"
-sha256sums="041de13937f3f0529dcde9ccc681b52bc85c5074a021060a56a1da2cdfe66315  xpra-0.17.1.tar.xz"
-sha512sums="f1d323b7207b89838045126939d7d68ff72313c00724f2be7d405c12880fedc12900c11c8d36a0780ee6f7ffca1b6f75c69136eeebd73333fbd437cf9a7ffcfa  xpra-0.17.1.tar.xz"
+md5sums="b8d028fe85245500bb3bfa041e04636f  xpra-0.17.4.tar.xz
+c51b684d9652ad65315c7aec3134b3f8  build-ffmpeg3.1.patch"
+sha256sums="92a7854b8ddad6a28efddf226bcbe8e79b051dff859246fcb5f2c7d0828f3d6d  xpra-0.17.4.tar.xz
+323e6a0ee209d4e1f36b476bd04372e2e4e62406cf8ad6383b13743bc4a34872  build-ffmpeg3.1.patch"
+sha512sums="5463d3ca659fe6d1617e69eee0b115f9df2f488c8c390a02e9eb31e04c29d262679a5463fdd13472cdd2328d01c52fde6ad9a87686fe95cb8adcbff97af6e324  xpra-0.17.4.tar.xz
+c32205b716848396c5c0872ad120f06e45841ef880ecbbbe8166fb004d3f1d3fb1575f5a7f3eebfc8764ff4a7e8d30e49b4a599ae791748c36a39b4782ead8f6  build-ffmpeg3.1.patch"
diff --git a/community/xpra/build-ffmpeg3.1.patch b/community/xpra/build-ffmpeg3.1.patch
new file mode 100644
index 0000000..04619ed
--- /dev/null
+++ b/community/xpra/build-ffmpeg3.1.patch
@@ -0,0 +1,26 @@
+Forwarded: not-needed
+Origin: upstream, https://www.xpra.org/trac/changeset/12944/xpra
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832863
+Bug-Upstream: https://www.xpra.org/trac/ticket/1242
+Author: Antoine Martin <antoine@devloop.org.uk>
+Description: avoid FTBFS with FFmpeg-3.1.
+ ~~~~
+ xpra/codecs/dec_avcodec2/decoder.c: In function '__pyx_pf_4xpra_6codecs_12dec_avcodec2_7decoder_7Decoder_22decompress_image':
+ xpra/codecs/dec_avcodec2/decoder.c:7505:9: error: 'avcodec_decode_video2' is deprecated [-Werror=deprecated-declarations]
+          __pyx_v_len = avcodec_decode_video2(__pyx_v_self->codec_ctx, __pyx_v_self->av_frame, (&__pyx_v_got_picture), (&__pyx_v_avpkt));
+          ^
+ ~~~~
+
+--- a/setup.py
++++ b/setup.py
+@@ -2310,8 +2310,9 @@
+ 
+ toggle_packages(dec_avcodec2_ENABLED, "xpra.codecs.dec_avcodec2")
+ if dec_avcodec2_ENABLED:
+     avcodec2_pkgconfig = pkgconfig("avcodec", "avutil")
++    add_to_keywords(avcodec2_pkgconfig, 'extra_compile_args', "-Wno-error=deprecated-declarations")
+     cython_add(Extension("xpra.codecs.dec_avcodec2.decoder",
+                 ["xpra/codecs/dec_avcodec2/decoder.pyx"]+membuffers_c,
+                 **avcodec2_pkgconfig))
+ 
+
-- 
2.9.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---