1 |
commit: 4b9eb1e60aacbee6a32a631113c101d12073eaf3 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 9 11:51:41 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 9 12:25:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9eb1e6 |
7 |
|
8 |
media-libs/libaom: bump to v2.0.0 RC1 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
media-libs/libaom/Manifest | 1 + |
14 |
media-libs/libaom/libaom-1.0.0_p20200507.ebuild | 6 ++++-- |
15 |
...aom-1.0.0_p20200507.ebuild => libaom-2.0.0_rc1.ebuild} | 15 ++++++++++----- |
16 |
media-libs/libaom/libaom-9999.ebuild | 11 +++++++++-- |
17 |
4 files changed, 24 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest |
20 |
index 190d5c53708..a3e5ed5a7d9 100644 |
21 |
--- a/media-libs/libaom/Manifest |
22 |
+++ b/media-libs/libaom/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4 |
25 |
DIST libaom-1.0.0_p20200507.tar.gz 3569380 BLAKE2B caaff47e7e443694b41dcac6b4d1ea08c7c33ab25a443582875be6f22157e515ec88050e3d9036f94e26177335db5d76cde1b1ea306fc674af01995def23620d SHA512 2f906ac3ca3c3fe87de03238ae4ded3c87e3d5a780cc29d4ceaf3bfce91c65d0088ee8b63018ceecff27cc48a022ae4dbf7b72861bf9bf4416de98115b493c65 |
26 |
+DIST libaom-2.0.0_rc1.tar.gz 3497410 BLAKE2B e8443e5d390c82912b951d78551f2c7a3e0cffe6aea1b846da29c0264cc9736069110e6701e6dc075964c0375e95f2c1c108c0c980a5ea78d0f970c6f47f4790 SHA512 06a0971e8fcd1d449c4fd2b04569dc32ce6fb8ab6c4a270413997c3aeba7a186e071683686e0fbc1eb1f8d6c2c3afa7f48601bf5530984bc1cf612ab5dd64841 |
27 |
|
28 |
diff --git a/media-libs/libaom/libaom-1.0.0_p20200507.ebuild b/media-libs/libaom/libaom-1.0.0_p20200507.ebuild |
29 |
index bb1078b69e7..9d13a216729 100644 |
30 |
--- a/media-libs/libaom/libaom-1.0.0_p20200507.ebuild |
31 |
+++ b/media-libs/libaom/libaom-1.0.0_p20200507.ebuild |
32 |
@@ -21,9 +21,10 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK" |
33 |
HOMEPAGE="https://aomedia.org" |
34 |
|
35 |
LICENSE="BSD-2" |
36 |
-SLOT="0/0" |
37 |
+SLOT="0/1.9999" |
38 |
IUSE="doc examples" |
39 |
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2" |
40 |
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" |
41 |
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" |
42 |
IUSE="${IUSE} cpu_flags_arm_neon" |
43 |
|
44 |
REQUIRED_USE=" |
45 |
@@ -60,6 +61,7 @@ multilib_src_configure() { |
46 |
-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) |
47 |
-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) |
48 |
-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) |
49 |
+ -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) |
50 |
-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) |
51 |
-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) |
52 |
) |
53 |
|
54 |
diff --git a/media-libs/libaom/libaom-1.0.0_p20200507.ebuild b/media-libs/libaom/libaom-2.0.0_rc1.ebuild |
55 |
similarity index 84% |
56 |
copy from media-libs/libaom/libaom-1.0.0_p20200507.ebuild |
57 |
copy to media-libs/libaom/libaom-2.0.0_rc1.ebuild |
58 |
index bb1078b69e7..bcc3c9689fb 100644 |
59 |
--- a/media-libs/libaom/libaom-1.0.0_p20200507.ebuild |
60 |
+++ b/media-libs/libaom/libaom-2.0.0_rc1.ebuild |
61 |
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then |
62 |
inherit git-r3 |
63 |
EGIT_REPO_URI="https://aomedia.googlesource.com/aom" |
64 |
else |
65 |
- MY_COMMIT="1a090d5d5ac322add74ebb6b5df7f4074909cd09" |
66 |
+ MY_COMMIT="1e711b0aca6721da83835e3b5ceda07238e8b6ae" |
67 |
#SRC_URI="https://aomedia.googlesource.com/aom/+archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
68 |
SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz" |
69 |
S="${WORKDIR}" |
70 |
@@ -21,9 +21,10 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK" |
71 |
HOMEPAGE="https://aomedia.org" |
72 |
|
73 |
LICENSE="BSD-2" |
74 |
-SLOT="0/0" |
75 |
+SLOT="0/2" |
76 |
IUSE="doc examples" |
77 |
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2" |
78 |
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" |
79 |
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" |
80 |
IUSE="${IUSE} cpu_flags_arm_neon" |
81 |
|
82 |
REQUIRED_USE=" |
83 |
@@ -39,8 +40,6 @@ BDEPEND="abi_x86_32? ( dev-lang/yasm ) |
84 |
doc? ( app-doc/doxygen ) |
85 |
" |
86 |
|
87 |
-PATCHES=( "${FILESDIR}/pthread_lib2.patch" ) |
88 |
- |
89 |
# the PATENTS file is required to be distributed with this package bug #682214 |
90 |
DOCS=( PATENTS ) |
91 |
|
92 |
@@ -49,6 +48,7 @@ multilib_src_configure() { |
93 |
-DENABLE_DOCS=$(multilib_native_usex doc ON OFF) |
94 |
-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) |
95 |
-DENABLE_NASM=OFF |
96 |
+ -DENABLE_TESTS=OFF |
97 |
-DENABLE_TOOLS=ON |
98 |
-DENABLE_WERROR=OFF |
99 |
|
100 |
@@ -60,6 +60,7 @@ multilib_src_configure() { |
101 |
-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) |
102 |
-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) |
103 |
-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) |
104 |
+ -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) |
105 |
-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) |
106 |
-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) |
107 |
) |
108 |
@@ -72,3 +73,7 @@ multilib_src_install() { |
109 |
fi |
110 |
cmake_src_install |
111 |
} |
112 |
+ |
113 |
+multilib_src_install_all() { |
114 |
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die |
115 |
+} |
116 |
|
117 |
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild |
118 |
index 22ed3683685..67c9b166e78 100644 |
119 |
--- a/media-libs/libaom/libaom-9999.ebuild |
120 |
+++ b/media-libs/libaom/libaom-9999.ebuild |
121 |
@@ -25,9 +25,10 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK" |
122 |
HOMEPAGE="https://aomedia.org" |
123 |
|
124 |
LICENSE="BSD-2" |
125 |
-SLOT="0/0" |
126 |
+SLOT="0/1.9999" |
127 |
IUSE="doc examples" |
128 |
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2" |
129 |
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" |
130 |
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" |
131 |
IUSE="${IUSE} cpu_flags_arm_neon" |
132 |
|
133 |
REQUIRED_USE=" |
134 |
@@ -53,6 +54,7 @@ multilib_src_configure() { |
135 |
-DENABLE_DOCS=$(multilib_native_usex doc ON OFF) |
136 |
-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) |
137 |
-DENABLE_NASM=OFF |
138 |
+ -DENABLE_TESTS=OFF |
139 |
-DENABLE_TOOLS=ON |
140 |
-DENABLE_WERROR=OFF |
141 |
|
142 |
@@ -64,6 +66,7 @@ multilib_src_configure() { |
143 |
-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) |
144 |
-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) |
145 |
-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) |
146 |
+ -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) |
147 |
-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) |
148 |
-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) |
149 |
) |
150 |
@@ -76,3 +79,7 @@ multilib_src_install() { |
151 |
fi |
152 |
cmake_src_install |
153 |
} |
154 |
+ |
155 |
+multilib_src_install_all() { |
156 |
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die |
157 |
+} |