| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101 |
- From 69ffe0b92d91261aafc59d9d451c02a07bc5cd2e Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
- Date: Sat, 20 Jul 2013 23:35:05 +0200
- Subject: [PATCH 17/17] contrib/png: fix ARM assembly for iOS
- ---
- contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
- contrib/src/png/rules.mak | 3 +++
- 2 files changed, 69 insertions(+)
- create mode 100644 contrib/src/png/ios.patch
- diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
- new file mode 100644
- index 0000000..1d7ee04
- --- /dev/null
- +++ b/contrib/src/png/ios.patch
- @@ -0,0 +1,66 @@
- ++ diff -ru png/arm/filter_neon.S png-fixed/arm/filter_neon.S
- ++ --- png/arm/filter_neon.S 2013-06-27 05:25:41.000000000 +0200
- ++ +++ png-fixed/arm/filter_neon.S 2013-07-20 23:33:23.000000000 +0200
- ++ @@ -46,7 +46,7 @@
- ++ \name:
- ++ .endm
- ++
- ++ -func png_read_filter_row_sub4_neon, export=1
- ++ +func _png_read_filter_row_sub4_neon, export=1
- ++ ldr r3, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- ++ 1:
- ++ @@ -62,7 +62,7 @@
- ++ bx lr
- ++ endfunc
- ++
- ++ -func png_read_filter_row_sub3_neon, export=1
- ++ +func _png_read_filter_row_sub3_neon, export=1
- ++ ldr r3, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- ++ mov r0, r1
- ++ @@ -88,7 +88,7 @@
- ++ bx lr
- ++ endfunc
- ++
- ++ -func png_read_filter_row_up_neon, export=1
- ++ +func _png_read_filter_row_up_neon, export=1
- ++ ldr r3, [r0, #4] @ rowbytes
- ++ 1:
- ++ vld1.8 {q0}, [r1,:128]
- ++ @@ -101,7 +101,7 @@
- ++ bx lr
- ++ endfunc
- ++
- ++ -func png_read_filter_row_avg4_neon, export=1
- ++ +func _png_read_filter_row_avg4_neon, export=1
- ++ ldr r12, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- ++ 1:
- ++ @@ -122,7 +122,7 @@
- ++ bx lr
- ++ endfunc
- ++
- ++ -func png_read_filter_row_avg3_neon, export=1
- ++ +func _png_read_filter_row_avg3_neon, export=1
- ++ push {r4,lr}
- ++ ldr r12, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- ++ @@ -173,7 +173,7 @@
- ++ vbsl \rx, \ra, d28
- ++ .endm
- ++
- ++ -func png_read_filter_row_paeth4_neon, export=1
- ++ +func _png_read_filter_row_paeth4_neon, export=1
- ++ ldr r12, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- ++ vmov.i8 d20, #0
- ++ @@ -196,7 +196,7 @@
- ++ bx lr
- ++ endfunc
- ++
- ++ -func png_read_filter_row_paeth3_neon, export=1
- ++ +func _png_read_filter_row_paeth3_neon, export=1
- ++ push {r4,lr}
- ++ ldr r12, [r0, #4] @ rowbytes
- ++ vmov.i8 d3, #0
- diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
- index d1adc34..701e3a8 100644
- --- a/contrib/src/png/rules.mak
- +++ b/contrib/src/png/rules.mak
- @@ -17,6 +17,9 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
- $(APPLY) $(SRC)/png/winrt.patch
- $(APPLY) $(SRC)/png/bins.patch
- $(APPLY) $(SRC)/png/automake.patch
- +ifdef HAVE_IOS
- + $(APPLY) $(SRC)/png/ios.patch
- +endif
- $(MOVE)
-
- DEPS_png = zlib $(DEPS_zlib)
- --
- 1.7.12.4 (Apple Git-37)
|
