mirror of
https://git.busybox.net/buildroot.git
synced 2025-01-26 14:23:24 +08:00
libvorbis: split tremor into its own package
This commit splits the Tremor fixed-point implementation out of the libvorbis package and creates a new package called 'tremor' for it. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Sven Neumann
Peter Korsgaard
parent
5c3817bb46
commit
1dc19c4457
@ -24,5 +24,6 @@ source "package/multimedia/speex/Config.in"
|
||||
source "package/multimedia/swfdec/Config.in"
|
||||
source "package/multimedia/festival/Config.in"
|
||||
source "package/multimedia/taglib/Config.in"
|
||||
source "package/multimedia/tremor/Config.in"
|
||||
source "package/multimedia/vlc/Config.in"
|
||||
endmenu
|
||||
|
||||
@ -12,10 +12,3 @@ config BR2_PACKAGE_LIBVORBIS
|
||||
representations such as MPEG-4 (AAC), and similar to, but higher
|
||||
performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
|
||||
WMA and PAC.
|
||||
|
||||
config BR2_PACKAGE_LIBVORBIS_TREMOR
|
||||
bool "use fixed point implementation (tremor)"
|
||||
default y if BR2_SOFT_FLOAT
|
||||
depends on BR2_PACKAGE_LIBVORBIS
|
||||
help
|
||||
Use the Tremor fixed point implementation
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
ifneq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y)
|
||||
|
||||
LIBVORBIS_VERSION = 1.2.3
|
||||
LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
|
||||
LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
|
||||
@ -19,81 +17,12 @@ LIBVORBIS_DEPENDENCIES = host-pkgconfig libogg
|
||||
|
||||
$(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
|
||||
|
||||
else
|
||||
|
||||
############################################################
|
||||
#
|
||||
# Tremor (Integer decoder for Vorbis)
|
||||
#
|
||||
############################################################
|
||||
|
||||
TREMOR_TRUNK:=http://svn.xiph.org/trunk/Tremor/
|
||||
TREMOR_VERSION:=16259
|
||||
TREMOR_NAME:=Tremor-svn-r$(TREMOR_VERSION)
|
||||
TREMOR_DIR:=$(BUILD_DIR)/$(TREMOR_NAME)
|
||||
TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
|
||||
TREMOR_CAT=$(BZCAT)
|
||||
|
||||
$(DL_DIR)/$(TREMOR_SOURCE):
|
||||
$(SVN_CO) -r $(TREMOR_VERSION) $(TREMOR_TRUNK) $(TREMOR_DIR)
|
||||
tar -cv -C $(BUILD_DIR) $(TREMOR_NAME) | bzip2 - -c > $@
|
||||
|
||||
$(TREMOR_DIR)/.source: $(DL_DIR)/$(TREMOR_SOURCE)
|
||||
$(TREMOR_CAT) $(DL_DIR)/$(TREMOR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||
touch $@
|
||||
|
||||
$(TREMOR_DIR)/.configured: $(TREMOR_DIR)/.source
|
||||
(cd $(TREMOR_DIR); rm -rf config.cache; \
|
||||
$(TARGET_CONFIGURE_ARGS) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
./autogen.sh \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
--build=$(GNU_HOST_NAME) \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--disable-oggtest \
|
||||
$(DISABLE_NLS) \
|
||||
)
|
||||
touch $@
|
||||
|
||||
$(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured
|
||||
$(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR)
|
||||
touch $@
|
||||
|
||||
$(STAGING_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs
|
||||
$(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) install
|
||||
touch $@
|
||||
|
||||
$(TARGET_DIR)/usr/lib/tremor.so: $(STAGING_DIR)/usr/lib/tremor.so
|
||||
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \
|
||||
$(if $(BR2_STRIP_none),install,install-strip)
|
||||
touch $@
|
||||
|
||||
$(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so
|
||||
cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/
|
||||
touch $@
|
||||
|
||||
tremor libvorbis: host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so
|
||||
|
||||
tremor-source libvorbis-source: $(DL_DIR)/$(TREMOR_SOURCE)
|
||||
|
||||
tremor-clean libvorbis-clean:
|
||||
$(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) uninstall
|
||||
-$(MAKE) -C $(TREMOR_DIR) clean
|
||||
|
||||
tremor-dirclean libvorbis-dirclean:
|
||||
rm -rf $(TREMOR_DIR)
|
||||
|
||||
|
||||
############################################################
|
||||
#
|
||||
# Toplevel Makefile options
|
||||
#
|
||||
############################################################
|
||||
TARGETS+=tremor
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
|
||||
TARGETS+=libvorbis
|
||||
endif
|
||||
|
||||
7
package/multimedia/tremor/Config.in
Normal file
7
package/multimedia/tremor/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_TREMOR
|
||||
bool "tremor (fixed point vorbis decoder)"
|
||||
help
|
||||
Tremor is a fixed point implementation of an Ogg Vorbis
|
||||
decoder. It provides a decoding API similar to libvorbis,
|
||||
but gives much better performance on systems without a
|
||||
floating-point unit.
|
||||
31
package/multimedia/tremor/tremor.mk
Normal file
31
package/multimedia/tremor/tremor.mk
Normal file
@ -0,0 +1,31 @@
|
||||
############################################################
|
||||
#
|
||||
# Tremor (Integer decoder for Vorbis)
|
||||
#
|
||||
############################################################
|
||||
|
||||
TREMOR_TRUNK:=http://svn.xiph.org/trunk/Tremor/
|
||||
TREMOR_VERSION:=16259
|
||||
TREMOR_NAME:=Tremor-svn-r$(TREMOR_VERSION)
|
||||
TREMOR_DIR:=$(BUILD_DIR)/$(TREMOR_NAME)
|
||||
TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
|
||||
TREMOR_CAT=$(BZCAT)
|
||||
TREMOR_AUTORECONF = YES
|
||||
TREMOR_INSTALL_STAGING = YES
|
||||
TREMOR_INSTALL_TARGET = YES
|
||||
|
||||
$(DL_DIR)/$(TREMOR_SOURCE):
|
||||
$(SVN_CO) -r $(TREMOR_VERSION) $(TREMOR_TRUNK) $(TREMOR_DIR)
|
||||
tar -cv -C $(BUILD_DIR) $(TREMOR_NAME) | bzip2 - -c > $@
|
||||
|
||||
$(eval $(call AUTOTARGETS,package/multimedia,tremor))
|
||||
|
||||
|
||||
############################################################
|
||||
#
|
||||
# Toplevel Makefile options
|
||||
#
|
||||
############################################################
|
||||
ifeq ($(BR2_PACKAGE_TREMOR),y)
|
||||
TARGETS+=tremor
|
||||
endif
|
||||
Loading…
Reference in New Issue
Block a user