NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/celt051: drop package

Browse Source 
Remove celt051 package as celt has been merged into the IETF Opus codec
and is now obsolete (see http://celt-codec.org/).

The only reverse dependency of celt051 is spice. Opus support on spice
has been added upstream 6 years ago with:
ce9b714137

Spice disabled celt by default since version 0.14.1 and:
72b0d603e1

Spice evens error out, by default, if Opus is missing but not explicitly
disabeld since:
f522473842

This will also fix a static build failure on spice with celt051 and opus.

Fixes:
 - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: slight rephrasing in legacy help]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2020-01-24 21:09:31 +01:00 committed by Yann E. MORIN
parent 0e1a39ff26
commit b32efbdb03
9 changed files with 10 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Config.in.legacy
View File

@ -146,6 +146,16 @@ endif
comment "Legacy options removed in 2020.02"
config BR2_PACKAGE_CELT051
bool "celt051 package was removed"
select BR2_LEGACY
select BR2_PACKAGE_OPUS
help
The celt051 package was removed as it is now obsolete since
the CELT codec has been merged into the IETF Opus codec. As
a result, the opus package has been automatically selected
in your configuration.
config BR2_PACKAGE_WIREGUARD
bool "wireguard package renamed"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10

1
DEVELOPERS
View File

@ -2535,7 +2535,6 @@ F: configs/nanopi_neo_defconfig
F: fs/squashfs/
F: package/asterisk/
F: package/cegui06/
F: package/celt051/
F: package/dahdi-linux/
F: package/dahdi-tools/
F: package/dtc/

1
package/Config.in
View File

@ -1210,7 +1210,6 @@ menu "Audio/Sound"
source "package/audiofile/Config.in"
source "package/bcg729/Config.in"
source "package/caps/Config.in"
source "package/celt051/Config.in"
source "package/fdk-aac/Config.in"
source "package/libao/Config.in"
source "package/libasplib/Config.in"

29
package/celt051/0001-fix-gnuc-prereq.patch
View File

@ -1,29 +0,0 @@
Fix musl build
musl does not define __GNUC_PREREQ. Use patch from Alpine Linux
(http://git.alpinelinux.org/cgit/aports/plain/main/celt051/fix-gnuc-prereq.patch).
Fixes http://autobuild.buildroot.net/results/223/223ba6003bdd7e0c896455c21fa8fee943b4e716/
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
--- celt-0.5.1.3.orig/libcelt/ecintrin.h
+++ celt-0.5.1.3/libcelt/ecintrin.h
@@ -52,8 +52,7 @@
/*Count leading zeros.
This macro should only be used for implementing ec_ilog(), if it is defined.
All other code should use EC_ILOG() instead.*/
-#ifdef __GNUC_PREREQ
-#if __GNUC_PREREQ(3,4)
+#if defined(__GNUC__) && ((__GNUC__<<16)+__GNUC_MINOR__) >= 0x304
# if INT_MAX>=2147483647
# define EC_CLZ0 sizeof(unsigned)*CHAR_BIT
# define EC_CLZ(_x) (__builtin_clz(_x))
@@ -61,7 +60,6 @@
# define EC_CLZ0 sizeof(unsigned long)*CHAR_BIT
# define EC_CLZ(_x) (__builtin_clzl(_x))
# endif
-#endif
#endif
#if defined(EC_CLZ)

15
package/celt051/Config.in
View File

@ -1,15 +0,0 @@
config BR2_PACKAGE_CELT051
bool "celt051"
select BR2_PACKAGE_LIBOGG
help
The CELT ultra-low delay audio codec
The CELT codec is a compression algorithm for audio. Like MP3,
Vorbis, and AAC it is suitable for transmitting music with
high quality. Unlike these formats CELT imposes very little
delay on the signal, even less than is typical for speech
centric formats like Speex, GSM, or G.729.
Note: this is version 0.5.1.3 of celt.
http://www.celt-codec.org/

2
package/celt051/celt051.hash
View File

@ -1,2 +0,0 @@
# From http://downloads.xiph.org/releases/celt/SHA1SUMS
sha1 eb05030108c36cb063c3f026c349f16d78e0a497 celt-0.5.1.3.tar.gz

30
package/celt051/celt051.mk
View File

@ -1,30 +0,0 @@
################################################################################
#
# celt
#
################################################################################
# Although version newer than 0.5.1.3 exists, we're
# stuck with 0.5.1.3 for use by Spice (coming later)
CELT051_VERSION = 0.5.1.3
CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
CELT051_SITE = http://downloads.xiph.org/releases/celt
CELT051_LICENSE = BSD-2-Clause
CELT051_LICENSE_FILES = COPYING
CELT051_INSTALL_STAGING = YES
CELT051_DEPENDENCIES = libogg
# Need to specify --with-ogg, otherwise /usr/lib may be searched for
# if target is the same kind as host (ie. same arch, same bitness,
# same endianness, so that /usr/lib contains libraries linkable by
# our cross-compiler)
CELT051_CONF_OPTS = \
--enable-fixed-point \
--disable-fixed-point-debug \
--disable-experimental-postfilter \
--disable-static-modes \
--disable-assertions \
--disable-oggtest \
--with-ogg=$(STAGING_DIR)/usr
$(eval $(autotools-package))

5
package/jack2/jack2.mk
View File

@ -34,11 +34,6 @@ JACK2_DEPENDENCIES += dbus
JACK2_CONF_OPTS += --dbus
endif
# Even though it advertises support for celt-0.5.x, jack2 really
# requires celt >= 0.5.2 but we only have 0.5.1.3 and we cannot
# upgrade, so we do not add a dependency to celt051, which it can't
# find anyway as it looks for celt.pc but we only have celt-51.pc.
# The dependency against eigen is only useful in conjunction with
# gtkiostream, which we do not have, so we don't need to depend on
# eigen.

7
package/spice/spice.mk
View File

@ -32,13 +32,6 @@ SPICE_CONF_OPTS = \
SPICE_DEPENDENCIES += host-pkgconf
ifeq ($(BR2_PACKAGE_CELT051),y)
SPICE_CONF_OPTS += --enable-celt051
SPICE_DEPENDENCIES += celt051
else
SPICE_CONF_OPTS += --disable-celt051
endif
ifeq ($(BR2_PACKAGE_LZ4),y)
SPICE_CONF_OPTS += --enable-lz4
SPICE_DEPENDENCIES += lz4