From e7df5afeb9634a0d95499049efb5c4887069290d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 15 Nov 2008 21:33:07 +0000
Subject: package/audio: rename audio category to multimedia

Prepare for the merge of audio and video packages. Many packages cannot
properly be assigned to either audio or video, because they have support
for both (libogg, mplayer, vlc).

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
 package/audio/speex/Config.in | 25 -------------------------
 package/audio/speex/speex.mk  | 36 ------------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 package/audio/speex/Config.in
 delete mode 100644 package/audio/speex/speex.mk

(limited to 'package/audio/speex')

diff --git a/package/audio/speex/Config.in b/package/audio/speex/Config.in
deleted file mode 100644
index 424a83001..000000000
--- a/package/audio/speex/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-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.
-	  It can be used for Voice over IP
-
-	  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
-	default y
-	bool
-	depends on BR2_PACKAGE_SPEEX && BR2_arm && !(BR2_PACKAGE_SPEEX_ARM_GENERIC || BR2_PACKAGE_SPEEX_ARM4)
-
diff --git a/package/audio/speex/speex.mk b/package/audio/speex/speex.mk
deleted file mode 100644
index 516781c11..000000000
--- a/package/audio/speex/speex.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################################################
-#
-# speex
-#
-#############################################################
-SPEEX_VERSION=1.2rc1
-SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz
-SPEEX_SITE=http://downloads.us.xiph.org/releases/speex
-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 \
-		 --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
-
-$(eval $(call AUTOTARGETS,package/audio,speex))
-
-$(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 $@
-
-$(SPEEX_HOOK_POST_INSTALL): $(SPEEX_TARGET_INSTALL_TARGET)
-	rm -rf $(TARGET_DIR)/usr/share/doc/speex $(TARGET_DIR)/usr/share/aclocal
-	touch $@
-- 
cgit v1.2.3