| 1 |
commit: c52485a2413414510b9239a0b8e89bae5834c18d |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 04:52:23 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 04:52:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52485a2 |
| 7 |
|
| 8 |
www-plugins/chrome-binary-plugins: change install location |
| 9 |
|
| 10 |
Install in /usr/lib64/chromium, where they may be detected by QtWebEngine. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/592896 |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0_p24 |
| 15 |
|
| 16 |
.../chrome-binary-plugins-53.0.2785.92.ebuild | 7 ++++--- |
| 17 |
.../chrome-binary-plugins-53.0.2785.92_beta.ebuild | 9 +++++---- |
| 18 |
.../chrome-binary-plugins-54.0.2840.8_alpha.ebuild | 6 +++--- |
| 19 |
3 files changed, 12 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild |
| 22 |
index 94dadcf..2757b38 100644 |
| 23 |
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild |
| 24 |
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild |
| 25 |
@@ -53,10 +53,11 @@ pkg_nofetch() { |
| 26 |
src_install() { |
| 27 |
local version flapper |
| 28 |
|
| 29 |
- insinto /usr/$(get_libdir)/chromium-browser/ |
| 30 |
+ insinto /usr/$(get_libdir)/chromium |
| 31 |
|
| 32 |
if use widevine; then |
| 33 |
- doins libwidevinecdm.so |
| 34 |
+ doins libwidevinecdm.so libwidevinecdmadapter.so |
| 35 |
+ dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so |
| 36 |
strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version |
| 37 |
doins widevine.version |
| 38 |
fi |
| 39 |
@@ -67,7 +68,7 @@ src_install() { |
| 40 |
# Since this is a live ebuild, we're forced to, unfortuantely, |
| 41 |
# dynamically construct the command line args for Chromium. |
| 42 |
version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json) |
| 43 |
- flapper="${EPREFIX}/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so" |
| 44 |
+ flapper="${EPREFIX}/usr/$(get_libdir)/chromium/PepperFlash/libpepflashplayer.so" |
| 45 |
echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash |
| 46 |
echo -n "--ppapi-flash-path=$flapper " >> pepper-flash |
| 47 |
echo "--ppapi-flash-version=$version\"" >> pepper-flash |
| 48 |
|
| 49 |
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild |
| 50 |
index 07c207f..2757b38 100644 |
| 51 |
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild |
| 52 |
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild |
| 53 |
@@ -31,7 +31,7 @@ MY_PN="google-chrome-${SLOT}" |
| 54 |
MY_P="${MY_PN}_${MY_PV}" |
| 55 |
|
| 56 |
SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" |
| 57 |
-KEYWORDS="-* ~amd64" |
| 58 |
+KEYWORDS="-* amd64" |
| 59 |
|
| 60 |
LICENSE="google-chrome" |
| 61 |
IUSE="+flash +widevine" |
| 62 |
@@ -53,10 +53,11 @@ pkg_nofetch() { |
| 63 |
src_install() { |
| 64 |
local version flapper |
| 65 |
|
| 66 |
- insinto /usr/$(get_libdir)/chromium-browser/ |
| 67 |
+ insinto /usr/$(get_libdir)/chromium |
| 68 |
|
| 69 |
if use widevine; then |
| 70 |
- doins libwidevinecdm.so |
| 71 |
+ doins libwidevinecdm.so libwidevinecdmadapter.so |
| 72 |
+ dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so |
| 73 |
strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version |
| 74 |
doins widevine.version |
| 75 |
fi |
| 76 |
@@ -67,7 +68,7 @@ src_install() { |
| 77 |
# Since this is a live ebuild, we're forced to, unfortuantely, |
| 78 |
# dynamically construct the command line args for Chromium. |
| 79 |
version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json) |
| 80 |
- flapper="${EPREFIX}/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so" |
| 81 |
+ flapper="${EPREFIX}/usr/$(get_libdir)/chromium/PepperFlash/libpepflashplayer.so" |
| 82 |
echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash |
| 83 |
echo -n "--ppapi-flash-path=$flapper " >> pepper-flash |
| 84 |
echo "--ppapi-flash-version=$version\"" >> pepper-flash |
| 85 |
|
| 86 |
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild |
| 87 |
index d7fd45a..27b7eea 100644 |
| 88 |
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild |
| 89 |
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild |
| 90 |
@@ -53,10 +53,10 @@ pkg_nofetch() { |
| 91 |
src_install() { |
| 92 |
local version |
| 93 |
|
| 94 |
- insinto /usr/$(get_libdir)/chromium-browser/ |
| 95 |
- |
| 96 |
+ insinto /usr/$(get_libdir)/chromium |
| 97 |
if use widevine; then |
| 98 |
- doins libwidevinecdm.so |
| 99 |
+ doins libwidevinecdm.so libwidevinecdmadapter.so |
| 100 |
+ dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so |
| 101 |
strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version |
| 102 |
doins widevine.version |
| 103 |
fi |
Archives