| 1 |
commit: 62d6aa651cc9cba85937b117a0d8a00e24cf0f22 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 14 16:20:12 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 14 16:20:18 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d6aa65 |
| 7 |
|
| 8 |
media-libs/kvazaar: Bump to 1.0.0. |
| 9 |
|
| 10 |
Fix tests by downloading greatest, bug #595932 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2 |
| 13 |
|
| 14 |
media-libs/kvazaar/Manifest | 2 ++ |
| 15 |
media-libs/kvazaar/files/multilib.patch | 15 +++++++++++++++ |
| 16 |
.../{kvazaar-9999.ebuild => kvazaar-1.0.0.ebuild} | 19 ++++++++++++++----- |
| 17 |
media-libs/kvazaar/kvazaar-9999.ebuild | 17 ++++++++++++----- |
| 18 |
4 files changed, 43 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest |
| 21 |
index 10fb437..63b16fc 100644 |
| 22 |
--- a/media-libs/kvazaar/Manifest |
| 23 |
+++ b/media-libs/kvazaar/Manifest |
| 24 |
@@ -1 +1,3 @@ |
| 25 |
+DIST greatest-1.2.1.tar.gz 19792 SHA256 e3c1211ec5dfea61092833bca56c6a14620ac23aa0d53940d99943587cbe1677 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 WHIRLPOOL b4e01659539e02224d5396609ba73715eca1391e9da165ac22cf28f25c13cf89a9c4059cfe3f88e1d88d06e35153f7d1d3e012433b9b4f4deaa2a464e6d6b7ca |
| 26 |
DIST kvazaar-0.8.3.tar.gz 429852 SHA256 a5cebc313bc2edcf631684e67c33227e56d803bfbc940cf8c2f3906b4f543a12 SHA512 7de2c311c75b77d1f9a95f1de79212560b86bd6f8d7ae743240ff33cec52ecb2837be7984f12fe617560445838381ada245196bf1bf67eeb3861f025998fdf60 WHIRLPOOL 1fdcf9835aca8a4d4261c184e957abcc4fa21df5e3d0520a63e95dfc800d086dc6ae5f70fc4110db232a013f84205230f1c5e2043f57db21cc100b33ef504d05 |
| 27 |
+DIST kvazaar-1.0.0.tar.gz 473495 SHA256 40eb7b4b23897299e99050f0c011e9380cf898b25615dd143f018b278b972a46 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340 WHIRLPOOL ed0c6332c5a1efa88b569845f2cb5436881c3866e381369d770a3393d61e37605ad5c114dcbdae424035f451ceea5ab1ee0787769c9bf44fc44bbd2815e87ed7 |
| 28 |
|
| 29 |
diff --git a/media-libs/kvazaar/files/multilib.patch b/media-libs/kvazaar/files/multilib.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000..fb0711d |
| 32 |
--- /dev/null |
| 33 |
+++ b/media-libs/kvazaar/files/multilib.patch |
| 34 |
@@ -0,0 +1,15 @@ |
| 35 |
+https://github.com/ultravideo/kvazaar/pull/141 |
| 36 |
+ |
| 37 |
+Index: kvazaar-1.0.0/src/global.h |
| 38 |
+=================================================================== |
| 39 |
+--- kvazaar-1.0.0.orig/src/global.h |
| 40 |
++++ kvazaar-1.0.0/src/global.h |
| 41 |
+@@ -253,7 +253,7 @@ typedef enum { COLOR_Y = 0, COLOR_U, COL |
| 42 |
+ |
| 43 |
+ |
| 44 |
+ // Hardware data (abstraction of defines). Extend for other compilers |
| 45 |
+-#if defined(_M_IX86) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__) |
| 46 |
++#if defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__) |
| 47 |
+ # define COMPILE_INTEL 1 |
| 48 |
+ #else |
| 49 |
+ # define COMPILE_INTEL 0 |
| 50 |
|
| 51 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-1.0.0.ebuild |
| 52 |
similarity index 62% |
| 53 |
copy from media-libs/kvazaar/kvazaar-9999.ebuild |
| 54 |
copy to media-libs/kvazaar/kvazaar-1.0.0.ebuild |
| 55 |
index 4d22819..ef87a92 100644 |
| 56 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
| 57 |
+++ b/media-libs/kvazaar/kvazaar-1.0.0.ebuild |
| 58 |
@@ -6,25 +6,29 @@ EAPI=5 |
| 59 |
|
| 60 |
SCM="" |
| 61 |
|
| 62 |
+GREATEST_PV="1.2.1" |
| 63 |
+ |
| 64 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 65 |
SCM="git-r3" |
| 66 |
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" |
| 67 |
fi |
| 68 |
|
| 69 |
-inherit multilib autotools multilib-minimal toolchain-funcs ${SCM} |
| 70 |
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM} |
| 71 |
|
| 72 |
DESCRIPTION="An open-source HEVC encoder" |
| 73 |
HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
| 74 |
|
| 75 |
if [ "${PV#9999}" = "${PV}" ] ; then |
| 76 |
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 77 |
+ SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 78 |
+ test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
| 79 |
KEYWORDS="~amd64 ~ppc" |
| 80 |
fi |
| 81 |
|
| 82 |
LICENSE="LGPL-2.1" |
| 83 |
# subslot = libkvazaar major |
| 84 |
SLOT="0/3" |
| 85 |
-IUSE="cpu_flags_x86_avx2 static-libs" |
| 86 |
+IUSE="static-libs test" |
| 87 |
+REQUIRED_USE="test? ( static-libs )" |
| 88 |
|
| 89 |
DEPEND="" |
| 90 |
RDEPEND="${DEPEND}" |
| 91 |
@@ -35,15 +39,20 @@ DEPEND="${DEPEND} |
| 92 |
abi_x86_64? ( ${ASM_DEP} )" |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
+ epatch "${FILESDIR}/multilib.patch" |
| 96 |
eautoreconf |
| 97 |
+ if use test ; then |
| 98 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=595932 |
| 99 |
+ rmdir "${S}/greatest" || die |
| 100 |
+ mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die |
| 101 |
+ fi |
| 102 |
} |
| 103 |
|
| 104 |
multilib_src_configure() { |
| 105 |
ECONF_SOURCE="${S}" \ |
| 106 |
econf \ |
| 107 |
--docdir "/usr/share/doc/${PF}" \ |
| 108 |
- $(use_enable static-libs static) \ |
| 109 |
- $(use_enable cpu_flags_x86_avx2 asm) |
| 110 |
+ $(use_enable static-libs static) |
| 111 |
} |
| 112 |
|
| 113 |
multilib_src_install_all() { |
| 114 |
|
| 115 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild |
| 116 |
index 4d22819..7f8fec2 100644 |
| 117 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
| 118 |
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild |
| 119 |
@@ -6,25 +6,28 @@ EAPI=5 |
| 120 |
|
| 121 |
SCM="" |
| 122 |
|
| 123 |
+GREATEST_PV="1.2.1" |
| 124 |
+ |
| 125 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 126 |
SCM="git-r3" |
| 127 |
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" |
| 128 |
fi |
| 129 |
|
| 130 |
-inherit multilib autotools multilib-minimal toolchain-funcs ${SCM} |
| 131 |
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM} |
| 132 |
|
| 133 |
DESCRIPTION="An open-source HEVC encoder" |
| 134 |
HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
| 135 |
|
| 136 |
if [ "${PV#9999}" = "${PV}" ] ; then |
| 137 |
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 138 |
+ SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 139 |
+ test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
| 140 |
KEYWORDS="~amd64 ~ppc" |
| 141 |
fi |
| 142 |
|
| 143 |
LICENSE="LGPL-2.1" |
| 144 |
# subslot = libkvazaar major |
| 145 |
SLOT="0/3" |
| 146 |
-IUSE="cpu_flags_x86_avx2 static-libs" |
| 147 |
+IUSE="static-libs test" |
| 148 |
|
| 149 |
DEPEND="" |
| 150 |
RDEPEND="${DEPEND}" |
| 151 |
@@ -36,14 +39,18 @@ DEPEND="${DEPEND} |
| 152 |
|
| 153 |
src_prepare() { |
| 154 |
eautoreconf |
| 155 |
+ if use test ; then |
| 156 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=595932 |
| 157 |
+ rmdir "${S}/greatest" || die |
| 158 |
+ mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die |
| 159 |
+ fi |
| 160 |
} |
| 161 |
|
| 162 |
multilib_src_configure() { |
| 163 |
ECONF_SOURCE="${S}" \ |
| 164 |
econf \ |
| 165 |
--docdir "/usr/share/doc/${PF}" \ |
| 166 |
- $(use_enable static-libs static) \ |
| 167 |
- $(use_enable cpu_flags_x86_avx2 asm) |
| 168 |
+ $(use_enable static-libs static) |
| 169 |
} |
| 170 |
|
| 171 |
multilib_src_install_all() { |
Archives