alsa-lib 1.0.25-1 màj port

(cherry picked from commit 592fa2af6e3b49d7254d7b0ccb5837b9bab46869)

6 files changed, 44 insertions, 32 deletions

diff --git a/alsa-lib/.footprint.i686 b/alsa-lib/.footprint.i686
index 1f8c0a99f..c3f93eeaf 100644
--- a/alsa-lib/.footprint.i686
+++ b/alsa-lib/.footprint.i686
@@ -1,9 +1,10 @@
+drwxr-xr-x	root/root	etc/
+-rw-r--r--	root/root	etc/asound.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/aserver
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/alsa/
--rw-r--r--	root/root	usr/include/alsa/alisp.h
 -rw-r--r--	root/root	usr/include/alsa/asoundef.h
 -rw-r--r--	root/root	usr/include/alsa/asoundlib.h
 -rw-r--r--	root/root	usr/include/alsa/conf.h
@@ -45,19 +46,14 @@ drwxr-xr-x	root/root	usr/include/sys/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-hda.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-python.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.so
--rw-r--r--	root/root	usr/lib/libasound.a
 -rwxr-xr-x	root/root	usr/lib/libasound.la
 lrwxrwxrwx	root/root	usr/lib/libasound.so -> libasound.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libasound.so.2 -> libasound.so.2.0.0
@@ -69,6 +65,8 @@ drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/alsa.m4
 drwxr-xr-x	root/root	usr/share/alsa/
 -rw-r--r--	root/root	usr/share/alsa/alsa.conf
+drwxr-xr-x	root/root	usr/share/alsa/alsa.conf.d/
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/README
 drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/AACI.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ATIIXP-MODEM.conf
@@ -94,6 +92,8 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/ENS1371.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ES1968.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/FM801.conf
+-rw-r--r--	root/root	usr/share/alsa/cards/FWSpeakers.conf
+-rw-r--r--	root/root	usr/share/alsa/cards/FireWave.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/GUS.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/HDA-Intel.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ICE1712.conf
@@ -111,9 +111,6 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/RME9652.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/SB-XFi.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/SI7018.conf
-drwxr-xr-x	root/root	usr/share/alsa/cards/SI7018/
--rw-r--r--	root/root	usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
--rw-r--r--	root/root	usr/share/alsa/cards/SI7018/sndop-mixer.alisp
 -rw-r--r--	root/root	usr/share/alsa/cards/TRID4DWAVENX.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/USB-Audio.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/VIA686A.conf
@@ -124,7 +121,6 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/SI7018/
 -rw-r--r--	root/root	usr/share/alsa/cards/VXPocket.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/VXPocket440.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/YMF744.conf
--rw-r--r--	root/root	usr/share/alsa/cards/aliases.alisp
 -rw-r--r--	root/root	usr/share/alsa/cards/aliases.conf
 drwxr-xr-x	root/root	usr/share/alsa/pcm/
 -rw-r--r--	root/root	usr/share/alsa/pcm/center_lfe.conf
@@ -144,4 +140,3 @@ drwxr-xr-x	root/root	usr/share/alsa/pcm/
 -rw-r--r--	root/root	usr/share/alsa/pcm/surround51.conf
 -rw-r--r--	root/root	usr/share/alsa/pcm/surround71.conf
 -rw-r--r--	root/root	usr/share/alsa/smixer.conf
--rw-r--r--	root/root	usr/share/alsa/sndo-mixer.alisp
diff --git a/alsa-lib/.footprint.x86_64 b/alsa-lib/.footprint.x86_64
index 1f8c0a99f..c3f93eeaf 100644
--- a/alsa-lib/.footprint.x86_64
+++ b/alsa-lib/.footprint.x86_64
@@ -1,9 +1,10 @@
+drwxr-xr-x	root/root	etc/
+-rw-r--r--	root/root	etc/asound.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/aserver
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/alsa/
--rw-r--r--	root/root	usr/include/alsa/alisp.h
 -rw-r--r--	root/root	usr/include/alsa/asoundef.h
 -rw-r--r--	root/root	usr/include/alsa/asoundlib.h
 -rw-r--r--	root/root	usr/include/alsa/conf.h
@@ -45,19 +46,14 @@ drwxr-xr-x	root/root	usr/include/sys/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-hda.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-python.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.so
--rw-r--r--	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.a
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.so
--rw-r--r--	root/root	usr/lib/libasound.a
 -rwxr-xr-x	root/root	usr/lib/libasound.la
 lrwxrwxrwx	root/root	usr/lib/libasound.so -> libasound.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libasound.so.2 -> libasound.so.2.0.0
@@ -69,6 +65,8 @@ drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/alsa.m4
 drwxr-xr-x	root/root	usr/share/alsa/
 -rw-r--r--	root/root	usr/share/alsa/alsa.conf
+drwxr-xr-x	root/root	usr/share/alsa/alsa.conf.d/
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/README
 drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/AACI.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ATIIXP-MODEM.conf
@@ -94,6 +92,8 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/ENS1371.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ES1968.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/FM801.conf
+-rw-r--r--	root/root	usr/share/alsa/cards/FWSpeakers.conf
+-rw-r--r--	root/root	usr/share/alsa/cards/FireWave.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/GUS.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/HDA-Intel.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ICE1712.conf
@@ -111,9 +111,6 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/RME9652.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/SB-XFi.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/SI7018.conf
-drwxr-xr-x	root/root	usr/share/alsa/cards/SI7018/
--rw-r--r--	root/root	usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
--rw-r--r--	root/root	usr/share/alsa/cards/SI7018/sndop-mixer.alisp
 -rw-r--r--	root/root	usr/share/alsa/cards/TRID4DWAVENX.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/USB-Audio.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/VIA686A.conf
@@ -124,7 +121,6 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/SI7018/
 -rw-r--r--	root/root	usr/share/alsa/cards/VXPocket.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/VXPocket440.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/YMF744.conf
--rw-r--r--	root/root	usr/share/alsa/cards/aliases.alisp
 -rw-r--r--	root/root	usr/share/alsa/cards/aliases.conf
 drwxr-xr-x	root/root	usr/share/alsa/pcm/
 -rw-r--r--	root/root	usr/share/alsa/pcm/center_lfe.conf
@@ -144,4 +140,3 @@ drwxr-xr-x	root/root	usr/share/alsa/pcm/
 -rw-r--r--	root/root	usr/share/alsa/pcm/surround51.conf
 -rw-r--r--	root/root	usr/share/alsa/pcm/surround71.conf
 -rw-r--r--	root/root	usr/share/alsa/smixer.conf
--rw-r--r--	root/root	usr/share/alsa/sndo-mixer.alisp
diff --git a/alsa-lib/.md5sum.i686 b/alsa-lib/.md5sum.i686
index 0165b2581..e3a0cd869 100644
--- a/alsa-lib/.md5sum.i686
+++ b/alsa-lib/.md5sum.i686
@@ -1 +1,2 @@
-7cc05f25e1d5b65da8fb3fdcd540f226  alsa-lib-1.0.24.1.tar.bz2
+06fe5819020c6684b991dcffc5471304  alsa-lib-1.0.25.tar.bz2
+c74c148efcf0db7a55b4095628d72708  asound.conf
diff --git a/alsa-lib/.md5sum.x86_64 b/alsa-lib/.md5sum.x86_64
index 0165b2581..e3a0cd869 100644
--- a/alsa-lib/.md5sum.x86_64
+++ b/alsa-lib/.md5sum.x86_64
@@ -1 +1,2 @@
-7cc05f25e1d5b65da8fb3fdcd540f226  alsa-lib-1.0.24.1.tar.bz2
+06fe5819020c6684b991dcffc5471304  alsa-lib-1.0.25.tar.bz2
+c74c148efcf0db7a55b4095628d72708  asound.conf
diff --git a/alsa-lib/Pkgfile b/alsa-lib/Pkgfile
index c879a7bb4..48366a562 100755
--- a/alsa-lib/Pkgfile
+++ b/alsa-lib/Pkgfile
@@ -6,19 +6,26 @@
 # Run on: 
 
 name=alsa-lib
-version=1.0.24.1
+version=1.0.25
 release=1
-source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2)
+source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2
+	asound.conf)
 
 build() {
-	unset MAKEFLAGS
 	cd $name-$version
 	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-                --enable-static \
-		--with-pythonlibs="-lpthread -lm -ldl -lpython2.7" --with-pythonincludes=-I/usr/include/python2.7
+		--disable-aload \
+		--disable-alisp \
+		--with-plugindir=/usr/lib/alsa-lib \
+		--with-pythonlibs="-lpthread -lm -ldl -lpython2.7" \
+		--with-pythonincludes=-I/usr/include/python2.7
+
+	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 	make
 	make DESTDIR=$PKG install
+
+	mkdir -p -m 755 $PKG/etc
+	install -p -m 644 ../asound.conf $PKG/etc
 }
-  
diff --git a/alsa-lib/asound.conf b/alsa-lib/asound.conf
new file mode 100644
index 000000000..9b1d6ea53
--- /dev/null
+++ b/alsa-lib/asound.conf
@@ -0,0 +1,13 @@
+#
+# Place your global alsa-lib configuration here...
+#
+
+@hooks [
+	{
+		func load
+		files [
+			"/etc/alsa/pulse-default.conf"
+		]
+		errors false
+	}
+]