Skip to content

Commit

Permalink
Fixed building mpg123 on Android x86_64 and mips architectures
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Nov 5, 2017
1 parent beefbf5 commit 0fbb584
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 2 deletions.
70 changes: 68 additions & 2 deletions external/mpg123-1.25.6.patch
View file
Expand Up @@ -1927,8 +1927,8 @@ diff -ruN mpg123-1.25.6.orig/android/mpg123.h mpg123-1.25.6/android/mpg123.h
+#endif
diff -ruN mpg123-1.25.6.orig/Android.mk mpg123-1.25.6/Android.mk
--- mpg123-1.25.6.orig/Android.mk 1969-12-31 16:00:00.000000000 -0800
+++ mpg123-1.25.6/Android.mk 2017-11-02 10:11:23.366221713 -0700
@@ -0,0 +1,115 @@
+++ mpg123-1.25.6/Android.mk 2017-11-04 22:43:44.473949961 -0700
@@ -0,0 +1,181 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
Expand Down Expand Up @@ -2004,6 +2004,60 @@ diff -ruN mpg123-1.25.6.orig/Android.mk mpg123-1.25.6/Android.mk
+ src/libmpg123/dither.c \
+ src/libmpg123/feature.c \
+
+DECODER_CFLAGS_X64 := -DOPT_MULTI -DOPT_X86_64 -DOPT_GENERIC -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DOPT_AVX
+
+DECODER_SRC_X64 := \
+ src/libmpg123/stringbuf.c \
+ src/libmpg123/icy.c \
+ src/libmpg123/icy.h \
+ src/libmpg123/icy2utf8.c \
+ src/libmpg123/icy2utf8.h \
+ src/libmpg123/ntom.c \
+ src/libmpg123/synth.c \
+ src/libmpg123/synth.h \
+ src/libmpg123/synth_8bit.c \
+ src/libmpg123/synth_8bit.h \
+ src/libmpg123/layer1.c \
+ src/libmpg123/layer2.c \
+ src/libmpg123/layer3.c \
+ src/libmpg123/synth_s32.c \
+ src/libmpg123/synth_real.c \
+ src/libmpg123/dct36_x86_64.S \
+ src/libmpg123/dct64_x86_64_float.S \
+ src/libmpg123/synth_x86_64_float.S \
+ src/libmpg123/synth_x86_64_s32.S \
+ src/libmpg123/synth_stereo_x86_64_float.S \
+ src/libmpg123/synth_stereo_x86_64_s32.S \
+ src/libmpg123/synth_x86_64.S \
+ src/libmpg123/dct64_x86_64.S \
+ src/libmpg123/synth_stereo_x86_64.S \
+ src/libmpg123/dither.c \
+ src/libmpg123/dither.h \
+ src/libmpg123/getcpuflags_x86_64.S \
+ src/libmpg123/dct36_avx.S \
+ src/libmpg123/dct64_avx_float.S \
+ src/libmpg123/synth_stereo_avx_float.S \
+ src/libmpg123/synth_stereo_avx_s32.S \
+ src/libmpg123/dct64_avx.S \
+ src/libmpg123/synth_stereo_avx.S \
+ src/libmpg123/feature.c
+
+DECODER_CFLAGS_MIPS := -DOPT_GENERIC -DREAL_IS_FLOAT
+
+DECODER_SRC_MIPS := \
+ 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/feature.c
+
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+DECODER_CFLAGS := $(DECODER_CFLAGS_NEON)
+DECODER_SRC := $(DECODER_SRC_NEON)
Expand All @@ -2016,6 +2070,18 @@ diff -ruN mpg123-1.25.6.orig/Android.mk mpg123-1.25.6/Android.mk
+DECODER_CFLAGS := $(DECODER_CFLAGS_X86)
+DECODER_SRC := $(DECODER_SRC_X86)
+endif
+ifeq ($(TARGET_ARCH_ABI),x86_64)
+DECODER_CFLAGS := $(DECODER_CFLAGS_X64)
+DECODER_SRC := $(DECODER_SRC_X64)
+endif
+ifeq ($(TARGET_ARCH_ABI),mips)
+DECODER_CFLAGS := $(DECODER_CFLAGS_MIPS)
+DECODER_SRC := $(DECODER_SRC_MIPS)
+endif
+ifeq ($(TARGET_ARCH_ABI),mips64)
+DECODER_CFLAGS := $(DECODER_CFLAGS_MIPS)
+DECODER_SRC := $(DECODER_SRC_MIPS)
+endif
+
+LOCAL_CFLAGS := $(DECODER_CFLAGS)
+
Expand Down
66 changes: 66 additions & 0 deletions external/mpg123-1.25.6/Android.mk
View file
Expand Up @@ -73,6 +73,60 @@ DECODER_SRC_X86 := \
src/libmpg123/dither.c \
src/libmpg123/feature.c \

