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

2022-05-29 Thread Alessandro Barbieri 
commit: 3c6a43c6e1c3baa9ac5053aad4c5abb50207f306
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun May 29 21:01:27 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun May 29 21:04:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c6a43c6

media-libs/skia: add subslot

Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/Manifest | 2 +-
 media-libs/skia/{skia-97-r1.ebuild => skia-97-r2.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/skia/Manifest b/media-libs/skia/Manifest
index 184ea284c..3595db41e 100644
--- a/media-libs/skia/Manifest
+++ b/media-libs/skia/Manifest
@@ -1 +1 @@
-DIST skia-97.tar.gz 55736513 BLAKE2B 
a3fddcab23b395e884b64179577c0e88b22c5580c484b79ce11a598ea8822fe797248071ca638541c9146f6752d93e99d9effb7e3499cf1f1efd75e375f9d3d5
 SHA512 
c30cd68fd69cbe998c04db8a9d7d201fefa2e72541745a1216a51bde809152c11f53fd3ba66a5c7bfb971c090e5eecc2be50a3cf013645052c2c447bf70d5f7a
+DIST skia-97.gh.tar.gz 55736513 BLAKE2B 
a3fddcab23b395e884b64179577c0e88b22c5580c484b79ce11a598ea8822fe797248071ca638541c9146f6752d93e99d9effb7e3499cf1f1efd75e375f9d3d5
 SHA512 
c30cd68fd69cbe998c04db8a9d7d201fefa2e72541745a1216a51bde809152c11f53fd3ba66a5c7bfb971c090e5eecc2be50a3cf013645052c2c447bf70d5f7a

diff --git a/media-libs/skia/skia-97-r1.ebuild 
b/media-libs/skia/skia-97-r2.ebuild
similarity index 99%
rename from media-libs/skia/skia-97-r1.ebuild
rename to media-libs/skia/skia-97-r2.ebuild
index 4c190e20b..6dbe9973c 100644
--- a/media-libs/skia/skia-97-r1.ebuild
+++ b/media-libs/skia/skia-97-r2.ebuild
@@ -15,12 +15,12 @@ HOMEPAGE="
https://skia.org
https://github.com/google/skia
 "
-SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 KEYWORDS="~amd64"
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+ccpr debug ffmpeg +fontconfig +freetype gpu +harfbuzz +icu jit +jpeg 
+lottie lua opencl +opengl +pdf +png +rive svg vulkan +webp +zlib +X +xml"
 #TODO: find out how to enable and link: angle dawn piex sfntly wuffs

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

2022-05-29 Thread Alessandro Barbieri 
commit: 4298d9fab1b98cf542a633f700f4191df54df855
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun May 29 20:59:03 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun May 29 21:04:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4298d9fa

media-libs/skia: drop 97

Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/skia-97.ebuild | 151 -
 1 file changed, 151 deletions(-)

diff --git a/media-libs/skia/skia-97.ebuild b/media-libs/skia/skia-97.ebuild
deleted file mode 100644
index ff47d59f2..0
--- a/media-libs/skia/skia-97.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="f2093bf1b076210bd017f237eaab84ea4d3d6771"
-
-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=""
-#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
-#  ffmpeg? ( virtual/ffmpeg )
-#  heif? ( media-libs/libheif )
-#  icu? ( dev-libs/icu )
-#  virtual/opengl
-#  lua? ( dev-lang/lua )
-#  opencl? ( virtual/opencl )
-RDEPEND="
-   app-arch/bzip2
-   dev-libs/expat
-   dev-libs/libbsd
-   dev-libs/libpcre
-   media-gfx/graphite2
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/harfbuzz[icu]
-   media-libs/libglvnd[X]
-   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}
-   ${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 "${LDFLAGS}" ldflags
-
-   myconf_gn+=(
-   ar=\"${AR}\"
-   cc=\"${CC}\"
-   cxx=\"${CXX}\"
-   is_component_build=true
-   is_official_build=true
-   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)
-#
-#  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_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)
-#

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

2022-05-29 Thread Alessandro Barbieri 
commit: 8735d9ef019819a26f54c8432723dec8dda93f56
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun May 29 21:00:32 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun May 29 21:04:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8735d9ef

media-libs/skia: enable py3.10, py3.11

Closes: https://bugs.gentoo.org/848384
Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/skia-97-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/skia/skia-97-r1.ebuild 
b/media-libs/skia/skia-97-r1.ebuild
index fd289b368..4c190e20b 100644
--- a/media-libs/skia/skia-97-r1.ebuild
+++ b/media-libs/skia/skia-97-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit ninja-utils python-any-r1 toolchain-funcs

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

2022-03-10 Thread Alessandro Barbieri 
commit: 3d10bcaf4ad74752d3de70c0e604936811a5dd4d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Mar 10 18:22:09 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Mar 10 18:23:29 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d10bcaf

media-libs/skia: fix useflags

Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/metadata.xml  | 2 ++
 media-libs/skia/skia-97-r1.ebuild | 8 
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-libs/skia/metadata.xml b/media-libs/skia/metadata.xml
index c4eacab6f..c9c4a6c8a 100644
--- a/media-libs/skia/metadata.xml
+++ b/media-libs/skia/metadata.xml
@@ -12,10 +12,12 @@ Skia is an open source 2D graphics library which provides 
common APIs that work
   
 enable coverage counting path renderer
 enable media-libs/freetype support
+enable GPU backend
 enable media-libs/harfbuzz support
 Play back bodymovin lottie files
 enable opencl support
 enable support for rive files
+enable support for SVG files
 enable vulkan backend
   
 

diff --git a/media-libs/skia/skia-97-r1.ebuild 
b/media-libs/skia/skia-97-r1.ebuild
index cf53c41df..fd289b368 100644
--- a/media-libs/skia/skia-97-r1.ebuild
+++ b/media-libs/skia/skia-97-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 KEYWORDS="~amd64"
 LICENSE="BSD"
 SLOT="0"
-IUSE="+ccpr debug ffmpeg +fontconfig +freetype +harfbuzz +icu jit +jpeg 
+lottie lua opencl +opengl +pdf +png +rive vulkan +webp +zlib +X +xml"
+IUSE="+ccpr debug ffmpeg +fontconfig +freetype gpu +harfbuzz +icu jit +jpeg 
+lottie lua opencl +opengl +pdf +png +rive svg vulkan +webp +zlib +X +xml"
 #TODO: find out how to enable and link: angle dawn piex sfntly wuffs
 
 CDEPEND="
@@ -92,10 +92,11 @@ src_configure() {
ar=\"${AR}\"
cc=\"${CC}\"
cxx=\"${CXX}\"
-   is_component_build=false
+   is_component_build=true
is_official_build=true
is_shared_library=true
skia_build_fuzzers=false
+   skia_compile_processors = true
skia_compile_sksl_tests=false
skia_enable_android_utils=false #android
skia_enable_api_available_macro = true
@@ -128,8 +129,7 @@ src_configure() {
skia_use_wuffs=false #todo
skia_use_xps=false #windows
 
-   skia_compile_processors = $(usex processors true false)
-   skia_enable_ccpr=$(usex cppr true false)
+   skia_enable_ccpr=$(usex ccpr true false)
skia_enable_gpu=$(usex gpu true false)
skia_enable_gpu_debug_layers=$(usex debug true false)
skia_enable_pdf=$(usex pdf true false)

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

2022-03-09 Thread Alessandro Barbieri 
commit: 49e50a8a5c03b15294661dc6f1bccbd1f9fabdaf
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Mar 10 00:39:20 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Mar 10 01:05:46 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=49e50a8a

media-libs/skia: update EAPI 7 -> 8

Signed-off-by: Alessandro Barbieri  gmail.com>

 .../skia/files/skia-97-questionable-flags.patch|  52 +
 .../skia/files/skia-97-system-skcms-headers.patch  | 232 +
 media-libs/skia/files/skia-97-system-skcms.patch   |  52 +
 media-libs/skia/files/skia-97-system-vulkan.patch  | 101 +
 media-libs/skia/files/skia-97-system-zlib.patch|  16 ++
 media-libs/skia/metadata.xml   |  11 +-
 media-libs/skia/skia-97-r1.ebuild  | 213 +++
 7 files changed, 675 insertions(+), 2 deletions(-)

diff --git a/media-libs/skia/files/skia-97-questionable-flags.patch 
b/media-libs/skia/files/skia-97-questionable-flags.patch
new file mode 100644
index 0..ee1aaea7e
--- /dev/null
+++ b/media-libs/skia/files/skia-97-questionable-flags.patch
@@ -0,0 +1,52 @@
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
+@@ -335,7 +335,7 @@
+ config("no_exceptions") {
+   # Exceptions are disabled by default on Windows.  (Use /EHsc to enable 
them.)
+   if (!is_win) {
+-cflags_cc = [ "-fno-exceptions" ]
++cflags_cc = [ "" ]
+   }
+ }
+ 
+@@ -572,7 +572,7 @@
+ if (is_win) {
+   cflags_cc = [ "/GR-" ]
+ } else {
+-  cflags_cc = [ "-fno-rtti" ]
++  cflags_cc = [ "" ]
+ }
+   }
+ }
+@@ -592,10 +592,6 @@
+ if (is_mac || is_ios) {
+   ldflags = [ "-dead_strip" ]
+ } else {
+-  cflags += [
+-"-fdata-sections",
+-"-ffunction-sections",
+-  ]
+   ldflags = [ "-Wl,--gc-sections" ]
+ }
+ if (target_cpu == "wasm") {
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
+@@ -358,7 +358,6 @@
+ -DSK_DISABLE_AAA \
+ -DSK_FORCE_8_BYTE_ALIGNMENT \
+ -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
+--fno-rtti \
+ $WASM_GPU \
+ $WASM_PATHOPS \
+ $WASM_RT_SHADER \
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
+@@ -113,7 +113,7 @@
+ --no-entry \
+ --pre-js $BASE_DIR/helper.js \
+ --pre-js $BASE_DIR/chaining.js \
+--fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
++-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
+ $WASM_CONF \
+ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
+ -s EXPORT_NAME="PathKitInit" \

diff --git a/media-libs/skia/files/skia-97-system-skcms-headers.patch 
b/media-libs/skia/files/skia-97-system-skcms-headers.patch
new file mode 100644
index 0..c46b77276
--- /dev/null
+++ b/media-libs/skia/files/skia-97-system-skcms-headers.patch
@@ -0,0 +1,232 @@
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
+@@ -28,7 +28,7 @@
+ #include "include/ports/SkImageGeneratorWIC.h"
+ #include "include/private/SkImageInfoPriv.h"
+ #include "include/private/SkTLogic.h"
+-#include "include/third_party/skcms/skcms.h"
++#include "skcms.h"
+ #include "include/utils/SkNullCanvas.h"
+ #include "include/utils/SkPaintFilterCanvas.h"
+ #include "include/utils/SkRandom.h"
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
 
skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
+@@ -130,7 +130,7 @@
+ $RELEASE_CONF \
+ -I. \
+ -Ithird_party/icu \
+--Ithird_party/skcms \
++-lskcms \
+ -DSK_DISABLE_AAA \
+ -DSK_FORCE_8_BYTE_ALIGNMENT \
+ -std=c++17 \
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
+@@ -22,7 +22,7 @@
+ #include "include/core/SkString.h"
+ #include "include/core/SkSurface.h"
+ #include "include/core/SkTileMode.h"
+-#include "include/third_party/skcms/skcms.h"
++#include "skcms.h"
+ 
+ #include 
+ 
+--- 
/var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
 skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
+@@ -23,7 +23,7 @@
+ #include "include/core/SkString.h"
+ #include "include/core/SkTypes.h"
+ #include "include/gpu/GrDirectContext.h"
+-#include "include/third_party/skcms/skcms.h"
++#include

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

2021-10-09 Thread Theo Anderson 
commit: 7ae9d02e43e904432799a1d8d8bedbf88ddf2320
Author: James Beddek  posteo  de>
AuthorDate: Sat Oct  9 09:26:04 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Sat Oct  9 09:30:09 2021 +
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  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)

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

2021-05-05 Thread Alessandro Barbieri 
commit: 4da611f5da2b7afc65290b95dcd4ab5c3168226c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed May  5 07:32:20 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed May  5 07:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4da611f5

media-libs/skia: comaintainers welcome

Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/metadata.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-libs/skia/metadata.xml b/media-libs/skia/metadata.xml
index 5a8da9408..9cad69888 100644
--- a/media-libs/skia/metadata.xml
+++ b/media-libs/skia/metadata.xml
@@ -1,7 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
-
 
+  
+comaintainers welcome
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+  
   
 Skia is an open source 2D graphics library which provides common APIs that 
work across a variety of hardware and software platforms. It serves as the 
graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and 
Firefox OS, and many other products.

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

2021-04-24 Thread Alessandro Barbieri 
commit: 2f8fec9c5ffc7a743e73f466dd650d4e57438513
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Apr 24 18:51:15 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Apr 24 18:51:42 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f8fec9c

media-libs/skia: try to respect ldflags

Closes: https://bugs.gentoo.org/780981
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/skia/skia-80_p20191220-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-80_p20191220-r1.ebuild
index 8f876a980..4b6788080 100644
--- a/media-libs/skia/skia-80_p20191220-r1.ebuild
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -88,7 +88,7 @@ src_configure() {
}
passflags "${CFLAGS}" cflags_c
passflags "${CXXFLAGS}" cflags_cc
-   passflags "${CFLAGS}" ldflags
+   passflags "${LDFLAGS}" ldflags
 
