From 60469b5e673b5844fcbd7fb5f1de68497c7f325d Mon Sep 17 00:00:00 2001 From: "Sascha Kuehndel (InuSasha)" Date: Thu, 14 Dec 2017 16:48:20 +0100 Subject: [PATCH] chromium: drop pre_make_target we have make_target, already --- packages/addons/browser/chromium/package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk index aa4a98752e..ac610338e5 100644 --- a/packages/addons/browser/chromium/package.mk +++ b/packages/addons/browser/chromium/package.mk @@ -26,7 +26,7 @@ PKG_ARCH="x86_64" PKG_LICENSE="Mixed" PKG_SITE="http://www.chromium.org/Home" PKG_URL="https://commondatastorage.googleapis.com/chromium-browser-official/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_HOST="toolchain ninja:host" +PKG_DEPENDS_HOST="toolchain ninja:host Python:host" PKG_DEPENDS_TARGET="chromium:host pciutils dbus libXcomposite libXcursor libXtst alsa-lib bzip2 yasm nss libXScrnSaver libexif libpng harfbuzz atk gtk+ libva-vdpau-driver unclutter xdotool" PKG_SECTION="browser" PKG_SHORTDESC="Chromium Browser: the open-source web browser from Google" @@ -39,8 +39,13 @@ PKG_ADDON_TYPE="xbmc.python.script" PKG_ADDON_PROVIDES="executable" post_patch() { + cd $(get_build_dir chromium) + # Use Python 2 - find $(get_build_dir chromium) -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$TOOLCHAIN/bin/python|g" {} + + find . -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$TOOLCHAIN/bin/python|g" {} + + + # set correct widevine + sed -i -e 's/@WIDEVINE_VERSION@/Pinkie Pie/' ./third_party/widevine/cdm/stub/widevine_cdm_version.h } make_host() { @@ -51,13 +56,8 @@ makeinstall_host() { : } -pre_make_target() { - strip_lto - - sed -i -e 's/@WIDEVINE_VERSION@/Pinkie Pie/' third_party/widevine/cdm/stub/widevine_cdm_version.h -} - make_target() { + strip_lto export LDFLAGS="$LDFLAGS -ludev" export LD=$CXX