From e6f385e7b215ac50668e7505ad0d6ff8d715530f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Apr 2013 11:11:41 +0200 Subject: [PATCH 1/3] Updated to 1.0.27 --- alsa-lib.spec | 15 ++++++++++----- modprobe-dist-oss.conf | 5 +++-- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index d1627f7..9ae22e2 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.0.26 -Release: 4%{?prever_dot}%{?dist} +Version: 1.0.27 +Release: 2%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -17,7 +17,6 @@ Source12: modprobe-dist-oss.conf 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 -Patch5: alsa-lib-sys-types.patch BuildRequires: doxygen Requires(post): /sbin/ldconfig, coreutils @@ -48,7 +47,6 @@ against the ALSA libraries and interfaces. %patch0 -p1 -b .config %patch2 -p1 -b .glibc-open %patch4 -p1 -b .no-dox-date -%patch5 -p1 -b .sys-types %build %configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp @@ -75,7 +73,9 @@ install -p -m 644 %{SOURCE10} %{buildroot}/etc # Install the modprobe files for ALSA mkdir -p -m 755 %{buildroot}/lib/modprobe.d/ install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf -install -p -m 644 %{SOURCE12} %{buildroot}/lib/modprobe.d/dist-oss.conf +# bug#926973, place this file to the doc directory +mkdir -p -m 755 %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ +install -p -m 644 %{SOURCE12} %{buildroot}%{_defaultdocdir}/%{name}-%{version}/modprobe-dist-oss.conf # Create UCM directory mkdir -p %{buildroot}/%{_datadir}/alsa/ucm @@ -109,6 +109,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/aclocal/alsa.m4 %changelog + +* Thu Apr 11 2013 Jaroslav Kysela - 1.0.17-2 +- Updated to 1.0.27 +- move dist-oss.conf to doc as modprobe-dist-oss.conf + * Wed Apr 03 2013 Stephen Gallagher - 1.0.26-4 - Add upstream patch to explicitly include sys/types.h diff --git a/modprobe-dist-oss.conf b/modprobe-dist-oss.conf index d432d7e..21f93cc 100644 --- a/modprobe-dist-oss.conf +++ b/modprobe-dist-oss.conf @@ -2,6 +2,7 @@ # This has been disabled in F11 onwards because it can interfere with the # PulseAudio sound service (a legacy OSS application can prevent PulseAudio # applications from playing sound by preventing PulseAudio from (re-)opening -# the sound device). To re-enable support, uncomment the following line: +# the sound device). To re-enable support, copy this file to +# the /etc/modprobe.d directory. # -# install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss +install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss diff --git a/sources b/sources index 1efdbd6..c8af2c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2dfa35d28471d721e592b616beedf965 alsa-lib-1.0.26.tar.bz2 +f090c7dbd0fe57d786d82e411eac2d08 alsa-lib-1.0.27.tar.bz2 From bfe4053036dcaadfcf8ccf19e3425a4f31a1d2a5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 May 2013 08:52:00 -0500 Subject: [PATCH 2/3] fix changelog --- alsa-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index 9ae22e2..b6f4674 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -110,7 +110,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog -* Thu Apr 11 2013 Jaroslav Kysela - 1.0.17-2 +* Thu Apr 11 2013 Jaroslav Kysela - 1.0.27-2 - Updated to 1.0.27 - move dist-oss.conf to doc as modprobe-dist-oss.conf From fa5f53e2afecc9e57efc0e3d78c5b607e8358499 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 May 2013 08:54:16 -0500 Subject: [PATCH 3/3] pull in upstream fix for building in C90 mode --- ...-Use-__inline__-for-exported-headers.patch | 155 ++++++++++++++++++ alsa-lib.spec | 9 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 0004-Use-__inline__-for-exported-headers.patch diff --git a/0004-Use-__inline__-for-exported-headers.patch b/0004-Use-__inline__-for-exported-headers.patch new file mode 100644 index 0000000..fd9d814 --- /dev/null +++ b/0004-Use-__inline__-for-exported-headers.patch @@ -0,0 +1,155 @@ +From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 25 Apr 2013 09:52:33 +0200 +Subject: [PATCH 4/6] Use __inline__ for exported headers + +Some programs are still using C90. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 +Signed-off-by: Takashi Iwai +--- + include/control.h | 4 ++-- + include/iatomic.h | 14 +++++++------- + include/pcm.h | 2 +- + include/pcm_extplug.h | 4 ++-- + include/use-case.h | 4 ++-- + 5 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/control.h b/include/control.h +index 27fe2ac..5fdf379 100644 +--- a/include/control.h ++++ b/include/control.h +@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t + int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); + int snd_ctl_close(snd_ctl_t *ctl); + int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); +-static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } ++static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } + int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, + snd_async_callback_t callback, void *private_data); + snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); +@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); + int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); + int snd_hctl_close(snd_hctl_t *hctl); + int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); +-static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } ++static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } + int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); + int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); + int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); +diff --git a/include/iatomic.h b/include/iatomic.h +index e92dbfd..5711fe8 100644 +--- a/include/iatomic.h ++++ b/include/iatomic.h +@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) + return result; + } + +-static inline int atomic_add_negative(int i, volatile atomic_t *v) ++static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) + { + unsigned long flags; + int result; +@@ -1160,36 +1160,36 @@ typedef struct { + + void snd_atomic_read_wait(snd_atomic_read_t *t); + +-static inline void snd_atomic_write_init(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) + { + w->begin = 0; + w->end = 0; + } + +-static inline void snd_atomic_write_begin(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) + { + w->begin++; + wmb(); + } + +-static inline void snd_atomic_write_end(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) + { + wmb(); + w->end++; + } + +-static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) ++static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) + { + r->write = w; + } + +-static inline void snd_atomic_read_begin(snd_atomic_read_t *r) ++static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) + { + r->end = r->write->end; + rmb(); + } + +-static inline int snd_atomic_read_ok(snd_atomic_read_t *r) ++static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) + { + rmb(); + return r->end == r->write->begin; +diff --git a/include/pcm.h b/include/pcm.h +index e440030..95b8aed 100644 +--- a/include/pcm.h ++++ b/include/pcm.h +@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); + int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); + int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); + int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); +-static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } ++static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } + int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, + snd_async_callback_t callback, void *private_data); + snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); +diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h +index 884f322..e3b71bc 100644 +--- a/include/pcm_extplug.h ++++ b/include/pcm_extplug.h +@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, + /** + * set the parameter constraint with a single value + */ +-static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); + } +@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type + /** + * set the parameter constraint for slave PCM with a single value + */ +-static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); + } +diff --git a/include/use-case.h b/include/use-case.h +index defd4ea..93b3456 100644 +--- a/include/use-case.h ++++ b/include/use-case.h +@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); + * \param list Returned allocated list + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_card_list(const char **list[]) ++static __inline__ int snd_use_case_card_list(const char **list[]) + { + return snd_use_case_get_list(NULL, NULL, list); + } +@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) + * \param list Returned list of verbs + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, ++static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, + const char **list[]) + { + return snd_use_case_get_list(uc_mgr, "_verbs", list); +-- +1.8.1.4 + diff --git a/alsa-lib.spec b/alsa-lib.spec index b6f4674..80e907a 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -5,7 +5,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: 1.0.27 -Release: 2%{?prever_dot}%{?dist} +Release: 3%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -18,6 +18,9 @@ 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 +## upstream patches +Patch100: 0004-Use-__inline__-for-exported-headers.patch + BuildRequires: doxygen Requires(post): /sbin/ldconfig, coreutils @@ -48,6 +51,8 @@ against the ALSA libraries and interfaces. %patch2 -p1 -b .glibc-open %patch4 -p1 -b .no-dox-date +%patch100 -p1 -b .0004 + %build %configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp @@ -109,6 +114,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/aclocal/alsa.m4 %changelog +* Tue May 07 2013 Rex Dieter 1.0.27-3 +- pull in upstream fix for building in C90 mode * Thu Apr 11 2013 Jaroslav Kysela - 1.0.27-2 - Updated to 1.0.27