Request 6101 (accepted)

Overview

Request 6101 (accepted)

reenable build on ARM by using a newer compiler

Created by olh almost 2 years ago
In state accepted

Submit x265

Submit package Staging / x265 to package Essentials / x265

x265.spec Changed

@@ -30,11 +30,20 @@
 URL:            https://bitbucket.org/multicoreware/x265_git
 Source0:        https://bitbucket.org/multicoreware/x265_git/downloads/%{name}_%{version}.tar.gz
 Patch1:         x265.pkgconfig.patch
-Patch2:         x265-fix_enable512.patch
 Patch3:         0001-Fix-arm-flags.patch
 Patch4:         0004-Do-not-build-with-assembly-support-on-arm.patch
-BuildRequires:  cmake >= 2.8.8
+BuildRequires:  cmake
+%if 0%{?suse_version} > 1500
 BuildRequires:  gcc-c++
+%else
+%if 0%{?sle_version} > 150500
+BuildRequires:  gcc13
+BuildRequires:  gcc13-c++
+%else
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
+%endif
+%endif
 BuildRequires:  nasm >= 2.13
 BuildRequires:  pkgconfig
 %ifarch x86_64
@@ -73,16 +82,27 @@
 streams.
 
 %prep
-%setup -q -n %{name}_%{version}
-%autopatch -p1
+%autosetup -p1 -n %{name}_%{version}
 
+%build
+test -x "$(type -p gcc)"    && CC="$_"
+test -x "$(type -p g++)"    && CXX="$_"
+test -x "$(type -p gcc-10)" && CC="$_"
+test -x "$(type -p g++-10)" && CXX="$_"
+test -x "$(type -p gcc-13)" && CC="$_"
+test -x "$(type -p g++-13)" && CXX="$_"
+export CC="$(readlink -f ${CC})"
+export CXX="$(readlink -f ${CXX})"
+CFLAGS='%optflags -Wno-misleading-indentation -Wno-unused-parameter -Wno-unused-variable'
+CXXFLAGS='%optflags -Wno-misleading-indentation -Wno-unused-parameter -Wno-unused-variable'
 # set the version by hand
-sed -i "/^include(Version)/d" source/CMakeLists.txt
+sed -i~ "/^include(Version)/d" source/CMakeLists.txt
+diff -u "$_"~ "$_" && exit 1
 # force version number in the soname
-sed -i 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%{version}/' \
+sed -i~ 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%{version}/' \
        source/CMakeLists.txt
+diff -u "$_"~ "$_" && exit 1
 
-%build
 SOURCE_DIR="$PWD"/source
 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"

x265-fix_enable512.patch Deleted

Build Results
RPM Lint

Refresh

Comments for request 6101 0

Request History

olh created request almost 2 years ago

reenable build on ARM by using a newer compiler

olh accepted request almost 2 years ago