Switch back to extracting from Chrome

2 files changed, 22 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47f868611fa9..29b61112e19f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = chromium-widevine
 	pkgdesc = A browser plugin designed for the viewing of premium video content
-	pkgver = 1.4.8.1008
+	pkgver = 1.4.8.1029
 	pkgrel = 1
 	epoch = 1
 	url = https://www.widevine.com/
-	arch = i686
 	arch = x86_64
 	license = custom
 	options = !strip
-	source_i686 = https://dl.google.com/widevine-cdm/1.4.8.1008-linux-ia32.zip
-	sha256sums_i686 = a8e65d5fd65587d1debecf6df855689805ea36b02034042de4d039f0519a1c88
-	source_x86_64 = https://dl.google.com/widevine-cdm/1.4.8.1008-linux-x64.zip
-	sha256sums_x86_64 = fe04a5b56eac6674f1eda2c8eb28a0183ec1a66d80f72db618291e33078eb17d
+	source = chrome-eula_text.html::https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html
+	source = https://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/google-chrome-stable_62.0.3202.89-1_amd64.deb
+	sha256sums = e93c01576427cad9099f2cf0df0be70d0a2cc0a3a66c743318b2138aa7c4ed93
+	sha256sums = b9b9a34cc9bf625d8251b1142881524409f2132d29c59853afa7e033dacf8b16
 
 pkgname = chromium-widevine
 	depends = chromium
diff --git a/PKGBUILD b/PKGBUILD
index 0dfdc407269d..8e543ca1c6a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,30 @@
 
 pkgname=chromium-widevine
 pkgdesc='A browser plugin designed for the viewing of premium video content'
-pkgver=1.4.8.1008
+pkgver=1.4.8.1029
+_chrome_ver=62.0.3202.89
 pkgrel=1
 epoch=1
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.widevine.com/'
 license=('custom')
 options=('!strip')
-source_i686=("https://dl.google.com/widevine-cdm/$pkgver-linux-ia32.zip")
-source_x86_64=("https://dl.google.com/widevine-cdm/$pkgver-linux-x64.zip")
-sha256sums_i686=('a8e65d5fd65587d1debecf6df855689805ea36b02034042de4d039f0519a1c88')
-sha256sums_x86_64=('fe04a5b56eac6674f1eda2c8eb28a0183ec1a66d80f72db618291e33078eb17d')
+source=('chrome-eula_text.html::https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html'
+        "https://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${_chrome_ver}-1_amd64.deb")
+sha256sums=('e93c01576427cad9099f2cf0df0be70d0a2cc0a3a66c743318b2138aa7c4ed93'
+            'b9b9a34cc9bf625d8251b1142881524409f2132d29c59853afa7e033dacf8b16')
+
+prepare() {
+  bsdtar -xf data.tar.xz opt/google/chrome/{chrome,libwidevinecdm.so}
+}
+
+pkgver() {
+  awk 'match($0,/\(version: \0?([0-9.]+)/,a) {print a[1];}' opt/google/chrome/chrome
+}
 
 package() {
   depends=('chromium' 'gcc-libs' 'glib2' 'glibc' 'nspr' 'nss')
 
-  install -Dm644 libwidevinecdm.so -t "$pkgdir/usr/lib/chromium/"
-  install -Dm644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -Dm644 opt/google/chrome/libwidevinecdm.so -t "$pkgdir/usr/lib/chromium/"
+  install -Dm644 chrome-eula_text.html "$pkgdir/usr/share/licenses/$pkgname/eula_text.html"
 }