diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-11-15 21:33:07 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-11-15 21:33:07 +0000 |
commit | e7df5afeb9634a0d95499049efb5c4887069290d (patch) | |
tree | 307e4abcfc17552130058735e2d9dbd8e1f64784 /package/audio/mpg123 | |
parent | 4190cc1c4166160a2802efb1c090dd42ff2e7d6e (diff) | |
download | buildroot-novena-e7df5afeb9634a0d95499049efb5c4887069290d.tar.gz buildroot-novena-e7df5afeb9634a0d95499049efb5c4887069290d.zip |
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>
Diffstat (limited to 'package/audio/mpg123')
-rw-r--r-- | package/audio/mpg123/Config.in | 12 | ||||
-rw-r--r-- | package/audio/mpg123/mpg123-0.59r-cross.patch | 44 | ||||
-rw-r--r-- | package/audio/mpg123/mpg123.mk | 73 |
3 files changed, 0 insertions, 129 deletions
diff --git a/package/audio/mpg123/Config.in b/package/audio/mpg123/Config.in deleted file mode 100644 index 69ae4c62a..000000000 --- a/package/audio/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/audio/mpg123/mpg123-0.59r-cross.patch b/package/audio/mpg123/mpg123-0.59r-cross.patch deleted file mode 100644 index c3fb5830c..000000000 --- a/package/audio/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/audio/mpg123/mpg123.mk b/package/audio/mpg123/mpg123.mk deleted file mode 100644 index a56b69031..000000000 --- a/package/audio/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/audio/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 |