[oe-commits] org.oe.dev pulse: unify
koen commit
openembedded-commits at lists.openembedded.org
Fri Jun 8 20:57:17 UTC 2007
pulse: unify
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3
Files:
1
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/pulseaudio/pulseaudio_0.9.6.bb
Diffs:
#
# mt diff -rf184f34be3ef014649de817a3a11d78069757003 -rf20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3
#
#
#
# add_file "packages/pulseaudio/pulse.inc"
# content [49cb20c18bb9950a2d327522824ef326b6c4a39a]
#
# patch "packages/pulseaudio/pulseaudio_0.9.5.bb"
# from [03f67d3f8d0ebc4410868be3a107429ead92cb0b]
# to [a11c1056ff363bda7672ea63e72652f348e0571f]
#
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
# from [49cb20c18bb9950a2d327522824ef326b6c4a39a]
# to [5abfc734aa49c822b8c809b2cafd1f43dd35394b]
#
============================================================
--- packages/pulseaudio/pulse.inc 49cb20c18bb9950a2d327522824ef326b6c4a39a
+++ packages/pulseaudio/pulse.inc 49cb20c18bb9950a2d327522824ef326b6c4a39a
@@ -0,0 +1,94 @@
+DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
+HOMEPAGE = "http://www.pulseaudio.org"
+AUTHOR = "Lennart Poettering"
+SECTION = "libs/multimedia"
+LICENSE = "LGPL"
+
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
+# optional
+DEPENDS += "alsa-lib"
+
+PR = "r0"
+
+SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
+
+SRC_URI += "file://volatiles.04_pulse"
+
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+ --disable-lynx \
+ --without-x \
+ --without-glib \
+ --without-jack \
+ --with-alsa \
+ --with-oss \
+ "
+
+PARALLEL_MAKE = ""
+
+export TARGET_FPU="${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
+ sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
+ fi
+}
+
+
+LEAD_SONAME = "libpulse.so"
+
+PACKAGES =+ "${PN}-bin ${PN}-conf"
+PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
+
+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"
+
+CONFFILES_${PN}-conf = "\
+ ${sysconfdir}/pulse/default.pa \
+ ${sysconfdir}/pulse/daemon.conf \
+ ${sysconfdir}/pulse/client.conf \
+ "
+pkg_postinst_${PN}-bin() {
+if test "x$D" != "x"; then
+ exit 1
+else
+ grep -q pulse: /etc/group || addgroup pulse
+ grep -q pulse: /etc/passwd || \
+ adduser --disabled-password --home=/var/run/pulse/ --system \
+ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
+ /etc/init.d/populate-volatile.sh update
+fi
+}
+
+pkg_postrm${PN}-bin() {
+if test "x$D" != "x"; then
+ exit 1
+else
+ deluser pulse
+fi
+}
+
+
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+python populate_packages_prepend() {
+ #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
+
+ plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
+ do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
+ do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
+}
============================================================
--- packages/pulseaudio/pulseaudio_0.9.5.bb 03f67d3f8d0ebc4410868be3a107429ead92cb0b
+++ packages/pulseaudio/pulseaudio_0.9.5.bb a11c1056ff363bda7672ea63e72652f348e0571f
@@ -1,95 +1,3 @@
-DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
-HOMEPAGE = "http://www.pulseaudio.org"
-AUTHOR = "Lennart Poettering"
-SECTION = "libs/multimedia"
-LICENSE = "LGPL"
+require pulse.inc
+PR = "r8"
-DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool"
-# optional
-DEPENDS += "alsa-lib"
-
-
-PR = "r7"
-
-SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
-
-SRC_URI += "file://volatiles.04_pulse"
-
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
- --disable-lynx \
- --without-x \
- --without-glib \
- --without-jack \
- --with-alsa \
- --with-oss \
- "
-
-PARALLEL_MAKE = ""
-
-export TARGET_FPU="${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
- sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
- fi
-}
-
-
-LEAD_SONAME = "libpulse.so"
-
-PACKAGES =+ "${PN}-bin ${PN}-conf"
-PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-*"
-
-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"
-
-CONFFILES_${PN}-conf = "\
- ${sysconfdir}/pulse/default.pa \
- ${sysconfdir}/pulse/daemon.conf \
- ${sysconfdir}/pulse/client.conf \
- "
-pkg_postinst_${PN}-bin() {
-if test "x$D" != "x"; then
- exit 1
-else
- grep -q pulse: /etc/group || addgroup pulse
- grep -q pulse: /etc/passwd || \
- adduser --disabled-password --home=/var/run/pulse/ --system \
- --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
- /etc/init.d/populate-volatile.sh update
-fi
-}
-
-pkg_postrm${PN}-bin() {
-if test "x$D" != "x"; then
- exit 1
-else
- deluser pulse
-fi
-}
-
-
-
-
-do_stage() {
- autotools_stage_all
-}
-
-
-python populate_packages_prepend() {
- #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
-
- plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
- do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
- do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
-}
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb 49cb20c18bb9950a2d327522824ef326b6c4a39a
+++ packages/pulseaudio/pulseaudio_0.9.6.bb 5abfc734aa49c822b8c809b2cafd1f43dd35394b
@@ -1,94 +1,3 @@
-DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
-HOMEPAGE = "http://www.pulseaudio.org"
-AUTHOR = "Lennart Poettering"
-SECTION = "libs/multimedia"
-LICENSE = "LGPL"
+require pulse.inc
+DEFAULT_PREFERENCE = "-1"
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
-# optional
-DEPENDS += "alsa-lib"
-
-PR = "r0"
-
-SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
-
-SRC_URI += "file://volatiles.04_pulse"
-
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
- --disable-lynx \
- --without-x \
- --without-glib \
- --without-jack \
- --with-alsa \
- --with-oss \
- "
-
-PARALLEL_MAKE = ""
-
-export TARGET_FPU="${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
- sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
- fi
-}
-
-
-LEAD_SONAME = "libpulse.so"
-
-PACKAGES =+ "${PN}-bin ${PN}-conf"
-PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
-
-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"
-
-CONFFILES_${PN}-conf = "\
- ${sysconfdir}/pulse/default.pa \
- ${sysconfdir}/pulse/daemon.conf \
- ${sysconfdir}/pulse/client.conf \
- "
-pkg_postinst_${PN}-bin() {
-if test "x$D" != "x"; then
- exit 1
-else
- grep -q pulse: /etc/group || addgroup pulse
- grep -q pulse: /etc/passwd || \
- adduser --disabled-password --home=/var/run/pulse/ --system \
- --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
- /etc/init.d/populate-volatile.sh update
-fi
-}
-
-pkg_postrm${PN}-bin() {
-if test "x$D" != "x"; then
- exit 1
-else
- deluser pulse
-fi
-}
-
-
-
-
-do_stage() {
- autotools_stage_all
-}
-
-
-python populate_packages_prepend() {
- #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
-
- plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
- do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
- do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
-}
More information about the Openembedded-commits
mailing list