Subject: [alpine-aports] [PATCH 1/2] main/x265: upgrade to 1.8

From: Sören Tempel <[email-masked]>
Date: Sat, 10 Oct 2015 09:00:02 +0200

---
 main/x265/APKBUILD                                 | 18 +++++---------
 main/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch | 28 ----------------------
 2 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 main/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch

diff --git a/main/x265/APKBUILD b/main/x265/APKBUILD
index abdf5f0..91835bf 100644
--- a/main/x265/APKBUILD
+++ b/main/x265/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <[email-masked]>
 # Maintainer:
 pkgname=x265
-pkgver=1.7
+pkgver=1.8
 pkgrel=0
 pkgdesc="Open Source H265/HEVC video encoder"
 url="https://bitbucket.org/multicoreware/x265"
@@ -12,11 +12,9 @@ depends_dev=""
 makedepends="$depends_dev cmake yasm"
 install=""
 subpackages="$pkgname-dev"
-source="http://ftp.videolan.org/pub/videolan/x265/x265_${pkgver}.tar.gz
-	x265-1.7-fix-slowness-with-gcc-5.1.patch"
-
-_builddir="$srcdir/x265_$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/multicoreware/$pkgname/downloads/${pkgname}_${pkgver}.tar.gz"
 
+_builddir="$srcdir"/x265_11047
 prepare() {
 	local i
 	cd "$_builddir"
@@ -40,12 +38,8 @@ build() {
 package() {
 	cd "$_builddir"/build/linux
 	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="ff31a807ebc868aa59b60706e303102f  x265_1.7.tar.gz
-30c7fc491f22cbdec1ee17caab7d620a  x265-1.7-fix-slowness-with-gcc-5.1.patch"
-sha256sums="a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585  x265_1.7.tar.gz
-1414e10c96654070cf0e96dcb79c560fc415e48250cd5bd0ad8a2a6d7f754d50  x265-1.7-fix-slowness-with-gcc-5.1.patch"
-sha512sums="cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89  x265_1.7.tar.gz
-5d0807ade416c15156252b27e9b6fca10743274ec3b1e8e638299604b3a12f437e54aa5864c179c9f2b976011d67a7ab648252ade01d7d7298d9c4097eba3c4d  x265-1.7-fix-slowness-with-gcc-5.1.patch"
+md5sums="8b7ef9bc0b5bd26965d05a4508effeed  x265-1.8.tar.gz"
+sha256sums="760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857  x265-1.8.tar.gz"
+sha512sums="498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c  x265-1.8.tar.gz"
diff --git a/main/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch b/main/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch
deleted file mode 100644
index 6aa679d..0000000
--- a/main/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Deepthi Nandakumar <[email-masked]>
-# Date 1434559454 -19800
-#      Wed Jun 17 22:14:14 2015 +0530
-# Branch stable
-# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
-# Parent  e0738af788da598a3cdf4458dbb46fbb07563534
-fix issue #143 x265 is slow when it is build with GCC 5.1
-
-diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
---- a/source/common/vec/vec-primitives.cpp	Wed May 20 10:29:09 2015 -0500
-+++ b/source/common/vec/vec-primitives.cpp	Wed Jun 17 22:14:14 2015 +0530
-@@ -32,12 +32,13 @@
- #define HAVE_SSE4
- #define HAVE_AVX2
- #elif defined(__GNUC__)
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
-+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-+#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
- #define HAVE_SSE3
- #define HAVE_SSSE3
- #define HAVE_SSE4
- #endif
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
- #define HAVE_AVX2
- #endif
- #elif defined(_MSC_VER)
-- 
2.6.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Sören Tempel <[email-masked]>
Date: Sat, 10 Oct 2015 09:00:03 +0200

---
 main/ffmpeg/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 05da439..b212ee4 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=ffmpeg
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
 arch="all"
-- 
2.6.1

---