update flag, source, prepare=()

2 files changed, 52 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 085cbcbbf515..10dc364ba227 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. Last stable branch
-	pkgver = 1.6.1.r50.gb94291a97
+	pkgver = 1.7.0.r11.g7f3368569
 	pkgrel = 1
 	url = https://handbrake.fr/
 	arch = i686
@@ -36,55 +36,51 @@ pkgbase = handbrake-git
 	optdepends = intel-media-sdk: for enabling Intel QSV
 	optdepends = nvidia-utils: for Nvidia users, enable Nvidia nvenc
 	optdepends = cuda: for Nvidia users, enable Nvidia nvdec
-	noextract = AMF-1.4.24.tar.gz
-	noextract = dav1d-1.0.0.tar.bz2
+	noextract = AMF-1.4.30-slim.tar.gz
+	noextract = dav1d-1.3.0.tar.bz2
 	noextract = fdk-aac-2.0.2.tar.gz
-	noextract = ffmpeg-5.1.2.tar.bz2
+	noextract = ffmpeg-6.1.tar.bz2
 	noextract = libbluray-1.3.4.tar.bz2
 	noextract = libdvdnav-6.1.1.tar.bz2
 	noextract = libdvdread-6.1.3.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-2023.1.0.tar.gz
-	noextract = SVT-AV1-v1.4.1.tar.gz
-	noextract = x265-snapshot-20221130-12747.tar.gz
-	noextract = zimg-3.0.4.tar.gz
+	noextract = nv-codec-headers-12.1.14.0.tar.gz
+	noextract = oneVPL-2023.3.1.tar.gz
+	noextract = SVT-AV1-v1.7.0.tar.gz
+	noextract = x265-snapshot-20230403-12776.tar.gz
+	noextract = zimg-3.0.5.tar.gz
 	options = !lto
-	source = handbrake::git+https://github.com/HandBrake/HandBrake.git#branch=1.6.x
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.24.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.0.0.tar.bz2
+	source = handbrake::git+https://github.com/HandBrake/HandBrake.git#branch=1.7.x
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.3.0.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.2.tar.gz
-	source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.bz2
-	source = https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/ffmpeg-avcodec-x86-mathops-binutils-fix.patch
-	source = https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/ffmpeg-hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
+	source = https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2
 	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.4.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.3.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-2023.1.0.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.4.1.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20221130-12747.tar.gz
-	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.4.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-12.1.14.0.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2023.3.1.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.7.0.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20230403-12776.tar.gz
+	source = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.5.tar.gz
 	sha256sums = SKIP
-	sha256sums = 07d325da97a5a3cb58d83c54b2ce1148dc84dc9bb3971b0c30ff4cc16e159194
-	sha256sums = 4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f
+	sha256sums = 665bd83dc7facb407e9e32168e38f9a1e0f37cd3802f4409d3889a3bcaec908f
+	sha256sums = bde8db3d0583a4f3733bb5a4ac525556ffd03ab7dcd8a6e7c091bee28d9466b1
 	sha256sums = 7812b4f0cf66acda0d0fe4302545339517e702af7674dd04e5fe22a5ade16a90
-	sha256sums = 39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b
-	sha256sums = a50d7da9870a3fd801ad3a4d13d5c9b260acb094cf8bfa4afd95a54741173a7f
-	sha256sums = 478d1a71e1352671f9893a330f1bb9104aeb7bf8e418c6941376c77a5f251147
+	sha256sums = eb7da3de7dd3ce48a9946ab447a7346bd11a3a85e6efb8f2c2ce637e7f547611
 	sha256sums = 478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b
 	sha256sums = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 	sha256sums = ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369
 	sha256sums = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
 	sha256sums = 0790ff82158837124150ab4034db37433a92caac0f145f249d2f194d8ccba3ca
-	sha256sums = 97e37b85922f1167b2f0bf0bb804c3d7266cc679e78814fe820cf8912a0e1291
-	sha256sums = 0a1991278c64849f471e4b307a7c01f465a308674f359054886c32352e887b60
-	sha256sums = e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f
-	sha256sums = 1a2418fd757a3d92928acacef2ae8ddb71f7aecc8803890eacb55f6e3a62bba5
-	sha256sums = 219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f
+	sha256sums = 62b30ab37e4e9be0d0c5b37b8fee4b094e38e570984d56e1135a6b6c2c164c9f
+	sha256sums = 4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+	sha256sums = ce0973584f1a187aa4abf63f509ff8464397120878e322a3153f87e9c161fc4f
+	sha256sums = 23898695c5520e9e971d12e88125d5ad03ad67f462fc8ecaa016b48adad7cb20
+	sha256sums = a9a0226bf85e0d83c41a8ebe4e3e690e1348682f6a2a7838f1b8cbff1b799bcf
 
 pkgname = handbrake-git
 	pkgdesc = Multithreaded video transcoder
diff --git a/PKGBUILD b/PKGBUILD
index 082dbc02a98c..460e9505b87e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,29 +8,27 @@
 
 pkgbase=handbrake-git
 pkgname=(handbrake-git handbrake-cli-git)
-pkgver=1.6.1.r50.gb94291a97
+pkgver=1.7.0.r11.g7f3368569
 pkgrel=1
 pkgdesc="Multithreaded video transcoder. Enabled: x265, nvenc, fdk-aac, qsv, vce, numa, hardened. Last stable branch"
 arch=(i686 x86_64)
 url="https://handbrake.fr/"
 license=(GPL2)