myconf_gn+=(
ar=\"${AR}\"

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

2021-04-15 Thread Andrew Ammerlaan 
commit: d064df47e06b35da71c0daf6b58f6466dd8b8a73
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Thu Apr 15 12:43:41 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Thu Apr 15 12:43:41 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d064df47

media-libs/skia: remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  riseup.net>

 media-libs/skia/skia-80_p20191220.ebuild | 159 ---
 1 file changed, 159 deletions(-)

diff --git a/media-libs/skia/skia-80_p20191220.ebuild 
b/media-libs/skia/skia-80_p20191220.ebuild
deleted file mode 100644
index 05b6b9634..0
--- a/media-libs/skia/skia-80_p20191220.ebuild
+++ /dev/null
@@ -1,159 +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 toolchain-funcs
-
-#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"
-
-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=""
-#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
-#  ffmpeg? ( virtual/ffmpeg )
-#  heif? ( media-libs/libheif )
-#  icu? ( dev-libs/icu )
-#  virtual/opengl
-#  lua? ( dev-lang/lua )
-#  opencl? ( virtual/opencl )
-RDEPEND="
-   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[X]
-   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}
-   ${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
-
-   #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() {
-   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_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)
-#  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)
-#

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

2021-04-15 Thread Andrew Ammerlaan 
commit: ed485532fb1ac279611ac7057f699d01ade33288
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Thu Apr 15 12:40:19 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Thu Apr 15 12:40:19 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed485532

media-libs/skia: add missing dependency

Closes: https://bugs.gentoo.org/782943
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  riseup.net>

 media-libs/skia/skia-80_p20191220-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-80_p20191220-r1.ebuild
index 520dfec8d..8f876a980 100644
--- a/media-libs/skia/skia-80_p20191220-r1.ebuild
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -38,7 +38,7 @@ RDEPEND="
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype
-   media-libs/harfbuzz
+   media-libs/harfbuzz[icu]
media-libs/libglvnd[X]
media-libs/libjpeg-turbo
media-libs/libpng

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

2020-12-23 Thread Theo Anderson 
commit: f014db2c079312f4dc3063ce62176663d009de24
Author: Theo Anderson  posteo  de>
AuthorDate: Wed Dec 23 07:15:11 2020 +
Commit: Theo Anderson  posteo  de>
CommitDate: Wed Dec 23 07:15:11 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f014db2c

media-libs/skia: depend media-libs/libglvnd[X]

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>

 media-libs/skia/skia-80_p20191220-r1.ebuild | 2 +-
 media-libs/skia/skia-80_p20191220.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-80_p20191220-r1.ebuild
index 7f224415..520dfec8 100644
--- a/media-libs/skia/skia-80_p20191220-r1.ebuild
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz
-   media-libs/libglvnd
+   media-libs/libglvnd[X]
media-libs/libjpeg-turbo
media-libs/libpng
media-libs/libwebp

