8:44 a.m.
commit 2ee2fdd068d0859530e1cfc7ac67782301d40515
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Wed Nov 27 09:43:58 2019 +0100
New upstream version (fixes compilation with Pango 1.44+)
New dependencies: libdrm, libdav1d, numactl
fixes rfbz#5426
.gitignore | 2 ++
HandBrake-nostrip.patch | 2 +-
HandBrake-qsv.patch | 13 +++++++++++++
HandBrake.spec | 33 ++++++++++++++++++++++-----------
sources | 4 ++--
5 files changed, 40 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1cef356..680676f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
/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
diff --git a/HandBrake-nostrip.patch b/HandBrake-nostrip.patch
index 077e544..9377325 100644
--- a/HandBrake-nostrip.patch
+++ b/HandBrake-nostrip.patch
@@ -2,7 +2,7 @@
+++ b/gtk/module.rules
@@ -21,6 +21,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)confi
CXX="$(GCC.gxx)" \
- CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
+ CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D *W ?extra)" \
LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
+ STRIP="$(STRIP.exe)" \
PYTHON="$(PYTHON.exe)" \
diff --git a/HandBrake-qsv.patch b/HandBrake-qsv.patch
new file mode 100644
index 0000000..490031e
--- /dev/null
+++ b/HandBrake-qsv.patch
@@ -0,0 +1,13 @@
+diff -up HandBrake-1.3.0/libhb/enc_qsv.c.orig HandBrake-1.3.0/libhb/enc_qsv.c
+--- HandBrake-1.3.0/libhb/enc_qsv.c.orig 2019-11-09 21:44:32.000000000 +0100
++++ HandBrake-1.3.0/libhb/enc_qsv.c 2019-11-25 13:13:44.248840649 +0100
+@@ -525,7 +525,9 @@ AVBufferRef *hb_qsv_create_mids(AVBuffer
+ for (i = 0; i < nb_surfaces; i++) {
+ QSVMid *mid = &mids[i];
+ mid->handle = frames_hwctx->surfaces[i].Data.MemId;
++#if CONFIG_D3D11VA
+ mid->texture = frames_hwctx->texture;
++#endif
+ mid->hw_frames_ref = hw_frames_ref1;
+ }
+
diff --git a/HandBrake.spec b/HandBrake.spec
index 79303f0..c559714 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -17,8 +17,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.2.2
-Release: 7%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.3.0
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
@@ -39,12 +39,12 @@ Source0:
https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{
# Build with unpatched libbluray (https://github.com/HandBrake/HandBrake/pull/458)
# can be dropped with libbluray-1.0.0
Patch1: %{name}-no_clip_id.patch
-# Use system OpenCL headers
-Patch2: %{name}-system-OpenCL.patch
# Pass strip tool override to gtk/configure
Patch3: %{name}-nostrip.patch
# Don't link with libva unnecessarily
Patch4: %{name}-no-libva.patch
+# Fix QSV with unpatched system FFmpeg
+Patch5: %{name}-qsv.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake3
@@ -64,10 +64,12 @@ BuildRequires: libappindicator-gtk3-devel
# Should be >= 0.13.2:
BuildRequires: libass-devel >= 0.13.1
BuildRequires: libbluray-devel >= 0.9.3
+BuildRequires: libdav1d-devel
+BuildRequires: libdrm-devel
BuildRequires: libdvdnav-devel >= 5.0.1
BuildRequires: libdvdread-devel >= 5.0.0
# FDK is non-free
-%{?_with_fdk:BuildRequires: libfdk-aac-devel >= 0.1.4}
+%{?_with_fdk:BuildRequires: fdk-aac-devel >= 0.1.4}
BuildRequires: libgudev-devel
%if 0%{?_with_mfx:1}
BuildRequires: libmfx-devel >= 1.23-1
@@ -82,13 +84,14 @@ BuildRequires: libvorbis-devel
# Should be >= 1.5:
BuildRequires: libvpx-devel >= 1.3
BuildRequires: make
+BuildRequires: meson
%if 0%{?_with_asm:1}
BuildRequires: nasm
%endif
+BuildRequires: numactl-devel
BuildRequires: nv-codec-headers
-BuildRequires: opencl-headers
BuildRequires: opus-devel
-BuildRequires: python2
+BuildRequires: python3
BuildRequires: speex-devel
BuildRequires: x264-devel >= 0.148
BuildRequires: x265-devel >= 1.9
@@ -135,17 +138,19 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%if 0%{?rhel}
%patch1 -p1
%endif
-%patch2 -p1
%patch3 -p1
+%if 0%{!?_with_mfx}
%patch4 -p1
+%else
+%patch5 -p1
+%endif
mkdir -p download
%{?_without_ffmpeg:cp -p %{SOURCE10} download}
# Use system libraries in place of bundled ones
-for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdvdnav
libdvdread libbluray %{?_with_mfx:libmfx} nvenc libvpx x265; do
+for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav
libdvdread libbluray %{?_with_mfx:libmfx} nvenc libvpx x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
-rm libhb/extras/cl{,_platform}.h
# Fix desktop file
sed -i -e 's/%{desktop_id}.svg/%{desktop_id}/g' gtk/src/%{desktop_id}.desktop
@@ -165,7 +170,7 @@ export http_proxy=http://127.0.0.1
# By default the project is built with optimizations for speed and no debug.
# Override configure settings by passing RPM_OPT_FLAGS and disabling preset
# debug options.
-echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -lx265
%{?_with_fdk:-lfdk-aac} %{?_with_mfx:-lmfx}" > custom.defs
+echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -ldl -lx265
%{?_with_fdk:-lfdk-aac} %{?_with_mfx:-lmfx}" > custom.defs
echo "GCC.args.g.none = " >> custom.defs
# Not an autotools configure script.
@@ -176,6 +181,7 @@ echo "GCC.args.g.none = " >> custom.defs
--strip=%{_bindir}/echo \
--verbose \
--disable-df-fetch \
+ --disable-df-verify \
--disable-gtk-update-checks \
%{?_with_asm:--enable-asm} \
--enable-x265 \
@@ -234,6 +240,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%{_bindir}/HandBrakeCLI
%changelog
+* Thu Nov 21 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 1.3.0-1
+- New upstream version (fixes compilation with Pango 1.44+)
+- New dependencies: libdrm, libdav1d, numactl
+- fixes rfbz#5426
+
* Fri Nov 15 2019 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> -
1.2.2-7
- rebuild for libdvdread ABI bump
diff --git a/sources b/sources
index 03e475c..1a0fe55 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-282924665fa45b3b08fef66b51beaac5 HandBrake-1.2.2-source.tar.bz2
-6c474003189f8cadf76838f20cf12e07 HandBrake-1.2.2-source.tar.bz2.sig
+SHA512 (HandBrake-1.3.0-source.tar.bz2) =
40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
+SHA512 (HandBrake-1.3.0-source.tar.bz2.sig) =
3c8d3d611daa46486c1fc4fb3970d52bd0e09907155c8a96d857b150069effc6595dd90bae357d7cb04f75f09cbab2c252c4917ef8664a229da1e2e087ee57a9