switch to 1.5.x branch

2 files changed, 35 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 377cd4792509..a5f8977b9ebb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = handbrake-git
 	pkgdesc = Multithreaded video transcoder. Enabled: x265, nvenc, fdk-aac, qsv, vce, numa, hardened
-	pkgver = 1.4.0.r0.gcbe7e4428
+	pkgver = 1.5.0.r0.ga11651939
 	pkgrel = 1
 	url = https://handbrake.fr/
 	arch = i686
@@ -13,6 +13,7 @@ pkgbase = handbrake-git
 	makedepends = wget
 	makedepends = cmake
 	makedepends = meson
+	makedepends = x264
 	makedepends = libxml2
 	makedepends = libass
 	makedepends = libvorbis
@@ -20,7 +21,7 @@ pkgbase = handbrake-git
 	makedepends = speex
 	makedepends = libtheora
 	makedepends = lame
-	makedepends = x264
+	makedepends = libx264.so
 	makedepends = jansson
 	makedepends = libvpx
 	makedepends = libva
@@ -33,43 +34,46 @@ pkgbase = handbrake-git
 	optdepends = intel-media-sdk: for enabling Intel QSV
 	optdepends = nvidia-utils: for enabling Nvidia nvenc
 	noextract = AMF-1.4.18.tar.gz
-	noextract = dav1d-0.9.0.tar.bz2
+	noextract = dav1d-0.9.2.tar.bz2
 	noextract = fdk-aac-2.0.1.tar.gz
-	noextract = ffmpeg-4.4.tar.bz2
+	noextract = ffmpeg-4.4.1.tar.bz2
 	noextract = libbluray-1.3.0.tar.bz2
 	noextract = libdvdnav-6.1.1.tar.bz2
 	noextract = libdvdread-6.1.1.tar.bz2
 	noextract = libvpx-1.7.0.tar.gz
 	noextract = mfx_dispatch-1.35.tar.gz
 	noextract = nv-codec-headers-11.0.10.1.tar.gz
+	noextract = oneVPL-2021.6.0.tar.gz
 	noextract = x265_3.5.tar.gz
-	noextract = zimg-3.0.1.tar.gz
-	source = handbrake::git+https://github.com/HandBrake/HandBrake.git#branch=1.4.x
+	noextract = zimg-3.0.3.tar.gz
+	source = handbrake::git+https://github.com/HandBrake/HandBrake.git#branch=1.5.x
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.18.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.0.tar.bz2
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.2.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.1.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.tar.bz2
+	source = https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.0.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.1.1.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libvpx-1.7.0.tar.gz
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/mfx_dispatch-1.35.tar.gz
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-11.0.10.1.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.1.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.3.tar.gz
 	sha256sums = SKIP
 	sha256sums = 4f21ee07c8bb9b73ff48dbce7cb0917cdcd4d81d33333da391d97ce7f00642fe
-	sha256sums = e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5
+	sha256sums = 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8
 	sha256sums = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
-	sha256sums = 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e
+	sha256sums = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42
 	sha256sums = e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 	sha256sums = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 	sha256sums = 3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796
 	sha256sums = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
 	sha256sums = 0790ff82158837124150ab4034db37433a92caac0f145f249d2f194d8ccba3ca
 	sha256sums = 97e37b85922f1167b2f0bf0bb804c3d7266cc679e78814fe820cf8912a0e1291
+	sha256sums = c83590c4b0d12c4a48f4cbf4b6e8d595bf1f6f96bb262d21457793d19f7b2b6a
 	sha256sums = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
-	sha256sums = c50a0922f4adac4efad77427d13520ed89b8366eef0ef2fa379572951afcc73f
+	sha256sums = 5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
 
 pkgname = handbrake-git
 	pkgdesc = Multithreaded video transcoder
@@ -80,7 +84,7 @@ pkgname = handbrake-git
 	depends = speex
 	depends = libtheora
 	depends = lame
-	depends = x264
+	depends = libx264.so
 	depends = jansson
 	depends = libvpx
 	depends = libva
@@ -106,7 +110,7 @@ pkgname = handbrake-cli-git
 	depends = speex
 	depends = libtheora
 	depends = lame
-	depends = x264
+	depends = libx264.so
 	depends = jansson
 	depends = libvpx
 	depends = libva
diff --git a/PKGBUILD b/PKGBUILD
index 679ba21079c3..9462e26b3ade 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,60 +8,65 @@
 
 pkgbase=handbrake-git
 pkgname=(handbrake-git handbrake-cli-git)
-pkgver=1.4.0.r0.gcbe7e4428
+pkgver=1.5.0.r0.ga11651939
 pkgrel=1
 pkgdesc="Multithreaded video transcoder. Enabled: x265, nvenc, fdk-aac, qsv, vce, numa, hardened"
 arch=(i686 x86_64)
 url="https://handbrake.fr/"
 license=(GPL)
-source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git#branch=1.4.x"
+source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git#branch=1.5.x"
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.18.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.0.tar.bz2'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.2.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.1.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.tar.bz2'
+        #'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.1.tar.bz2'
+        'https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.0.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.1.1.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libvpx-1.7.0.tar.gz'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/mfx_dispatch-1.35.tar.gz'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-11.0.10.1.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.1.tar.gz')
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.3.tar.gz')
 _commondeps=(libxml2 libass libvorbis opus speex libtheora lame
-             x264 jansson libvpx libva numactl)
+             libx264.so jansson libvpx libva numactl)
 _guideps=(gst-plugins-base gtk3 librsvg libgudev)
 makedepends=(git intltool python nasm wget cmake meson
+             x264
              "${_commondeps[@]}" "${_guideps[@]}")
 optdepends=('libdvdcss: for decoding encrypted DVDs'
             'intel-media-sdk: for enabling Intel QSV'
             'nvidia-utils: for enabling Nvidia nvenc')
 sha256sums=('SKIP'
             '4f21ee07c8bb9b73ff48dbce7cb0917cdcd4d81d33333da391d97ce7f00642fe'
-            'e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5'
+            '0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8'
             'a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6'
-            '42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e'
+            '8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42'
             'e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9'
             'c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48'
             '3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796'
             '1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238'
             '0790ff82158837124150ab4034db37433a92caac0f145f249d2f194d8ccba3ca'
             '97e37b85922f1167b2f0bf0bb804c3d7266cc679e78814fe820cf8912a0e1291'
+            'c83590c4b0d12c4a48f4cbf4b6e8d595bf1f6f96bb262d21457793d19f7b2b6a'
             'e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8'
-            'c50a0922f4adac4efad77427d13520ed89b8366eef0ef2fa379572951afcc73f')
+            '5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7')
 
 noextract=(
     'AMF-1.4.18.tar.gz'
-    'dav1d-0.9.0.tar.bz2'
+    'dav1d-0.9.2.tar.bz2'
     'fdk-aac-2.0.1.tar.gz'
-    'ffmpeg-4.4.tar.bz2'
+    'ffmpeg-4.4.1.tar.bz2'
     'libbluray-1.3.0.tar.bz2'
     'libdvdnav-6.1.1.tar.bz2'
     'libdvdread-6.1.1.tar.bz2'
     'libvpx-1.7.0.tar.gz'
     'mfx_dispatch-1.35.tar.gz'
     'nv-codec-headers-11.0.10.1.tar.gz'
+    'oneVPL-2021.6.0.tar.gz'
     'x265_3.5.tar.gz'
-    'zimg-3.0.1.tar.gz'
+    'zimg-3.0.3.tar.gz'
     )
 
 pkgver() {