Bump to v1.3.0 and sync from main Arch package

2 files changed, 56 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 344074513160..dba89078c712 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,61 +1,62 @@
 pkgbase = handbrake-fdkaac
-	pkgver = 1.2.2
+	pkgver = 1.3.0
 	pkgrel = 1
 	url = https://handbrake.fr/
 	arch = x86_64
 	license = GPL
 	makedepends = intltool
-	makedepends = python2
+	makedepends = python
 	makedepends = nasm
 	makedepends = wget
 	makedepends = cmake
-	makedepends = bzip2
-	makedepends = gcc-libs
-	makedepends = xz
-	makedepends = zlib
-	makedepends = libnotify
-	makedepends = gst-plugins-base
-	makedepends = gtk3
-	makedepends = dbus-glib
-	makedepends = libass
-	makedepends = lame
+	makedepends = meson
 	makedepends = libxml2
-	makedepends = opus
+	makedepends = libass
 	makedepends = libvorbis
-	makedepends = libtheora
-	makedepends = libsamplerate
+	makedepends = opus
 	makedepends = speex
+	makedepends = libtheora
+	makedepends = lame
 	makedepends = x264
 	makedepends = jansson
+	makedepends = libvpx
+	makedepends = libva
+	makedepends = numactl
+	makedepends = bzip2
+	makedepends = gcc-libs
+	makedepends = zlib
+	makedepends = xz
+	makedepends = gst-plugins-base
+	makedepends = gtk3
 	makedepends = librsvg
 	makedepends = libgudev
-	source = https://download.handbrake.fr/releases/1.2.2/HandBrake-1.2.2-source.tar.bz2
-	sha256sums = df6816f517d60ae8a6626aa731821af2d1966c155fa53b2b9a06c47f3c565e4c
+	source = https://download.handbrake.fr/releases/1.3.0/HandBrake-1.3.0-source.tar.bz2
+	sha256sums = a9a82eb5ca04a793705b3d7d11cefa29946694eeb13b40161446aaca35b31d96
 
 pkgname = handbrake-fdkaac
 	pkgdesc = Multithreaded video transcoder
-	depends = bzip2
-	depends = gcc-libs
-	depends = zlib
-	depends = gst-plugins-base
-	depends = libnotify
-	depends = dbus-glib
-	depends = gtk3
-	depends = xz
-	depends = libass
-	depends = lame
+	depends = desktop-file-utils
+	depends = hicolor-icon-theme
 	depends = libxml2
-	depends = opus
+	depends = libass
 	depends = libvorbis
-	depends = libtheora
-	depends = libsamplerate
+	depends = opus
 	depends = speex
+	depends = libtheora
+	depends = lame
 	depends = x264
 	depends = jansson
+	depends = libvpx
+	depends = libva
+	depends = numactl
+	depends = bzip2
+	depends = gcc-libs
+	depends = zlib
+	depends = xz
+	depends = gst-plugins-base
+	depends = gtk3
 	depends = librsvg
 	depends = libgudev
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
 	optdepends = gst-plugins-good: for video previews
 	optdepends = gst-libav: for video previews
 	optdepends = libdvdcss: for decoding encrypted DVDs
@@ -63,20 +64,22 @@ pkgname = handbrake-fdkaac
 
 pkgname = handbrake-cli-fdkaac
 	pkgdesc = Multithreaded video transcoder (CLI)
-	depends = bzip2
-	depends = gcc-libs
-	depends = zlib
-	depends = xz
-	depends = libass
-	depends = lame
 	depends = libxml2
-	depends = opus
+	depends = libass
 	depends = libvorbis
-	depends = libtheora
-	depends = libsamplerate
+	depends = opus
 	depends = speex
+	depends = libtheora
+	depends = lame
 	depends = x264
 	depends = jansson
+	depends = libvpx
+	depends = libva
+	depends = numactl
+	depends = bzip2
+	depends = gcc-libs
+	depends = zlib
+	depends = xz
 	optdepends = libdvdcss: for decoding encrypted DVDs
 	conflicts = handbrake-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index f0c6a15781c7..3ca134bbd9f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,26 @@
 # Contributor: Sebastien Piccand <sebcactus gmail com>
 
 pkgname=('handbrake-fdkaac' 'handbrake-cli-fdkaac')
-pkgver=1.2.2
+pkgver=1.3.0
 pkgrel=1
 arch=('x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
-makedepends=('intltool' 'python2' 'nasm' 'wget' 'cmake' 'bzip2' 'gcc-libs' 'xz'
-             'zlib' 'libnotify' 'gst-plugins-base' 'gtk3' 'dbus-glib' 'libass'
-             'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora' 'libsamplerate'
-             'speex' 'x264' 'jansson' 'librsvg' 'libgudev')
+_commondeps=('libxml2' 'libass' 'libvorbis' 'opus' 'speex' 'libtheora' 'lame'
+             'x264' 'jansson' 'libvpx' 'libva' 'numactl'
+             'bzip2' 'gcc-libs' 'zlib' 'xz')
+_guideps=('gst-plugins-base' 'gtk3' 'librsvg' 'libgudev')
+makedepends=('intltool' 'python' 'nasm' 'wget' 'cmake' 'meson'
+             "${_commondeps[@]}" "${_guideps[@]}")
 source=(https://download.handbrake.fr/releases/$pkgver/HandBrake-$pkgver-source.tar.bz2)
-sha256sums=('df6816f517d60ae8a6626aa731821af2d1966c155fa53b2b9a06c47f3c565e4c')
+sha256sums=('a9a82eb5ca04a793705b3d7d11cefa29946694eeb13b40161446aaca35b31d96')
 
 build() {
   cd "$srcdir/HandBrake-$pkgver"
 
   ./configure \
     --prefix=/usr \
-    --disable-gtk-update-checks \
+    --enable-qsv \
     --enable-fdk
   make -C build
 }
@@ -29,10 +31,8 @@ build() {
 package_handbrake-fdkaac() {
   pkgdesc="Multithreaded video transcoder"
   conflicts=('handbrake')
-  depends=('bzip2' 'gcc-libs' 'zlib' 'gst-plugins-base' 'libnotify' 'dbus-glib'
-           'gtk3' 'xz' 'libass' 'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora'
-           'libsamplerate' 'speex' 'x264' 'jansson' 'librsvg' 'libgudev'
-           'desktop-file-utils' 'hicolor-icon-theme')
+  depends=('desktop-file-utils' 'hicolor-icon-theme'
+           "${_commondeps[@]}" "${_guideps[@]}")
   optdepends=('gst-plugins-good: for video previews'
               'gst-libav: for video previews'
               'libdvdcss: for decoding encrypted DVDs')
@@ -46,8 +46,7 @@ package_handbrake-fdkaac() {
 package_handbrake-cli-fdkaac() {
   pkgdesc="Multithreaded video transcoder (CLI)"
   conflicts=('handbrake-cli')
-  depends=('bzip2' 'gcc-libs' 'zlib' 'xz' 'libass' 'lame' 'libxml2' 'opus'
-           'libvorbis' 'libtheora' 'libsamplerate' 'speex' 'x264' 'jansson')
+  depends=("${_commondeps[@]}")
   optdepends=('libdvdcss: for decoding encrypted DVDs')
 
   cd "$srcdir/HandBrake-$pkgver/build"