-source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git#branch=1.6.x"
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.24.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.0.0.tar.bz2'
+source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git#branch=1.7.x"
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.3.0.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.2.tar.gz'
-        'https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.bz2'
-        'https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/ffmpeg-avcodec-x86-mathops-binutils-fix.patch'
-        'https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/ffmpeg-hwcontext_vulkan-remove-optional-encode-decode-extensions.patch'
+        'https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.4.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.3.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-2023.1.0.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.4.1.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20221130-12747.tar.gz'
-        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.4.tar.gz')
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-12.1.14.0.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2023.3.1.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.7.0.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20230403-12776.tar.gz'
+        'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.5.tar.gz')
 _commondeps=(libxml2 libass libvorbis opus speex libtheora lame libjpeg-turbo
              libx264.so jansson libvpx libva numactl)
 _guideps=(gst-plugins-base gtk3 libgudev)
@@ -42,38 +40,36 @@ optdepends=('libdvdcss: for decoding encrypted DVDs'
             'nvidia-utils: for Nvidia users, enable Nvidia nvenc'
             'cuda: for Nvidia users, enable Nvidia nvdec')
 sha256sums=('SKIP'
-            '07d325da97a5a3cb58d83c54b2ce1148dc84dc9bb3971b0c30ff4cc16e159194'
-            '4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f'
+            '665bd83dc7facb407e9e32168e38f9a1e0f37cd3802f4409d3889a3bcaec908f'
+            'bde8db3d0583a4f3733bb5a4ac525556ffd03ab7dcd8a6e7c091bee28d9466b1'
             '7812b4f0cf66acda0d0fe4302545339517e702af7674dd04e5fe22a5ade16a90'
-            '39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b'
-            'a50d7da9870a3fd801ad3a4d13d5c9b260acb094cf8bfa4afd95a54741173a7f'
-            '478d1a71e1352671f9893a330f1bb9104aeb7bf8e418c6941376c77a5f251147'
+            'eb7da3de7dd3ce48a9946ab447a7346bd11a3a85e6efb8f2c2ce637e7f547611'
             '478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b'
             'c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48'
             'ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369'
             '1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238'
             '0790ff82158837124150ab4034db37433a92caac0f145f249d2f194d8ccba3ca'
-            '97e37b85922f1167b2f0bf0bb804c3d7266cc679e78814fe820cf8912a0e1291'
-            '0a1991278c64849f471e4b307a7c01f465a308674f359054886c32352e887b60'
-            'e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f'
-            '1a2418fd757a3d92928acacef2ae8ddb71f7aecc8803890eacb55f6e3a62bba5'
-            '219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f')
+            '62b30ab37e4e9be0d0c5b37b8fee4b094e38e570984d56e1135a6b6c2c164c9f'
+            '4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5'
+            'ce0973584f1a187aa4abf63f509ff8464397120878e322a3153f87e9c161fc4f'
+            '23898695c5520e9e971d12e88125d5ad03ad67f462fc8ecaa016b48adad7cb20'
+            'a9a0226bf85e0d83c41a8ebe4e3e690e1348682f6a2a7838f1b8cbff1b799bcf')
 options=(!lto)
 noextract=(
-    'AMF-1.4.24.tar.gz'
-    'dav1d-1.0.0.tar.bz2'
+    'AMF-1.4.30-slim.tar.gz'
+    'dav1d-1.3.0.tar.bz2'
     'fdk-aac-2.0.2.tar.gz'
-    'ffmpeg-5.1.2.tar.bz2'
+    'ffmpeg-6.1.tar.bz2'
     'libbluray-1.3.4.tar.bz2'
     'libdvdnav-6.1.1.tar.bz2'
     'libdvdread-6.1.3.tar.bz2'
     'libvpx-1.7.0.tar.gz'
     'mfx_dispatch-1.35.tar.gz'
-    'nv-codec-headers-11.0.10.1.tar.gz'
-    'oneVPL-2023.1.0.tar.gz'
-    'SVT-AV1-v1.4.1.tar.gz'
-    'x265-snapshot-20221130-12747.tar.gz'
-    'zimg-3.0.4.tar.gz'
+    'nv-codec-headers-12.1.14.0.tar.gz'
+    'oneVPL-2023.3.1.tar.gz'
+    'SVT-AV1-v1.7.0.tar.gz'
+    'x265-snapshot-20230403-12776.tar.gz'
+    'zimg-3.0.5.tar.gz'
     )
 
 pkgver() {
@@ -82,9 +78,6 @@ pkgver() {
 }
 
 prepare() {
-  install ffmpeg-avcodec-x86-mathops-binutils-fix.patch handbrake/contrib/ffmpeg/A34-avcodec-x86-mathops-binutils-fix.patch
-  install ffmpeg-hwcontext_vulkan-remove-optional-encode-decode-extensions.patch handbrake/contrib/ffmpeg/A35-hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
-
   cd "${pkgname%-git}"
 
   [ -d download ] || mkdir download
@@ -99,7 +92,6 @@ prepare() {
   ./configure \
     --prefix=/usr \
     --harden \
-    --disable-gtk-update-checks \
     --enable-x265 \
     --enable-numa \
     --enable-fdk-aac \