[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gstreamer-cvs
Subject:    [1.2] sdk/cerbero: libpng: fix neon build in iOS
From:       slomo () kemper ! freedesktop ! org (Sebastian Dröge)
Date:       2013-10-31 11:49:05
Message-ID: 20131031114905.ACEC476571 () kemper ! freedesktop ! org
[Download RAW message or body]

Module: sdk/cerbero
Branch: 1.2
Commit: a84d0944bca34c8883426efb98b9772092709377
URL:    http://cgit.freedesktop.org/gstreamer/sdk/cerbero/commit/?id=a84d0944bca34c8883426efb98b9772092709377


Author: Andoni Morales Alastruey <ylatuya@gmail.com>
Date:   Mon Oct 28 17:18:00 2013 +0100

libpng: fix neon build in iOS

---

 ...n-fix-function-export-names-for-iOS-armv7.patch |   52 ++++++++++++++++++++
 recipes/{ => libpng}/libpng.recipe                 |    5 ++
 2 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch \
b/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch new file \
mode 100644 index 0000000..c847c62
--- /dev/null
+++ b/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch
@@ -0,0 +1,52 @@
+From efeee8d042eaacb8694296da17b7a069baadd07b Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Mon, 28 Oct 2013 13:26:35 +0100
+Subject: [PATCH] neon: fix function export names for iOS armv7
+
+---
+ arm/filter_neon.S |   16 +++++++++++-----
+ 1 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/arm/filter_neon.S b/arm/filter_neon.S
+index b8aef10..8794f0d 100644
+--- a/arm/filter_neon.S
++++ b/arm/filter_neon.S
+@@ -20,6 +20,12 @@
+ .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
+ #endif
+ 
++#if defined(__APPLE__)
++#define FUNC_PREFIX _
++#else
++#define FUNC_PREFIX
++#endif
++
+ #ifdef PNG_READ_SUPPORTED
+ #if PNG_ARM_NEON_OPT > 0
+ 
+@@ -34,17 +40,17 @@
+ 
+ .macro  func    name, export=0
+     .macro endfunc
+-ELF     .size   \name, . - \name
++ELF     .size   FUNC_PREFIX\name, . - FUNC_PREFIX\name
+         .endfunc
+         .purgem endfunc
+     .endm
+         .text
+     .if \export
+-        .global \name
++        .global FUNC_PREFIX\name
+     .endif
+-ELF     .type   \name, STT_FUNC
+-        .func   \name
+-\name:
++ELF     .type   FUNC_PREFIX\name, STT_FUNC
++        .func   FUNC_PREFIX\name
++FUNC_PREFIX\name:
+ .endm
+ 
+ func    png_read_filter_row_sub4_neon, export=1
+-- 
+1.7.4.4
+
diff --git a/recipes/libpng.recipe b/recipes/libpng/libpng.recipe
similarity index 67%
rename from recipes/libpng.recipe
rename to recipes/libpng/libpng.recipe
index fb26443..37a8e36 100644
--- a/recipes/libpng.recipe
+++ b/recipes/libpng/libpng.recipe
@@ -8,7 +8,12 @@ class Recipe(recipe.Recipe):
     url = 'http://download.sourceforge.net/libpng/libpng-1.6.6.tar.xz'
     licenses = [License.LibPNG]
     deps = ['zlib']
+    patches = ['0001-neon-fix-function-export-names-for-iOS-armv7.patch']
 
     files_libs = ['libpng16']
     files_devel = ['include/libpng16', 'bin/libpng16-config',
                    'lib/pkgconfig/libpng16.pc', 'lib/pkgconfig/libpng.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.IOS:
+            self.new_env = {'CCAS': os.environ.get('GAS', '')}

_______________________________________________
gstreamer-commits mailing list
gstreamer-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits


[prev in list] [next in list] [prev in thread] [next in thread]