diff --git a/media-libs/skia/skia-80_p20191220.ebuild 
b/media-libs/skia/skia-80_p20191220.ebuild
index 938bcfe2..05b6b963 100644
--- a/media-libs/skia/skia-80_p20191220.ebuild
+++ b/media-libs/skia/skia-80_p20191220.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz
-   media-libs/libglvnd
+   media-libs/libglvnd[X]
media-libs/libjpeg-turbo
media-libs/libpng
media-libs/libwebp

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

2020-11-23 Thread Theo Anderson 
commit: 3b65672bf79705a9926cbceaa475a960b5e49294
Author: Theo Anderson  posteo  de>
AuthorDate: Mon Nov 23 23:32:35 2020 +
Commit: Theo Anderson  posteo  de>
CommitDate: Mon Nov 23 23:32:35 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3b65672b

media-libs/skia: explicit inherit toolchain-funcs

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>

 media-libs/skia/skia-80_p20191220-r1.ebuild | 2 +-
 media-libs/skia/skia-80_p20191220.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-80_p20191220-r1.ebuild
index 708bfe37..7f224415 100644
--- a/media-libs/skia/skia-80_p20191220-r1.ebuild
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit ninja-utils python-any-r1
+inherit ninja-utils python-any-r1 toolchain-funcs
 
 #https://github.com/google/skia/blob/master/include/core/SkMilestone.h
 COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"

diff --git a/media-libs/skia/skia-80_p20191220.ebuild 
b/media-libs/skia/skia-80_p20191220.ebuild
index 7de65b68..938bcfe2 100644
--- a/media-libs/skia/skia-80_p20191220.ebuild
+++ b/media-libs/skia/skia-80_p20191220.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit ninja-utils python-any-r1
+inherit ninja-utils python-any-r1 toolchain-funcs
 
 #https://github.com/google/skia/blob/master/include/core/SkMilestone.h
 COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"

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

2020-04-30 Thread Alessandro Barbieri 
commit: 64def23e2b8cf1b4c810b6e2d95936f0c8bf803e
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Apr 29 14:47:50 2020 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Apr 30 19:17:22 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=64def23e

media-libs/skia: lift some restrictions

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

 media-libs/skia/skia-80_p20191220-r1.ebuild | 157 
 1 file changed, 157 insertions(+)

diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild 
b/media-libs/skia/skia-80_p20191220-r1.ebuild
new file mode 100644
index 000..708bfe3
--- /dev/null
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -0,0 +1,157 @@
+# 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="1c9ebb50024f80f3bf289838298e15185d8f6966"
+
+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=""
+#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
+#  ffmpeg? ( virtual/ffmpeg )
+#  heif? ( media-libs/libheif )
+#  icu? ( dev-libs/icu )
+#  virtual/opengl
+#  lua? ( dev-lang/lua )
+#  opencl? ( virtual/opencl )
+RDEPEND="
+   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}
+   ${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
+
+   #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() {
+   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_use_dng_sdk=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)
+#  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)
+#

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

2020-04-26 Thread Alessandro Barbieri 
commit: 751e25f4ab2a4e601145be84a9bc4953f90a1863
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Apr 26 20:37:21 2020 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Apr 26 20:38:53 2020 +
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  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.
   
-  
-use Dawn, a WebGPU implementation
-  
 

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 @@

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

2020-04-24 Thread Alessandro Barbieri 
commit: 9d1db4a3a02af5233999f88d1fc5f9b569f03ce5
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Apr 23 13:12:09 2020 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Apr 25 00:37:15 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d1db4a3

media-libs/skia: new package

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

 media-libs/skia/Manifest   |   1 +
 media-libs/skia/metadata.xml   |  13 
 media-libs/skia/skia-84.ebuild | 142 +
 3 files changed, 156 insertions(+)

diff --git a/media-libs/skia/Manifest b/media-libs/skia/Manifest
new file mode 100644
index 000..f1160cc
--- /dev/null
+++ b/media-libs/skia/Manifest
@@ -0,0 +1 @@
+DIST skia-84.tar.gz 46451124 BLAKE2B 
f64d5a4e66307ab99214e36be402064e75acd83d9f6e4957b52c3be3c1088feb92ac53ef6a15b94d3bbd74f5567c34146cc837e750c4867c02254a5ff258b2fb
 SHA512 
e2455d57db4de093b7ce5c0a9ef7260df7ad7bebbe7684e39153a4bd7c80169629bdb58163fec5ed304b1f8a846200ce7100a8d067540afee6eff6a230393542

diff --git a/media-libs/skia/metadata.xml b/media-libs/skia/metadata.xml
new file mode 100644
index 000..8e363d5
--- /dev/null
+++ b/media-libs/skia/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+  
+Skia is an open source 2D graphics library which provides common APIs that 
work across a variety of hardware and software platforms. It serves as the 
graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and 
Firefox OS, and many other products.
+
+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.
+  
+  
+use Dawn, a WebGPU implementation
+  
+

diff --git a/media-libs/skia/skia-84.ebuild b/media-libs/skia/skia-84.ebuild
new file mode 100644
index 000..ec24265
--- /dev/null
+++ b/media-libs/skia/skia-84.ebuild
@@ -0,0 +1,142 @@
+# 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
+
+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)
+

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

2020-04-24 Thread Alessandro Barbieri 
commit: fb7ccdc00a41e170fad5059449e82c565c9ff410
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Apr 25 00:30:33 2020 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Apr 25 00:37:17 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb7ccdc0

media-libs/skia: add skia-80

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

 media-libs/skia/Manifest   | 1 +
 media-libs/skia/{skia-84.ebuild => skia-80.ebuild} | 3 ++-
 media-libs/skia/skia-84.ebuild | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/skia/Manifest b/media-libs/skia/Manifest
index f1160cc..47b7b21 100644
--- a/media-libs/skia/Manifest
+++ b/media-libs/skia/Manifest
@@ -1 +1,2 @@
+DIST skia-80.tar.gz 35947943 BLAKE2B 
dd716b842f909cd0c1e7b7b6836762ec2dcd63d5d9e889f550926fe8927ef649b3255c0fb19901cfded421b015f7eb856ed2f3f09401596b82440b98d260ad6d
 SHA512 
748eab7b1afb8b1a9ceb6249ad045dfa52ada9133fb29aa333ca0a72f615304815b83811fd659a570c18acbd2e9a701f58f836adb31847f85c387a6386dbd804
 DIST skia-84.tar.gz 46451124 BLAKE2B 
f64d5a4e66307ab99214e36be402064e75acd83d9f6e4957b52c3be3c1088feb92ac53ef6a15b94d3bbd74f5567c34146cc837e750c4867c02254a5ff258b2fb
 SHA512 
e2455d57db4de093b7ce5c0a9ef7260df7ad7bebbe7684e39153a4bd7c80169629bdb58163fec5ed304b1f8a846200ce7100a8d067540afee6eff6a230393542

diff --git a/media-libs/skia/skia-84.ebuild b/media-libs/skia/skia-80.ebuild
similarity index 97%
copy from media-libs/skia/skia-84.ebuild
copy to media-libs/skia/skia-80.ebuild
index ec24265..1585976 100644
--- a/media-libs/skia/skia-84.ebuild
+++ b/media-libs/skia/skia-80.ebuild
@@ -7,7 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit ninja-utils python-any-r1
 
-COMMIT="2fc431eaea2979f6e6b20cdb715db8861d5a47b1"
+#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
+COMMIT="93e853bf2b832d13cb64194b90a8fec44544e518"
 
 SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 KEYWORDS="~amd64"

diff --git a/media-libs/skia/skia-84.ebuild b/media-libs/skia/skia-84.ebuild
index ec24265..610a193 100644
--- a/media-libs/skia/skia-84.ebuild
+++ b/media-libs/skia/skia-84.ebuild
@@ -7,6 +7,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"