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

["Alessandro Barbieri" <lssndrbarbieri@gmail.com>]

commit:     751e25f4ab2a4e601145be84a9bc4953f90a1863
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 26 20:37:21 2020 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 26 20:38:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=751e25f4

media-libs/skia: this version is ok for skia-pathops

also dropped all the useflags, investigate their readd

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/skia/Manifest                           |   3 +-
 media-libs/skia/metadata.xml                       |   3 -
 .../{skia-80.ebuild => skia-80_p20191220.ebuild}   |  72 +++++++----
 media-libs/skia/skia-84.ebuild                     | 143 ---------------------
 4 files changed, 45 insertions(+), 176 deletions(-)

diff --git a/media-libs/skia/Manifest b/media-libs/skia/Manifest
index 47b7b21..493e2d2 100644
--- a/media-libs/skia/Manifest
+++ b/media-libs/skia/Manifest
@@ -1,2 +1 @@
-DIST skia-80.tar.gz 35947943 BLAKE2B dd716b842f909cd0c1e7b7b6836762ec2dcd63d5d9e889f550926fe8927ef649b3255c0fb19901cfded421b015f7eb856ed2f3f09401596b82440b98d260ad6d SHA512 748eab7b1afb8b1a9ceb6249ad045dfa52ada9133fb29aa333ca0a72f615304815b83811fd659a570c18acbd2e9a701f58f836adb31847f85c387a6386dbd804
-DIST skia-84.tar.gz 46451124 BLAKE2B f64d5a4e66307ab99214e36be402064e75acd83d9f6e4957b52c3be3c1088feb92ac53ef6a15b94d3bbd74f5567c34146cc837e750c4867c02254a5ff258b2fb SHA512 e2455d57db4de093b7ce5c0a9ef7260df7ad7bebbe7684e39153a4bd7c80169629bdb58163fec5ed304b1f8a846200ce7100a8d067540afee6eff6a230393542
+DIST skia-80_p20191220.tar.gz 36702975 BLAKE2B 3863b482b2655702b9d53b141e34bf6cb162e01c24589b26c530a1f2fc393fb4a8b0beca5e28603353ec6639d230da1f3ad7ddc84e450dd6aacec0c846def67c SHA512 15d831a4d2776f210313f9015bc255a40d616d30dffdf607c3a8264a84509eca5c4b826758def6a02a7c9a2daa6cef5ce409594e94f43a54cd2d09c32d6d8193

diff --git a/media-libs/skia/metadata.xml b/media-libs/skia/metadata.xml
index 8e363d5..5a8da94 100644
--- a/media-libs/skia/metadata.xml
+++ b/media-libs/skia/metadata.xml
@@ -7,7 +7,4 @@ Skia is an open source 2D graphics library which provides common APIs that work
 
 Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source.
   </longdescription>
-  <use>
-    <flag name="dawn">use Dawn, a WebGPU implementation</flag>
-  </use>
 </pkgmetadata>

diff --git a/media-libs/skia/skia-80.ebuild b/media-libs/skia/skia-80_p20191220.ebuild
similarity index 67%
rename from media-libs/skia/skia-80.ebuild
rename to media-libs/skia/skia-80_p20191220.ebuild
index 1585976..7de65b6 100644
--- a/media-libs/skia/skia-80.ebuild
+++ b/media-libs/skia/skia-80_p20191220.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit ninja-utils python-any-r1
 
 #https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="93e853bf2b832d13cb64194b90a8fec44544e518"
+COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"
 
 SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
@@ -19,25 +19,36 @@ HOMEPAGE="
 "
 LICENSE="BSD"
 SLOT="0"
-IUSE="dawn expat gif jpeg png pdf webp zlib"
+IUSE=""
+#IUSE="dawn expat gif jpeg png pdf webp zlib"
 #TODO: find out how to enable and link: angle egl ffmpeg fontconfig freetype gl harfbuzz heif icu lua opencl piex sfntly wuffs vulkan xps s
 
 #TODO: find out which deps are needed for gl/egl/vulkan/X/gif/xps
-#	fontconfig? ( media-libs/fontconfig )
-#	freetype? ( media-libs/freetype )
 #	ffmpeg? ( virtual/ffmpeg )
-#	harfbuzz? ( media-libs/harfbuzz )
 #	heif? ( media-libs/libheif )
 #	icu? ( dev-libs/icu )
 #	virtual/opengl
 #	lua? ( dev-lang/lua )
 #	opencl? ( virtual/opencl )
 RDEPEND="
-	expat? ( dev-libs/expat )
-	jpeg? ( media-libs/libjpeg-turbo )
-	png? ( media-libs/libpng )
-	webp? ( media-libs/libwebp )
-	zlib? ( sys-libs/zlib )
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/libbsd
+	dev-libs/libpcre
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/libwebp
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 "
 DEPEND="
 	${PYTHON_DEPS}
@@ -57,6 +68,11 @@ src_prepare() {
 		-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() {
@@ -80,25 +96,25 @@ src_configure() {
 		cxx=\"${CXX}\"
 		is_component_build=true
 		is_official_build=true
-
-		skia_enable_pdf=$(usex pdf true false)
-
-		skia_use_dawn=$(usex dawn true false)
-		skia_use_expat=$(usex expat true false)
-		skia_use_libgifcodec=$(usex gif true false)
-		skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
-		skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
-		skia_use_libpng_decode=$(usex png true false)
-		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_direct3d=false
 		skia_use_dng_sdk=false
 		skia_use_fonthost_mac=false
 		skia_use_metal=false
+		skia_use_sfntly=false
 	)
+#		skia_enable_pdf=$(usex pdf true false)
+#
+#		skia_use_dawn=$(usex dawn true false)
+#		skia_use_expat=$(usex expat true false)
+#		skia_use_libgifcodec=$(usex gif true false)
+#		skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
+#		skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
+#		skia_use_libpng_decode=$(usex png true false)
+#		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)
 #		skia_use_fontconfig=$(usex fontconfig true false)
@@ -120,11 +136,11 @@ src_configure() {
 #	use freetype	&& myconf_gn+=( skia_use_system_freetype2=true )
 #	use harfbuzz	&& myconf_gn+=( skia_use_system_harfbuzz=true )
 #	use icu		&& myconf_gn+=( skia_use_system_icu=true )
-	use jpeg	&& myconf_gn+=( skia_use_system_libjpeg_turbo=true )
+#	use jpeg	&& myconf_gn+=( skia_use_system_libjpeg_turbo=true )
 #	use lua		&& myconf_gn+=( skia_use_system_lua=true )
-	use png		&& myconf_gn+=( skia_use_system_libpng=true )
-	use webp	&& myconf_gn+=( skia_use_system_libwebp=true )
-	use zlib	&& myconf_gn+=( skia_use_system_zlib=true )
+#	use png		&& myconf_gn+=( skia_use_system_libpng=true )
+#	use webp	&& myconf_gn+=( skia_use_system_libwebp=true )
+#	use zlib	&& myconf_gn+=( skia_use_system_zlib=true )
 
 	myconf_gn="${myconf_gn[@]} ${EXTRA_GN}"
 	set -- gn gen --args="${myconf_gn% }" out/Release

diff --git a/media-libs/skia/skia-84.ebuild b/media-libs/skia/skia-84.ebuild
deleted file mode 100644
index 610a193..0000000
--- a/media-libs/skia/skia-84.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ninja-utils python-any-r1
-
-#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="2fc431eaea2979f6e6b20cdb715db8861d5a47b1"
-
-SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="A complete 2D graphic library for drawing Text, Geometries, and Images"
-HOMEPAGE="
-	https://skia.org
-	https://github.com/google/skia
-"
-LICENSE="BSD"
-SLOT="0"
-IUSE="dawn expat gif jpeg png pdf webp zlib"
-#TODO: find out how to enable and link: angle egl ffmpeg fontconfig freetype gl harfbuzz heif icu lua opencl piex sfntly wuffs vulkan xps s
-
-#TODO: find out which deps are needed for gl/egl/vulkan/X/gif/xps
-#	fontconfig? ( media-libs/fontconfig )
-#	freetype? ( media-libs/freetype )
-#	ffmpeg? ( virtual/ffmpeg )
-#	harfbuzz? ( media-libs/harfbuzz )
-#	heif? ( media-libs/libheif )
-#	icu? ( dev-libs/icu )
-#	virtual/opengl
-#	lua? ( dev-lang/lua )
-#	opencl? ( virtual/opencl )
-RDEPEND="
-	expat? ( dev-libs/expat )
-	jpeg? ( media-libs/libjpeg-turbo )
-	png? ( media-libs/libpng )
-	webp? ( media-libs/libwebp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/gn
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	# https://chromium.googlesource.com/chromium/src/third_party/zlib
-	# https://github.com/jtkukunas/zlib
-	sed \
-		-e '/:zlib_x86/d' \
-		-e '/third_party("zlib_x86/,/^}/d' \
-		-i third_party/zlib/BUILD.gn
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-
-	local myconf_gn=()
-	passflags() {
-		local _f _x
-		_f=( ${1} )
-		_x="[$(printf '"%s", ' "${_f[@]}")]"
-		myconf_gn+=( extra_${2}="${_x}" )
-	}
-	passflags "${CFLAGS}" cflags_c
-	passflags "${CXXFLAGS}" cflags_cc
-	passflags "${CFLAGS}" ldflags
-
-	myconf_gn+=(
-		ar=\"${AR}\"
-		cc=\"${CC}\"
-		cxx=\"${CXX}\"
-		is_component_build=true
-		is_official_build=true
-
-		skia_enable_pdf=$(usex pdf true false)
-
-		skia_use_dawn=$(usex dawn true false)
-		skia_use_expat=$(usex expat true false)
-		skia_use_libgifcodec=$(usex gif true false)
-		skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
-		skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
-		skia_use_libpng_decode=$(usex png true false)
-		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_direct3d=false
-		skia_use_dng_sdk=false
-		skia_use_fonthost_mac=false
-		skia_use_metal=false
-	)
-#		skia_use_angle=$(usex angle true false)
-#		skia_use_egl=$(usex egl true false)
-#		skia_use_fontconfig=$(usex fontconfig true false)
-#		skia_use_freetype=$(usex freetype true false)
-#		skia_use_ffmpeg=$(usex ffmpeg  true false)
-#		skia_use_gl=$(usex gl true false)
-#		skia_use_harfbuzz=$(usex harfbuzz true false)
-#		skia_use_icu=$(usex icu true false)
-#		skia_use_libheif=$(usex heif true false)
-#		skia_use_lua=$(usex lua true false)
-#		skia_use_opencl=$(usex opencl true false)
-#		skia_use_vulkan=$(usex vulkan true false)
-#		skia_use_x11=$(usex X true false)
-#		skia_use_xps=$(usex xps true false)
-#		skia_use_piex=$(usex piex true false)
-#		skia_use_sfntly=$(usex sfntly true false)
-#		skia_use_wuffs=$(usex wuffs true false)
-
-#	use freetype	&& myconf_gn+=( skia_use_system_freetype2=true )
-#	use harfbuzz	&& myconf_gn+=( skia_use_system_harfbuzz=true )
-#	use icu		&& myconf_gn+=( skia_use_system_icu=true )
-	use jpeg	&& myconf_gn+=( skia_use_system_libjpeg_turbo=true )
-#	use lua		&& myconf_gn+=( skia_use_system_lua=true )
-	use png		&& myconf_gn+=( skia_use_system_libpng=true )
-	use webp	&& myconf_gn+=( skia_use_system_libwebp=true )
-	use zlib	&& myconf_gn+=( skia_use_system_zlib=true )
-
-	myconf_gn="${myconf_gn[@]} ${EXTRA_GN}"
-	set -- gn gen --args="${myconf_gn% }" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	eninja -C out/Release
-}
-
-src_install() {
-	dolib.so out/Release/*.so
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-}