commit 939baef970ec0b36fee2ff981b0f4d4e5af03134
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Apr 9 22:06:34 2023 +0100
Updated to version 1.6.1.
.gitignore | 27 ++------------------
HandBrake-fix-wformat.patch | 61 ---------------------------------------------
HandBrake.spec | 39 +++++++++++++++--------------
sources | 4 +--
4 files changed, 24 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b96a27..d725192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,2 @@
-/HandBrake-1.0.3.tar.bz2
-/HandBrake-1.0.7.tar.bz2
-/HandBrake-1.0.7.tar.bz2.sig
-/HandBrake-1.1.0-source.tar.bz2
-/HandBrake-1.1.0-source.tar.bz2.sig
-/HandBrake-1.1.2-source.tar.bz2
-/HandBrake-1.1.2-source.tar.bz2.sig
-/HandBrake-1.2.0-source.tar.bz2
-/HandBrake-1.2.0-source.tar.bz2.sig
-/HandBrake-1.2.2-source.tar.bz2
-/HandBrake-1.2.2-source.tar.bz2.sig
-/HandBrake-1.3.0-source.tar.bz2
-/HandBrake-1.3.0-source.tar.bz2.sig
-/HandBrake-1.3.1-source.tar.bz2
-/HandBrake-1.3.1-source.tar.bz2.sig
-/HandBrake-1.3.2-source.tar.bz2
-/HandBrake-1.3.2-source.tar.bz2.sig
-/HandBrake-1.3.3-source.tar.bz2
-/HandBrake-1.3.3-source.tar.bz2.sig
-/HandBrake-1.4.2-source.tar.bz2
-/HandBrake-1.4.2-source.tar.bz2.sig
-/HandBrake-1.5.1-source.tar.bz2
-/HandBrake-1.5.1-source.tar.bz2.sig
-/HandBrake-1.6.0-source.tar.bz2
-/HandBrake-1.6.0-source.tar.bz2.sig
+HandBrake-*-source.tar.bz2
+HandBrake-*-source.tar.bz2.sig
diff --git a/HandBrake.spec b/HandBrake.spec
index c77d2ec..4d69c26 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 9951c73a797b9c22814a1cfcbb0341d66853a262
-%global date 20221228
+%global commit0 04413a27e6d616cddd98c2c6468aca2bf91b87b5
+%global date 20230122
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -15,8 +15,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.6.0
-Release: 4%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.6.1
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL:
https://handbrake.fr/
@@ -27,9 +27,7 @@ Source1:
https://github.com/%{name}/%{name}/releases/download/%{version}/
# import from
https://handbrake.fr/openpgp.php or
https://github.com/HandBrake/HandBrake/wiki/OpenPGP
# gpg2 --export --export-options export-minimal 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645
> gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
-# Fix build on non-x86 (without nasm)
-Patch6: %{name}-no-nasm.patch
-BuildRequires: gnupg2
+
%else
Source0:
https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{s...
%endif
@@ -37,20 +35,21 @@ Source0:
https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{
%{?_without_ffmpeg:Source10:
https://libav.org/releases/libav-12.tar.gz}
# Pass strip tool override to gtk/configure
-Patch3: %{name}-nostrip.patch
+Patch0: %{name}-nostrip.patch
# Don't link with libva unnecessarily
-Patch4: %{name}-no-libva.patch
+Patch1: %{name}-no-libva.patch
# Don't link with fdk_aac unnecessarily
-Patch5: %{name}-no-fdk_aac.patch
+Patch2: %{name}-no-fdk_aac.patch
+# Fix build on non-x86 (without nasm)
+Patch3: %{name}-no-nasm.patch
# Patch from Gentoo
-Patch9: %{name}-x265-link.patch
-#
https://github.com/HandBrake/HandBrake/commit/fa9e4bfd3a5be0b433d1a67cd40...
-Patch11: %{name}-fix-wformat.patch
+Patch4: %{name}-x265-link.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
+BuildRequires: gnupg2
BuildRequires: libappstream-glib
%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5}
# Should be >= 2.6:
@@ -139,14 +138,13 @@ This package contains the main program with a graphical interface.
gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%endif
%setup -q %{!?tag:-n %{name}-%{commit0}}
-%patch3 -p1
+%patch -P0 -p1
%if 0%{!?_with_vpl}
-%patch4 -p1
+%patch -P1 -p1
%endif
-%patch5 -p1
-%patch6 -p1
-%patch9 -p1
-%patch11 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
# Use system libraries in place of bundled ones
for module in a52dec fdk-aac %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread
libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do
@@ -224,6 +222,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Sun Apr 09 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.6.1-1
+- Updated to version 1.6.1.
+
* Wed Mar 01 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.6.0-4
- Rebuild for new ffmpeg
diff --git a/sources b/sources
index 6e015e8..3bcdc47 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.6.0-source.tar.bz2) =
1984bff578037efd48e2f37175b958994bef19364547ded14f71f64a9843c936e621760ee3123a6d8d730baba617988da6710272c8e912ca528a92dc02ae8ffd
-SHA512 (HandBrake-1.6.0-source.tar.bz2.sig) =
ab900b129a65cfb683ee9fc2678f574092813357b81755c2ff3d407eb5cbdea65c4c3d2eb7cc531e9f77a96e44995f14f6b4c2971fd05ef6489291ff80f7f1d5
+SHA512 (HandBrake-1.6.1-source.tar.bz2) =
e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617
+SHA512 (HandBrake-1.6.1-source.tar.bz2.sig) =
040def2c1e23bf16d4a83e7a2cea4a37b74bf3e03cfb22d245d51c8476510ba33d1a0e967a5dba56c5222ed293f134e3fad99cc0c37d3fdbdb925aa709802986