vivaldi-ffmpeg-codecs :: 69.0.3497.100-1

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

3 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d83fbdd2c2cc..f8f98ec0f004 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Apr 25 13:55:24 UTC 2018
+# Wed Sep 26 08:17:37 UTC 2018
 pkgbase = vivaldi-ffmpeg-codecs
 	pkgdesc = additional support for proprietary codecs for vivaldi
-	pkgver = 65.0.3325.184
+	pkgver = 69.0.3497.100
 	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -15,14 +15,12 @@ pkgbase = vivaldi-ffmpeg-codecs
 	makedepends = pciutils
 	makedepends = python2
 	makedepends = xdg-utils
-	makedepends = ncurses5-compat-libs
+	makedepends = gn
 	depends = glibc
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.184.tar.xz
-	source = chromium-last-commit-position-r1.patch
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-69.0.3497.100.tar.xz
 	source = chromium-FORTIFY_SOURCE-r2.patch
-	sha512sums = f1db95a63f58e1505d9a0a89e0aa95789b1ebb4b1049b607821ad693a82e44557c9fadc5ae48a5d42b97fd34418b49d850fa5bc43a44cc3dd7b58ded9d3e8f95
-	sha512sums = 8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41
+	sha512sums = bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
 	sha512sums = 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c
 
 pkgname = vivaldi-ffmpeg-codecs
diff --git a/.pkgupdate b/.pkgupdate
deleted file mode 100644
index cf6126699824..000000000000
--- a/.pkgupdate
+++ /dev/null
@@ -1 +0,0 @@
-update_pkgver="65.0.3325.183"
diff --git a/PKGBUILD b/PKGBUILD
index 28400ec780a9..bf05bc90dba9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=vivaldi-ffmpeg-codecs
-pkgver=65.0.3325.184
+pkgver=69.0.3497.100
 pkgrel=1
 pkgdesc="additional support for proprietary codecs for vivaldi"
 arch=('x86_64')
@@ -10,16 +10,14 @@ license=('LGPL2.1')
 depends=('glibc')
 makedepends=(
   'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
-  'xdg-utils' 'ncurses5-compat-libs'
+  'xdg-utils' 'gn'
 )
 options=('!strip')
 source=(
   "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
-  'chromium-last-commit-position-r1.patch'
   'chromium-FORTIFY_SOURCE-r2.patch'
 )
-sha512sums=('f1db95a63f58e1505d9a0a89e0aa95789b1ebb4b1049b607821ad693a82e44557c9fadc5ae48a5d42b97fd34418b49d850fa5bc43a44cc3dd7b58ded9d3e8f95'
-            '8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
+sha512sums=('bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f'
             '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c')
 
 prepare() {
@@ -33,21 +31,29 @@ prepare() {
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
   patch -p1 -i "$srcdir/chromium-FORTIFY_SOURCE-r2.patch"
 }
 
 build() {
   cd "$srcdir/chromium-$pkgver"
 
-  python2 tools/clang/scripts/update.py --without-android
+  #python2 tools/clang/scripts/update.py --without-android
 
-  export PATH="$srcdir/path:$PATH"
+  #export PATH="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin:$srcdir/path:$PATH"
 
-  local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=true clang_use_chrome_plugins=true is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
+  #export CC="clang"
+  #export CXX="clang++"
 
-  python2 tools/gn/bootstrap/bootstrap.py -v -s
-  out/Release/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
+  local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
+
+  #(
+    #cd third_party/ffmpeg
+    #chromium/scripts/build_ffmpeg.py linux x64 --branding ChromeOS
+    #chromium/scripts/copy_config.sh
+    #chromium/scripts/generate_gn.py
+  #)
+
+  gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
 
   ninja -C out/Release -v media/ffmpeg
 }