[SCM] graphite2 packaging repository branch, master, updated. graphite2_1.0.1-2-3-gaafe9d7
The following commit has been merged in the master branch:
commit 425e99e6d117f293f0dd3a7ba44e9632e159c56b
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 10 15:45:29 2011 +0200
add additional upstream fix for setting -DWORDS_BIGENDIAN also for the tests
diff --git a/changelog b/changelog
index e265522..958ffa4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+graphite2 (1.0.1-3) UNRELEASED; urgency=low
+
+ * debian/patches/fix-typedefs.diff: move ...
+ * debian/patches/words-bigendian-fixes.diff: ... here and add additional
+ upstream fix for setting -DWORDS_BIGENDIAN also for the tests...
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2011 15:42:59 +0200
+
graphite2 (1.0.1-2) unstable; urgency=low
* debian/patches/fix-typedefs.diff: fix Main.h typedefs for
diff --git a/patches/fix-typedefs.diff b/patches/fix-typedefs.diff
deleted file mode 100644
index 97d9513..0000000
--- a/patches/fix-typedefs.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- graphite2-1.0.1.orig/src/Main.h
-+++ graphite2-1.0.1/src/Main.h
-@@ -29,8 +29,6 @@ of the License or (at your option) any l
- #include <cstdlib>
- #include "graphite2/Types.h"
-
--#if !defined WORDS_BIGENDIAN || defined PC_OS
--
- namespace graphite2 {
-
- typedef gr_uint8 uint8;
-@@ -42,6 +40,7 @@ typedef gr_int16 int16;
- typedef gr_int32 int32;
- typedef size_t uintptr;
-
-+#if !defined WORDS_BIGENDIAN || defined PC_OS
- inline uint16 swap16(uint16 x) { return (x << 8) | (x >> 8); }
- inline int16 swap16(int16 x) { return int16(swap16(uint16(x))); }
- inline uint32 swap32(uint32 x) { return (uint32(swap16(uint16(x))) << 16) | swap16(uint16(x >> 16)); }
diff --git a/patches/series b/patches/series
index b1e88a2..a35961c 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,2 @@
include-and-libraries.diff
-fix-typedefs.diff
+words-bigendian-fixes.diff
diff --git a/patches/words-bigendian-fixes.diff b/patches/words-bigendian-fixes.diff
new file mode 100644
index 0000000..21abf42
--- /dev/null
+++ b/patches/words-bigendian-fixes.diff
@@ -0,0 +1,48 @@
+diff -r 72f15ef32493 -r 565ef2e926ef CMakeLists.txt
+--- a/CMakeLists.txt Wed Aug 10 10:29:41 2011 +0700
++++ b/CMakeLists.txt Wed Aug 10 15:50:45 2011 +0700
+@@ -1,6 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
+ cmake_policy(SET CMP0012 NEW)
+ include(CMakeDependentOption)
++include(TestBigEndian)
+
+ project(graphite2)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+@@ -50,6 +51,12 @@
+ endif (VM_MACHINE_TYPE STREQUAL "direct" AND NOT CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "Using vm machine type: ${VM_MACHINE_TYPE}")
+
++TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
++if (WORDS_BIGENDIAN)
++ add_definitions(-DWORDS_BIGENDIAN)
++endif (WORDS_BIGENDIAN)
++
++
+ add_subdirectory(src)
+ add_subdirectory(gr2fonttest)
+ add_subdirectory(tests)
+diff -r 72f15ef32493 -r 565ef2e926ef src/Main.h
+--- a/src/Main.h Wed Aug 10 10:29:41 2011 +0700
++++ b/src/Main.h Wed Aug 10 15:50:45 2011 +0700
+@@ -29,7 +29,6 @@
+ #include <cstdlib>
+ #include "graphite2/Types.h"
+
+-#if !defined WORDS_BIGENDIAN || defined PC_OS
+
+ namespace graphite2 {
+
+@@ -42,10 +41,11 @@
+ typedef gr_int32 int32;
+ typedef size_t uintptr;
+
++#if !defined WORDS_BIGENDIAN || defined PC_OS
+ inline uint16 swap16(uint16 x) { return (x << 8) | (x >> 8); }
+ inline int16 swap16(int16 x) { return int16(swap16(uint16(x))); }
+ inline uint32 swap32(uint32 x) { return (uint32(swap16(uint16(x))) << 16) | swap16(uint16(x >> 16)); }
+-inline int32 swap32(int32 x) { return int16(swap16(uint16(x))); }
++inline int32 swap32(int32 x) { return int32(swap32(uint32(x))); }
+ #else
+ #define swap16(x) (x)
+ #define swap32(x) (x)
--
graphite2 packaging repository
Reply to: