- updated to 1.0

- updated suid,pa-machine-id patches
- qpaeq (new python/qt-based equalizer) packaged in -qt subpackage

Changed files:
    pulseaudio-pa-machine-id.patch -> 1.2
    pulseaudio-suid.patch -> 1.8
    pulseaudio.spec -> 1.92

diff --git a/pulseaudio-pa-machine-id.patch b/pulseaudio-pa-machine-id.patch
index 3e4fc6bc3c557625ec05662fc0029b243d87d7d9..2b1678ae1601f8653950dad2abf1a796d4754e85 100644 (file)
--- a/pulseaudio-pa-machine-id.patch
+++ b/pulseaudio-pa-machine-id.patch
@@ -1,13 +1,15 @@
---- pulseaudio-0.9.21/src/Makefile.am~ 2010-06-08 17:31:32.581778168 +0200
-+++ pulseaudio-0.9.21/src/Makefile.am  2010-06-09 00:17:58.023181027 +0200
-@@ -83,6 +83,7 @@
-       -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
-       -DAO_REQUIRE_CAS \
-       -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
-+      -DPA_PA_MACHINE_ID=\"$(PA_DEFAULT_CONFIG_DIR)/machine-id\" \
-       -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
-         -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-         -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
+--- pulseaudio-1.0/configure.ac.orig   2011-09-27 09:55:58.000000000 +0200
++++ pulseaudio-1.0/configure.ac        2011-10-12 20:57:56.702352030 +0200
+@@ -1112,6 +1112,9 @@
+ AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
+ AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
+ 
++PA_PA_MACHINE_ID="${sysconfdir}/pulse"
++AX_DEFINE_DIR(PA_PA_MACHINE_ID, PA_PA_MACHINE_ID, [PA machine-id file])
++
+ AC_DEFINE_UNQUOTED(PA_BUILDDIR, "${ac_pwd}/src", [Location of uninstalled binaries])
+ 
+ #### Mac OSX specific stuff #####
 --- pulseaudio-0.9.21/src/pulsecore/core-util.c.orig   2009-11-23 04:57:07.000000000 +0100
 +++ pulseaudio-0.9.21/src/pulsecore/core-util.c        2010-06-09 00:20:25.361930253 +0200
 @@ -2560,6 +2560,20 @@

diff --git a/pulseaudio-suid.patch b/pulseaudio-suid.patch
index 0b7eada5ce9ca631b44b1ac863ce88e419552f5d..edd6cb80de07dcfe8ffeac753067a5bcfbd4a481 100644 (file)
--- a/pulseaudio-suid.patch
+++ b/pulseaudio-suid.patch
@@ -1,11 +1,13 @@
---- pulseaudio-0.9.19/src/Makefile.am.orig     2007-11-17 00:47:32.000000000 +0100
-+++ pulseaudio-0.9.19/src/Makefile.am  2007-12-16 03:28:22.793213746 +0100
-@@ -1488,8 +1488,6 @@
-               -e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
- 
+--- pulseaudio-1.0/src/Makefile.am.orig        2011-09-15 12:29:38.000000000 +0200
++++ pulseaudio-1.0/src/Makefile.am     2011-10-12 20:52:05.305673597 +0200
+@@ -1883,10 +1883,6 @@
+ SYMLINK_PROGRAM=ln -sf
+ endif
  install-exec-hook:
+-if HAVE_BLUEZ
 -      -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
 -      -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
-       ln -sf pacat $(DESTDIR)$(bindir)/parec
-       ln -sf pacat $(DESTDIR)$(bindir)/pamon
-       ln -sf pacat $(DESTDIR)$(bindir)/paplay
+-endif
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)

diff --git a/pulseaudio.spec b/pulseaudio.spec
index d65ba2b9abd0c0cf509f99a82c8de32170856007..73c876dfccb79131bcb9ca6030e3fddae47321f2 100644 (file)
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -12,12 +12,12 @@
 Summary:       Modular sound server
 Summary(pl.UTF-8):     Modularny serwer dźwięku
 Name:          pulseaudio
