@@ -1,4 +1,10 @@

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

+Wed May 19 13:21:09 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

+

+- Build libx265_main10 and libx265_main12 unconditionally and

+  clean up spec a bit

+

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

 Fri Mar 26 12:02:14 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

 - Update to version 3.5

​

@@ -73,9 +73,8 @@

 %prep

 %setup -q -n %{name}_%{version}

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

+%autopatch -p1

+

 # set the version by hand

 sed -i "/^include(Version)/d" source/CMakeLists.txt

 # force version number in the soname

@@ -87,7 +86,6 @@

 COMMON_FLAGS="-DENABLE_TESTS=OFF -DENABLE_PIC=ON -Wno-dev"

 HIGH_BIT_DEPTH_FLAGS="-DENABLE_CLI=OFF -DENABLE_SHARED=OFF -DEXPORT_C_API=OFF -DHIGH_BIT_DEPTH=ON"

-%if 0%{?suse_version} >= 1500

 %define __sourcedir ./source

 # Build 10bit depth version of the library

@@ -115,33 +113,20 @@

 # Build general version of the library linking in the 10/12bit depth versions

 %define __builddir ./source/build

-%cmake -DENABLE_TESTS=OFF \

+%cmake $COMMON_FLAGS \

        -DENABLE_SHARED=ON \

        -DX265_LATEST_TAG="%{sover}.0" \

        -DX265_VERSION="%{version}" \

        -DENABLE_HDR10_PLUS=ON \

-       -DENABLE_PIC=ON \

        -DENABLE_CLI=ON \

        -DLINKED_10BIT=ON \

        -DLINKED_12BIT=ON \

        -DEXTRA_LINK_FLAGS="-L$SOURCE_DIR/build-10bit -L$SOURCE_DIR/build-12bit" \

-       -DEXTRA_LIB="x265_main10.a;x265_main12.a" \

-       -Wno-dev

-%else

-cd source

-%cmake $COMMON_FLAGS \

-       -DENABLE_SHARED=ON \

-       -DX265_LATEST_TAG="%{sover}.0" \

-       -DX265_VERSION="%{version}" \

-       -DENABLE_HDR10_PLUS=ON

-%endif

+       -DEXTRA_LIB="x265_main10.a;x265_main12.a"

 make %{?_smp_mflags}

 cd ../../

 %install

-%if 0%{?suse_version} < 1500

-cd source

-%endif

 %cmake_install

 find %{buildroot} -type f -name "*.a" -delete -print0

​