net-www/inox*: bump to 61.0.3163.100

This commit is contained in:
2017-10-12 22:47:58 +02:00
parent e7fac8a7b0
commit a9b6c0f0f5
5 changed files with 38 additions and 80 deletions

View File

@@ -1,19 +0,0 @@
Source: Gentoo
Upstream: Unknown
Reason: Fix compile failure with GCC on CPUs supporting AVX2
Disable AVX2 code to prevent build failure with GCC
Bug: https://bugs.gentoo.org/608640
--- a/third_party/skia/include/core/SkPreConfig.h
+++ b/third_party/skia/include/core/SkPreConfig.h
@@ -125,7 +125,7 @@
// These checks must be done in descending order to ensure we set the highest
// available SSE level.
#if defined(__AVX2__)
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX2
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX
#elif defined(__AVX__)
#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX
#elif defined(__SSE4_2__)

View File

@@ -1,20 +0,0 @@
import("//build/toolchain/gcc_toolchain.gni")
gcc_toolchain("default") {
cc = getenv("CC")
cxx = getenv("CXX")
ar = getenv("AR")
nm = getenv("NM")
ld = cxx
extra_cflags = getenv("CFLAGS")
extra_cppflags = getenv("CPPFLAGS")
extra_cxxflags = getenv("CXXFLAGS")
extra_ldflags = getenv("LDFLAGS")
toolchain_args = {
current_cpu = current_cpu
current_os = current_os
}
}

View File

@@ -13,31 +13,16 @@ PLATFORMS="~amd64 ~x86"
RESTRICT=test
# Temponary fix, chromium doesn't package freetype2 anymore
# https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
DOWNLOADS+="
https://chromium.googlesource.com/chromium/src/third_party/freetype2/+archive/5a3490e054bda8a318ebde482.tar.gz -> \
freetype2-5a3490e054bda8a318ebde482.tar.gz"
DEPENDENCIES+="
suggestion:
net-www/inox-widevine-plugin [[ description = [ Content Decryption Module plugin required for e.g. Netflix ] ]]
"
# http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${PV}-1_amd64.deb
# $ ar -x google-chrome-stable_${PV}-1_amd64.deb
# $ tar xf data.tar.xz
# $ strings ./opt/google/chrome/chrome | grep -C 1 " (version:" | head -n 1
WIDEVINE_VERSION=1.4.8.977
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PN}-58.0.3029.81-skia-avx2.patch
)
src_unpack() {
unpack chromium-${PV}.tar.xz
unpack inox-patches-${PATCHSET}.tar.gz
# Temponary fix, chromium doesn't package freetype2 anymore
edo mkdir "${WORK}"/third_party/freetype/src
edo cd "${WORK}"/third_party/freetype/src
unpack freetype2-5a3490e054bda8a318ebde482.tar.gz
}
WIDEVINE_VERSION=1.4.8.1008
src_prepare() {
inox_src_prepare