-Version:       0.9.23
-Release:       2
+Version:       1.0
+Release:       1
 License:       GPL v2+ (server and libpulsecore), LGPL v2+ (libpulse)
 Group:         Libraries
-Source0:       http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 7391205a337d1e04a9ff38025f684034
+Source0:       http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
+# Source0-md5: 538e0b55ab9ba2987a88047ae332f5f4
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-suid.patch
@@ -29,7 +29,8 @@ BuildRequires:        autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: avahi-devel >= 0.6.0
 BuildRequires: bluez-libs-devel >= 3.0
-BuildRequires: dbus-devel >= 1.0.0
+BuildRequires: dbus-devel >= 1.3.0
+BuildRequires: fftw3-single-devel >= 3
 BuildRequires: gcc >= 6:4.1
 %{?with_gdbm:BuildRequires:    gdbm-devel}
 BuildRequires: gettext-devel
@@ -37,10 +38,11 @@ BuildRequires:      glib2-devel >= 1:2.4.0
 BuildRequires: gtk+2-devel >= 2:2.4.0
 %{?with_hal:BuildRequires:     hal-devel >= 0.5.11}
 BuildRequires: intltool >= 0.35.0
-BuildRequires: jack-audio-connection-kit-devel >= 0.100
+BuildRequires: jack-audio-connection-kit-devel >= 0.117.0
+BuildRequires: json-c-devel >= 0.9
 BuildRequires: libasyncns-devel >= 0.1
 BuildRequires: libcap-devel
-BuildRequires: libltdl-devel
+BuildRequires: libltdl-devel >= 2:2.2
 BuildRequires: libsamplerate-devel >= 0.1.0
 BuildRequires: libsndfile-devel >= 1.0.20
 BuildRequires: libtool >= 2:2.2
@@ -50,13 +52,17 @@ BuildRequires:      libxcb-devel >= 1.6
 BuildRequires: m4
 # for module-roap
 BuildRequires: openssl-devel > 0.9
+BuildRequires: orc-devel >= 0.4.11
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: speex-devel >= 1:1.2-beta3
+BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 143
+BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xz
 Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     polypaudio
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -109,6 +115,23 @@ Skrypty startowe do uruchamiania PA jako usługi systemowej.
 
 Nie chcesz tego o ile nie robisz systemu wbudowanego.
 
+%package qt
+Summary:       Qt-based utilities for PulseAudio (equalizer)
+Summary(pl.UTF-8):     Oparte na Qt narzędzia do PulseAudio (equalizer)
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-PyQt4
+Requires:      python-dbus
+Requires:      python-sip
+
+%description qt
+Qt-based utilities for PulseAudio (currently just qpaeq - an
+equalizer).
+
+%description qt -l pl.UTF-8
+Oparte na Qt narzędzia do PulseAudio (obecnie tylko qpaeq -
+equalizer).
+
 %package libs
 Summary:       PulseAudio libraries
 Summary(pl.UTF-8):     Biblioteki PulseAudio
@@ -269,7 +292,7 @@ Summary(pl.UTF-8):  Moduły JACK dla PulseAudio
 License:       GPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      jack-audio-connection-kit >= 0.100
+Requires:      jack-audio-connection-kit >= 0.117.0
 Obsoletes:     polypaudio-jack
 
 %description jack
@@ -297,6 +320,8 @@ Moduł LIRC dla PulseAudio.
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' src/utils/qpaeq
+
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -304,11 +329,11 @@ Moduł LIRC dla PulseAudio.
 %{__autoheader}
 %{__automake}
 %configure \
-       --%{?with_hal:en}%{!?with_hal:dis}able-hal \
-       --%{!?with_hal:en}%{?with_hal:dis}able-hal-compat \
+       %{?with_hal:--enable-hal --disable-hal-compat} \
+       %{!?with_hal:--disable-hal --enable-hal-compat} \
        %{!?with_lirc:--disable-lirc} \
        --disable-silent-rules \
-       --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
+       --enable-static%{!?with_static_libs:=no} \
        --with-database=%{?with_gdbm:gdbm}%{!?with_gdbm:simple} \
        --with-access-group=pulse-access \
        --with-system-user=pulse \
