Hello community, here is the log from the commit of package ogre for openSUSE:Factory checked in at 2018-01-06 18:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ogre (Old) and /work/SRC/openSUSE:Factory/.ogre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ogre" Sat Jan 6 18:49:19 2018 rev:3 rq:561743 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ogre/ogre.changes 2017-12-15 14:06:26.909537190 +0100 +++ /work/SRC/openSUSE:Factory/.ogre.new/ogre.changes 2018-01-06 18:49:23.934643865 +0100 @@ -1,0 +2,6 @@ +Tue Jan 2 16:33:09 UTC 2018 - [email protected] + +- Fix aarch64 build, add fix-aarch64-detection.patch +- Fix armv{6,7}l build, set flags for zzip (same as i586) + +------------------------------------------------------------------- New: ---- fix-aarch64-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ogre.spec ++++++ --- /var/tmp/diff_new_pack.7IpP1J/_old 2018-01-06 18:49:27.242489305 +0100 +++ /var/tmp/diff_new_pack.7IpP1J/_new 2018-01-06 18:49:27.246489118 +0100 @@ -1,7 +1,7 @@ # # spec file for package ogre # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: Object-Oriented Graphics Rendering Engine License: LGPL-2.1 Group: Development/Libraries/C and C++ -URL: http://www.ogre3d.org/ +Url: http://www.ogre3d.org/ Source0: https://bitbucket.org/sinbad/ogre/get/v%{_version}.tar.bz2 # PATCH-FIX-UPSTREAM ogre1.9.0-browser-cmake.patch Patch0: ogre1.9.0-browser-cmake.patch @@ -37,6 +37,8 @@ Patch3: ogre-1.9.0-longlongconstants.patch # PATCH-FIX-UPSTREAM resolve link errors due to incorrect template creation Patch4: fix-template-function.patch +# Patch-FIX-UPSTREAM fix-aarch64-detection.patch +Patch5: fix-aarch64-detection.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -227,7 +229,6 @@ %package -n libOgreMain-devel Summary: Development files for the Ogre Terrain System Group: Development/Libraries/C and C++ -# _includedir/OGRE/Threading/OgreThreadHeadersBoost.h includes headers from boost Requires: libOgreMain%{soname} = %{version} Requires: pkgconfig Requires: pkgconfig(OIS) @@ -239,6 +240,7 @@ Requires: pkgconfig(xrandr) Requires: pkgconfig(xt) Requires: pkgconfig(zziplib) +# _includedir/OGRE/Threading/OgreThreadHeadersBoost.h includes headers from boost %if 0%{?suse_version} >= 1500 Requires: libboost_atomic-devel Requires: libboost_chrono-devel @@ -393,6 +395,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Be sure we use system tinyxml rm Tools/XMLConverter/src/tiny* rm Tools/XMLConverter/include/tiny* @@ -409,7 +412,7 @@ %endif %build -%ifarch %{ix86} +%ifarch %{ix86} %{arm} %define largefiledef -DZZIP_LARGEFILE_SENSITIVE -D_ZZIP_LARGEFILE -DZZIP_LARGEFILE_RENAME %endif ++++++ fix-aarch64-detection.patch ++++++ >From c425a7a7cb8e9fa172f00c2c2670ce5d84c50ba2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz <[email protected]> Date: Mon, 23 Jun 2014 18:25:46 +0200 Subject: [PATCH] Mark AArch64 (64-bit ARM) as 64-bit architecture --- OgreMain/include/OgrePlatform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h index 258691a857..d46547a866 100644 --- a/OgreMain/include/OgrePlatform.h +++ b/OgreMain/include/OgrePlatform.h @@ -160,7 +160,7 @@ namespace Ogre { #endif /* Find the arch type */ -#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(__arm64__) || defined(_aarch64_) || defined(__mips64) || defined(__mips64_) +#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(__arm64__) || defined(__aarch64__) || defined(__mips64) || defined(__mips64_) # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 #else # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32