DECODER_CFLAGS_X64 := -DOPT_MULTI -DOPT_X86_64 -DOPT_GENERIC -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DOPT_AVX

DECODER_SRC_X64 := \
src/libmpg123/stringbuf.c \
src/libmpg123/icy.c \
src/libmpg123/icy.h \
src/libmpg123/icy2utf8.c \
src/libmpg123/icy2utf8.h \
src/libmpg123/ntom.c \
src/libmpg123/synth.c \
src/libmpg123/synth.h \
src/libmpg123/synth_8bit.c \
src/libmpg123/synth_8bit.h \
src/libmpg123/layer1.c \
src/libmpg123/layer2.c \
src/libmpg123/layer3.c \
src/libmpg123/synth_s32.c \
src/libmpg123/synth_real.c \
src/libmpg123/dct36_x86_64.S \
src/libmpg123/dct64_x86_64_float.S \
src/libmpg123/synth_x86_64_float.S \
src/libmpg123/synth_x86_64_s32.S \
src/libmpg123/synth_stereo_x86_64_float.S \
src/libmpg123/synth_stereo_x86_64_s32.S \
src/libmpg123/synth_x86_64.S \
src/libmpg123/dct64_x86_64.S \
src/libmpg123/synth_stereo_x86_64.S \
src/libmpg123/dither.c \
src/libmpg123/dither.h \
src/libmpg123/getcpuflags_x86_64.S \
src/libmpg123/dct36_avx.S \
src/libmpg123/dct64_avx_float.S \
src/libmpg123/synth_stereo_avx_float.S \
src/libmpg123/synth_stereo_avx_s32.S \
src/libmpg123/dct64_avx.S \
src/libmpg123/synth_stereo_avx.S \
src/libmpg123/feature.c

DECODER_CFLAGS_MIPS := -DOPT_GENERIC -DREAL_IS_FLOAT

DECODER_SRC_MIPS := \
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/feature.c

ifeq ($(TARGET_ARCH_ABI),armeabi)
DECODER_CFLAGS := $(DECODER_CFLAGS_NEON)
DECODER_SRC := $(DECODER_SRC_NEON)
Expand All @@ -85,6 +139,18 @@ ifeq ($(TARGET_ARCH_ABI),x86)
DECODER_CFLAGS := $(DECODER_CFLAGS_X86)
DECODER_SRC := $(DECODER_SRC_X86)
endif
ifeq ($(TARGET_ARCH_ABI),x86_64)
DECODER_CFLAGS := $(DECODER_CFLAGS_X64)
DECODER_SRC := $(DECODER_SRC_X64)
endif
ifeq ($(TARGET_ARCH_ABI),mips)
DECODER_CFLAGS := $(DECODER_CFLAGS_MIPS)
DECODER_SRC := $(DECODER_SRC_MIPS)
endif
ifeq ($(TARGET_ARCH_ABI),mips64)
DECODER_CFLAGS := $(DECODER_CFLAGS_MIPS)
DECODER_SRC := $(DECODER_SRC_MIPS)
endif

LOCAL_CFLAGS := $(DECODER_CFLAGS)

Expand Down

0 comments on commit 0fbb584

Please sign in to comment.