@@ -390,7 +415,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/default.pa
 %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
 %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
-%attr(755,root,root) %{_bindir}/pabrowse
 %attr(755,root,root) %{_bindir}/pacat
 %attr(755,root,root) %{_bindir}/pacmd
 %attr(755,root,root) %{_bindir}/pactl
@@ -425,17 +449,22 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-cli-protocol-unix.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-console-kit.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-combine.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-combine-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-cork-music-on-phone.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-dbus-protocol.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-default-device-restore.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-detect.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-device-manager.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-device-restore.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-echo-cancel.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-equalizer-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-esound-compat-spawnfd.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-esound-compat-spawnpid.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-esound-protocol-tcp.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-esound-protocol-unix.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-esound-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-filter-apply.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-filter-heuristics.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-http-protocol-tcp.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-http-protocol-unix.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-intended-roles.so
@@ -447,6 +476,7 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-native-protocol-tcp.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-native-protocol-unix.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-null-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-null-source.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-oss.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-pipe-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-pipe-source.so
@@ -464,9 +494,12 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-sine-source.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-stream-restore.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-suspend-on-idle.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-switch-on-connect.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-tunnel-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-tunnel-source.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-udev-detect.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-virtual-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-virtual-source.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-volume-restore.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-bell.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-cork-request.so
@@ -474,7 +507,6 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-xsmp.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-zeroconf-discover.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-zeroconf-publish.so
-%{_mandir}/man1/pabrowse.1*
 %{_mandir}/man1/pacat.1*
 %{_mandir}/man1/pacmd.1*
 %{_mandir}/man1/pactl.1*
@@ -483,6 +515,8 @@ fi
 %{_mandir}/man1/pasuspender.1*
 %{_mandir}/man1/pax11publish.1*
 %{_mandir}/man1/pulseaudio.1*
+%{_mandir}/man1/start-pulseaudio-kde.1*
+%{_mandir}/man1/start-pulseaudio-x11.1*
 %{_mandir}/man5/default.pa.5*
 %{_mandir}/man5/pulse-client.conf.5*
 %{_mandir}/man5/pulse-daemon.conf.5*
@@ -495,16 +529,18 @@ fi
 %dir %attr(750,pulse,pulse-access) /var/run/pulse
 /etc/dbus-1/system.d/pulseaudio-system.conf
 
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qpaeq
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpulse.so.*.*.*
-%attr(755,root,root) %{_libdir}/libpulse-browse.so.*.*.*
 %attr(755,root,root) %{_libdir}/libpulse-mainloop-glib.so.*.*.*
 %attr(755,root,root) %{_libdir}/libpulse-simple.so.*.*.*
 %attr(755,root,root) %{_libdir}/libpulsecommon-%{version}.so
 %attr(755,root,root) %{_libdir}/libpulsecore-%{version}.so
 %attr(755,root,root) %ghost %{_libdir}/libpulse.so.0
-%attr(755,root,root) %ghost %{_libdir}/libpulse-browse.so.0
 %attr(755,root,root) %ghost %{_libdir}/libpulse-mainloop-glib.so.0
 %attr(755,root,root) %ghost %{_libdir}/libpulse-simple.so.0
 %attr(755,root,root) %{_libdir}/libpulsedsp.so
@@ -515,12 +551,10 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpulse.so
-%attr(755,root,root) %{_libdir}/libpulse-browse.so
 %attr(755,root,root) %{_libdir}/libpulse-mainloop-glib.so
 %attr(755,root,root) %{_libdir}/libpulse-simple.so
 %{_includedir}/pulse
 %{_pkgconfigdir}/libpulse.pc
-%{_pkgconfigdir}/libpulse-browse.pc
 %{_pkgconfigdir}/libpulse-mainloop-glib.pc
 %{_pkgconfigdir}/libpulse-simple.pc
 
@@ -528,7 +562,6 @@ fi
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpulse.a
-%{_libdir}/libpulse-browse.a
 %{_libdir}/libpulse-mainloop-glib.a
 %{_libdir}/libpulse-simple.a
 %{_libdir}/libpulsecommon-%{version}.a