* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2008-08-17 13:46 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-08-17 13:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-17 06:46:46 -0700 (Sun, 17 Aug 2008)
New Revision: 23100
Log:
speex: also compile static libraries
Modified:
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2008-08-17 13:46:42 UTC (rev 23099)
+++ trunk/buildroot/package/speex/speex.mk 2008-08-17 13:46:46 UTC (rev 23100)
@@ -11,8 +11,9 @@
SPEEX_INSTALL_TARGET = YES
SPEEX_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip
SPEEX_DEPENDENCIES = libogg
-SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib --with-ogg-includes=$(STAGING_DIR)/usr/include \
- --disable-static --enable-fixed-point $(DISABLE_NLS)
+SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
+ --with-ogg-includes=$(STAGING_DIR)/usr/include \
+ --enable-fixed-point $(DISABLE_NLS)
ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
SPEEX_CONF_OPT += --enable-arm4-asm
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2008-08-17 13:46 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-08-17 13:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-17 06:46:42 -0700 (Sun, 17 Aug 2008)
New Revision: 23099
Log:
speex: automate selection of arm specific optimizations
ARM version info according to wikipedia, hopefully I got it all correct.
Modified:
trunk/buildroot/package/speex/Config.in
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/Config.in
===================================================================
--- trunk/buildroot/package/speex/Config.in 2008-08-17 13:20:31 UTC (rev 23098)
+++ trunk/buildroot/package/speex/Config.in 2008-08-17 13:46:42 UTC (rev 23099)
@@ -8,10 +8,18 @@
http://www.speex.org/
+config BR2_PACKAGE_SPEEX_ARM_GENERIC
+ bool
+ default y
+ depends on BR2_PACKAGE_SPEEX && (BR2_generic_arm || BR2_arm610 || BR2_arm710)
+
+config BR2_PACKAGE_SPEEX_ARM4
+ bool
+ default y
+ depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_sa110 || BR2_sa1100)
+
config BR2_PACKAGE_SPEEX_ARM5E
- bool "Support ARM5E instruction set"
default y
- depends on BR2_PACKAGE_SPEEX && BR2_arm
- help
- Use the additional instructions available in the ARM5E
- or later cores.
+ bool
+ depends on BR2_PACKAGE_SPEEX && BR2_arm && !(BR2_PACKAGE_SPEEX_ARM_GENERIC || BR2_PACKAGE_SPEEX_ARM4)
+
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2008-08-17 13:20:31 UTC (rev 23098)
+++ trunk/buildroot/package/speex/speex.mk 2008-08-17 13:46:42 UTC (rev 23099)
@@ -14,6 +14,10 @@
SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib --with-ogg-includes=$(STAGING_DIR)/usr/include \
--disable-static --enable-fixed-point $(DISABLE_NLS)
+ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
+ SPEEX_CONF_OPT += --enable-arm4-asm
+endif
+
ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
SPEEX_CONF_OPT += --enable-arm5e-asm
endif
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2008-08-17 13:20 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-08-17 13:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-17 06:20:31 -0700 (Sun, 17 Aug 2008)
New Revision: 23098
Log:
speex: fix target install
Use install-strip and clean up documentation files instead of
install-exec so files get stripped and manpages installed if
requested.
Modified:
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2008-08-17 13:20:28 UTC (rev 23097)
+++ trunk/buildroot/package/speex/speex.mk 2008-08-17 13:20:31 UTC (rev 23098)
@@ -9,6 +9,7 @@
SPEEX_AUTORECONF = NO
SPEEX_INSTALL_STAGING = YES
SPEEX_INSTALL_TARGET = YES
+SPEEX_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip
SPEEX_DEPENDENCIES = libogg
SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib --with-ogg-includes=$(STAGING_DIR)/usr/include \
--disable-static --enable-fixed-point $(DISABLE_NLS)
@@ -25,3 +26,7 @@
$(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(SPEEX_DIR)/libtool
$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
$(Q)touch $@
+
+$(SPEEX_HOOK_POST_INSTALL): $(SPEEX_TARGET_INSTALL_TARGET)
+ rm -rf $(TARGET_DIR)/usr/share/doc/speex $(TARGET_DIR)/usr/share/aclocal
+ touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2008-08-17 13:20 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-08-17 13:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-17 06:20:28 -0700 (Sun, 17 Aug 2008)
New Revision: 23097
Log:
speex: select libogg
Speex depends on libogg, so make it visible in Kconfig
Modified:
trunk/buildroot/package/speex/Config.in
Changeset:
Modified: trunk/buildroot/package/speex/Config.in
===================================================================
--- trunk/buildroot/package/speex/Config.in 2008-08-17 13:20:25 UTC (rev 23096)
+++ trunk/buildroot/package/speex/Config.in 2008-08-17 13:20:28 UTC (rev 23097)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_SPEEX
bool "speex"
+ select BR2_PACKAGE_LIBOGG
help
Speex is an Open Source/Free Software patent-free
audio compression format designed for speech.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2008-08-17 13:20 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-08-17 13:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-17 06:20:25 -0700 (Sun, 17 Aug 2008)
New Revision: 23096
Log:
speex: convert to Makefile.autotools.in and bump version to 1.2rc1
Patch by Malek <souf_oued@yahoo.fr>
Modified:
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2008-08-17 12:47:19 UTC (rev 23095)
+++ trunk/buildroot/package/speex/speex.mk 2008-08-17 13:20:25 UTC (rev 23096)
@@ -3,107 +3,25 @@
# speex
#
#############################################################
-
-SPEEX_VERSION=1.2beta2
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
+SPEEX_VERSION=1.2rc1
SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz
-SPEEX_CAT:=$(ZCAT)
SPEEX_SITE=http://downloads.us.xiph.org/releases/speex
-SPEEX_DIR=$(BUILD_DIR)/speex-$(SPEEX_VERSION)
+SPEEX_AUTORECONF = NO
+SPEEX_INSTALL_STAGING = YES
+SPEEX_INSTALL_TARGET = YES
+SPEEX_DEPENDENCIES = libogg
+SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib --with-ogg-includes=$(STAGING_DIR)/usr/include \
+ --disable-static --enable-fixed-point $(DISABLE_NLS)
ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
-SPEEX_FOR_ARM5E:=--enable-arm5e-asm
+ SPEEX_CONF_OPT += --enable-arm5e-asm
endif
-$(DL_DIR)/$(SPEEX_SOURCE):
- $(WGET) -P $(DL_DIR) $(SPEEX_SITE)/$(SPEEX_SOURCE)
+$(eval $(call AUTOTARGETS,package,speex))
-$(SPEEX_DIR)/.unpacked: $(DL_DIR)/$(SPEEX_SOURCE)
- $(SPEEX_CAT) $(DL_DIR)/$(SPEEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SPEEX_DIR) package/speex/ speex-$(SPEEX_VERSION)\*.patch
- $(CONFIG_UPDATE) $(SPEEX_DIR)
- touch $(SPEEX_DIR)/.unpacked
-
-$(SPEEX_DIR)/Makefile: $(SPEEX_DIR)/.unpacked
- rm -f $(SPEEX_DIR)/Makefile
- mkdir -p $(SPEEX_DIR)
- (cd $(SPEEX_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(SPEEX_DIR)/configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --includedir=/usr/include \
- --enable-shared \
- --enable-fixed-point \
- $(SPEEX_FOR_ARM5E) \
- $(DISABLE_NLS); \
- )
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/Makefile
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/libspeex/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/libspeex/Makefile
- $(SED) "s,-I/usr/include,,g" $(SPEEX_DIR)/libspeex/Makefile
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/src/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/src/Makefile
- $(SED) "s,-I/usr/include,,g" $(SPEEX_DIR)/src/Makefile
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/include/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/include/Makefile
- $(SED) "s,-I/usr/include,,g" $(SPEEX_DIR)/include/Makefile
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/include/speex/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/include/speex/Makefile
- $(SED) "s,-I/usr/include,,g" $(SPEEX_DIR)/include/speex/Makefile
- $(SED) "s,^OGG_CFLAGS.*,OGG_CFLAGS= -I$(STAGING_DIR)/usr/include,g" $(SPEEX_DIR)/doc/Makefile
- $(SED) "s,^OGG_LIBS.*,OGG_LIBS= -L$(STAGING_DIR)/usr/lib -logg,g" $(SPEEX_DIR)/doc/Makefile
- $(SED) "s,-I/usr/include,,g" $(SPEEX_DIR)/doc/Makefile
-
-
-
-$(SPEEX_DIR)/speex: $(SPEEX_DIR)/Makefile
- rm -f $@
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SPEEX_DIR)
-
-$(SPEEX_DIR)/.installed: $(SPEEX_DIR)/speex
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SPEEX_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libspeex.la
- touch $@
-
-$(TARGET_DIR)/usr/bin/speexdec: $(SPEEX_DIR)/.installed
- cp -dpf $(STAGING_DIR)/usr/bin/speexdec $(TARGET_DIR)/usr/bin/speexdec
-
-$(TARGET_DIR)/usr/bin/speexenc: $(TARGET_DIR)/usr/bin/speexdec
- cp -dpf $(STAGING_DIR)/usr/bin/speexenc $(TARGET_DIR)/usr/bin/speexenc
-
-$(TARGET_DIR)/usr/lib/libspeex.so: $(TARGET_DIR)/usr/bin/speexenc
- cp -dpf $(STAGING_DIR)/usr/lib/libspeex.so* $(TARGET_DIR)/usr/lib
-
-speex-bins:
-
-speex: uclibc libogg $(TARGET_DIR)/usr/lib/libspeex.so
-
-speex-source: $(DL_DIR)/$(SPEEX_SOURCE)
-
-speex-clean:
- -$(MAKE) -C $(SPEEX_DIR) clean
- -rm -f $(STAGING_DIR)/usr/lib/libspeex.so*
- rm -f $(STAGING_DIR)/usr/bin/speexenc $(STAGING_DIR)/usr/bin/speexdec
- -rm -f $(TARGET_DIR)/usr/lib/libspeex.so*
- rm -f $(TARGET_DIR)/usr/bin/speexenc $(TARGET_DIR)/usr/bin/speexdec
-
-
-speex-dirclean:
- rm -rf $(SPEEX_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SPEEX)),y)
-TARGETS+=speex
-endif
+$(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE)
+ $(call MESSAGE,"Building")
+ $(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(SPEEX_DIR)/libtool
+ $(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(SPEEX_DIR)/libtool
+ $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+ $(Q)touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2007-11-30 12:33 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-11-30 12:33 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-30 04:33:37 -0800 (Fri, 30 Nov 2007)
New Revision: 20597
Log:
Ensure speex will use any future patch
Modified:
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2007-11-30 12:32:33 UTC (rev 20596)
+++ trunk/buildroot/package/speex/speex.mk 2007-11-30 12:33:37 UTC (rev 20597)
@@ -23,6 +23,7 @@
$(SPEEX_DIR)/.unpacked: $(DL_DIR)/$(SPEEX_SOURCE)
$(SPEEX_CAT) $(DL_DIR)/$(SPEEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(SPEEX_DIR) package/speex/ speex-$(SPEEX_VERSION)\*.patch
$(CONFIG_UPDATE) $(SPEEX_DIR)
touch $(SPEEX_DIR)/.unpacked
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/speex
@ 2007-11-29 13:05 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:05 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:05:28 -0800 (Thu, 29 Nov 2007)
New Revision: 20588
Log:
Update config for speex
Modified:
trunk/buildroot/package/speex/speex.mk
Changeset:
Modified: trunk/buildroot/package/speex/speex.mk
===================================================================
--- trunk/buildroot/package/speex/speex.mk 2007-11-29 13:04:41 UTC (rev 20587)
+++ trunk/buildroot/package/speex/speex.mk 2007-11-29 13:05:28 UTC (rev 20588)
@@ -23,6 +23,7 @@
$(SPEEX_DIR)/.unpacked: $(DL_DIR)/$(SPEEX_SOURCE)
$(SPEEX_CAT) $(DL_DIR)/$(SPEEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(CONFIG_UPDATE) $(SPEEX_DIR)
touch $(SPEEX_DIR)/.unpacked
$(SPEEX_DIR)/Makefile: $(SPEEX_DIR)/.unpacked
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-08-17 13:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-17 13:46 [Buildroot] svn commit: trunk/buildroot/package/speex jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-08-17 13:46 jacmet at uclibc.org
2008-08-17 13:20 jacmet at uclibc.org
2008-08-17 13:20 jacmet at uclibc.org
2008-08-17 13:20 jacmet at uclibc.org
2007-11-30 12:33 ulf at uclibc.org
2007-11-29 13:05 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox