Hello community, here is the log from the commit of package OpenImageIO for openSUSE:Factory checked in at 2015-05-30 12:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenImageIO (Old) and /work/SRC/openSUSE:Factory/.OpenImageIO.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenImageIO" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenImageIO/OpenImageIO.changes 2015-03-30 19:32:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.OpenImageIO.new/OpenImageIO.changes 2015-05-30 12:34:12.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 28 17:11:30 CEST 2015 - [email protected] + +- added patch oiio-detectplatform-others.patch + to fix build on other architectures +- added patch oiio-clusterfit-boundscheck.patch + to fix build failure on aarch64, looks like compiler is smarter + +------------------------------------------------------------------- New: ---- oiio-clusterfit-boundscheck.patch oiio-detectplatform-others.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenImageIO.spec ++++++ --- /var/tmp/diff_new_pack.Zvbmj2/_old 2015-05-30 12:34:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Zvbmj2/_new 2015-05-30 12:34:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package OpenImageIO # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define so_ver 1_5 Name: OpenImageIO @@ -26,6 +27,8 @@ Url: http://www.openimageio.org/ #DL-URL: https://github.com/OpenImageIO/oiio/archive/Release-%%{version}/OpenImageIO-%%{version}.tar.gz Source0: oiio-Release-%{version}.tar.bz2 +Patch0: oiio-clusterfit-boundscheck.patch +Patch1: oiio-detectplatform-others.patch #BuildRequires: Field3D-devel BuildRequires: OpenColorIO-devel BuildRequires: boost-devel @@ -53,10 +56,10 @@ BuildRequires: OpenEXR-devel %endif #BuildRequires: openjpeg-devel -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) BuildRequires: pugixml-devel BuildRequires: python-devel +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glu) # NOTE: txt2man is needed for the man pages but not in factory. #BuildRequires: txt2man BuildRequires: zlib-devel @@ -114,6 +117,8 @@ %prep %setup -q -n oiio-Release-%{version} +%patch0 +%patch1 # Make sure that bundled libraries are not used rm -f src/include/pugiconfig.hpp \ ++++++ oiio-clusterfit-boundscheck.patch ++++++ --- src/dds.imageio/squish/clusterfit.cpp +++ src/dds.imageio/squish/clusterfit.cpp @@ -66,14 +66,14 @@ // build the list of dot products float dps[16]; u8* order = ( u8* )m_order + 16*iteration; - for( int i = 0; i < count; ++i ) + for( int i = 0; i < count && i < 16; ++i ) { dps[i] = Dot( values[i], axis ); order[i] = ( u8 )i; } // stable sort using them - for( int i = 0; i < count; ++i ) + for( int i = 0; i < count && i < 16; ++i ) { for( int j = i; j > 0 && dps[j] < dps[j - 1]; --j ) { ++++++ oiio-detectplatform-others.patch ++++++ --- src/make/detectplatform.mk +++ src/make/detectplatform.mk @@ -25,7 +25,19 @@ ifneq (${hw},x86_64) ifneq (${hw},i386) ifneq (${hw},i686) - $(error "ERROR: Unknown hardware architecture") + ifneq (${hw},aarch64) + ifneq (${hw},ppc) + ifneq (${hw},ppc64) + ifneq (${hw},ppc64le) + ifneq (${hw},s390) + ifneq (${hw},s390x) + $(error "ERROR: Unknown hardware architecture") + endif + endif + endif + endif + endif + endif endif endif endif @@ -44,6 +56,18 @@ ifeq (${hw},x86_64) platform := linux64 endif + ifeq (${hw},aarch64) + platform := linux64 + endif + ifeq (${hw},ppc64) + platform := linux64 + endif + ifeq (${hw},ppc64le) + platform := linux64 + endif + ifeq (${hw},s390x) + platform := linux64 + endif endif # Windows
