summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-20 12:47:24 +0000
committerDaniel Bermond2019-06-20 12:47:24 +0000
commit1317a458d6af79ef170cb65f1ce0e7ead34c527d (patch)
tree2700711c3943fa64e2bf3d51d2ea866d4f8c9121
parent03444d1b8ceb6ab4804cb128e58275ac97e6ef04 (diff)
downloadaur-1317a458d6af79ef170cb65f1ce0e7ead34c527d.tar.gz
Remove patch that fixes tests (fixed upstream)
References ---------- https://github.com/ultravideo/kvazaar/issues/215 https://github.com/ultravideo/kvazaar/commit/75b25955fa401d857c98ea55ad837415179f02c3
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--kvazaar-git-disable-test-external-symbols.patch18
3 files changed, 4 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d1047a2d3b7..000ecbfdc811 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = kvazaar-git
pkgdesc = An open-source HEVC encoder (git version)
- pkgver = 1.2.0.r313.g933ff6ed
+ pkgver = 1.2.0.r318.g75b25955
pkgrel = 1
url = http://ultravideo.cs.tut.fi/#encoder
arch = x86_64
@@ -16,10 +16,8 @@ pkgbase = kvazaar-git
conflicts = kvazaar
source = git+https://github.com/ultravideo/kvazaar.git
source = git+https://github.com/ultravideo/greatest.git
- source = kvazaar-git-disable-test-external-symbols.patch
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 3a4dd1b38d58751381b24c81a86c21df7cfdc85ba5c6a13d879f112e463189b9
pkgname = kvazaar-git
diff --git a/PKGBUILD b/PKGBUILD
index 756ab74966cc..a0678c0e55f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Devaux Fabien <fdev31@gmail.com>
pkgname=kvazaar-git
-pkgver=1.2.0.r313.g933ff6ed
+pkgver=1.2.0.r318.g75b25955
pkgrel=1
pkgdesc='An open-source HEVC encoder (git version)'
arch=('x86_64')
@@ -14,11 +14,9 @@ checkdepends=('ffmpeg' 'hm')
provides=('kvazaar')
conflicts=('kvazaar')
source=('git+https://github.com/ultravideo/kvazaar.git'
- 'git+https://github.com/ultravideo/greatest.git'
- 'kvazaar-git-disable-test-external-symbols.patch')
+ 'git+https://github.com/ultravideo/greatest.git')
sha256sums=('SKIP'
- 'SKIP'
- '3a4dd1b38d58751381b24c81a86c21df7cfdc85ba5c6a13d879f112e463189b9')
+ 'SKIP')
prepare() {
cd kvazaar
@@ -27,10 +25,6 @@ prepare() {
git config --local submodule.greatest.url "${srcdir}/greatest"
git submodule update
- # disable a test that is failing: test_external_symbols.sh
- # https://github.com/ultravideo/kvazaar/issues/215
- patch -Np1 -i "${srcdir}/kvazaar-git-disable-test-external-symbols.patch"
-
./autogen.sh
}
diff --git a/kvazaar-git-disable-test-external-symbols.patch b/kvazaar-git-disable-test-external-symbols.patch
deleted file mode 100644
index 0abb82ec1990..000000000000
--- a/kvazaar-git-disable-test-external-symbols.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naurp a/tests/Makefile.am b/tests/Makefile.am
---- a/tests/Makefile.am 2019-06-05 00:24:38.000000000 +0000
-+++ b/tests/Makefile.am 2019-06-05 00:25:15.735223946 +0000
-@@ -1,6 +1,5 @@
-
- TESTS = $(check_PROGRAMS) \
-- test_external_symbols.sh \
- test_gop.sh \
- test_interlace.sh \
- test_intra.sh \
-@@ -14,7 +13,6 @@ TESTS = $(check_PROGRAMS) \
- test_weird_shapes.sh
-
- EXTRA_DIST = \
-- test_external_symbols.sh \
- test_gop.sh \
- test_interlace.sh \
- test_intra.sh \