[Astlinux-commits] SF.net SVN: astlinux: [470] trunk/package

[<kr...@us...>]

Revision: 470
          http://svn.sourceforge.net/astlinux/?rev=470&view=rev
Author:   krisk84
Date:     2006-11-18 02:55:49 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
ALSA cleanup

Modified Paths:
--------------
    trunk/package/alsa-lib/alsa-lib.mk
    trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch
    trunk/package/alsa-utils/alsa-utils.mk

Modified: trunk/package/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/package/alsa-lib/alsa-lib.mk	2006-11-18 10:13:15 UTC (rev 469)
+++ trunk/package/alsa-lib/alsa-lib.mk	2006-11-18 10:55:49 UTC (rev 470)
@@ -30,16 +30,16 @@
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(STAGING_DIR)/usr \
-		--exec-prefix=$(STAGING_DIR)/usr \
-		--bindir=$(STAGING_DIR)/usr/bin \
-		--sbindir=$(STAGING_DIR)/usr/sbin \
-		--libexecdir=$(STAGING_DIR)/usr/lib \
-		--sysconfdir=$(STAGING_DIR)/etc \
-		--datadir=$(STAGING_DIR)/usr/share \
-		--localstatedir=$(STAGING_DIR)/var \
-		--mandir=$(STAGING_DIR)/usr/man \
-		--infodir=$(STAGING_DIR)/usr/info \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
 		--with-pic \
 		--disable-static \
 		--disable-aload \
@@ -71,6 +71,7 @@
 	    includedir=$(STAGING_DIR)/include \
 	-C $(ALSA_LIB_DIR) install
 	cp -a $(STAGING_DIR)/include/alsa $(STAGING_DIR)/usr/include/
+	cp -a $(STAGING_DIR)/usr/share/alsa $(TARGET_DIR)/usr/share/alsa
 # Install into target dir, for utils using shared libraries on target.
 $(TARGET_DIR)/lib/$(ALSA_LIB_BINARY): $(STAGING_DIR)/lib/$(ALSA_LIB_BINARY)
 	install -D -m 0644 $< $@

Modified: trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch
===================================================================
--- trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch	2006-11-18 10:13:15 UTC (rev 469)
+++ trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch	2006-11-18 10:55:49 UTC (rev 470)
@@ -6,7 +6,7 @@
  @ALSAMIXER_FALSE@ALSAMIXER_DIR = 
  @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer
 -SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
-+SUBDIRS = include amixer aplay
++SUBDIRS = include $(ALSAMIXER_DIR) amixer aplay
  EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4

Modified: trunk/package/alsa-utils/alsa-utils.mk
===================================================================
--- trunk/package/alsa-utils/alsa-utils.mk	2006-11-18 10:13:15 UTC (rev 469)
+++ trunk/package/alsa-utils/alsa-utils.mk	2006-11-18 10:55:49 UTC (rev 470)
@@ -31,7 +31,7 @@
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--disable-alsatest \
-		--disable-alsamixer \
+		--disable-rpath \
 		--with-alsa-prefix=$(STAGING_DIR)/lib \
 		--with-alsa-inc-prefix=$(STAGING_DIR)/include \
 		$(DISABLE_NLS) \
@@ -44,13 +44,13 @@
 
 # TODO: Only one target -- is that bad?
 $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY)/$(ALSA_UTILS_BINARY)
-	for i in aplay amixer;do \
+	for i in aplay amixer alsamixer;do \
 		install -D -m 0755 $(ALSA_UTILS_DIR)/$$i/$$i $(TARGET_DIR)/usr/bin/$$i; \
 		$(STRIP) $(TARGET_DIR)/usr/bin/$$i; \
 	done
 	(cd $(TARGET_DIR)/usr/bin;rm -f arecord;ln -s aplay arecord)
 
-alsa-utils: alsa-lib $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY)
+alsa-utils: uclibc ncurses alsa-lib $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY)
 
 alsa-utils-clean:
 	$(MAKE) -C $(ALSA_UTILS_DIR) distclean


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.