|
|
Author: notting
Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7404
Modified Files:
.cvsignore alsa-lib-ainit.patch alsa-lib.spec sources
Log Message:
- update to 1.0.9rc4, adjust patches (#157180, #158547)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 18 May 2005 13:07:49 -0000 1.11
+++ .cvsignore 24 May 2005 20:43:46 -0000 1.12
@@ -1,6 +1 @@
-alsa-lib-1.0.7.tar.bz2
-alsa-lib-1.0.8.tar.bz2
-alsa-lib-1.0.9rc2.tar.bz2
-ainit-0.2.tar.gz
-ainit-0.3.tar.gz
-ainit-0.4.tar.gz
+alsa-lib-1.0.9rc4.tar.bz2
alsa-lib-ainit.patch:
pcm_direct.c | 22 +++++++++------
pcm_direct.h | 5 ++-
pcm_dmix.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
pcm_dshare.c | 74 ++++++++++++++++++++++++++++++++++++++++++++---------
pcm_dsnoop.c | 59 +++++++++++++++++++++++++++++++++++-------
5 files changed, 197 insertions(+), 45 deletions(-)
Index: alsa-lib-ainit.patch
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib-ainit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-lib-ainit.patch 27 Apr 2005 12:41:25 -0000 1.1
+++ alsa-lib-ainit.patch 24 May 2005 20:43:46 -0000 1.2
@@ -14,18 +14,19 @@
int shmid; /* IPC global shared memory
identification */
--- alsa-lib-1.0.8/src/pcm/pcm_dmix.c.ainit 2005-04-12 13:29:53.000000000
+0200
+++ alsa-lib-1.0.8/src/pcm/pcm_dmix.c 2005-04-12 13:29:53.000000000 +0200
-@@ -69,11 +69,12 @@
+@@ -69,12 +69,12 @@
dmix->shmptr->s.buffer_size *
sizeof(signed int);
retryshm:
-- dmix->u.dmix.shmid_sum = shmget(dmix->ipc_key + 1, size, IPC_CREAT |
0666);
+- dmix->u.dmix.shmid_sum = shmget(dmix->ipc_key + 1, size,
+- IPC_CREAT | dmix->ipc_perm);
+ dmix->u.dmix.shmid_sum = shmget(dmix->ipc_mem_plug, size,
-+ IPC_CREAT | (dmix->share_ipc_key ?
0666 : 0600));
++ IPC_CREAT | (dmix->share_ipc_key ?
dmix->ipc_perm : 0600));
err = -errno;
if (dmix->u.dmix.shmid_sum < 0){
if (errno == EINVAL)
-- if ((tmpid = shmget(dmix->ipc_key + 1, 0, 0666)) != -1)
-+ if ((tmpid = shmget(dmix->ipc_mem_plug, 0, (dmix->share_ipc_key
? 0666 : 0600))) != -1)
+- if ((tmpid = shmget(dmix->ipc_key + 1, 0, dmix->ipc_perm)) !=
-1)
++ if ((tmpid = shmget(dmix->ipc_mem_plug, 0, (dmix->share_ipc_key
? dmix->ipc_perm : 0600))) != -1)
if (!shmctl(tmpid, IPC_STAT, &buf))
if (!buf.shm_nattch)
/* no users so destroy the segment */
@@ -279,13 +280,14 @@
return err;
--- alsa-lib-1.0.8/src/pcm/pcm_direct.c.ainit 2004-09-15 20:45:51.000000000
+0200
+++ alsa-lib-1.0.8/src/pcm/pcm_direct.c 2005-04-12 13:29:53.000000000
+0200
-@@ -56,7 +56,8 @@
+@@ -56,8 +56,8 @@
int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix)
{
-- dmix->semid = semget(dmix->ipc_key, DIRECT_IPC_SEMS, IPC_CREAT | 0666);
+- dmix->semid = semget(dmix->ipc_key, DIRECT_IPC_SEMS,
+- IPC_CREAT | dmix->ipc_perm);
+ dmix->semid = semget(dmix->ipc_sem, DIRECT_IPC_SEMS,
-+ IPC_CREAT | (dmix->share_ipc_key ? 0666 : 0600));
++ IPC_CREAT | (dmix->share_ipc_key ?
dmix->ipc_perm : 0600));
if (dmix->semid < 0)
return -errno;
return 0;
@@ -302,18 +304,19 @@
dmix->semid = -1;
return 0;
}
-@@ -103,11 +106,12 @@
+@@ -103,12 +106,12 @@
int tmpid, err;
retryget:
-- dmix->shmid = shmget(dmix->ipc_key, sizeof(snd_pcm_direct_share_t),
IPC_CREAT | 0666);
+- dmix->shmid = shmget(dmix->ipc_key, sizeof(snd_pcm_direct_share_t),
+- IPC_CREAT | dmix->ipc_perm);
+ dmix->shmid = shmget(dmix->ipc_mem_direct,
sizeof(snd_pcm_direct_share_t),
-+ IPC_CREAT | (dmix->share_ipc_key ? 0666 : 0600));
++ IPC_CREAT | (dmix->share_ipc_key ?
dmix->ipc_perm : 0600));
err = -errno;
if (dmix->shmid < 0){
if (errno == EINVAL)
-- if ((tmpid = shmget(dmix->ipc_key, 0, 0666)) != -1)
-+ if ((tmpid = shmget(dmix->ipc_mem_direct, 0,
(dmix->share_ipc_key ? 0666 : 0600))) != -1)
+- if ((tmpid = shmget(dmix->ipc_key, 0, dmix->ipc_perm)) != -1)
++ if ((tmpid = shmget(dmix->ipc_mem_direct, 0,
(dmix->share_ipc_key ? dmix->ipc_perm : 0600))) != -1)
if (!shmctl(tmpid, IPC_STAT, &buf))
if (!buf.shm_nattch)
/* no users so destroy the segment */
Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- alsa-lib.spec 18 May 2005 13:07:49 -0000 1.26
+++ alsa-lib.spec 24 May 2005 20:43:46 -0000 1.27
@@ -1,19 +1,14 @@
Summary: The Advanced Linux Sound Architecture (ALSA) library.
Name: alsa-lib
-Version: 1.0.9rc2
-Release: 5
+Version: 1.0.9rc4
+Release: 1
License: LGPL
Group: System Environment/Libraries
Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
Source1: ainit-0.4.tar.gz
#Patch0: alsa-lib-mixer.patch
-Patch1: alsa-lib-alpha.patch
-Patch2: alsa-lib-gcc4.patch
Patch3: alsa-lib-ainit.patch
-Patch4: alsa-lib-1.0.9rc2-cvs.patch
-#Patch5: alsa-lib-1.0.9rc2-ainit-config.patch
Patch6: alsa-lib-ainit-dsnoop.patch
-Patch7: alsa-lib-1.0.9rc3-mixer-gentoo.patch
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: doxygen
@@ -41,14 +36,8 @@
%prep
%setup -q -n %{name}-%{version}%{?prever} -a 1
-#%patch0 -p1 -b .mixer
-%patch1 -p1 -b .alpha
-%patch2 -p1 -b .gcc4
%patch3 -p1 -b .ainit
-%patch4 -p1 -b .arts
-#%patch5 -p1 -b .ainit
%patch6 -p1
-%patch7 -p1 -b .mixer
%build
%configure \
@@ -123,6 +112,9 @@
%{_datadir}/aclocal/alsa.m4
%changelog
+* Tue May 24 2005 Bill Nottingham <notting@xxxxxxxxxx> 1.0.9rc4-1
+- update to 1.0.9rc4 (#157180, #158547)
+
* Wed May 18 2005 Martin Stransky <stransky@xxxxxxxxxx> 1.0.9rc2-5
- fix for #130593
- new ainit (dmix/dsnoop is default only for cards which really need it)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 18 May 2005 13:07:49 -0000 1.12
+++ sources 24 May 2005 20:43:46 -0000 1.13
@@ -1,2 +1 @@
-0b606956d9c02e568be36a7f6ca15511 alsa-lib-1.0.9rc2.tar.bz2
-509cdf0740cd41297c7b568182974a46 ainit-0.4.tar.gz
+fb2330ad8b9a86b4d17345e8b34974e0 alsa-lib-1.0.9rc4.tar.bz2
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|