]> git.lizzy.rs Git - dragonfireclient.git/blob - build/android/patches/libvorbis-libogg-fpu.patch
Fix "Hunk #1 FAILED at 9 (different line endings)."
[dragonfireclient.git] / build / android / patches / libvorbis-libogg-fpu.patch
1 --- libvorbis-libogg-android/jni/libvorbis-jni/Android.mk.orig  2014-06-17 19:22:50.621559073 +0200
2 +++ libvorbis-libogg-android/jni/libvorbis-jni/Android.mk       2014-06-17 19:38:20.641581140 +0200
3 @@ -4,9 +4,6 @@
4  
5  LOCAL_MODULE := vorbis-jni
6  LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -fsigned-char
7 -ifeq ($(TARGET_ARCH),arm)
8 -       LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
9 -endif
10  
11  LOCAL_SHARED_LIBRARIES := libogg libvorbis
12  
13 --- libvorbis-libogg-android/jni/libvorbis/Android.mk.orig      2014-06-17 19:22:39.077558797 +0200
14 +++ libvorbis-libogg-android/jni/libvorbis/Android.mk   2014-06-17 19:38:52.121581887 +0200
15 @@ -4,9 +4,6 @@
16  
17  LOCAL_MODULE := libvorbis
18  LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
19 -ifeq ($(TARGET_ARCH),arm)
20 -       LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
21 -endif
22  LOCAL_SHARED_LIBRARIES := libogg
23  
24  LOCAL_SRC_FILES := \
25 --- libvorbis-libogg-android/jni/libogg/Android.mk.orig 2014-06-17 19:22:33.965558675 +0200
26 +++ libvorbis-libogg-android/jni/libogg/Android.mk      2014-06-17 19:38:25.337581252 +0200
27 @@ -4,10 +4,6 @@
28  
29  LOCAL_MODULE := libogg
30  LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
31 -ifeq ($(TARGET_ARCH),arm)
32 -       LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
33 -endif
34 -
35  
36  LOCAL_SRC_FILES := \
37         bitwise.c \