Author: vincentc-guest Date: 2012-05-02 05:44:03 +0000 (Wed, 02 May 2012) New Revision: 13533
Added: packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch Modified: packages/trunk/0ad/debian/changelog packages/trunk/0ad/debian/patches/series Log: 0ad: Update to version 0~r11339-2 Modified: packages/trunk/0ad/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2012-05-01 18:24:23 UTC (rev 13532) +++ packages/trunk/0ad/debian/changelog 2012-05-02 05:44:03 UTC (rev 13533) @@ -1,5 +1,6 @@ -0ad (0~r11339-2) UNRELEASED; urgency=low +0ad (0~r11339-2) unstable; urgency=low + * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. * Update debian/0ad.6. * Add build-depends on dpkg-dev (>= 1.15.5) for xz compression support. * Change build-depends on libjpeg8-dev to libjpeg-dev. @@ -8,7 +9,7 @@ * Add alternate dependency on fam. (Closes: #668353) * Override dh_auto_clean to clean source properly. (Closes: #668686) - -- Vincent Cheng <[email protected]> Mon, 09 Apr 2012 16:30:56 -0700 + -- Vincent Cheng <[email protected]> Thu, 26 Apr 2012 19:12:26 -0700 0ad (0~r11339-1) unstable; urgency=low Added: packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch (rev 0) +++ packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch 2012-05-02 05:44:03 UTC (rev 13533) @@ -0,0 +1,156 @@ +Description: Fix FTBFS on Debian GNU/kFreeBSD + Add defined(__FreeBSD_kernel__) for every instance of a FreeBSD preprocessor + directive in order to detect kfreebsd, and avoid linking with execinfo on + kfreebsd. +Forwarded: http://trac.wildfiregames.com/ticket/1322 +Author: Vincent Cheng <[email protected]> +Last-Update: 2012-04-26 + +--- a/build/premake/premake4.lua ++++ b/build/premake/premake4.lua +@@ -781,7 +781,7 @@ + elseif os.is("bsd") then + links { + -- Needed for backtrace* on FreeBSD +- "execinfo", ++ -- "execinfo", + } + end + +@@ -1012,6 +1012,10 @@ + elseif os.is("bsd") then + -- define BSD-something? + ++ links { ++ "dl", ++ } ++ + buildoptions { "-fno-strict-aliasing" } + + buildoptions { "-rdynamic" } +@@ -1183,7 +1187,7 @@ + elseif os.is("bsd") then + links { + -- Needed for backtrace* on FreeBSD +- "execinfo", ++ -- "execinfo", + } + end + +--- a/build/premake/premake4/src/host/premake.h ++++ b/build/premake/premake4/src/host/premake.h +@@ -15,7 +15,7 @@ + #if defined(__linux__) + #define PLATFORM_LINUX (1) + #define PLATFORM_STRING "linux" +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) + #define PLATFORM_BSD (1) + #define PLATFORM_STRING "bsd" + #elif defined(__APPLE__) && defined(__MACH__) +--- a/source/lib/sysdep/os.h ++++ b/source/lib/sysdep/os.h +@@ -66,7 +66,7 @@ + # define OS_MACOSX 0 + #endif + // BSD +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) + # define OS_BSD 1 + #else + # define OS_BSD 0 +--- a/libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h ++++ b/libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h +@@ -33,7 +33,7 @@ + #elif defined (__APPLE__) + //Do something here. + MPCriticalRegionID criticalSection; +-#elif defined (LINUX) || defined(__FreeBSD__) ++#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #else + #warning "FUCriticalSection: Critical section not implemented for other platforms." + #endif +--- a/libraries/fcollada/src/FCollada/FUtils/Platforms.h ++++ b/libraries/fcollada/src/FCollada/FUtils/Platforms.h +@@ -74,7 +74,7 @@ + #include <wchar.h> + #include <stdint.h> + #else // __APPLE__ +-#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) ++#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #include <ctype.h> + #include <wctype.h> + #include <unistd.h> +@@ -127,7 +127,7 @@ + #endif // PLATFORMS + + // Important functions that some OSes have missing! +-#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) ++#if defined(__APPLE__) || defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; } + inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; } + inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; } +--- a/libraries/fcollada/include/FUtils/FUCriticalSection.h ++++ b/libraries/fcollada/include/FUtils/FUCriticalSection.h +@@ -33,7 +33,7 @@ + #elif defined (__APPLE__) + //Do something here. + MPCriticalRegionID criticalSection; +-#elif defined (LINUX) || defined(__FreeBSD__) ++#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #else + #warning "FUCriticalSection: Critical section not implemented for other platforms." + #endif +--- a/libraries/fcollada/include/FUtils/Platforms.h ++++ b/libraries/fcollada/include/FUtils/Platforms.h +@@ -74,7 +74,7 @@ + #include <wchar.h> + #include <stdint.h> + #else // __APPLE__ +-#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) ++#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #include <ctype.h> + #include <wctype.h> + #include <unistd.h> +@@ -127,7 +127,7 @@ + #endif // PLATFORMS + + // Important functions that some OSes have missing! +-#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) ++#if defined(__APPLE__) || defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; } + inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; } + inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; } +--- a/libraries/fcollada/src/FCollada/FCDocument/FCDocument.h ++++ b/libraries/fcollada/src/FCollada/FCDocument/FCDocument.h +@@ -30,7 +30,7 @@ + #if defined(WIN32) + template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */ + template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */ +-#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) ++#elif defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + template <class T> class FCDLibrary; /**< Trick Doxygen. */ + template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */ + #endif // LINUX +--- a/libraries/fcollada/include/FCDocument/FCDocument.h ++++ b/libraries/fcollada/include/FCDocument/FCDocument.h +@@ -30,7 +30,7 @@ + #if defined(WIN32) + template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */ + template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */ +-#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) ++#elif defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + template <class T> class FCDLibrary; /**< Trick Doxygen. */ + template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */ + #endif // LINUX +--- a/source/third_party/mongoose/mongoose.cpp ++++ b/source/third_party/mongoose/mongoose.cpp +@@ -37,7 +37,7 @@ + + #undef DEBUG + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + // Fix undefined PF_INET on FreeBSD + #include <sys/socket.h> + #endif Modified: packages/trunk/0ad/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2012-05-01 18:24:23 UTC (rev 13532) +++ packages/trunk/0ad/debian/patches/series 2012-05-02 05:44:03 UTC (rev 13533) @@ -1 +1,2 @@ fix-bindir.patch +fix-kfreebsd-ftbfs.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
