[SCM] blender/master: debian/patches/: patchset refreshed

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Fri Aug 2 08:12:47 UTC 2013


The following commit has been merged in the master branch:
commit 31726da73a55e7d0c3c4d9521c4040047af49600
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu Aug 1 17:37:30 2013 +0200

    debian/patches/: patchset refreshed
    
    - 0010-fix_FTBFS_on_non-linux_architectures.patch updated

diff --git a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
index 481b772..4790662 100644
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -1,10 +1,11 @@
-From: Pino Toscano <pino at debian.org>
-Date: Wed, 26 Jun 2013 11:44:00 +0200
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Thu, 1 Aug 2013 17:05:39 +0200
 Subject: fix_FTBFS_on_non-linux_architectures
 
 ---
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
+ CMakeLists.txt                         | 3 +++
+ source/blender/blenlib/BLI_sys_types.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0a58232..e4e6518 100644
@@ -20,3 +21,16 @@ index 0a58232..e4e6518 100644
  
  	# lfs on glibc, all compilers should use
  	add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
+index e544006..c9cf4fc 100644
+--- a/source/blender/blenlib/BLI_sys_types.h
++++ b/source/blender/blenlib/BLI_sys_types.h
+@@ -82,7 +82,7 @@ typedef unsigned long uintptr_t;
+ #define _UINTPTR_T_DEFINED
+ #endif
+ 
+-#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ 
+ /* Linux-i386, Linux-Alpha, Linux-ppc */
+ #include <stdint.h>

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list