automatic version update by autodist [release 1.6.0-1mamba;Mon Jan 23 2023]
This commit is contained in:
parent
6a0b41b8e9
commit
bb3e9335dc
61
handbrake-1.6.0-fix-build-with-Werror-format-security.patch
Normal file
61
handbrake-1.6.0-fix-build-with-Werror-format-security.patch
Normal file
@ -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)
|
||||||
|
{
|
33
handbrake-1.6.0-vulkan-headers-1.3.238.patch
Normal file
33
handbrake-1.6.0-vulkan-headers-1.3.238.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lynne <dev@lynne.ee>
|
||||||
|
Date: Sun, 25 Dec 2022 01:03:30 +0100
|
||||||
|
Subject: [PATCH] hwcontext_vulkan: remove optional encode/decode extensions
|
||||||
|
from the list
|
||||||
|
|
||||||
|
They're not currently used, so they don't need to be there.
|
||||||
|
Vulkan stabilized the decode extensions less than a week ago, and their
|
||||||
|
name prefixes were changed from EXT to KHR. It's a bit too soon to be
|
||||||
|
depending on it, so rather than bumping, just remove these for now.
|
||||||
|
---
|
||||||
|
libavutil/hwcontext_vulkan.c | 8 --------
|
||||||
|
1 file changed, 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
|
||||||
|
index f1db1c7291f1..2a9b5f4aac62 100644
|
||||||
|
--- a/libavutil/hwcontext_vulkan.c
|
||||||
|
+++ b/libavutil/hwcontext_vulkan.c
|
||||||
|
@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
|
||||||
|
{ VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
|
||||||
|
{ VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
- /* Video encoding/decoding */
|
||||||
|
- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Converts return values to strings */
|
@ -1,5 +1,5 @@
|
|||||||
Name: handbrake
|
Name: handbrake
|
||||||
Version: 1.5.1
|
Version: 1.6.0
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: An open-source multithreaded video transcoder
|
Summary: An open-source multithreaded video transcoder
|
||||||
Group: Graphical Desktop/Applications/Multimedia
|
Group: Graphical Desktop/Applications/Multimedia
|
||||||
@ -8,32 +8,23 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://handbrake.fr/
|
URL: https://handbrake.fr/
|
||||||
Source: https://github.com/HandBrake/HandBrake/releases/download/%{version}/HandBrake-%{version}-source.tar.bz2
|
Source: https://github.com/HandBrake/HandBrake/releases/download/%{version}/HandBrake-%{version}-source.tar.bz2
|
||||||
|
Source1: handbrake-1.6.0-vulkan-headers-1.3.238.patch
|
||||||
Patch0: %{name}-0.9.5-dbus-glib.patch
|
Patch0: %{name}-0.9.5-dbus-glib.patch
|
||||||
Patch1: %{name}-0.9.5-libnotify-0.7.patch
|
Patch1: %{name}-0.9.5-libnotify-0.7.patch
|
||||||
Patch2: handbrake-0.10.1-ffmpeg-disable-inline-asm.patch
|
Patch2: handbrake-0.10.1-ffmpeg-disable-inline-asm.patch
|
||||||
|
Patch3: handbrake-1.6.0-fix-build-with-Werror-format-security.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libICE-devel
|
|
||||||
BuildRequires: libSM-devel
|
|
||||||
BuildRequires: libX11-devel
|
|
||||||
BuildRequires: libXau-devel
|
|
||||||
BuildRequires: libXcomposite-devel
|
|
||||||
BuildRequires: libXdamage-devel
|
|
||||||
BuildRequires: libXdmcp-devel
|
|
||||||
BuildRequires: libXfixes-devel
|
BuildRequires: libXfixes-devel
|
||||||
BuildRequires: libXrender-devel
|
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
BuildRequires: libass-devel
|
BuildRequires: libass-devel
|
||||||
BuildRequires: libatk-devel
|
BuildRequires: libat-spi2-core-devel
|
||||||
BuildRequires: libbrotli-devel
|
BuildRequires: libbrotli-devel
|
||||||
BuildRequires: libbsd-devel
|
|
||||||
BuildRequires: libbzip2-devel
|
BuildRequires: libbzip2-devel
|
||||||
BuildRequires: libcairo-devel
|
BuildRequires: libcairo-devel
|
||||||
BuildRequires: libe2fs-devel
|
BuildRequires: libe2fs-devel
|
||||||
BuildRequires: libenchant1-devel
|
BuildRequires: libenchant1-devel
|
||||||
BuildRequires: libexpat-devel
|
|
||||||
BuildRequires: libffi-devel
|
|
||||||
BuildRequires: libfontconfig-devel
|
BuildRequires: libfontconfig-devel
|
||||||
BuildRequires: libfreetype-devel
|
BuildRequires: libfreetype-devel
|
||||||
BuildRequires: libfribidi-devel
|
BuildRequires: libfribidi-devel
|
||||||
@ -42,7 +33,6 @@ BuildRequires: libgcrypt-devel
|
|||||||
BuildRequires: libgdk-pixbuf-devel
|
BuildRequires: libgdk-pixbuf-devel
|
||||||
BuildRequires: libglib-devel
|
BuildRequires: libglib-devel
|
||||||
BuildRequires: libglvnd-devel
|
BuildRequires: libglvnd-devel
|
||||||
BuildRequires: libgpg-error-devel
|
|
||||||
BuildRequires: libgraphite2-devel
|
BuildRequires: libgraphite2-devel
|
||||||
BuildRequires: libgst-plugins-base-devel
|
BuildRequires: libgst-plugins-base-devel
|
||||||
BuildRequires: libgstreamer-devel
|
BuildRequires: libgstreamer-devel
|
||||||
@ -60,22 +50,17 @@ BuildRequires: libogg-devel
|
|||||||
BuildRequires: libopus-devel
|
BuildRequires: libopus-devel
|
||||||
BuildRequires: libpango-devel
|
BuildRequires: libpango-devel
|
||||||
BuildRequires: libpcre-devel
|
BuildRequires: libpcre-devel
|
||||||
BuildRequires: libpng-devel
|
|
||||||
BuildRequires: libsecret-devel
|
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
BuildRequires: libsoup2-devel
|
BuildRequires: libsoup2-devel
|
||||||
BuildRequires: libspeex-devel
|
BuildRequires: libspeex-devel
|
||||||
BuildRequires: libsqlite-devel
|
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
BuildRequires: libthai-devel
|
BuildRequires: libthai-devel
|
||||||
BuildRequires: libtheora-devel
|
BuildRequires: libtheora-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: libvorbis-devel
|
BuildRequires: libvorbis-devel
|
||||||
BuildRequires: libvpx-devel
|
BuildRequires: libvpx6-devel
|
||||||
BuildRequires: libwebkit-gtk3-devel
|
BuildRequires: libwebkit-gtk3-devel
|
||||||
BuildRequires: libwebp-devel
|
|
||||||
BuildRequires: libx264-devel
|
BuildRequires: libx264-devel
|
||||||
BuildRequires: libxcb-devel
|
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
@ -92,9 +77,15 @@ HandBrake is an open-source, GPL-licensed, multithreaded video transcoder.
|
|||||||
#%patch0 -p1
|
#%patch0 -p1
|
||||||
#%patch1 -p0
|
#%patch1 -p0
|
||||||
#%patch2 -p1
|
#%patch2 -p1
|
||||||
|
%patch3 -p1 -b .fix-build-with-Werror-format-security
|
||||||
|
|
||||||
|
cp %{SOURCE1} contrib/ffmpeg/A31-vulkan-headers.patch
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure --prefix=%{_prefix}
|
./configure \
|
||||||
|
--prefix=%{_prefix}
|
||||||
|
|
||||||
|
# --enable-qsv
|
||||||
#--force
|
#--force
|
||||||
|
|
||||||
cd build
|
cd build
|
||||||
@ -121,6 +112,9 @@ cd ..
|
|||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 23 2023 Automatic Build System <autodist@mambasoft.it> 1.6.0-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Tue Jan 11 2022 Automatic Build System <autodist@mambasoft.it> 1.5.1-1mamba
|
* Tue Jan 11 2022 Automatic Build System <autodist@mambasoft.it> 1.5.1-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user