The package rpms/osgearth.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/osgearth.git/commit/?id=f198e7744....
Change:
+%ifnarch i686 x86_64
Thanks.
Full change:
============
commit f198e7744adee83a502e0f5e89596780fdf2845d
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Fri Feb 25 11:06:32 2022 +0100
Ensure fastdxt is only disabled on native non-x86 arches
diff --git a/osgearth.spec b/osgearth.spec
index 98963f0..c95327a 100644
--- a/osgearth.spec
+++ b/osgearth.spec
@@ -12,6 +12,8 @@ URL:
http://osgearth.org/
Source0:
https://github.com/gwaldron/osgearth/archive/%{name}-%{version}.tar.gz
# Fix mingw build failure due to header case mismatch
Patch0: osgearth_mingw.patch
+# Support option to disable fastdxt build
+Patch1: osgearth_fastdxt.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -147,15 +149,15 @@ MinGW Windows %{name} tools.
# Remove non-free content
rm -rf data/loopix
-# Disable fastdxt driver on non x86 arches, requires x86 intrinsics
-%ifnarch i686 x86_64
-sed -i 's|add_subdirectory(fastdxt)|# add_subdirectory(fastdxt)|'
src/osgEarthDrivers/CMakeLists.txt
-%endif
-
%build
# Native build
+# Disable fastdxt driver on non x86 arches, requires x86 intrinsics
+%ifnarch i686 x86_64
+%cmake -DDISABLE_FASTDXT=ON
+%else
%cmake
+%endif
%cmake_build
%if 0%{?with_docs}
make -C docs html
diff --git a/osgearth_fastdxt.patch b/osgearth_fastdxt.patch
new file mode 100644
index 0000000..2e80d3e
--- /dev/null
+++ b/osgearth_fastdxt.patch
@@ -0,0 +1,12 @@
+diff -rupN osgearth-osgearth-3.2/src/osgEarthDrivers/CMakeLists.txt
osgearth-osgearth-3.2-new/src/osgEarthDrivers/CMakeLists.txt
+--- osgearth-osgearth-3.2/src/osgEarthDrivers/CMakeLists.txt 2021-08-09
19:37:52.000000000 +0200
++++ osgearth-osgearth-3.2-new/src/osgEarthDrivers/CMakeLists.txt 2022-02-25
11:03:20.003770220 +0100
+@@ -59,6 +59,7 @@ if(OSGEARTH_BUILD_ROCKSDB_CACHE)
+ add_subdirectory(cache_rocksdb)
+ endif()
+
+-IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT ANDROID)
++OPTION(DISABLE_FASTDXT "Disale fastdxt build" OFF)
++IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT ANDROID AND NOT DISABLE_FASTDXT)
+ add_subdirectory(fastdxt)
+ ENDIF()