commit 4127daf6c4296ad9addb738962a25835c6228273 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Thu Feb 17 15:25:52 2022 +0100 new upstream version (rfbz#6221) drop obsolete patch keep building with libmfx .gitignore | 2 ++ HandBrake-no-libvpl.patch | 84 +++++++++++++++++++++++++++++++++++++++++++++++ HandBrake-qsv.patch | 13 -------- HandBrake.spec | 18 ++++++---- sources | 4 +-- 5 files changed, 99 insertions(+), 22 deletions(-) --- diff --git a/.gitignore b/.gitignore index cbc2aef..cab2526 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /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 diff --git a/HandBrake-no-libvpl.patch b/HandBrake-no-libvpl.patch new file mode 100644 index 0000000..bfe246b --- /dev/null +++ b/HandBrake-no-libvpl.patch @@ -0,0 +1,84 @@ +diff -up HandBrake-1.5.1/libhb/enc_qsv.c.orig HandBrake-1.5.1/libhb/enc_qsv.c +--- HandBrake-1.5.1/libhb/enc_qsv.c.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/libhb/enc_qsv.c 2022-02-17 13:57:36.709960390 +0100 +@@ -41,7 +41,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO + + #include "libavutil/hwcontext_qsv.h" + #include "libavutil/hwcontext.h" +-#include "vpl/mfxvideo.h" ++#include "mfx/mfxvideo.h" + + /* + * The frame info struct remembers information about each frame across calls to +diff -up HandBrake-1.5.1/libhb/handbrake/ports.h.orig HandBrake-1.5.1/libhb/handbrake/ports.h +--- HandBrake-1.5.1/libhb/handbrake/ports.h.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/libhb/handbrake/ports.h 2022-02-17 13:59:03.276623855 +0100 +@@ -27,7 +27,7 @@ + #include "handbrake/project.h" + + #if HB_PROJECT_FEATURE_QSV +-#include "vpl/mfxstructures.h" ++#include "mfx/mfxstructures.h" + #if defined(SYS_LINUX) || defined(SYS_FREEBSD) + #include <va/va_drm.h> + #endif +diff -up HandBrake-1.5.1/libhb/handbrake/qsv_common.h.orig HandBrake-1.5.1/libhb/handbrake/qsv_common.h +--- HandBrake-1.5.1/libhb/handbrake/qsv_common.h.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/libhb/handbrake/qsv_common.h 2022-02-17 13:58:23.563319471 +0100 +@@ -23,7 +23,7 @@ void hb_qsv_force_workarounds(); // for + #ifdef __LIBHB__ + // Private API + +-#include "vpl/mfxvideo.h" ++#include "mfx/mfxvideo.h" + + #define HB_QSV_VERSION_ATLEAST(MAJOR, MINOR) \ + (MFX_VERSION_MAJOR > (MAJOR) || \ +diff -up HandBrake-1.5.1/libhb/handbrake/qsv_libav.h.orig HandBrake-1.5.1/libhb/handbrake/qsv_libav.h +--- HandBrake-1.5.1/libhb/handbrake/qsv_libav.h.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/libhb/handbrake/qsv_libav.h 2022-02-17 13:57:58.188124993 +0100 +@@ -116,7 +116,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO + + #include <stdint.h> + #include <string.h> +-#include "vpl/mfxvideo.h" ++#include "mfx/mfxvideo.h" + #include "libavutil/mem.h" + #include "libavutil/time.h" + #include "libavcodec/avcodec.h" +diff -up HandBrake-1.5.1/libhb/qsv_common.c.orig HandBrake-1.5.1/libhb/qsv_common.c +--- HandBrake-1.5.1/libhb/qsv_common.c.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/libhb/qsv_common.c 2022-02-17 13:57:20.460835853 +0100 +@@ -28,7 +28,7 @@ + #include "libavfilter/buffersink.h" + #include "libavutil/hwcontext_qsv.h" + #include "libavutil/hwcontext.h" +-#include "vpl/mfxadapter.h" ++#include "mfx/mfxadapter.h" + + typedef struct hb_qsv_adapter_details + { +diff -up HandBrake-1.5.1/gtk/configure.ac.orig HandBrake-1.5.1/gtk/configure.ac +--- HandBrake-1.5.1/gtk/configure.ac.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/gtk/configure.ac 2022-02-17 14:04:54.529315971 +0100 +@@ -224,7 +224,7 @@ if test "x$use_x265" = "xyes" ; then + fi + + if test "x$use_qsv" = "xyes" ; then +- HB_LIBS="$HB_LIBS -lvpl" ++ HB_LIBS="$HB_LIBS -lmfx" + fi + + case $host in +diff -up HandBrake-1.5.1/test/module.defs.orig HandBrake-1.5.1/test/module.defs +--- HandBrake-1.5.1/test/module.defs.orig 2022-01-10 20:11:37.000000000 +0100 ++++ HandBrake-1.5.1/test/module.defs 2022-02-17 14:13:07.946128348 +0100 +@@ -24,7 +24,7 @@ ifeq (,$(filter $(HOST.system),darwin cy + endif + + ifeq (1,$(FEATURE.qsv)) +- TEST.GCC.l += vpl ++ TEST.GCC.l += mfx + ifneq (,$(filter $(HOST.system),linux freebsd)) + TEST.GCC.l += va va-drm + endif diff --git a/HandBrake.spec b/HandBrake.spec index e62a644..630f1fe 100644 --- a/HandBrake.spec +++ b/HandBrake.spec @@ -17,8 +17,8 @@ %global desktop_id fr.handbrake.ghb Name: HandBrake -Version: 1.4.2 -Release: 2%{!?tag:.%{date}git%{shortcommit0}}%{?dist} +Version: 1.5.1 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: An open-source multiplatform video transcoder License: GPLv2+ URL: http://handbrake.fr/ @@ -43,8 +43,6 @@ Patch1: %{name}-no_clip_id.patch 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 # Fix build on non-x86 (without nasm) Patch6: %{name}-no-nasm.patch # rhel gettext is too old to support metainfo @@ -53,6 +51,8 @@ Patch7: %{name}-no-metainfo.patch # Patch from Gentoo Patch8: %{name}-ffmpeg-5.0.patch Patch9: %{name}-x265-link.patch +# keep using MediaSDK +Patch10: %{name}-no-libvpl.patch BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: cmake3 @@ -157,8 +157,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0} %if 0%{!?_with_mfx} %patch4 -p1 %else -# Needs checking -#patch5 -p1 +%patch10 -p1 %endif %patch6 -p1 %if 0%{?rhel} @@ -171,7 +170,7 @@ 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} libdav1d 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 libvpl} nvenc libvpx x265; do sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs done @@ -268,6 +267,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/HandBrakeCLI %changelog +* Thu Feb 17 2022 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net&gt; - 1.5.1-1 +- new upstream version (rfbz#6221) +- drop obsolete patch +- keep building with libmfx + * Tue Feb 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 32b5ee1..26bc0fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (HandBrake-1.4.2-source.tar.bz2) = ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e -SHA512 (HandBrake-1.4.2-source.tar.bz2.sig) = dd8ffeffdec80f38333d0d3b491c0fdb3a25b76d528ede5b882049f4e95941cbdbd2407ff0847684a8ce7b1d631021a1ffbca409f466f899d48b143829cbc122 +SHA512 (HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568 +SHA512 (HandBrake-1.5.1-source.tar.bz2.sig) = 8638f5a2a592213efaedcb76570bf960b6c01c05fc34b472685b4b8d7d067a96745c07e9fe1c01e7f20b193870d502cf2240096e49380b89606ad6c33f31c1b4