← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to debian/patches/04_target_s4.patch

  • Committer: Package Import Robot
  • Author(s): Whoopie
  • Date: 2012-03-22 10:29:10 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120322102910-tb8hugi2su1tguwh
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/913018
* Apply some upstream patches to fix FTBFS (LP: #913018):
  - debian/patches/05_glib_includes.patch: fix glib includes.
  - debian/patches/06_use_XkbKeycodeToKeysym.patch: use 
    XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_target_s4.patch
 
1
Description: Add build definitions for SH4
 
2
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
 
3
Bug-Debian: http://bugs.debian.org/658987
 
4
Forwarded: no
 
5
Last-Update: 2012-02-07
 
6
 
 
7
--- sflphone-1.0.1.orig/daemon/libs/pjproject/pjlib/include/pj/config.h
 
8
+++ sflphone-1.0.1/daemon/libs/pjproject/pjlib/include/pj/config.h
 
9
@@ -276,6 +276,20 @@
 
10
 #   define PJ_HAS_PENTIUM      0
 
11
 #   define PJ_IS_LITTLE_ENDIAN 1
 
12
 #   define PJ_IS_BIG_ENDIAN    0
 
13
+
 
14
+#elif defined(PJ_M_SH) || defined(__sh__) || defined(__sh) || \
 
15
+       defined(__SH__) || defined(_ARCH_SH) || defined(_SH_)
 
16
+    /*
 
17
+     * Renesas SuperH, default to little endian
 
18
+     */
 
19
+#   undef PJ_M_SH
 
20
+#   define PJ_M_SH             1
 
21
+#   define PJ_M_NAME           "sh"
 
22
+#   define PJ_HAS_PENTIUM      0
 
23
+#   if !defined(PJ_IS_LITTLE_ENDIAN) && !defined(PJ_IS_BIG_ENDIAN)
 
24
+#      define PJ_IS_LITTLE_ENDIAN      1
 
25
+#      define PJ_IS_BIG_ENDIAN         0
 
26
+#   endif
 
27
                
 
28
 #else
 
29
 #   error "Please specify target machine."