diff --git a/vlc.changes b/vlc.changes index bc2f40e..560d9e9 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 12 11:00:12 UTC 2022 - Hans-Peter Jansen + +- Do not apply vlc.a52.patch if liba52 is < 0.8.0 +- Avoid ugly _FORTIFY_SOURCE redefinition warnings + ------------------------------------------------------------------- Fri Nov 25 15:22:01 UTC 2022 - Niklas Haas diff --git a/vlc.spec b/vlc.spec index b4cb1a5..7923601 100644 --- a/vlc.spec +++ b/vlc.spec @@ -401,7 +401,6 @@ OpenCV based video filters and a face detection example. %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch4 -p1 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 @@ -409,6 +408,11 @@ OpenCV based video filters and a face detection example. %endif %patch103 -p1 +# a52_init() < 0.8.0 doesn't take any arguments +if pkg-config --max-version 0.8 liba52; then +%patch0 -p1 +fi + ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then %patch2 -p1 @@ -511,6 +515,11 @@ autoreconf -fiv ### ONLY REMOVE THIS IF YOU KNOW WHAT YOU ARE DOING! sed -i 's/^#define.*VLC_COMPILE_HOST.*/#define VLC_COMPILE_HOST "obs-build"/' config.h +# avoid ugly warnings +if echo "%{optflags}" | grep -q -- '-D_FORTIFY_SOURCE'; then + sed -i '/#define _FORTIFY_SOURCE/d' config.h +fi + %make_build %install