[rpms/svt-av1] epel9-next: Fix FTBFS

[rpms/svt-av1] epel9-next: Fix FTBFS

[@ 2026-07-14 21:52 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/svt-av1
            Branch : epel9-next
            Commit : 8945e382f1abd9604a5ddb9c727b1589f8d25fca
            Author : Robert-André Mauchin <zebob.m@gmail.com>
            Date   : 2020-08-08T23:09:58+02:00
            Stats  : +10/-15 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/svt-av1/c/8945e382f1abd9604a5ddb9c727b1589f8d25fca?branch=epel9-next

            Log:
            Fix FTBFS

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---
diff --git a/svt-av1.spec b/svt-av1.spec
index 2675cb7..a9f8f43 100644
--- a/svt-av1.spec
+++ b/svt-av1.spec
@@ -65,10 +65,8 @@ sed -e "s|install: true,|install: true, include_directories : [ include_director
 -e "/svtav1enc_dep =/d" -e 's|, svtav1enc_dep||' -e "s|svtav1enc_dep.found()|true|" -i gstreamer-plugin/meson.build
 
 %build
-mkdir _build
-pushd _build
 # https://github.com/OpenVisualCloud/SVT-AV1/issues/999
-# Use -fcommon until all tho global variables are fixed upstream
+# Use -fcommon until all the global variables are fixed upstream
 export CFLAGS="%build_cflags -fcommon"
 export CXXFLAGS="%build_cxxflags -fcommon"
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -80,20 +78,18 @@ export CXXFLAGS="%build_cxxflags -fcommon"
        -DBUILD_TESTING=OFF \
        -DNATIVE=OFF \
        ..
-%make_build
-popd
+%cmake_build
 
-pushd gstreamer-plugin
-    export LIBRARY_PATH="$PWD/../Bin/RelWithDebInfo:$LIBRARY_PATH"
-    %meson
-    %meson_build
-popd
+cd gstreamer-plugin
+export LIBRARY_PATH="$PWD/../Bin/RelWithDebInfo:$LIBRARY_PATH"
+%meson
+%meson_build
 
 %install
-pushd _build
-%make_install
+%cmake_install
 rm -f %{buildroot}%{_libdir}/*.{a,la}
 
+pushd %{_vpath_builddir}
 mkdir -p %{buildroot}/%{_mandir}/man1
 export PATH=$PATH:%{buildroot}%{_bindir}
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
@@ -101,9 +97,8 @@ help2man -N --help-option=-help --version-string=%{version} SvtAv1DecApp > %{bui
 help2man -N --help-option=-help --no-discard-stderr --version-string=%{version} SvtAv1EncApp > %{buildroot}%{_mandir}/man1/SvtAv1EncApp.1
 popd
 
-pushd gstreamer-plugin
-    %meson_install
-popd
+cd gstreamer-plugin
+%meson_install
 
 %files
 %{_bindir}/SvtAv1DecApp