From 13ad2a91a0a6a3e397c5f09801eb24d10f5aa54d186df9842eef30c30526bf42 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 9 Feb 2009 11:38:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=41 --- pulseaudio-0.9.12.tar.bz2 | 3 - pulseaudio-0.9.14.tar.bz2 | 3 + pulseaudio-allow-in-sample-names.patch | 124 ------------------------- pulseaudio-asserts.patch | 20 ---- pulseaudio-dot-pulse.patch | 45 --------- pulseaudio.changes | 29 ++++++ pulseaudio.spec | 68 ++++++++------ 7 files changed, 74 insertions(+), 218 deletions(-) delete mode 100644 pulseaudio-0.9.12.tar.bz2 create mode 100644 pulseaudio-0.9.14.tar.bz2 delete mode 100644 pulseaudio-allow-in-sample-names.patch delete mode 100644 pulseaudio-asserts.patch delete mode 100644 pulseaudio-dot-pulse.patch diff --git a/pulseaudio-0.9.12.tar.bz2 b/pulseaudio-0.9.12.tar.bz2 deleted file mode 100644 index ce19c04..0000000 --- a/pulseaudio-0.9.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045cc4e621e5ae4b6a916f9711960d3b0c5990f6088fac44192124b43e05a5b3 -size 913067 diff --git a/pulseaudio-0.9.14.tar.bz2 b/pulseaudio-0.9.14.tar.bz2 new file mode 100644 index 0000000..9cefcc3 --- /dev/null +++ b/pulseaudio-0.9.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e602e36f73ae3642495fcfc471f785c3db92e77a828e3395fd5edf5217f1b537 +size 943571 diff --git a/pulseaudio-allow-in-sample-names.patch b/pulseaudio-allow-in-sample-names.patch deleted file mode 100644 index e3c7de9..0000000 --- a/pulseaudio-allow-in-sample-names.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Lennart Poettering -Date: Fri, 3 Oct 2008 17:49:15 +0000 (+0200) -Subject: allow - in sample names -X-Git-Tag: v0.9.13~18 -X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=c0815deb4add5ae4598de7c2c0589d1f5dc1c641 - -allow - in sample names ---- - -diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c -index 814dff5..1d080e1 100644 ---- a/src/pulsecore/core-scache.c -+++ b/src/pulsecore/core-scache.c -@@ -98,7 +98,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) { - pa_assert(c); - pa_assert(name); - -- if ((e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 0))) { -+ if ((e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE))) { - if (e->memchunk.memblock) - pa_memblock_unref(e->memchunk.memblock); - -@@ -111,7 +111,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) { - } else { - e = pa_xnew(pa_scache_entry, 1); - -- if (!pa_namereg_register(c, name, PA_NAMEREG_SAMPLE, e, 1)) { -+ if (!pa_namereg_register(c, name, PA_NAMEREG_SAMPLE, e, TRUE)) { - pa_xfree(e); - return NULL; - } -@@ -134,9 +134,11 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) { - e->lazy = FALSE; - e->last_used_time = 0; - -- memset(&e->sample_spec, 0, sizeof(e->sample_spec)); -+ e->sample_spec.format = PA_SAMPLE_INVALID; -+ e->sample_spec.rate = e->sample_spec.channels = 0; - pa_channel_map_init(&e->channel_map); -- pa_cvolume_reset(&e->volume, PA_CHANNELS_MAX); -+ pa_cvolume_set(&e->volume, 1, -1); -+ e->volume.channels = 0; - - pa_proplist_sets(e->proplist, PA_PROP_MEDIA_ROLE, "event"); - -@@ -159,10 +159,12 @@ int pa_scache_add_item( - pa_assert(c); - pa_assert(name); - pa_assert(!ss || pa_sample_spec_valid(ss)); -- pa_assert(!map || (pa_channel_map_valid(map) && ss && ss->channels == map->channels)); -+ pa_assert(!map || (pa_channel_map_valid(map) && ss && pa_channel_map_compatible(map, ss))); - -- if (ss && !map) -+ if (ss && !map) { - pa_channel_map_init_extend(&tmap, ss->channels, PA_CHANNEL_MAP_DEFAULT); -+ map = &tmap; -+ } - - if (chunk && chunk->length > PA_SCACHE_ENTRY_SIZE_MAX) - return -1; -@@ -170,12 +172,15 @@ int pa_scache_add_item( - if (!(e = scache_add_item(c, name))) - return -1; - -- memset(&e->sample_spec, 0, sizeof(e->sample_spec)); -+ e->sample_spec.format = PA_SAMPLE_INVALID; -+ e->sample_spec.rate = e->sample_spec.channels = 0; - pa_channel_map_init(&e->channel_map); -+ pa_cvolume_set(&e->volume, 1, -1); -+ e->volume.channels = 0; - - if (ss) { - e->sample_spec = *ss; -- e->volume.channels = e->sample_spec.channels; -+ pa_cvolume_reset(&e->volume, ss->channels); - } - - if (map) -@@ -310,17 +313,21 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t - pa_assert(name); - pa_assert(sink); - -- if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 1))) -+ if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE))) - return -1; - - if (e->lazy && !e->memchunk.memblock) { -+ pa_channel_map old_channel_map = e->channel_map; -+ - if (pa_sound_file_load(c->mempool, e->filename, &e->sample_spec, &e->channel_map, &e->memchunk) < 0) - return -1; - - pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index); - -- if (e->volume.channels > e->sample_spec.channels) -- e->volume.channels = e->sample_spec.channels; -+ if (pa_cvolume_valid(&e->volume)) -+ pa_cvolume_remap(&e->volume, &old_channel_map, &e->channel_map); -+ else -+ pa_cvolume_reset(&e->volume, e->sample_spec.channels); - } - - if (!e->memchunk.memblock) -@@ -383,7 +390,7 @@ uint32_t pa_scache_get_id_by_name(pa_core *c, const char *name) { - pa_assert(c); - pa_assert(name); - -- if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 0))) -+ if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE))) - return PA_IDXSET_INVALID; - - return e->index; -diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c -index ad702e4..ecd8def 100644 ---- a/src/pulsecore/namereg.c -+++ b/src/pulsecore/namereg.c -@@ -51,6 +51,7 @@ static pa_bool_t is_valid_char(char c) { - (c >= 'A' && c <= 'Z') || - (c >= '0' && c <= '9') || - c == '.' || -+ c == '-' || - c == '_'; - } - diff --git a/pulseaudio-asserts.patch b/pulseaudio-asserts.patch deleted file mode 100644 index e48fcaa..0000000 --- a/pulseaudio-asserts.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/modules/module-alsa-source.c -=================================================================== ---- src/modules/module-alsa-source.c.orig -+++ src/modules/module-alsa-source.c -@@ -1280,9 +1280,12 @@ int pa__init(pa_module*m) { - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); - #endif - -- pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); -- pa_assert(u->hw_dB_min < u->hw_dB_max); -- u->hw_dB_supported = TRUE; -+ if (u->hw_dB_min >= u->hw_dB_max) -+ pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); -+ else { -+ pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); -+ u->hw_dB_supported = TRUE; -+ } - } - - if (suitable && diff --git a/pulseaudio-dot-pulse.patch b/pulseaudio-dot-pulse.patch deleted file mode 100644 index 5b71701..0000000 --- a/pulseaudio-dot-pulse.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Lennart Poettering -Date: Fri, 12 Sep 2008 14:39:08 +0000 (+0300) -Subject: make sure ~/.pulse exists before we create the runtime dir link beneath it -X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=61887370219ea124ca9cbda3706c4d4704694a15 - -make sure ~/.pulse exists before we create the runtime dir link beneath it ---- - -diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c -index 3e5ea49..a9e2a70 100644 ---- a/src/pulsecore/core-util.c -+++ b/src/pulsecore/core-util.c -@@ -1370,6 +1370,7 @@ static int make_random_dir_and_link(mode_t m, const char *k) { - char *pa_get_runtime_dir(void) { - char *d, *k = NULL, *p = NULL, *t = NULL, *mid; - struct stat st; -+ mode_t m; - - /* The runtime directory shall contain dynamic data that needs NOT - * to be kept accross reboots and is usuallly private to the user, -@@ -1378,10 +1379,9 @@ char *pa_get_runtime_dir(void) { - * this directory, we link it to a random subdir in /tmp, if it - * was not explicitly configured. */ - -- if ((d = getenv("PULSE_RUNTIME_PATH"))) { -- mode_t m; -+ m = pa_in_system_mode() ? 0755U : 0700U; - -- m = pa_in_system_mode() ? 0755U : 0700U; -+ if ((d = getenv("PULSE_RUNTIME_PATH"))) { - - if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { - pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); -@@ -1394,6 +1394,11 @@ char *pa_get_runtime_dir(void) { - if (!(d = get_pulse_home())) - goto fail; - -+ if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { -+ pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); -+ goto fail; -+ } -+ - if (!(mid = pa_machine_id())) { - pa_xfree(d); - goto fail; diff --git a/pulseaudio.changes b/pulseaudio.changes index e5b7da2..f05f774 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sat Jan 24 05:18:07 CET 2009 - vuntz@novell.com + +- Rename libpulse8 to libpulse9 because of soname change, to fix + the build. +- Add a lang package. +- Use %suse_update_desktop_file for pulseaudio.desktop. + +------------------------------------------------------------------- +Fri Jan 23 11:57:47 CET 2009 - rodrigo@novell.com + +- Remove perl-XML-Parser from BuildRequires + +------------------------------------------------------------------- +Thu Jan 15 17:03:17 CET 2009 - rodrigo@novell.com + +- Update to version 0.9.14: + + All bug fixes included in the 0.9.13 Fedora package +- Depend on libavahi-devel + +------------------------------------------------------------------- +Thu Jan 1 09:00:17 EST 2009 - mboman@suse.de + +- Update to version 0.9.13: + + Too many fixes/update to list. Please see Changelog for full details +- Remove pulseaudio-dot-pulse.patch. Fixed upstream +- Remove pulseaudio-allow-in-sample-names.patch. Fixed upstream +- Remove pulseaudio-asserts.patch. Fixed upstream + ------------------------------------------------------------------- Thu Dec 4 11:51:05 CET 2008 - rodrigo@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index c7dcf0c..42201b4 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,7 +1,7 @@ # -# spec file for package pulseaudio (Version 0.9.12) +# spec file for package pulseaudio (Version 0.9.14) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: pulseaudio %define drvver 0.9 Summary: A Networked Sound Server -Version: 0.9.12 -Release: 10 +Version: 0.9.14 +Release: 1 License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 @@ -30,18 +30,13 @@ Source1: default.pa Source2: setup-pulseaudio Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: PolicyKit-devel alsa-devel avahi-devel bluez-devel doxygen gconf2-devel gdbm-devel glib2-devel hal-devel intltool jack-devel libatomic-ops-devel liboil-devel libsamplerate-devel libsndfile-devel libtool lirc-devel perl-XML-Parser speex-devel tcpd-devel update-desktop-files xorg-x11-devel -Requires: libpulsecore7 = %{version} +BuildRequires: PolicyKit-devel alsa-devel bluez-devel doxygen gconf2-devel gdbm-devel glib2-devel hal-devel intltool jack-devel libatomic-ops-devel libavahi-devel liboil-devel libsamplerate-devel libsndfile-devel libtool lirc-devel speex-devel tcpd-devel update-desktop-files xorg-x11-devel +Requires: libpulsecore9 = %{version} Recommends: alsa-plugins-pulse PreReq: pwdutils -# PATCH FIX-UPSTREAM pulseaudio-defaults-daemon-conf.patch +# PATCH-FIX-UPSTREAM pulseaudio-defaults-daemon-conf.patch Patch3: pulseaudio-defaults-daemon-conf.patch -# PATCH-FIX-UPSTREAM pulseaudio-dot-pulse.patch -Patch4: pulseaudio-dot-pulse.patch -# PATCH-FIX-UPSTREAM pulseaudio-allow-in-sample-names.patch bnc#439054 -Patch5: pulseaudio-allow-in-sample-names.patch -# PATCH-FIX-UPSTREAM pulseaudio-asserts.patch bnc#443510 rodrigo@novell.com -Patch6: pulseaudio-asserts.patch +Requires: %{name}-lang = %{version} %description pulseaudio is a networked sound server for Linux and other Unix like @@ -212,14 +207,14 @@ Authors: Lennart Poettering Pierre Ossman -%package -n libpulsecore7 +%package -n libpulsecore9 Summary: System libraries for PulseAudio License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons Provides: pulseaudio-core-libs = %{version}-%{release} Obsoletes: pulseaudio-core-libs < %{version} -%description -n libpulsecore7 +%description -n libpulsecore9 pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -300,7 +295,7 @@ Summary: PulseAudio utilities License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons Requires: libpulse0 = %{version} -Requires: libpulsecore7 = %{version} +Requires: libpulsecore9 = %{version} Requires: libpulse-browse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} @@ -316,12 +311,10 @@ Authors: Lennart Poettering Pierre Ossman +%lang_package %prep %setup -q -T -b0 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 %build autoreconf -fi @@ -332,10 +325,11 @@ make doxygen %install %makeinstall -#suse_update_desktop_file pulseaudio-module-xsmp rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la # configure --disable-static had no effect; delete manually. rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a +%suse_update_desktop_file pulseaudio +%find_lang %{name} chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio install %SOURCE2 $RPM_BUILD_ROOT%{_bindir} chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio @@ -364,9 +358,9 @@ groupadd -r pulse-access &>/dev/null || : %postun -n libpulse-browse0 -p /sbin/ldconfig -%post -n libpulsecore7 -p /sbin/ldconfig +%post -n libpulsecore9 -p /sbin/ldconfig -%postun -n libpulsecore7 -p /sbin/ldconfig +%postun -n libpulsecore9 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -450,7 +444,6 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so %{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so %{_datadir}/PolicyKit/policy/org.pulseaudio.policy -%{_datadir}/locale/*/LC_MESSAGES/* %{_mandir}/man1/pulseaudio.1.gz %{_mandir}/man5/default.pa.5.gz %{_mandir}/man5/pulse-client.conf.5.gz @@ -487,8 +480,12 @@ groupadd -r pulse-access &>/dev/null || : %files module-bluetooth %defattr(-,root,root) -%{_libdir}/pulse-%{drvver}/modules/module-bt-proximity.so -%attr(0755,root,root) %{_libexecdir}/pulse/bt-proximity-helper +%{_libdir}/pulse-%{drvver}/modules/libbluetooth-ipc.so +%{_libdir}/pulse-%{drvver}/modules/libbluetooth-sbc.so +%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-device.so +%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-discover.so +%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-proximity.so +%attr(0755,root,root) %{_libexecdir}/pulse/proximity-helper %files module-gconf %defattr(-,root,root) @@ -504,7 +501,7 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse.so.* %{_libdir}/libpulse-simple.so.* -%files -n libpulsecore7 +%files -n libpulsecore9 %defattr(-,root,root) %{_libdir}/libpulsecore.so.* %{_libdir}/libpulsedsp.so @@ -547,7 +544,26 @@ groupadd -r pulse-access &>/dev/null || : %{_mandir}/man1/padsp.1.gz %{_mandir}/man1/pax11publish.1.gz +%files lang -f %{name}.lang + %changelog +* Sat Jan 24 2009 vuntz@novell.com +- Rename libpulse8 to libpulse9 because of soname change, to fix + the build. +- Add a lang package. +- Use %%suse_update_desktop_file for pulseaudio.desktop. +* Fri Jan 23 2009 rodrigo@novell.com +- Remove perl-XML-Parser from BuildRequires +* Thu Jan 15 2009 rodrigo@novell.com +- Update to version 0.9.14: + + All bug fixes included in the 0.9.13 Fedora package +- Depend on libavahi-devel +* Thu Jan 01 2009 mboman@suse.de +- Update to version 0.9.13: + + Too many fixes/update to list. Please see Changelog for full details +- Remove pulseaudio-dot-pulse.patch. Fixed upstream +- Remove pulseaudio-allow-in-sample-names.patch. Fixed upstream +- Remove pulseaudio-asserts.patch. Fixed upstream * Thu Dec 04 2008 rodrigo@novell.com - Renamed libpulsecore4 to libpulsecore7 to match so version (bnc#456053)