Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/speex: version bump and refactoring

Browse source 
- speexdsp has been broken out of the speex package by upstream. The
  released versions of both aren't aligned (speex is at 1.2.0, speexdsp
  at 1.2rc3). Break out speexdsp into its own Makefile accordingly.

- Don't disable VBR anymore as it has its applications (i.e. can be used
  with freeswitch-stable).

- Prevent build system from changing our CFLAGS (--enable-sse=no).

- Make integer mode depend on SOFT_FLOAT symbol so it doesn't get
  enabled on devices with FPUs.

- Use PKG_INSTALL and remove custom Build/Compile as there is no need
  for this.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-07-30 10:08:52 +02:00
parent 6e326f837d
commit 57b8233b57
2 changed files with 80 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
libs/speex/Makefile
View file

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2006-2017 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=speex
PKG_VERSION:=1.2rc1
PKG_VERSION:=1.2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
PKG_MD5SUM:=c4438b22c08e5811ff10e2b06ee9b9ae
PKG_HASH:=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -27,14 +28,6 @@ define Package/libspeex
MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/libspeexdsp
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Open source speech compression codec library output to DSP
URL:=http://www.speex.org/
MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/libspeex/description
Open source patent-free speech compression codec library.
Speex is an Open Source/Free Software patent-free audio compression
@ -47,48 +40,13 @@ define Package/libspeex/description
This package contains the shared codec library, needed by other programs.
endef
TARGET_CFLAGS += $(FPIC)
define Package/libspeexdsp/description
Open source patent-free speech compression codec library.
Speex is an Open Source/Free Software patent-free audio compression
format designed for speech. The Speex Project aims to lower the
barrier of entry for voice applications by providing a free
alternative to expensive proprietary speech codecs. Moreover, Speex
is well-adapted to Internet applications and provides useful features
that are not present in most other codecs.
This package contains the shared dsp library, needed by other programs.
endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--enable-fixed-point \
--disable-oggtest \
--disable-float-api \
--disable-vbr \
--with-ogg=$(STAGING_DIR)/usr \
)
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
bin_PROGRAMS="" \
all install
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libspeex/install
@ -96,10 +54,15 @@ define Package/libspeex/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
endef
define Package/libspeexdsp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--disable-binaries \
--disable-oggtest \
--enable-sse=no \
--with-ogg=$(STAGING_DIR)/usr \
$(if $(CONFIG_SOFT_FLOAT),--enable-fixed-point --disable-float-api)
$(eval $(call BuildPackage,libspeex))
$(eval $(call BuildPackage,libspeexdsp))

66
libs/speexdsp/Makefile Normal file
View file

@ -0,0 +1,66 @@
#
# Copyright (C) 2006-2017 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=speexdsp
PKG_VERSION:=1.2rc3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
PKG_HASH:=4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libspeexdsp
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Open source speech compression codec library output to DSP
URL:=http://www.speex.org/
MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/libspeexdsp/description
Open source patent-free speech compression codec library.
Speex is an Open Source/Free Software patent-free audio compression
format designed for speech. The Speex Project aims to lower the
barrier of entry for voice applications by providing a free
alternative to expensive proprietary speech codecs. Moreover, Speex
is well-adapted to Internet applications and provides useful features
that are not present in most other codecs.
This package contains the shared dsp library, needed by other programs.
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libspeexdsp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--disable-examples \
--enable-sse=no \
$(if $(CONFIG_SOFT_FLOAT),--enable-fixed-point --disable-float-api)
$(eval $(call BuildPackage,libspeexdsp))