Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libaom/
Date: Fri, 24 Dec 2021 06:14:26
Message-Id: 1640326413.628a37720393c8362cdecfaa9686e1e873f320c5.sam@gentoo
1 commit: 628a37720393c8362cdecfaa9686e1e873f320c5
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 06:13:33 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 06:13:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628a3772
7
8 media-libs/libaom: add 3.2.0
9
10 Bug: https://bugs.gentoo.org/816027
11 Bug: https://bugs.gentoo.org/828112
12 Bug: https://bugs.gentoo.org/793932
13 Bug: https://bugs.gentoo.org/798126
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 media-libs/libaom/Manifest | 1 +
17 .../libaom/{libaom-9999.ebuild => libaom-3.2.0.ebuild} | 13 ++++++++++---
18 media-libs/libaom/libaom-9999.ebuild | 13 ++++++++++---
19 3 files changed, 21 insertions(+), 6 deletions(-)
20
21 diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
22 index 26a8a2404a85..2a5253ffe2df 100644
23 --- a/media-libs/libaom/Manifest
24 +++ b/media-libs/libaom/Manifest
25 @@ -4,3 +4,4 @@ DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a430735
26 DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
27 DIST libaom-3.1.1.tar.gz 4604400 BLAKE2B b5e5030639fd7e33a4d0479cf0b5a174f2e0d0f67f6338bec6df7de333fd9bafa3821c7eb721959c1733a678209981f4893e4f228ed339e93f7b0b6fd136d967 SHA512 de91a47c23200ae83c34899c487db7f3b71872890f0506ffa7e2d9a1153ec389fc121b4df5ab1b30b28020599af34bb5d301eac3cdf2a34ce48dd26e07d7fc5b
28 DIST libaom-3.1.2.tar.gz 4605501 BLAKE2B 7aac22da4103408f04a5c2e5d11a96d5a12651fd52e980b547427ebe3e235ba7c16700a131f4bb1b6b4e8a7f82f3175e526281eb593cf604ad491bd7fed0184e SHA512 466c2923115dcf0b0e29fafc8922a057814a84d0e61780ab9b6816bea31d0b741695326183884da5a04afffa5c925ff8ec8f6073e0a1e48ed4914066da975c3b
29 +DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2eafd94eeb1b92177d2c7b5c32de2342f9cf1c7e500b28fdac2b00ea8d43b1e56c9d1c8c0efe1bbc4e40285a52a SHA512 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
30
31 diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-3.2.0.ebuild
32 similarity index 88%
33 copy from media-libs/libaom/libaom-9999.ebuild
34 copy to media-libs/libaom/libaom-3.2.0.ebuild
35 index 358a43197c20..3d106129756e 100644
36 --- a/media-libs/libaom/libaom-9999.ebuild
37 +++ b/media-libs/libaom/libaom-3.2.0.ebuild
38 @@ -1,7 +1,7 @@
39 # Copyright 1999-2021 Gentoo Authors
40 # Distributed under the terms of the GNU General Public License v2
41
42 -EAPI=7
43 +EAPI=8
44
45 CMAKE_ECLASS=cmake
46 inherit cmake-multilib
47 @@ -10,8 +10,9 @@ if [[ ${PV} == *9999* ]]; then
48 inherit git-r3
49 EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
50 else
51 - SRC_URI="https://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
52 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
53 + SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
54 + S="${WORKDIR}"
55 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
56 fi
57
58 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
59 @@ -42,6 +43,7 @@ DOCS=( PATENTS )
60
61 multilib_src_configure() {
62 local mycmakeargs=(
63 + -DENABLE_CCACHE=OFF
64 -DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
65 -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
66 -DENABLE_NASM=OFF
67 @@ -49,6 +51,9 @@ multilib_src_configure() {
68 -DENABLE_TOOLS=ON
69 -DENABLE_WERROR=OFF
70
71 + # Needs libjxl, currently unpackaged.
72 + -DCONFIG_TUNE_BUTTERAUGLI=OFF
73 +
74 # neon support is assumed to be always enabled on arm64
75 -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
76 # ENABLE_DSPR2 / ENABLE_MSA for mips
77 @@ -62,6 +67,7 @@ multilib_src_configure() {
78 -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
79 -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
80 )
81 +
82 cmake_src_configure
83 }
84
85 @@ -69,6 +75,7 @@ multilib_src_install() {
86 if multilib_is_native_abi && use doc ; then
87 local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
88 fi
89 +
90 cmake_src_install
91 }
92
93
94 diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
95 index 358a43197c20..3d106129756e 100644
96 --- a/media-libs/libaom/libaom-9999.ebuild
97 +++ b/media-libs/libaom/libaom-9999.ebuild
98 @@ -1,7 +1,7 @@
99 # Copyright 1999-2021 Gentoo Authors
100 # Distributed under the terms of the GNU General Public License v2
101
102 -EAPI=7
103 +EAPI=8
104
105 CMAKE_ECLASS=cmake
106 inherit cmake-multilib
107 @@ -10,8 +10,9 @@ if [[ ${PV} == *9999* ]]; then
108 inherit git-r3
109 EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
110 else
111 - SRC_URI="https://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
112 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
113 + SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
114 + S="${WORKDIR}"
115 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
116 fi
117
118 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
119 @@ -42,6 +43,7 @@ DOCS=( PATENTS )
120
121 multilib_src_configure() {
122 local mycmakeargs=(
123 + -DENABLE_CCACHE=OFF
124 -DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
125 -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
126 -DENABLE_NASM=OFF
127 @@ -49,6 +51,9 @@ multilib_src_configure() {
128 -DENABLE_TOOLS=ON
129 -DENABLE_WERROR=OFF
130
131 + # Needs libjxl, currently unpackaged.
132 + -DCONFIG_TUNE_BUTTERAUGLI=OFF
133 +
134 # neon support is assumed to be always enabled on arm64
135 -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
136 # ENABLE_DSPR2 / ENABLE_MSA for mips
137 @@ -62,6 +67,7 @@ multilib_src_configure() {
138 -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
139 -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
140 )
141 +
142 cmake_src_configure
143 }
144
145 @@ -69,6 +75,7 @@ multilib_src_install() {
146 if multilib_is_native_abi && use doc ; then
147 local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
148 fi
149 +
150 cmake_src_install
151 }