Author: vincentc-guest Date: 2013-12-26 02:21:32 +0000 (Thu, 26 Dec 2013) New Revision: 14734
Removed: packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch Modified: packages/trunk/0ad/debian/changelog packages/trunk/0ad/debian/patches/series Log: 0ad: Remove fix-arm-ftbfs.patch Modified: packages/trunk/0ad/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2013-12-26 02:19:29 UTC (rev 14733) +++ packages/trunk/0ad/debian/changelog 2013-12-26 02:21:32 UTC (rev 14734) @@ -1,6 +1,7 @@ 0ad (0.0.15-1) unstable; urgency=low * New upstream release. + - Remove fix-arm-ftbfs.patch, fixed upstream. * Add build-dep on libgloox-dev and libminiupnpc-dev. * Append '~' to libnvtt-dev build dependency to ease backporting. * Prefer libwxgtk3.0-dev over libwxgtk2.8-dev as build-dep (keep latter as Deleted: packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch 2013-12-26 02:19:29 UTC (rev 14733) +++ packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch 2013-12-26 02:21:32 UTC (rev 14734) @@ -1,84 +0,0 @@ -Description: Fix FTBFS on armel and armhf -Origin: upstream -Bug: http://trac.wildfiregames.com/ticket/2121 -Last-Update: 2013-09-17 - ---- a/build/premake/premake4.lua -+++ b/build/premake/premake4.lua -@@ -268,14 +268,12 @@ - end - - if arch == "arm" then -- -- disable warnings about va_list ABI change -- buildoptions { "-Wno-psabi" } -+ -- disable warnings about va_list ABI change and -+ -- target generic armv7 CPUs but use system default FPU/ABI -+ buildoptions { "-Wno-psabi -mtune=generic-armv7-a" } - if _OPTIONS["android"] then -- -- target generic arm CPUs with NEON -- buildoptions { "-mtune=generic-arm -mfpu=neon -mfloat-abi=softfp" } -- else -- -- target Cortex-A15 CPUs with NEON -- buildoptions { "-mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard" } -+ -- Android uses softfp, so we should too. -+ buildoptions { "-mfloat-abi=softfp" } - end - end - ---- a/libraries/source/fcollada/src/Makefile -+++ b/libraries/source/fcollada/src/Makefile -@@ -1,18 +1,17 @@ - OS_ARCH := $(shell uname -s) --OS_CPU := $(shell uname -p) - - ifeq ($(OS_ARCH),Darwin) --PIC_FLAGS ?= -fPIC -+ PIC_FLAGS ?= -fPIC - else --OS_DEFINE ?= -DLINUX --PIC_FLAGS ?= -fpic -+ OS_DEFINE ?= -DLINUX -+ PIC_FLAGS ?= -fpic - endif - - CXX ?= g++ - CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-but-set-variable $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) --# If we're compiling on *nix ARM, target Cortex-A15 CPUs with NEON ***mfloat-abi setting must be the same on everything linked to FCollada*** --ifeq ($(OS_CPU),armv7l) --CXXFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard -+# If we're compiling on *nix ARM, target generic armv7 CPUs but use default FPU/ABI -+ifeq ($(shell uname -p | grep -q "arm"; $?),0) -+ CXXFLAGS += -mtune=generic-armv7-a - endif - CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL - CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL ---- a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp -+++ b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp -@@ -8,6 +8,7 @@ - - #include "StdAfx.h" - #include "FUAssert.h" -+#include "sys/signal.h" - #ifdef __APPLE__ - #include <CoreServices/CoreServices.h> - #endif -@@ -41,14 +42,15 @@ - { - return true; - } --#elif defined (__APPLE__) -+#elif defined(__APPLE__) - Debugger(); - //SysBreak(); --#elif defined (__arm__) -+#elif defined(__arm__) - __asm__("bkpt 0"); --#else -- // AFAIK This is available on all X86 platforms -+#elif defined(__i386__) - __asm__("int $0x03"); -+#else -+ throw(SIGTRAP); - #endif // WIN32 - return false; - } Modified: packages/trunk/0ad/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2013-12-26 02:19:29 UTC (rev 14733) +++ packages/trunk/0ad/debian/patches/series 2013-12-26 02:21:32 UTC (rev 14734) @@ -1,2 +1 @@ enable-hardening-relro.patch -fix-arm-ftbfs.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
