Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opus: revert to autotools #23727

Merged
merged 1 commit into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions libs/opus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=opus
PKG_VERSION:=1.5.1
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.xiph.org/releases/opus
Expand All @@ -24,7 +24,6 @@ PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk

define Package/libopus
SECTION:=libs
Expand All @@ -39,23 +38,23 @@ define Package/libopus/description
is also intended for storage and streaming applications.
endef

MESON_ARGS+= \
-Ddocs=disabled \
-Dextra-programs=disabled
CONFIGURE_ARGS+= \
--disable-doc \
--disable-extra-programs

ifeq ($(CONFIG_SOFT_FLOAT),y)
MESON_ARGS+= \
-Dfixed-point=true
CONFIGURE_ARGS+= \
--enable-fixed-point
endif

ifneq ($(findstring neon,$(CONFIG_CPU_TYPE))$(findstring aarch64,$(CONFIG_ARCH)),)
MESON_ARGS+= \
-Dfixed-point=true
CONFIGURE_ARGS+= \
--enable-fixed-point
endif

CPU_ASM_BLACKLIST:=xscale arm926ej-s
ifneq ($(findstring $(call qstrip,$(CONFIG_CPU_TYPE)),$(CPU_ASM_BLACKLIST)),)
MESON_ARGS+= -Dasm=disabled
CONFIGURE_ARGS+= --disable-asm
endif

define Build/InstallDev
Expand Down
106 changes: 0 additions & 106 deletions libs/opus/patches/010-fix-meson.patch

This file was deleted.