vivaldi-snapshot :: 1.0.298.15-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>

3 files changed, 41 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2193f6e1c4e6..543ac2ff244b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vivaldi-snapshot
 	pkgdesc = An advanced browser made with the power user in mind. (weekly snapshot)
-	pkgver = 1.0.291.18
+	pkgver = 1.0.298.15
 	pkgrel = 1
 	url = https://vivaldi.com
 	install = vivaldi.install
@@ -17,12 +17,16 @@ pkgbase = vivaldi-snapshot
 	depends = desktop-file-utils
 	depends = shared-mime-info
 	depends = alsa-lib
+	optdepends = vivaldi-ffmpeg-codecs: playback of proprietary video/audio
+	optdepends = google-chrome: Widevine DRM Plugin
 	options = !strip
 	options = !zipman
-	source_i686 = https://vivaldi.com/download/snapshot/vivaldi-snapshot-1.0.291.18-1.i386.rpm
-	sha256sums_i686 = 6faa82caf153c691be5f94a1483da376f838c0bc5f15d3ed69aceb8d04d904dd
-	source_x86_64 = https://vivaldi.com/download/snapshot/vivaldi-snapshot-1.0.291.18-1.x86_64.rpm
-	sha256sums_x86_64 = cbda3e09389414183c47345ddc262b753a1ead3ef751322713aee0fbe0cbe266
+	source = vivaldi-ffmpeg-codecs.patch
+	sha256sums = 690ded55e6fc87a3fc6e1e89324eeedab68d0990d213b0b3362318da3f343379
+	source_i686 = https://vivaldi.com/download/snapshot/vivaldi-snapshot-1.0.298.15-1.i386.rpm
+	sha256sums_i686 = 4b5b4b4a3b3d192a4cb8cc351d58534650d5465d3a7ef1707d9edf2d3fcc059b
+	source_x86_64 = https://vivaldi.com/download/snapshot/vivaldi-snapshot-1.0.298.15-1.x86_64.rpm
+	sha256sums_x86_64 = f12afe7c2e99db5dc8bc2b4a665e06aa1b46fd8a35e2163106f0a0a1ff2c7d26
 
 pkgname = vivaldi-snapshot
 
diff --git a/PKGBUILD b/PKGBUILD
index 2c8fbbc55428..a744fdab7c0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: TZ86
 
 pkgname=vivaldi-snapshot
-pkgver=1.0.291.18
+pkgver=1.0.298.15
 pkgrel=1
 pkgdesc='An advanced browser made with the power user in mind. (weekly snapshot)'
 url="https://vivaldi.com"
@@ -11,10 +11,16 @@ options=(!strip !zipman)
 license=('custom')
 arch=('i686' 'x86_64')
 depends=('gtk2' 'nss' 'libxtst' 'gconf' 'libxss' 'freetype2' 'ttf-font' 'desktop-file-utils' 'shared-mime-info' 'alsa-lib')
+optdepends=(
+    'vivaldi-ffmpeg-codecs: playback of proprietary video/audio'
+    'google-chrome: Widevine DRM Plugin'
+)
+source=('vivaldi-ffmpeg-codecs.patch')
 source_i686=("https://vivaldi.com/download/snapshot/vivaldi-snapshot-${pkgver}-1.i386.rpm")
 source_x86_64=("https://vivaldi.com/download/snapshot/vivaldi-snapshot-${pkgver}-1.x86_64.rpm")
-sha256sums_i686=('6faa82caf153c691be5f94a1483da376f838c0bc5f15d3ed69aceb8d04d904dd')
-sha256sums_x86_64=('cbda3e09389414183c47345ddc262b753a1ead3ef751322713aee0fbe0cbe266')
+sha256sums=('690ded55e6fc87a3fc6e1e89324eeedab68d0990d213b0b3362318da3f343379')
+sha256sums_i686=('4b5b4b4a3b3d192a4cb8cc351d58534650d5465d3a7ef1707d9edf2d3fcc059b')
+sha256sums_x86_64=('f12afe7c2e99db5dc8bc2b4a665e06aa1b46fd8a35e2163106f0a0a1ff2c7d26')
 
 package() {
     cp -a {opt,usr} "$pkgdir"
@@ -27,5 +33,9 @@ package() {
         install -Dm644 "$pkgdir/opt/vivaldi-snapshot/product_logo_${res}.png" \
             "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi-snapshot.png"
     done
+
+    # allow playback of proprietary video/audio when alternative ffmpeg.so is installed
+    cd "$pkgdir"
+    patch -p1 -i "$srcdir/vivaldi-ffmpeg-codecs.patch"
 }
 
diff --git a/vivaldi-ffmpeg-codecs.patch b/vivaldi-ffmpeg-codecs.patch
new file mode 100644
index 000000000000..ecff1323ac0d
--- /dev/null
+++ b/vivaldi-ffmpeg-codecs.patch
@@ -0,0 +1,19 @@
+--- /opt/vivaldi-snapshot/vivaldi-snapshot.orig	2015-10-09 14:26:29.000000000 +0200
++++ /opt/vivaldi-snapshot/vivaldi-snapshot	2015-10-14 22:57:07.503932016 +0200
+@@ -45,13 +45,9 @@
+ fi
+ 
+ # Find libffmpeg.so with additional codecs.
+-CHR_CODECS_CH="/usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz"
+-if [ -r $CHR_CODECS_CH ]; then
+-  CHR_CODECS_VER=$(gzip -cd $CHR_CODECS_CH |
+-    sed -n '1s/chromium-browser (\(\([0-9]\+\.\)\{3\}\).*/\1/p')
+-  if [ "$CHR_CODECS_VER" = "45.0.2454." ]; then
+-    FFMPEG_LD_LIBRARY_PATH=":/usr/lib/chromium-browser/libs"
+-  fi
++VIV_CODECS_SO="/usr/lib/vivaldi-ffmpeg-codecs/libffmpeg.so"
++if [ -r "$VIV_CODECS_SO" ]; then
++  FFMPEG_LD_LIBRARY_PATH=":/usr/lib/vivaldi-ffmpeg-codecs"
+ fi
+ # Set LD_LIBRARY_PATH to prefer our libs, excluding $HERE/lib/libffmpeg.so if
+ # an alternative ffmpeg was found.