cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Update ARM NEON/VFP detection

Browse Source 
With openwrt/openwrt@8dcc108760, the ARM
FPU compiler options are no longer part of CONFIG_TARGET_OPTIMIZATION.

This updates various packages that look for NEON/VFP support to search
CONFIG_CPU_TYPE instead.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 2d99ee3004)
[adapted patch for pulseaudio using autotools build]
This commit is contained in:
Jeffery To
2020-05-11 03:02:05 +08:00
parent 5f5d63e791
commit 595342148e
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libpng/Makefile
+2 -2
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libpng PKG_NAME:=libpng
PKG_VERSION:=1.6.37 PKG_VERSION:=1.6.37
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/libpng PKG_SOURCE_URL:=@SF/libpng
@@ -40,7 +40,7 @@ TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
$(if $(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),--enable-hardware-optimizations=yes --enable-arm-neon=yes) $(if $(findstring neon,$(CONFIG_CPU_TYPE)),--enable-hardware-optimizations=yes --enable-arm-neon=yes)
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
libs/opus/Makefile
+2 -2
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=opus PKG_NAME:=opus
PKG_VERSION:=1.3.1 PKG_VERSION:=1.3.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://archive.mozilla.org/pub/opus PKG_SOURCE_URL:=https://archive.mozilla.org/pub/opus
@@ -47,7 +47,7 @@ ifeq ($(CONFIG_SOFT_FLOAT),y)
--enable-fixed-point --enable-fixed-point
endif endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),) ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-fixed-point --enable-fixed-point
endif endif
multimedia/ffmpeg/Makefile
+3 -3
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.4.7 PKG_VERSION:=3.4.7
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/ PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@@ -464,12 +464,12 @@ endif
ifneq ($(findstring arm,$(CONFIG_ARCH)),) ifneq ($(findstring arm,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE+= --enable-lto FFMPEG_CONFIGURE+= --enable-lto
ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),) ifneq ($(findstring vfp,$(CONFIG_CPU_TYPE)),)
FFMPEG_CONFIGURE+= --enable-vfp FFMPEG_CONFIGURE+= --enable-vfp
else else
FFMPEG_CONFIGURE+= --disable-vfp FFMPEG_CONFIGURE+= --disable-vfp
endif endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),) ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-neon \ --enable-neon \
--enable-vfp --enable-vfp
sound/mpg123/Makefile
+4 -6
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpg123 PKG_NAME:=mpg123
PKG_VERSION:=1.25.13 PKG_VERSION:=1.25.13
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/mpg123 PKG_SOURCE_URL:=@SF/mpg123
@@ -67,16 +67,14 @@ ifeq ($(CONFIG_SOFT_FLOAT),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-cpu=generic_nofpu \ --with-cpu=generic_nofpu \
--enable-int-quality=yes --enable-int-quality=yes
else ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
CONFIGURE_ARGS+= \
--with-cpu=arm_fpu
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-cpu=generic_fpu --with-cpu=generic_fpu
endif endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
CONFIGURE_ARGS+= \
--with-cpu=arm_fpu
endif
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DATA) \ $(INSTALL_DATA) \
sound/pulseaudio/Makefile
+2 -2
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pulseaudio PKG_NAME:=pulseaudio
PKG_VERSION:=12.2 PKG_VERSION:=12.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/ PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/
@@ -100,7 +100,7 @@ define Package/pulseaudio-profiles
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
$(if $(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),--enable-neon-opt,--disable-neon-opt) \ $(if $(findstring neon,$(CONFIG_CPU_TYPE)),--enable-neon-opt,--disable-neon-opt) \
--with-system-user=pulse \ --with-system-user=pulse \
--with-system-group=pulse \ --with-system-group=pulse \
--with-access-group=audio \ --with-access-group=audio \