diff -Nru qt3d-opensource-src-5.0~git20130731/debian/changelog qt3d-opensource-src-5.0~git20130731/debian/changelog --- qt3d-opensource-src-5.0~git20130731/debian/changelog 2014-02-28 09:08:18.000000000 +0000 +++ qt3d-opensource-src-5.0~git20130731/debian/changelog 2014-03-14 11:52:53.000000000 +0000 @@ -1,3 +1,15 @@ +qt3d-opensource-src (5.0~git20130731-0ubuntu4) trusty; urgency=medium + + * Run tests only on archs known to pass in the past + + -- Timo Jyrinki Fri, 14 Mar 2014 11:51:29 +0000 + +qt3d-opensource-src (5.0~git20130731-0ubuntu3) trusty; urgency=medium + + * Backport upstream patch to fix build on “uncommon” architectures. + + -- Dmitry Shachnev Fri, 14 Mar 2014 09:15:26 +0400 + qt3d-opensource-src (5.0~git20130731-0ubuntu2) trusty; urgency=medium [ Timo Jyrinki ] diff -Nru qt3d-opensource-src-5.0~git20130731/debian/patches/fix_build_on_uncommon_architectures.patch qt3d-opensource-src-5.0~git20130731/debian/patches/fix_build_on_uncommon_architectures.patch --- qt3d-opensource-src-5.0~git20130731/debian/patches/fix_build_on_uncommon_architectures.patch 1970-01-01 00:00:00.000000000 +0000 +++ qt3d-opensource-src-5.0~git20130731/debian/patches/fix_build_on_uncommon_architectures.patch 2014-03-14 11:52:53.000000000 +0000 @@ -0,0 +1,117 @@ +Description: Fix assimp build on uncommon architectures +Origin: upstream, https://qt.gitorious.org/qt/qt3d/commit/d3338a9f7fcac1 +Last-Update: 2014-03-14 + +--- a/3rdparty/assimp/code/Importer.cpp ++++ b/3rdparty/assimp/code/Importer.cpp +@@ -897,27 +897,35 @@ void WriteLogOpening(const std::string& file) + << aiGetVersionMinor() + << "." + << aiGetVersionRevision() ++ << " " + +-#if defined(ASSIMP_BUILD_X86_32BIT_ARCHITECTURE) ++#if defined(ASSIMP_BUILD_ARCHITECTURE) ++ << ASSIMP_BUILD_ARCHITECTURE ++#elif defined(_M_IX86) || defined(__x86_32__) || defined(__i386__) + << " x86" +-#elif defined(ASSIMP_BUILD_X86_64BIT_ARCHITECTURE) ++#elif defined(_M_X64) || defined(__x86_64__) + << " amd64" +-#elif defined(ASSIMP_BUILD_IA_64BIT_ARCHITECTURE) ++#elif defined(_M_IA64) || defined(__ia64__) + << " itanium" +-#elif defined(ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE) ++#elif defined(__ppc__) || defined(__powerpc__) + << " ppc32" +-#elif defined(ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE) +- << " arm32" ++#elif defined(__powerpc64__) ++ << " ppc64" ++#elif defined(__arm__) ++ << " arm" + #else +-# error unknown architecture ++ << " unknown architecture" + #endif + +-#if defined(_MSC_VER) ++ << " " ++#if defined(ASSIMP_BUILD_COMPILER) ++ << ASSIMP_BUILD_COMPILER ++#elif defined(_MSC_VER) + << " msvc" + #elif defined(__GNUC__) + << " gcc" + #else +-# warning unknown compiler ++# << " unknown compiler" + #endif + + #ifndef NDEBUG +--- a/3rdparty/assimp/include/aiDefines.h ++++ b/3rdparty/assimp/include/aiDefines.h +@@ -219,41 +219,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #endif + + ////////////////////////////////////////////////////////////////////////// +- /* ASSIMP_BUILD_XXXX_NNBIT_ARCHITECTURE */ +- ////////////////////////////////////////////////////////////////////////// +-#if defined(_MSC_VER) +- // See http://msdn.microsoft.com/en-us/library/b0084kay. +-# if defined(_M_IX86) +-# define ASSIMP_BUILD_X86_32BIT_ARCHITECTURE +-# elif defined(_M_X64) +-# define ASSIMP_BUILD_X86_64BIT_ARCHITECTURE +-# elif defined(_M_IA64) +-# define ASSIMP_BUILD_IA_64BIT_ARCHITECTURE +-# else +-# error unknown architecture +-# endif +-#elif defined(__GNUC__) +- // See http://gcc.gnu.org/onlinedocs/cpp/Predefined-Macros.html. +-# if defined(__x86_32__) || defined(__i386__) +-# define ASSIMP_BUILD_X86_32BIT_ARCHITECTURE +-# elif defined(__x86_64__) +-# define ASSIMP_BUILD_X86_64BIT_ARCHITECTURE +-# elif defined(__ppc__) +-# define ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE +-# elif defined(__arm__) +-# define ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE +-# else +-# error unknown architecture +-# endif +-#elif defined (__GCCE__) +-#define ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE +-#elif defined (__arm__) +-#define ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE +-#else //assume +-# error unknown compiler +-#endif +- +- ////////////////////////////////////////////////////////////////////////// + /* Useful constants */ + ////////////////////////////////////////////////////////////////////////// + +@@ -271,8 +236,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define AI_DEG_TO_RAD(x) (x*0.0174532925f) + #define AI_RAD_TO_DEG(x) (x*57.2957795f) + +-/* Support for big-endian builds on Mac OS X. */ +-#if defined(__APPLE__) && defined(__BIG_ENDIAN__) ++/* Support for big-endian builds */ ++#if defined(__BYTE_ORDER__) ++# if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++# if !defined(__BIG_ENDIAN__) ++# define __BIG_ENDIAN__ ++# endif ++# else /* little endian */ ++# if defined(__BIG_ENDIAN__) ++# undef(__BIG_ENDIAN__) ++# endif ++# endif ++#endif ++#if defined(__BIG_ENDIAN__) + #define AI_BUILD_BIG_ENDIAN + #endif + diff -Nru qt3d-opensource-src-5.0~git20130731/debian/patches/series qt3d-opensource-src-5.0~git20130731/debian/patches/series --- qt3d-opensource-src-5.0~git20130731/debian/patches/series 2014-02-28 09:08:18.000000000 +0000 +++ qt3d-opensource-src-5.0~git20130731/debian/patches/series 2014-03-14 11:52:53.000000000 +0000 @@ -1,3 +1,4 @@ link_against_system_zlib.patch workaround_zlib_linking_issue.patch skip_failing_tests.patch +fix_build_on_uncommon_architectures.patch diff -Nru qt3d-opensource-src-5.0~git20130731/debian/rules qt3d-opensource-src-5.0~git20130731/debian/rules --- qt3d-opensource-src-5.0~git20130731/debian/rules 2014-02-28 09:08:18.000000000 +0000 +++ qt3d-opensource-src-5.0~git20130731/debian/rules 2014-03-14 11:52:53.000000000 +0000 @@ -4,11 +4,15 @@ #export DH_VERBOSE=1 export QT_SELECT=qt5 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed +# Run tests only on archs known to pass in the past +testrun_architectures := amd64 arm64 armhf i386 ppc64el + %: dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg @@ -26,7 +30,9 @@ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la override_dh_auto_test: +ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testrun_architectures))) xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib +endif override_dh_builddeb: dh_builddeb -- -Zxz