#1 Disable vmaf on rhel
Merged 3 years ago by eclipseo. Opened 3 years ago by wtaymans.
rpms/ wtaymans/aom master  into  master

file modified
+14 -1
@@ -11,9 +11,15 @@ 

  %global snapshotdate    20201215

  # %%global prerelease      1

  

+ %if 0%{?rhel} >= 8

+ %bcond_with vmaf

+ %else

+ %bcond_without vmaf

+ %endif

+ 

  Name:       aom

  Version:    2.0.1

- Release:    2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}

+ Release:    3%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}

  Summary:    Royalty-free next-generation video format

  

  License:    BSD
@@ -30,9 +36,11 @@ 

  BuildRequires:  perl(Getopt::Long)

  BuildRequires:  python3-devel

  BuildRequires:  yasm

+ %if %{with vmaf}

  %ifarch x86_64

  BuildRequires:  pkgconfig(libvmaf)

  %endif

+ %endif

  

  Provides:       av1 = %{version}-%{release}

  Requires:       libaom%{?_isa} = %{version}-%{release}
@@ -86,9 +94,11 @@ 

          -DENABLE_TESTS=0 \

          -DCONFIG_ANALYZER=0 \

          -DCONFIG_SHARED=1 \

+ %if %{with vmaf}

  %ifarch x86_64

          -DCONFIG_TUNE_VMAF=1 \

  %endif

+ %endif

          %{nil}

  %cmake3_build

  
@@ -113,6 +123,9 @@ 

  %{_libdir}/pkgconfig/%{name}.pc

  

  %changelog

+ * Wed Jan 20 2021 Wim Taymans <wtaymans@redhat.com> - 2.0.1-3

+ - Disable vmaf on rhel

+ 

  * Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.1-2

  - Disable tests

  

I causes too many dependencies to be pulled in, like octave, portaudio and jack

rebased onto e439a69

3 years ago

rebased onto 2f42110

3 years ago

Thanks for the PR, I will rebuild the package once the issue with s390x builder is resolved (https://pagure.io/fedora-infrastructure/issue/9589).

Pull-Request has been merged by eclipseo

3 years ago