packages: pulseaudio/pulseaudio-pa-machine-id.patch, pulseaudio/pulseaudio-...
qboosh
qboosh at pld-linux.org
Thu Oct 13 19:04:51 CEST 2011
Author: qboosh Date: Thu Oct 13 17:04:51 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.0
- updated suid,pa-machine-id patches
- qpaeq (new python/qt-based equalizer) packaged in -qt subpackage
---- Files affected:
packages/pulseaudio:
pulseaudio-pa-machine-id.patch (1.1 -> 1.2) , pulseaudio-suid.patch (1.7 -> 1.8) , pulseaudio.spec (1.91 -> 1.92)
---- Diffs:
================================================================
Index: packages/pulseaudio/pulseaudio-pa-machine-id.patch
diff -u packages/pulseaudio/pulseaudio-pa-machine-id.patch:1.1 packages/pulseaudio/pulseaudio-pa-machine-id.patch:1.2
--- packages/pulseaudio/pulseaudio-pa-machine-id.patch:1.1 Wed Jun 9 01:10:32 2010
+++ packages/pulseaudio/pulseaudio-pa-machine-id.patch Thu Oct 13 19:04:46 2011
@@ -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 @@
================================================================
Index: packages/pulseaudio/pulseaudio-suid.patch
diff -u packages/pulseaudio/pulseaudio-suid.patch:1.7 packages/pulseaudio/pulseaudio-suid.patch:1.8
--- packages/pulseaudio/pulseaudio-suid.patch:1.7 Sat Oct 10 22:37:06 2009
+++ packages/pulseaudio/pulseaudio-suid.patch Thu Oct 13 19:04:46 2011
@@ -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, at 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)
================================================================
Index: packages/pulseaudio/pulseaudio.spec
diff -u packages/pulseaudio/pulseaudio.spec:1.91 packages/pulseaudio/pulseaudio.spec:1.92
--- packages/pulseaudio/pulseaudio.spec:1.91 Thu Jul 28 13:16:50 2011
+++ packages/pulseaudio/pulseaudio.spec Thu Oct 13 19:04:46 2011
@@ -13,12 +13,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
@@ -30,7 +30,8 @@
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
@@ -38,10 +39,11 @@
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
@@ -51,13 +53,17 @@
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)
@@ -110,6 +116,23 @@
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
@@ -270,7 +293,7 @@
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
@@ -298,6 +321,8 @@
%patch0 -p1
%patch1 -p1
+%{__sed} -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' src/utils/qpaeq
+
%build
%{__libtoolize}
%{__aclocal} -I m4
@@ -305,11 +330,11 @@
%{__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 \
@@ -391,7 +416,6 @@
%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
@@ -426,17 +450,22 @@
%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
@@ -448,6 +477,7 @@
%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
@@ -465,9 +495,12 @@
%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
@@ -475,7 +508,6 @@
%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*
@@ -484,6 +516,8 @@
%{_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*
@@ -496,16 +530,18 @@
%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
@@ -516,12 +552,10 @@
%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
@@ -529,7 +563,6 @@
%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
@@ -603,6 +636,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.92 2011/10/13 17:04:46 qboosh
+- updated to 1.0
+- updated suid,pa-machine-id patches
+- qpaeq (new python/qt-based equalizer) packaged in -qt subpackage
+
Revision 1.91 2011/07/28 11:16:50 baggins
- rel 2
- -hal package does not need hal-libs, it's just a compat stub
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio-pa-machine-id.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio-suid.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio.spec?r1=1.91&r2=1.92&f=u
More information about the pld-cvs-commit
mailing list