[SCM] libzen/master: Add patch to fix libmediainfo FTBFS on s390

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Fri Jan 20 13:19:42 UTC 2012


The following commit has been merged in the master branch:
commit 773397c7bde3924f16cd023c5afa66355cca5482
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jan 20 19:53:40 2012 +0800

    Add patch to fix libmediainfo FTBFS on s390

diff --git a/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch b/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch
new file mode 100644
index 0000000..766a83b
--- /dev/null
+++ b/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch
@@ -0,0 +1,27 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 19:50:10 +0800
+Subject: Amend conditions for NEED_SIZET
+
+When size_t is an unsigned int, and unsigned int and unsigned long have the same
+size, int32u gets defined as unsigned int. However, unsigned long/size_t is
+still treated as distinct from unsigned int by the compiler, and as such a
+size_t overload is needed.
+---
+ Source/ZenLib/Conf.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Source/ZenLib/Conf.h b/Source/ZenLib/Conf.h
+index a3d6b07..9899548 100755
+--- a/Source/ZenLib/Conf.h
++++ b/Source/ZenLib/Conf.h
+@@ -188,7 +188,8 @@
+ #endif
+ //---------------------------------------------------------------------------
+ //If we need size_t specific integer conversion
+-#if defined(__LP64__) || defined(MACOSX)
++#include <tr1/cstdint> //SIZE_MAX
++#if defined(__LP64__) || defined(MACOSX) || ((SIZE_MAX == UINT_MAX) && (UINT_MAX == ULONG_MAX))
+     #define NEED_SIZET
+ #endif
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 58c3add..cf34023 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Unbundle-TinyXml-use-system-TinyXml.patch
 0002-Expand-Doxygen-generated-documentation.patch
+0003-Amend-conditions-for-NEED_SIZET.patch

-- 
libzen packaging



More information about the pkg-multimedia-commits mailing list