[SCM] blender/master: debian/patches: #0013 dropped (applied upstream)

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Mon Mar 12 17:49:09 UTC 2012


The following commit has been merged in the master branch:
commit 9bdd915107dc0e2aa92c55f3d77c5f435169ae07
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Feb 21 22:20:07 2012 +0100

    debian/patches: #0013 dropped (applied upstream)

diff --git a/debian/patches/0013-fix_implicit_declaration_of_guardealloc.patch b/debian/patches/0013-fix_implicit_declaration_of_guardealloc.patch
deleted file mode 100644
index a73761e..0000000
--- a/debian/patches/0013-fix_implicit_declaration_of_guardealloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 26 Jan 2012 23:56:40 +0100
-Subject: fix_implicit_declaration_of_guardealloc
-
----
- source/blender/avi/intern/endian.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c
-index 1948806..94734b0 100644
---- a/source/blender/avi/intern/endian.c
-+++ b/source/blender/avi/intern/endian.c
-@@ -43,6 +43,10 @@
- #include "avi_intern.h"
- 
- #ifdef __BIG_ENDIAN__
-+#include "MEM_guardedalloc.h"
-+#endif
-+
-+#ifdef __BIG_ENDIAN__
- static void invert (int *num) {
- 	int new=0,i,j;
- 
--- 

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list