diff --git a/.gitignore b/.gitignore index 6ca2361..6dba41f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ alsa-lib-1.0.19.tar.bz2 alsa-lib-1.0.20.tar.bz2 alsa-lib-1.0.21.tar.bz2 alsa-lib-1.0.22.tar.bz2 +/alsa-lib-1.0.24.tar.bz2 diff --git a/alsa-lib-1.0.17-config.patch b/alsa-lib-1.0.17-config.patch deleted file mode 100644 index a733a43..0000000 --- a/alsa-lib-1.0.17-config.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruNp alsa-lib-1.0.17.orig/src/conf/alsa.conf alsa-lib-1.0.17/src/conf/alsa.conf ---- alsa-lib-1.0.17.orig/src/conf/alsa.conf 2008-07-14 10:57:56.000000000 +0200 -+++ alsa-lib-1.0.17/src/conf/alsa.conf 2008-07-21 11:51:45.000000000 +0200 -@@ -64,8 +64,7 @@ defaults.pcm.device 0 - defaults.pcm.subdevice -1 - defaults.pcm.nonblock 1 - defaults.pcm.ipc_key 5678293 --defaults.pcm.ipc_gid audio --defaults.pcm.ipc_perm 0660 -+defaults.pcm.ipc_perm 0600 - defaults.pcm.dmix.max_periods 0 - defaults.pcm.dmix.rate 48000 - defaults.pcm.dmix.format "unchanged" -diff -ruNp alsa-lib-1.0.17.orig/src/conf/pcm/dmix.conf alsa-lib-1.0.17/src/conf/pcm/dmix.conf ---- alsa-lib-1.0.17.orig/src/conf/pcm/dmix.conf 2008-07-14 10:57:56.000000000 +0200 -+++ alsa-lib-1.0.17/src/conf/pcm/dmix.conf 2008-07-21 11:51:45.000000000 +0200 -@@ -41,10 +41,6 @@ pcm.!dmix { - @func refer - name defaults.pcm.ipc_key - } -- ipc_gid { -- @func refer -- name defaults.pcm.ipc_gid -- } - ipc_perm { - @func refer - name defaults.pcm.ipc_perm -diff -ruNp alsa-lib-1.0.17.orig/src/conf/pcm/dsnoop.conf alsa-lib-1.0.17/src/conf/pcm/dsnoop.conf ---- alsa-lib-1.0.17.orig/src/conf/pcm/dsnoop.conf 2008-07-14 10:57:56.000000000 +0200 -+++ alsa-lib-1.0.17/src/conf/pcm/dsnoop.conf 2008-07-21 11:51:45.000000000 +0200 -@@ -41,10 +41,6 @@ pcm.!dsnoop { - @func refer - name defaults.pcm.ipc_key - } -- ipc_gid { -- @func refer -- name defaults.pcm.ipc_gid -- } - ipc_perm { - @func refer - name defaults.pcm.ipc_perm diff --git a/alsa-lib-1.0.24-config.patch b/alsa-lib-1.0.24-config.patch new file mode 100644 index 0000000..f0e50e3 --- /dev/null +++ b/alsa-lib-1.0.24-config.patch @@ -0,0 +1,44 @@ +diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf +index 1889f01..60c12ac 100644 +--- a/src/conf/alsa.conf ++++ b/src/conf/alsa.conf +@@ -66,8 +66,7 @@ defaults.pcm.nonblock 1 + defaults.pcm.compat 0 + defaults.pcm.minperiodtime 5000 # in us + defaults.pcm.ipc_key 5678293 +-defaults.pcm.ipc_gid audio +-defaults.pcm.ipc_perm 0660 ++defaults.pcm.ipc_perm 0600 + defaults.pcm.dmix.max_periods 0 + defaults.pcm.dmix.rate 48000 + defaults.pcm.dmix.format "unchanged" +diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf +index e62cb29..a005488 100644 +--- a/src/conf/pcm/dmix.conf ++++ b/src/conf/pcm/dmix.conf +@@ -41,10 +41,6 @@ pcm.!dmix { + @func refer + name defaults.pcm.ipc_key + } +- ipc_gid { +- @func refer +- name defaults.pcm.ipc_gid +- } + ipc_perm { + @func refer + name defaults.pcm.ipc_perm +diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf +index 49cfca9..842e1fb 100644 +--- a/src/conf/pcm/dsnoop.conf ++++ b/src/conf/pcm/dsnoop.conf +@@ -41,10 +41,6 @@ pcm.!dsnoop { + @func refer + name defaults.pcm.ipc_key + } +- ipc_gid { +- @func refer +- name defaults.pcm.ipc_gid +- } + ipc_perm { + @func refer + name defaults.pcm.ipc_perm diff --git a/alsa-lib.spec b/alsa-lib.spec index 665a202..6e495ce 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,13 +4,13 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.0.23 -Release: 2%{?prever_dot}%{?dist} +Version: 1.0.24 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Source10: asound.conf -Patch0: alsa-lib-1.0.17-config.patch +Patch0: alsa-lib-1.0.24-config.patch Patch2: alsa-lib-1.0.14-glibc-open.patch Patch4: alsa-lib-1.0.16-no-dox-date.patch URL: http://www.alsa-project.org/ @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/alsa.m4 %changelog +* Fri Jan 28 2011 Jaroslav Kysela - 1.0.24-1 +- Updated to 1.0.24 final + * Tue Nov 9 2010 Jochen Schmitt 1.0.23-2 - Set plugindir to %%{_libdir}/alsa-lib (bz#651507) diff --git a/sources b/sources index d4b5853..9dc6e7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f48b50421d8a69d2d806d9c47e534f0d alsa-lib-1.0.23.tar.bz2 +689a16918ddc63908d54fb85456b7ab9 alsa-lib-1.0.24.tar.bz2