Update to v1.6.0 and rebase PKGBUILD

3 files changed, 138 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9bf4f7163cd..2a4f8e26faa3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,85 +1,89 @@
 pkgbase = handbrake-nvenc
-	pkgver = 1.5.1
-	pkgrel = 2
+	pkgver = 1.6.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
-	makedepends = meson
-	depends = numactl
 	conflicts = handbrake
-	source = https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBrake-1.5.1-source.tar.bz2
-	source = https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBrake-1.5.1-source.tar.bz2.sig
+	options = !lto
+	source = https://download.handbrake.fr/releases/1.6.0/HandBrake-1.6.0-source.tar.bz2
+	source = https://download.handbrake.fr/releases/1.6.0/HandBrake-1.6.0-source.tar.bz2.sig
+	source = fix-build-with-Werror-format-security.patch
 	validpgpkeys = 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645
-	sha256sums = 3999fe06d5309c819799a73a968a8ec3840e7840c2b64af8f5cdb7fd8c9430f0
+	sha256sums = 7f23c76038b7bf329089d0eb33c14898400fcc0426e310e87dc11e538c103cda
 	sha256sums = SKIP
+	sha256sums = 9e46ab5c9539bd0910780f38131097c4e3871acde70c89a92abfc8edc9ec2c21
 
 pkgname = handbrake-nvenc
 	pkgdesc = Multithreaded video transcoder with NVEnc Support
-	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
 
 pkgname = handbrake-nvenc-cli
 	pkgdesc = Multithreaded video transcoder (CLI) with NVEnc Support
-	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
diff --git a/PKGBUILD b/PKGBUILD
index a136aa2f56f0..4d44de895035 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,45 @@
 # Maintainer: Alan Beale <the.mrabz@gmail.com>
 
 pkgname=('handbrake-nvenc' 'handbrake-nvenc-cli')
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 arch=('x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
-depends=('numactl')
-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' 'meson')
-source=(https://github.com/HandBrake/HandBrake/releases/download/$pkgver/HandBrake-$pkgver-source.tar.bz2
-        https://github.com/HandBrake/HandBrake/releases/download/$pkgver/HandBrake-$pkgver-source.tar.bz2.sig)
-sha256sums=('3999fe06d5309c819799a73a968a8ec3840e7840c2b64af8f5cdb7fd8c9430f0'
-            'SKIP')
+_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[@]}")
+options=('!lto') # https://bugs.archlinux.org/task/72600
+source=(https://download.handbrake.fr/releases/$pkgver/HandBrake-$pkgver-source.tar.bz2{,.sig}
+        fix-build-with-Werror-format-security.patch)
+sha256sums=('7f23c76038b7bf329089d0eb33c14898400fcc0426e310e87dc11e538c103cda'
+            'SKIP'
+            '9e46ab5c9539bd0910780f38131097c4e3871acde70c89a92abfc8edc9ec2c21')
 validpgpkeys+=('1629C061B3DDE7EB4AE34B81021DB8B44E4A8645') # HandBrake Team <developers@handbrake.fr>
 conflicts=('handbrake')
 
+prepare() {
+  cd HandBrake-$pkgver
+  # https://github.com/HandBrake/HandBrake/pull/4761
+  patch -Np1 -i ../fix-build-with-Werror-format-security.patch
+}
+
 build() {
-  cd "$srcdir/HandBrake-$pkgver"
+  cd HandBrake-$pkgver
 
-  ./configure --prefix=/usr --enable-nvenc
+  ./configure \
+    --prefix=/usr\
+    --enable-nvenc
   make -C build
 }
 
 package_handbrake-nvenc() {
   pkgdesc="Multithreaded video transcoder with NVEnc Support"
-  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')
@@ -43,11 +52,10 @@ package_handbrake-nvenc() {
 
 package_handbrake-nvenc-cli() {
   pkgdesc="Multithreaded video transcoder (CLI) with NVEnc Support"
-  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"
+  cd HandBrake-$pkgver/build
   install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
 }
 
diff --git a/fix-build-with-Werror-format-security.patch b/fix-build-with-Werror-format-security.patch
new file mode 100644
index 000000000000..b822c2a8084e
--- /dev/null
+++ b/fix-build-with-Werror-format-security.patch
@@ -0,0 +1,61 @@
+From 4d8f5fe1c4b29edfbcc77e4774378e05b38688db Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Wed, 28 Dec 2022 22:23:50 +0200
+Subject: [PATCH] LinGUI: fix build with -Werror=format-security
+
+Add missing format strings where needed.
+
+Fixes: f6c0971c0042 ("Added XDG color-scheme implementation")
+Fixes: 3c71841d7716 ("LinGUI: Add warning color to dialog buttons")
+Fixes: 23f067ef4186 ("LinGUI: Add subtitle and audio track names to queue")
+---
+ gtk/src/callbacks.c    | 2 +-
+ gtk/src/color-scheme.c | 2 +-
+ gtk/src/queuehandler.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
+index d815e10e2..eed9a4510 100644
+--- a/gtk/src/callbacks.c
++++ b/gtk/src/callbacks.c
+@@ -3790,7 +3790,7 @@ ghb_title_message_dialog(GtkWindow *parent, GtkMessageType type, const gchar *ti
+                             type, GTK_BUTTONS_NONE,
+                             "%s", title);
+     if (message)
+-        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), message);
++        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", message);
+ 
+     gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+                            no, GTK_RESPONSE_NO,
+diff --git a/gtk/src/color-scheme.c b/gtk/src/color-scheme.c
+index 6fbf65e71..0816d6808 100644
+--- a/gtk/src/color-scheme.c
++++ b/gtk/src/color-scheme.c
+@@ -173,7 +173,7 @@ DesktopColorScheme color_scheme_get_desktop_scheme (void)
+                                     DBUS_TIMEOUT, NULL, &error);
+     if (!result)
+     {
+-        g_debug(error->message);
++        g_debug("%s", error->message);
+         return DESKTOP_NO_PREFERENCE;
+     }
+ 
+diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
+index db186fbe3..a2b3e96aa 100644
+--- a/gtk/src/queuehandler.c
++++ b/gtk/src/queuehandler.c
+@@ -682,12 +682,12 @@ queue_update_summary(GhbValue * queueDict, signal_user_data_t *ud)
+         def         = ghb_dict_get_bool(subsettings, "Default");
+         name        = ghb_dict_get_string(subsettings, "Name");
+ 
+-        g_string_append_printf(str, sep);
++        g_string_append_printf(str, "%s", sep);
+         if (name)
+         {
+             g_string_append_printf(str, "%s - ", name);
+         }
+-        g_string_append_printf(str, desc);
++        g_string_append_printf(str, "%s", desc);
+         free(desc);
+         if (force)
+         {