We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch indent

android_sdl_mixer_indent.diff (text/plain), 7.19 KB, created by Sylvain on 2017-10-23 11:26:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2017-10-23 11:26:35 UTC

Size: 7.19 KB

patch

obsolete

>diff -r 4285a2d75921 Android.mk
>--- a/Android.mk	Sun Oct 22 17:32:31 2017 -0700
>+++ b/Android.mk	Mon Oct 23 13:24:22 2017 +0200
>@@ -65,8 +65,8 @@
> LOCAL_SHARED_LIBRARIES := SDL2
> 
> ifeq ($(SUPPORT_FLAC),true)
>-	LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/include
>-	LOCAL_CFLAGS += -DMUSIC_FLAC
>+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/include
>+    LOCAL_CFLAGS += -DMUSIC_FLAC
>     LOCAL_STATIC_LIBRARIES += libFLAC
> endif
> 
>@@ -74,7 +74,7 @@
>     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OGG_LIBRARY_PATH)/include
>     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)
>     LOCAL_CFLAGS += -DMUSIC_OGG -DOGG_USE_TREMOR -DOGG_HEADER="<ivorbisfile.h>"
>-	LOCAL_STATIC_LIBRARIES += ogg vorbisidec
>+    LOCAL_STATIC_LIBRARIES += ogg vorbisidec
> endif
> 
> # This needs to be a shared library to comply with the LGPL license
>@@ -88,13 +88,13 @@
>     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src
>     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src/libmodplug
>     LOCAL_CFLAGS += -DMUSIC_MOD_MODPLUG -DMODPLUG_HEADER="<modplug.h>"
>-	LOCAL_STATIC_LIBRARIES += modplug
>+    LOCAL_STATIC_LIBRARIES += modplug
> endif
> 
> ifeq ($(SUPPORT_TIMIDITY),true)
>-	LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)
>-	LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY
>-	LOCAL_STATIC_LIBRARIES += timidity
>+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)
>+    LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY
>+    LOCAL_STATIC_LIBRARIES += timidity
> endif
> 
> LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
>diff -r 4285a2d75921 external/flac-1.3.2/Android.mk
>--- a/external/flac-1.3.2/Android.mk	Sun Oct 22 17:32:31 2017 -0700
>+++ b/external/flac-1.3.2/Android.mk	Mon Oct 23 13:24:22 2017 +0200
>@@ -39,10 +39,10 @@
>     src/libFLAC/stream_encoder_intrin_avx2.c \
>     src/libFLAC/stream_encoder_framing.c \
>     src/libFLAC/window.c \
>-	src/libFLAC/ogg_decoder_aspect.c \
>-	src/libFLAC/ogg_encoder_aspect.c \
>-	src/libFLAC/ogg_helper.c \
>-	src/libFLAC/ogg_mapping.c
>+    src/libFLAC/ogg_decoder_aspect.c \
>+    src/libFLAC/ogg_encoder_aspect.c \
>+    src/libFLAC/ogg_helper.c \
>+    src/libFLAC/ogg_mapping.c
> 
> LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
> 
>diff -r 4285a2d75921 external/libvorbisidec-1.2.1/Android.mk
>--- a/external/libvorbisidec-1.2.1/Android.mk	Sun Oct 22 17:32:31 2017 -0700
>+++ b/external/libvorbisidec-1.2.1/Android.mk	Mon Oct 23 13:24:22 2017 +0200
>@@ -9,7 +9,7 @@
> LOCAL_CFLAGS :=
> 
> ifeq ($(TARGET_ARCH),arm)
>-	LOCAL_CFLAGS += -D_ARM_ASSEM_
>+    LOCAL_CFLAGS += -D_ARM_ASSEM_
> endif
> 
> LOCAL_SRC_FILES += \
>diff -r 4285a2d75921 external/mpg123-1.25.6/Android.mk
>--- a/external/mpg123-1.25.6/Android.mk	Sun Oct 22 17:32:31 2017 -0700
>+++ b/external/mpg123-1.25.6/Android.mk	Mon Oct 23 13:24:22 2017 +0200
>@@ -13,65 +13,65 @@
> 
> DECODER_SRC_NEON := \
>     src/libmpg123/stringbuf.c \
>-	src/libmpg123/icy.c \
>-	src/libmpg123/icy2utf8.c \
>-	src/libmpg123/ntom.c \
>-	src/libmpg123/synth.c \
>-	src/libmpg123/synth_8bit.c \
>-	src/libmpg123/layer1.c \
>-	src/libmpg123/layer2.c \
>-	src/libmpg123/layer3.c \
>-	src/libmpg123/dct36_neon.S \
>-	src/libmpg123/dct64_neon_float.S \
>-	src/libmpg123/synth_neon_float.S \
>-	src/libmpg123/synth_neon_s32.S \
>-	src/libmpg123/synth_stereo_neon_float.S \
>-	src/libmpg123/synth_stereo_neon_s32.S \
>-	src/libmpg123/dct64_neon.S \
>-	src/libmpg123/synth_neon.S \
>-	src/libmpg123/synth_stereo_neon.S \
>-	src/libmpg123/synth_s32.c \
>-	src/libmpg123/synth_real.c \
>-	src/libmpg123/feature.c \
>+    src/libmpg123/icy.c \
>+    src/libmpg123/icy2utf8.c \
>+    src/libmpg123/ntom.c \
>+    src/libmpg123/synth.c \
>+    src/libmpg123/synth_8bit.c \
>+    src/libmpg123/layer1.c \
>+    src/libmpg123/layer2.c \
>+    src/libmpg123/layer3.c \
>+    src/libmpg123/dct36_neon.S \
>+    src/libmpg123/dct64_neon_float.S \
>+    src/libmpg123/synth_neon_float.S \
>+    src/libmpg123/synth_neon_s32.S \
>+    src/libmpg123/synth_stereo_neon_float.S \
>+    src/libmpg123/synth_stereo_neon_s32.S \
>+    src/libmpg123/dct64_neon.S \
>+    src/libmpg123/synth_neon.S \
>+    src/libmpg123/synth_stereo_neon.S \
>+    src/libmpg123/synth_s32.c \
>+    src/libmpg123/synth_real.c \
>+    src/libmpg123/feature.c \
> 
> DECODER_CFLAGS_X86 := -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT
> 
> DECODER_SRC_X86 := \
>     src/libmpg123/stringbuf.c \
>-	src/libmpg123/icy.c \
>-	src/libmpg123/icy2utf8.c \
>-	src/libmpg123/ntom.c \
>-	src/libmpg123/synth.c \
>-	src/libmpg123/synth_8bit.c \
>-	src/libmpg123/layer1.c \
>-	src/libmpg123/layer2.c \
>-	src/libmpg123/layer3.c \
>-	src/libmpg123/synth_s32.c \
>-	src/libmpg123/synth_real.c \
>-	src/libmpg123/dct64_i386.c \
>-	src/libmpg123/synth_i586.S \
>-	src/libmpg123/synth_i586_dither.S \
>-	src/libmpg123/dct64_mmx.S \
>-	src/libmpg123/tabinit_mmx.S \
>-	src/libmpg123/synth_mmx.S \
>-	src/libmpg123/synth_3dnow.S \
>-	src/libmpg123/dct64_3dnow.S \
>-	src/libmpg123/equalizer_3dnow.S \
>-	src/libmpg123/dct36_3dnow.S \
>-	src/libmpg123/dct64_3dnowext.S \
>-	src/libmpg123/synth_3dnowext.S \
>-	src/libmpg123/dct36_3dnowext.S \
>-	src/libmpg123/dct64_sse_float.S \
>-	src/libmpg123/synth_sse_float.S \
>-	src/libmpg123/synth_stereo_sse_float.S \
>-	src/libmpg123/synth_sse_s32.S \
>-	src/libmpg123/synth_stereo_sse_s32.S \
>-	src/libmpg123/dct36_sse.S \
>-	src/libmpg123/dct64_sse.S \
>-	src/libmpg123/synth_sse.S \
>-	src/libmpg123/getcpuflags.S \
>-	src/libmpg123/dither.c \
>-	src/libmpg123/feature.c \
>+    src/libmpg123/icy.c \
>+    src/libmpg123/icy2utf8.c \
>+    src/libmpg123/ntom.c \
>+    src/libmpg123/synth.c \
>+    src/libmpg123/synth_8bit.c \
>+    src/libmpg123/layer1.c \
>+    src/libmpg123/layer2.c \
>+    src/libmpg123/layer3.c \
>+    src/libmpg123/synth_s32.c \
>+    src/libmpg123/synth_real.c \
>+    src/libmpg123/dct64_i386.c \
>+    src/libmpg123/synth_i586.S \
>+    src/libmpg123/synth_i586_dither.S \
>+    src/libmpg123/dct64_mmx.S \
>+    src/libmpg123/tabinit_mmx.S \
>+    src/libmpg123/synth_mmx.S \
>+    src/libmpg123/synth_3dnow.S \
>+    src/libmpg123/dct64_3dnow.S \
>+    src/libmpg123/equalizer_3dnow.S \
>+    src/libmpg123/dct36_3dnow.S \
>+    src/libmpg123/dct64_3dnowext.S \
>+    src/libmpg123/synth_3dnowext.S \
>+    src/libmpg123/dct36_3dnowext.S \
>+    src/libmpg123/dct64_sse_float.S \
>+    src/libmpg123/synth_sse_float.S \
>+    src/libmpg123/synth_stereo_sse_float.S \
>+    src/libmpg123/synth_sse_s32.S \
>+    src/libmpg123/synth_stereo_sse_s32.S \
>+    src/libmpg123/dct36_sse.S \
>+    src/libmpg123/dct64_sse.S \
>+    src/libmpg123/synth_sse.S \
>+    src/libmpg123/getcpuflags.S \
>+    src/libmpg123/dither.c \
>+    src/libmpg123/feature.c \
> 
> ifeq ($(TARGET_ARCH_ABI),armeabi)
> DECODER_CFLAGS := $(DECODER_CFLAGS_NEON)
>@@ -90,15 +90,15 @@
> 
> LOCAL_SRC_FILES := \
>     src/libmpg123/parse.c \
>-	src/libmpg123/frame.c \
>+    src/libmpg123/frame.c \
>     src/libmpg123/format.c \
>-	src/libmpg123/dct64.c \
>+    src/libmpg123/dct64.c \
>     src/libmpg123/equalizer.c \
>-	src/libmpg123/id3.c \
>+    src/libmpg123/id3.c \
>     src/libmpg123/optimize.c \
>-	src/libmpg123/readers.c \
>+    src/libmpg123/readers.c \
>     src/libmpg123/tabinit.c \
>-	src/libmpg123/libmpg123.c \
>+    src/libmpg123/libmpg123.c \
>     src/libmpg123/index.c \
>     src/compat/compat_str.c \
>     src/compat/compat.c \

Actions: View | Diff

Attachments on bug 2491: 1615 | 2944 | 3028 | 3030

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.