From 609871ae041cac81dbab5ebcd43520634f627dd2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jun 2007 18:34:33 +0000 Subject: pulseaudio: improve packaging: * more granular * proper Replaces: for a good upgrade path * proper CONFFILES --- packages/pulseaudio/pulse.inc | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'packages/pulseaudio/pulse.inc') diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index 9cbf9a3f89..c8cb6dc6b5 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -8,7 +8,7 @@ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib" -PR = "r0" +PR = "r1" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" @@ -28,31 +28,45 @@ EXTRA_OECONF = "\ PARALLEL_MAKE = "" -export TARGET_FPU="${TARGET_FPU}" +export TARGET_PFPU="${TARGET_FPU}" do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse - if [ "x${TARGET_FPU}" == "xsoft" ] ; then + if [ "x${TARGET_PFPU}" == "xsoft" ] ; then sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf fi } -LEAD_SONAME = "libpulse.so" +PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib pulseaudio-server \ + pulseaudio-misc pulseaudio-gconf-helper" + +#upgrade path: +RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" + -PACKAGES =+ "${PN}-bin ${PN}-conf" PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* " + +FILES_libpulsecore = "${libdir}/libpulsecore.so.*" +FILES_libpulse = "${libdir}/libpulse.so.*" +FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" +FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*" +FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" + FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ ${libdir}/pulse-0.9/modules/.debug" FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin = "${bindir}/* \ ${sysconfdir}/default/volatiles/volatiles.04_pulse" +FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}" +FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" +FILES_${PN}-misc = "${bindir}/*" -CONFFILES_${PN}-conf = "\ +CONFFILES_pulseaudio-server = "\ ${sysconfdir}/pulse/default.pa \ ${sysconfdir}/pulse/daemon.conf \ ${sysconfdir}/pulse/client.conf \ -- cgit v1.2.3 From be1c0792115507ce003b4f883745f098b0ebde31 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 Jun 2007 10:40:30 +0000 Subject: pulseaudio: fix postinsts --- packages/pulseaudio/pulse.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/pulseaudio/pulse.inc') diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index c8cb6dc6b5..d4a9c5ef54 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -8,7 +8,7 @@ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib" -PR = "r1" +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" @@ -71,7 +71,7 @@ CONFFILES_pulseaudio-server = "\ ${sysconfdir}/pulse/daemon.conf \ ${sysconfdir}/pulse/client.conf \ " -pkg_postinst_${PN}-bin() { +pkg_postinst_libppulse() { if test "x$D" != "x"; then exit 1 else @@ -83,7 +83,7 @@ else fi } -pkg_postrm${PN}-bin() { +pkg_postrm_libpulse() { if test "x$D" != "x"; then exit 1 else -- cgit v1.2.3