* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-08-28 18:18 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 18:18 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-28 11:18:10 -0700 (Tue, 28 Aug 2007)
New Revision: 19713
Log:
Remove mpg123 patch from current build, full removal pending
Added:
trunk/buildroot/package/mpg123/mpg123-0.59r-cross.patch
Modified:
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Copied: trunk/buildroot/package/mpg123/mpg123-0.59r-cross.patch (from rev 19712, trunk/buildroot/package/mpg123/mpg123-cross.patch)
===================================================================
--- trunk/buildroot/package/mpg123/mpg123-0.59r-cross.patch (rev 0)
+++ trunk/buildroot/package/mpg123/mpg123-0.59r-cross.patch 2007-08-28 18:18:10 UTC (rev 19713)
@@ -0,0 +1,44 @@
+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
+
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2007-08-28 12:41:56 UTC (rev 19712)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-08-28 18:18:10 UTC (rev 19713)
@@ -23,7 +23,7 @@
$(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\*.patch
+ toolchain/patch-kernel.sh $(MPG123_DIR) package/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
$(CONFIG_UPDATE) $(MPG123_DIR)/build
touch $@
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-09-23 14:24 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 14:24 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 07:24:13 -0700 (Sun, 23 Sep 2007)
New Revision: 19973
Log:
Use correct location of mpg123 binary
Modified:
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2007-09-23 14:23:16 UTC (rev 19972)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-09-23 14:24:13 UTC (rev 19973)
@@ -8,8 +8,8 @@
MPG123_CAT:=$(BZCAT)
MPG123_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
MPG123_DIR:=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
-MPG123_BIN:=mpg123
-MPG123_TARGET_BIN:=usr/bin/$(MPG123_BIN)
+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.
@@ -50,7 +50,7 @@
$(MAKE) -C $(MPG123_DIR)
$(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN)
- $(INSTALL) -D $(MPG123_DIR)/src/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
+ $(INSTALL) -D $(MPG123_DIR)/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-08-28 19:36 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 19:36 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-28 12:36:40 -0700 (Tue, 28 Aug 2007)
New Revision: 19719
Log:
Remove renamed mpg123 patch
Removed:
trunk/buildroot/package/mpg123/mpg123-cross.patch
Changeset:
Deleted: trunk/buildroot/package/mpg123/mpg123-cross.patch
===================================================================
--- trunk/buildroot/package/mpg123/mpg123-cross.patch 2007-08-28 19:35:54 UTC (rev 19718)
+++ trunk/buildroot/package/mpg123/mpg123-cross.patch 2007-08-28 19:36:40 UTC (rev 19719)
@@ -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
-
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-08-01 8:54 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-08-01 8:54 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-01 01:54:56 -0700 (Wed, 01 Aug 2007)
New Revision: 19382
Log:
Revert bad patch of mpg123
Modified:
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2007-08-01 08:41:45 UTC (rev 19381)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-08-01 08:54:56 UTC (rev 19382)
@@ -56,9 +56,7 @@
mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
mpg123-clean:
- @if [ -d $(MPG123_DIR)/Makefile ] ; then \
- $(MAKE) -C $(MPG123_DIR) clean ; \
- fi;
+ -$(MAKE) -C $(MPG123_DIR) clean
mpg123-dirclean:
rm -rf $(MPG123_DIR) $(MPG123_DIR)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-07-28 17:05 ulf at uclibc.org
2007-07-30 9:50 ` Bernhard Fischer
0 siblings, 1 reply; 10+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 17:05 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-28 10:05:38 -0700 (Sat, 28 Jul 2007)
New Revision: 19300
Log:
Bump version of mpg123,use configure, change site to Sourceforge
Modified:
trunk/buildroot/package/mpg123/Config.in
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Modified: trunk/buildroot/package/mpg123/Config.in
===================================================================
--- trunk/buildroot/package/mpg123/Config.in 2007-07-28 16:49:16 UTC (rev 19299)
+++ trunk/buildroot/package/mpg123/Config.in 2007-07-28 17:05:38 UTC (rev 19300)
@@ -6,3 +6,8 @@
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
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2007-07-28 16:49:16 UTC (rev 19299)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-07-28 17:05:38 UTC (rev 19300)
@@ -3,53 +3,67 @@
# 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:=mpg123
+MPG123_TARGET_BIN:=usr/bin/$(MPG123_BIN)
-MPG123_VERSION=0.59r
+# 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
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
-MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.gz
-MPG123_CAT:=$(ZCAT)
-MPG123_SITE=http://www.mpg123.de/mpg123
-MPG123_DIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
-
$(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\*.patch
+ $(CONFIG_UPDATE) $(MPG123_DIR)/build
touch $@
-$(MPG123_DIR)/mpg123: $(MPG123_DIR)/.unpacked
- rm -f $@
-ifeq ($(BR2_ARCH),"i386")
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux
-else
-ifeq ($(BR2_ENDIAN),"LITTLE")
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-littleend
-else
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-bigend
-endif
-endif
+$(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
+ (cd $(MPG123_DIR); rm -rf config.cache; \
+ $(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)/.installed: $(MPG123_DIR)/mpg123
- mkdir -p $(TARGET_DIR)/usr/bin
- cp -f $(MPG123_DIR)/mpg123 $(TARGET_DIR)/usr/bin
- $(STRIP) --strip-all $(TARGET_DIR)/usr/bin/mpg123
- touch $(MPG123_DIR)/.installed
+$(MPG123_DIR)/$(MPG123_BIN): $(MPG123_DIR)/.configured
+ $(MAKE) -C $(MPG123_DIR)
-mpg123: uclibc $(MPG123_DIR)/.installed
+$(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN)
+ $(INSTALL) -D $(MPG123_DIR)/src/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPG123_TARGET_BIN)
-mpg123-source: $(DL_DIR)/$(MPG123_SOURCE)
+mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
mpg123-clean:
- -$(MAKE) -C $(MPG123_DIR) clean
+ @if [ -d $(MPG123_DIR)/Makefile ] ; then \
+ $(MAKE) -C $(MPG123_DIR) clean ; \
+ fi;
mpg123-dirclean:
- rm -rf $(MPG123_DIR)
+ rm -rf $(MPG123_DIR) $(MPG123_DIR)
+mpg123-source: $(DL_DIR)/$(MPG123_SOURCE)
+
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
2007-07-28 17:05 ulf at uclibc.org
@ 2007-07-30 9:50 ` Bernhard Fischer
0 siblings, 0 replies; 10+ messages in thread
From: Bernhard Fischer @ 2007-07-30 9:50 UTC (permalink / raw)
To: buildroot
On Sat, Jul 28, 2007 at 10:05:39AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-28 10:05:38 -0700 (Sat, 28 Jul 2007)
>New Revision: 19300
>
>Log:
>Bump version of mpg123,use configure, change site to Sourceforge
>
>Modified:
> trunk/buildroot/package/mpg123/Config.in
> trunk/buildroot/package/mpg123/mpg123.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/mpg123/Config.in
>===================================================================
>--- trunk/buildroot/package/mpg123/Config.in 2007-07-28 16:49:16 UTC (rev 19299)
>+++ trunk/buildroot/package/mpg123/Config.in 2007-07-28 17:05:38 UTC (rev 19300)
>@@ -6,3 +6,8 @@
> 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
>
>Modified: trunk/buildroot/package/mpg123/mpg123.mk
>===================================================================
>--- trunk/buildroot/package/mpg123/mpg123.mk 2007-07-28 16:49:16 UTC (rev 19299)
>+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-07-28 17:05:38 UTC (rev 19300)
>@@ -3,53 +3,67 @@
> # 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:=mpg123
>+MPG123_TARGET_BIN:=usr/bin/$(MPG123_BIN)
>
>-MPG123_VERSION=0.59r
>+# 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
>
>-# Don't alter below this line unless you (think) you know
>-# what you are doing! Danger, Danger!
>-
>-MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.gz
>-MPG123_CAT:=$(ZCAT)
>-MPG123_SITE=http://www.mpg123.de/mpg123
>-MPG123_DIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
>-
> $(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\*.patch
>+ $(CONFIG_UPDATE) $(MPG123_DIR)/build
> touch $@
>
>-$(MPG123_DIR)/mpg123: $(MPG123_DIR)/.unpacked
>- rm -f $@
>-ifeq ($(BR2_ARCH),"i386")
>- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux
>-else
>-ifeq ($(BR2_ENDIAN),"LITTLE")
>- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-littleend
>-else
>- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-bigend
>-endif
>-endif
>+$(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
>+ (cd $(MPG123_DIR); rm -rf config.cache; \
>+ $(TARGET_CONFIGURE_OPTS) \
>+ CFLAGS="$(TARGET_CFLAGS)" \
>+ LDFLAGS="$(TARGET_LDFLAGS)" \
Missing TARGET_CONFIGURE_ARGS.
Ulf, you usually forget to use the TARGET_CONFIGURE_ARGS. Please audit
all of your patches to include them, TIA.
> mpg123-clean:
>- -$(MAKE) -C $(MPG123_DIR) clean
>+ @if [ -d $(MPG123_DIR)/Makefile ] ; then \
>+ $(MAKE) -C $(MPG123_DIR) clean ; \
>+ fi;
This changes looks like it is wrong. Please revert (-$(MAKE) is the
correct thing to do).
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2007-05-31 15:42 jacmet at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: jacmet at uclibc.org @ 2007-05-31 15:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-31 08:42:33 -0700 (Thu, 31 May 2007)
New Revision: 18712
Log:
Cleanup, get rid of MPG123_WORKDIR, use $@, libmad not needed
Modified:
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2007-05-31 15:27:05 UTC (rev 18711)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2007-05-31 15:42:33 UTC (rev 18712)
@@ -12,8 +12,7 @@
MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.gz
MPG123_CAT:=$(ZCAT)
MPG123_SITE=http://www.mpg123.de/mpg123
-MPG123_DIR=$(BUILD_DIR)/${shell basename $(MPG123_SOURCE) .tar.gz}
-MPG123_WORKDIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
+MPG123_DIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
$(DL_DIR)/$(MPG123_SOURCE):
$(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE)
@@ -21,37 +20,35 @@
$(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\*.patch
- touch $(MPG123_DIR)/.unpacked
+ touch $@
-$(MPG123_WORKDIR)/mpg123: $(MPG123_DIR)/.unpacked
+$(MPG123_DIR)/mpg123: $(MPG123_DIR)/.unpacked
rm -f $@
ifeq ($(BR2_ARCH),"i386")
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux
else
ifeq ($(BR2_ENDIAN),"LITTLE")
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux-littleend
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-littleend
else
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux-bigend
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-bigend
endif
endif
-$(MPG123_WORKDIR)/.installed: $(MPG123_WORKDIR)/mpg123
+$(MPG123_DIR)/.installed: $(MPG123_DIR)/mpg123
mkdir -p $(TARGET_DIR)/usr/bin
- cp -f $(MPG123_WORKDIR)/mpg123 $(TARGET_DIR)/usr/bin
+ cp -f $(MPG123_DIR)/mpg123 $(TARGET_DIR)/usr/bin
$(STRIP) --strip-all $(TARGET_DIR)/usr/bin/mpg123
- touch $(MPG123_WORKDIR)/.installed
+ touch $(MPG123_DIR)/.installed
-mpg123: uclibc libmad $(MPG123_WORKDIR)/.installed
+mpg123: uclibc $(MPG123_DIR)/.installed
mpg123-source: $(DL_DIR)/$(MPG123_SOURCE)
mpg123-clean:
- @if [ -d $(MPG123_WORKDIR)/Makefile ] ; then \
- $(MAKE) -C $(MPG123_WORKDIR) clean ; \
- fi;
+ -$(MAKE) -C $(MPG123_DIR) clean
mpg123-dirclean:
- rm -rf $(MPG123_DIR) $(MPG123_WORKDIR)
+ rm -rf $(MPG123_DIR)
#############################################################
#
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2006-12-14 16:03 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2006-12-14 16:03 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-14 08:03:40 -0800 (Thu, 14 Dec 2006)
New Revision: 16931
Log:
- forgot to add the cross patch.
Added:
trunk/buildroot/package/mpg123/mpg123-cross.patch
Changeset:
Added: trunk/buildroot/package/mpg123/mpg123-cross.patch
===================================================================
--- trunk/buildroot/package/mpg123/mpg123-cross.patch 2006-12-14 15:55:33 UTC (rev 16930)
+++ trunk/buildroot/package/mpg123/mpg123-cross.patch 2006-12-14 16:03:40 UTC (rev 16931)
@@ -0,0 +1,44 @@
+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
+
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mpg123
@ 2006-12-14 15:55 aldot at uclibc.org
2006-12-14 16:06 ` Ulrich Hecht
0 siblings, 1 reply; 10+ messages in thread
From: aldot at uclibc.org @ 2006-12-14 15:55 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-14 07:55:33 -0800 (Thu, 14 Dec 2006)
New Revision: 16930
Log:
- Ulrich Hecht writes: The current mpg123 package
- ignores TARGET_CC (overwritten in Makefile)
- ignores TARGET_CFLAGS
- is hardcoded to use the i386 target
Modified:
trunk/buildroot/package/mpg123/mpg123.mk
Changeset:
Modified: trunk/buildroot/package/mpg123/mpg123.mk
===================================================================
--- trunk/buildroot/package/mpg123/mpg123.mk 2006-12-14 15:47:50 UTC (rev 16929)
+++ trunk/buildroot/package/mpg123/mpg123.mk 2006-12-14 15:55:33 UTC (rev 16930)
@@ -20,11 +20,20 @@
$(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\*.patch
touch $(MPG123_DIR)/.unpacked
$(MPG123_WORKDIR)/mpg123: $(MPG123_DIR)/.unpacked
rm -f $@
- $(MAKE) CC=$(TARGET_CC) -C $(MPG123_WORKDIR) linux
+ifeq ($(BR2_ARCH),"i386")
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux
+else
+ifeq ($(BR2_ENDIAN),"LITTLE")
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux-littleend
+else
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_WORKDIR) linux-bigend
+endif
+endif
$(MPG123_WORKDIR)/.installed: $(MPG123_WORKDIR)/mpg123
mkdir -p $(TARGET_DIR)/usr/bin
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-09-23 14:24 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-28 18:18 [Buildroot] svn commit: trunk/buildroot/package/mpg123 ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-09-23 14:24 ulf at uclibc.org
2007-08-28 19:36 ulf at uclibc.org
2007-08-01 8:54 ulf at uclibc.org
2007-07-28 17:05 ulf at uclibc.org
2007-07-30 9:50 ` Bernhard Fischer
2007-05-31 15:42 jacmet at uclibc.org
2006-12-14 16:03 aldot at uclibc.org
2006-12-14 15:55 aldot at uclibc.org
2006-12-14 16:06 ` Ulrich Hecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox