From 76235a15b37bae9e3c83bc20e9afd49a66e33455 Mon Sep 17 00:00:00 2001
From: Daniel Laird <danieljlaird@hotmail.com>
Date: Fri, 5 Sep 2008 12:06:50 +0000
Subject: audio: Move all audio packages into audio subdir

Moved all audio packages into a subdir called audio.
I then created a Config.in and made sure that a audio.mk
existed.

Daniel Laird
---
 package/mpg123/Config.in                | 12 ------
 package/mpg123/mpg123-0.59r-cross.patch | 44 --------------------
 package/mpg123/mpg123.mk                | 73 ---------------------------------
 3 files changed, 129 deletions(-)
 delete mode 100644 package/mpg123/Config.in
 delete mode 100644 package/mpg123/mpg123-0.59r-cross.patch
 delete mode 100644 package/mpg123/mpg123.mk

(limited to 'package/mpg123')

diff --git a/package/mpg123/Config.in b/package/mpg123/Config.in
deleted file mode 100644
index 69ae4c62a..000000000
--- a/package/mpg123/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_MPG123
-	bool "mpg123"
-	help
-	  Fast, free and portable MPEG audio player for Unix.  It supports
-	  MPEG 1.0/2.0 layers 1, 2 and 3.
-
-	  http://www.mpg123.de/
-
-config BR2_PACKAGE_MPG123_ALSA
-	bool
-	default y
-	depends on BR2_PACKAGE_ALSA_LIB
diff --git a/package/mpg123/mpg123-0.59r-cross.patch b/package/mpg123/mpg123-0.59r-cross.patch
deleted file mode 100644
index c3fb5830c..000000000
--- a/package/mpg123/mpg123-0.59r-cross.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ruN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
---- mpg123-0.59r.orig/Makefile	1999-06-15 22:39:06.000000000 +0200
-+++ mpg123-0.59r/Makefile	2006-12-14 15:52:44.000000000 +0100
-@@ -103,14 +103,14 @@
-         mpg123-make
- 
- linux:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE) LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
- 			-DREAD_MMAP -DOSS -DTERM_CONTROL\
--			-Wall -O2 -m486 \
-+			-Wall \
- 			-fomit-frame-pointer -funroll-all-loops \
--			-finline-functions -ffast-math' \
-+			-finline-functions -ffast-math $(CFLAGS)' \
- 		mpg123-make
- 
- linux-3dnow:
-@@ -246,6 +246,22 @@
- 			-finline-functions -ffast-math' \
- 		mpg123-make
- 
-+linux-bigend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS+='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -DOSS_BIG_ENDIAN -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
-+linux-littleend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
- linux-sajber:
- 	@ $(MAKE) FRONTEND=sajberplay-make linux-frontend
- 
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
deleted file mode 100644
index 76977e280..000000000
--- a/package/mpg123/mpg123.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#############################################################
-#
-# mpg123
-#
-#############################################################
-MPG123_VERSION=0.66
-MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.bz2
-MPG123_CAT:=$(BZCAT)
-MPG123_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
-MPG123_DIR:=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
-MPG123_BIN:=src/mpg123
-MPG123_TARGET_BIN:=usr/bin/mpg123
-
-# Check if ALSA is built, then we should configure after alsa-lib so
-# ./configure can find alsa-lib.
-ifeq ($(strip $(BR2_PACKAGE_MPG123_ALSA)),y)
-MPG123_USE_ALSA:=--with-audio=alsa
-MPG123_ALSA_DEP:=alsa-lib
-endif
-
-$(DL_DIR)/$(MPG123_SOURCE):
-	$(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE)
-
-$(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
-	$(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MPG123_DIR) package/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
-	$(CONFIG_UPDATE) $(MPG123_DIR)/build
-	touch $@
-
-$(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
-	(cd $(MPG123_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-		--target=$(REAL_GNU_TARGET_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-cpu=generic_nofpu \
-		$(MPG123_USE_ALSA) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-	)
-	touch $@
-
-$(MPG123_DIR)/$(MPG123_BIN): $(MPG123_DIR)/.configured
-	$(MAKE) -C $(MPG123_DIR)
-
-$(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN)
-	$(INSTALL) -D $(MPG123_DIR)/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
-
-mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
-
-mpg123-clean:
-	-$(MAKE) -C $(MPG123_DIR) clean
-
-mpg123-dirclean:
-	rm -rf $(MPG123_DIR) $(MPG123_DIR)
-
-mpg123-source: $(DL_DIR)/$(MPG123_SOURCE)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MPG123)),y)
-TARGETS+=mpg123
-endif
-- 
cgit v1.2.3