[gentoo-commits] repo/proj/guru:dev commit in: media-libs/skia/

[Theo Anderson]

commit:     7ae9d02e43e904432799a1d8d8bedbf88ddf2320
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Oct  9 09:26:04 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Oct  9 09:30:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ae9d02e

media-libs/skia: add 97, drop 80_p20191220-r1

Signed-off-by: James Beddek <telans <AT> posteo.de>

 media-libs/skia/Manifest                                   |  2 +-
 .../skia/{skia-80_p20191220-r1.ebuild => skia-97.ebuild}   | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/media-libs/skia/Manifest b/media-libs/skia/Manifest
index 493e2d23c..184ea284c 100644
--- a/media-libs/skia/Manifest
+++ b/media-libs/skia/Manifest
@@ -1 +1 @@
-DIST skia-80_p20191220.tar.gz 36702975 BLAKE2B 
3863b482b2655702b9d53b141e34bf6cb162e01c24589b26c530a1f2fc393fb4a8b0beca5e28603353ec6639d230da1f3ad7ddc84e450dd6aacec0c846def67c
 SHA512 
15d831a4d2776f210313f9015bc255a40d616d30dffdf607c3a8264a84509eca5c4b826758def6a02a7c9a2daa6cef5ce409594e94f43a54cd2d09c32d6d8193
+DIST skia-97.tar.gz 55736513 BLAKE2B 
a3fddcab23b395e884b64179577c0e88b22c5580c484b79ce11a598ea8822fe797248071ca638541c9146f6752d93e99d9effb7e3499cf1f1efd75e375f9d3d5
 SHA512 
c30cd68fd69cbe998c04db8a9d7d201fefa2e72541745a1216a51bde809152c11f53fd3ba66a5c7bfb971c090e5eecc2be50a3cf013645052c2c447bf70d5f7a

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-97.ebuild
similarity index 92%
rename from media-libs/skia/skia-80_p20191220-r1.ebuild
rename to media-libs/skia/skia-97.ebuild
index 5be82ea75..ff47d59f2 100644
--- a/media-libs/skia/skia-80_p20191220-r1.ebuild
+++ b/media-libs/skia/skia-97.ebuild
@@ -3,12 +3,12 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( )
+PYTHON_COMPAT=( python3_9 )
 
 inherit ninja-utils python-any-r1 toolchain-funcs
 
 #https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"
+COMMIT="f2093bf1b076210bd017f237eaab84ea4d3d6771"
 
 SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 KEYWORDS="~amd64"
@@ -64,15 +64,9 @@ src_prepare() {
        default
        # https://chromium.googlesource.com/chromium/src/third_party/zlib
        # https://github.com/jtkukunas/zlib
-       sed \
-               -e '/:zlib_x86/d' \
+       sed -e '/:zlib_x86/d' \
                -e '/third_party("zlib_x86/,/^}/d' \
                -i third_party/zlib/BUILD.gn
-
-       #remove questionable cflags
-       sed -i 's|-O3||g' gn/BUILD.gn || die
-       sed -i 's|-ffunction-sections||g' gn/BUILD.gn || die
-       sed -i 's|-fdata-sections||g' gn/BUILD.gn || die
 }
 
 src_configure() {
@@ -99,6 +93,7 @@ src_configure() {
                skia_use_dng_sdk=false
                skia_use_metal=false
                skia_use_sfntly=false
+               skia_use_zlib=false # disable to build
        )
 #              skia_enable_pdf=$(usex pdf true false)
 #
@@ -111,7 +106,6 @@ src_configure() {
 #              skia_use_libpng_encode=$(usex png true false)
 #              skia_use_libwebp_decode=$(usex webp true false)
 #              skia_use_libwebp_encode=$(usex webp true false)
-#              skia_use_zlib=$(usex zlib true false)
 
 #              skia_use_angle=$(usex angle true false)
 #              skia_use_egl=$(usex egl true false)