@@ -1,4 +1,13 @@

 -------------------------------------------------------------------

+Tue Nov  8 11:59:52 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>

+

+- Improve build

+- Consistent CFLAGS and specifically _FORTIFY_SOURCE across project

+- qsv build conditional

+- Apply qsv build fix: HandBrake-end-of-non-void-function.patch

+- Add librsvg-2.0 build dependency

+

+-------------------------------------------------------------------

 Sun Nov  6 18:16:53 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>

 - Add libjpeg as explicit build dependency

​

@@ -3,7 +3,7 @@

 #

 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>

 # Copyright (c) 2014 B1 Systems GmbH, Vobhurg, Germany

-# Copyright (c) 2019-2020 LISA GmbH, Bingen, Germany

+# Copyright (c) 2019-2022 LISA GmbH, Bingen, Germany

 #

 # All modifications and additions to the file contributed by third parties

 # remain the property of their copyright owners, unless otherwise agreed

@@ -17,6 +17,9 @@

 # Please submit bugfixes or comments via http://bugs.opensuse.org/

 #

+%ifarch x86_64

+%bcond_without  qsv

+%endif

 Name:           HandBrake

 Summary:        Multithreaded Video Transcoder

@@ -27,6 +30,7 @@

 Source1:        download.tar.xz

 Source2:        pre_checkin.sh

 Source3:        version.txt

+Patch0:         HandBrake-end-of-non-void-function.patch

 License:        GPL-2.0+

 Group:          Productivity/Multimedia/Video/Editors and Convertors

 BuildRequires:  autoconf

@@ -45,10 +49,8 @@

 BuildRequires:  subversion

 BuildRequires:  update-desktop-files

 BuildRequires:  wget

-BuildRequires:  yasm

 BuildRequires:  glibc-devel

 BuildRequires:  libmp3lame-devel

-BuildRequires:  libnuma-devel

 BuildRequires:  pkgconfig(bzip2)

 BuildRequires:  pkgconfig(dbus-glib-1)

 BuildRequires:  pkgconfig(dvdnav)

@@ -64,11 +66,8 @@

 BuildRequires:  pkgconfig(libdrm)

 BuildRequires:  pkgconfig(libjpeg)

 BuildRequires:  pkgconfig(liblzma)

-%ifarch x86_64

-BuildRequires:  pkgconfig(libmfx)

-%endif

 BuildRequires:  pkgconfig(libnotify)

-BuildRequires:  pkgconfig(libva)

+BuildRequires:  pkgconfig(librsvg-2.0)

 BuildRequires:  pkgconfig(libxml-2.0)

 BuildRequires:  pkgconfig(ogg)

 BuildRequires:  pkgconfig(opus)

@@ -76,15 +75,20 @@

 BuildRequires:  pkgconfig(speex)

 BuildRequires:  pkgconfig(theora)

 BuildRequires:  pkgconfig(vorbis)

-BuildRequires:  pkgconfig(vpl)

 BuildRequires:  pkgconfig(vpx) >= 1.4

 BuildRequires:  pkgconfig(webkit2gtk-4.0)

 BuildRequires:  pkgconfig(x264)

-%ifarch armv6l || armv6hl

+%if %{with qsv}

+BuildRequires:  pkgconfig(libmfx)

+BuildRequires:  pkgconfig(libva)

+BuildRequires:  pkgconfig(vpl)

+%endif

+%ifnarch %{arm}

+BuildRequires:  libnuma-devel

+%else

 BuildRequires:  Mesa-libEGL1

 BuildRequires:  Mesa-libEGL-devel

 %endif

-BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description

 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video

@@ -116,11 +120,10 @@

 This package contains a GTK+ graphical user interface for Handbrake.

 %lang_package -n %{name}-gtk

-Provides:       handbrake-gtk-lang = %{version}

-Obsoletes:      handbrake-gtk-lang < %{version}

 %prep

 %setup -q -n %{name}-%{version} -a 1

+%patch0 -p0

 cp -vp %{SOURCE3} .

 # disable contrib parts, that we provide externally

@@ -137,16 +140,27 @@

 %build

 # the contrib libraries doesn't like LTO bindings

 %define _lto_cflags %{nil}

-echo "CFLAGS=$CFLAGS"

+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"

 export CXXFLAGS="$CFLAGS -Wno-reorder"

-echo "CXXFLAGS=$CXXFLAGS"

 export PATH="%{_builddir}/%{name}-%{version}/build/contrib/bin:$PATH"

-%ifarch x86_64

-./configure --prefix=/usr --enable-x265 --enable-numa --enable-nvenc --enable-qsv --launch-jobs=$(nproc)

-%else

-./configure --prefix=/usr --enable-x265 --enable-numa --enable-nvenc --disable-qsv --launch-jobs=$(nproc)

+./configure \

+    --prefix=%{_prefix} \

+    --optimize=speed \

+    --enable-fdk-aac \

+    --enable-x265 \

+    --enable-nvenc \

+%if %{with qsv}

+    --enable-qsv \

 %endif

+%ifarch %{arm}

+    --enable-numa \

+%endif

+    --debug=max \

+    --launch-jobs=$(nproc)

+

+# don't redefine _FORTIFY_SOURCE; we define _FORTIFY_SOURCE=3 via CFLAGS already

+sed -i 's: -D_FORTIFY_SOURCE=2::g' make/include/gcc.defs

 pushd build

 make -j$(nproc)

 popd

@@ -154,12 +168,12 @@

 %install

 %makeinstall -C build

-%__ln_s ghb %{buildroot}%{_bindir}/HandBrakeGUI

+ln -sfvb ghb %{buildroot}%{_bindir}/HandBrakeGUI

 %suse_update_desktop_file -r fr.handbrake.ghb AudioVideo AudioVideoEditing

 # -f because it might not be there if built without gtk...

-%__rm -f "%{buildroot}%{_datadir}/icons"/*/*.cache

+rm -vf "%{buildroot}%{_datadir}/icons"/*/*.cache

 %find_lang ghb

​

@@ -0,0 +1,10 @@

+--- libhb/qsv_common.c.orig    2021-07-19 09:51:29.420769173 +0200

++++ libhb/qsv_common.c 2021-07-19 09:51:29.436768899 +0200

+@@ -4358,6 +4358,7 @@

+ 

+ int hb_qsv_get_mid_by_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, mfxFrameSurface1 *surface, QSVMid **out_mid)

+ {

++    return 0;

+ }

+ 

+ int hb_qsv_release_surface_from_pool_by_surface_pointer(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const mfxFrameSurface1 *surface)

​