| Message ID | 1401628284-23998-1-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 1cf2c6ea93d3bd855df7c9883d3882034f0568fa |
| Headers | show |
Thomas, All, On 2014-06-01 15:11 +0200, Thomas Petazzoni spake thusly: > As suggested by Gustavo, this patch bumps mpg123 to 1.20.0, and > therefore superseds the patch initially provided by Sven Neumann. In > 1.20.0, there is a new CPU type arm_fpu, which will compile code for > both VFP and NEON, and choose at runtime which one to use. > > Similarly for AArch64, the option --with-cpu=aarch64 will compile both > the NEON and generic decoders, and select at runtime which one to use. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/mpg123/mpg123.mk | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk > index d66592c..ac64132 100644 > --- a/package/mpg123/mpg123.mk > +++ b/package/mpg123/mpg123.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MPG123_VERSION = 1.18.0 > +MPG123_VERSION = 1.20.0 > MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 > MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) > MPG123_CONF_OPT = --disable-lfs-alias > @@ -14,9 +14,17 @@ MPG123_LICENSE_FILES = COPYING > > MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu) > > +ifeq ($(BR2_aarch64),y) > +MPG123_CPU = aarch64 > +endif > + > ifeq ($(BR2_arm),y) > +ifeq ($(or $(BR2_ARM_CPU_HAS_NEON),$(BR2_ARM_CPU_HAS_VFPV2)),y) > +MPG123_CPU = arm_fpu > +else > MPG123_CPU = arm_nofpu > endif > +endif > > ifeq ($(BR2_i386),y) > MPG123_CPU = x86 > -- > 1.9.3 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > As suggested by Gustavo, this patch bumps mpg123 to 1.20.0, and > therefore superseds the patch initially provided by Sven Neumann. In > 1.20.0, there is a new CPU type arm_fpu, which will compile code for > both VFP and NEON, and choose at runtime which one to use. > Similarly for AArch64, the option --with-cpu=aarch64 will compile both > the NEON and generic decoders, and select at runtime which one to use. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index d66592c..ac64132 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.18.0 +MPG123_VERSION = 1.20.0 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPT = --disable-lfs-alias @@ -14,9 +14,17 @@ MPG123_LICENSE_FILES = COPYING MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu) +ifeq ($(BR2_aarch64),y) +MPG123_CPU = aarch64 +endif + ifeq ($(BR2_arm),y) +ifeq ($(or $(BR2_ARM_CPU_HAS_NEON),$(BR2_ARM_CPU_HAS_VFPV2)),y) +MPG123_CPU = arm_fpu +else MPG123_CPU = arm_nofpu endif +endif ifeq ($(BR2_i386),y) MPG123_CPU = x86
As suggested by Gustavo, this patch bumps mpg123 to 1.20.0, and therefore superseds the patch initially provided by Sven Neumann. In 1.20.0, there is a new CPU type arm_fpu, which will compile code for both VFP and NEON, and choose at runtime which one to use. Similarly for AArch64, the option --with-cpu=aarch64 will compile both the NEON and generic decoders, and select at runtime which one to use. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/mpg123/mpg123.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)