[oe-commits] org.oe.dev pulseaudio: beautify pulse.inc, add gcc4 compliance patch, make 0.9.6 the new default

[mickeyl commit]

pulseaudio: beautify pulse.inc, add gcc4 compliance patch, make 0.9.6 the new default

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bc14395624375a26acbbd5e4c92900e2e5e456f0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bc14395624375a26acbbd5e4c92900e2e5e456f0
Files:
1
packages/pulseaudio/files/gcc4-compile-fix.patch
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/pulseaudio/pulseaudio_0.9.6.bb
Diffs:

#
# mt diff -re9648d606db1285ecc25c461364f213d7614a1bf -rbc14395624375a26acbbd5e4c92900e2e5e456f0
#
# 
# 
# add_file "packages/pulseaudio/files/gcc4-compile-fix.patch"
#  content [54e4ce6aec99fa1dbbcb86bc032f486efc2604a2]
# 
# patch "packages/pulseaudio/pulse.inc"
#  from [c638989d87a4dd9da2e275a5ed4d3ef7a50fe5a0]
#    to [f89af52f87198178c40491617e535f1bf63aa6e5]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.5.bb"
#  from [b0aa0216dde0d510631aafbaa74344f1f7e90a29]
#    to [91b2e301a8530a84142cc3ab0bb3f5f35d7b70a3]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
#  from [5abfc734aa49c822b8c809b2cafd1f43dd35394b]
#    to [5fd2aeb06e04c45caebb9f24c26dc6c080630be7]
# 
============================================================
--- packages/pulseaudio/files/gcc4-compile-fix.patch	54e4ce6aec99fa1dbbcb86bc032f486efc2604a2
+++ packages/pulseaudio/files/gcc4-compile-fix.patch	54e4ce6aec99fa1dbbcb86bc032f486efc2604a2
@@ -0,0 +1,18 @@
+| fix for more strict syntax compliance in gcc4.x
+| pulsecore/core-util.c: In function 'pa_raise_priority':
+| pulsecore/core-util.c:547: error: label at end of compound statement
+| Signed off: mickey at openmoko.org
+|
+Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
+===================================================================
+--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
++++ pulseaudio-0.9.6/src/pulsecore/core-util.c
+@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
+         pa_log_info("Successfully gained high priority class.");
+ #endif
+ 
+-fail:
++fail:;
+ 
+ #if defined(HAVE_SYS_CAPABILITY_H)
+     if (caps) {
============================================================
--- packages/pulseaudio/pulse.inc	c638989d87a4dd9da2e275a5ed4d3ef7a50fe5a0
+++ packages/pulseaudio/pulse.inc	f89af52f87198178c40491617e535f1bf63aa6e5
@@ -6,30 +6,31 @@ DEPENDS = "libatomics-ops liboil avahi l
 
 DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
 # optional
-DEPENDS += "alsa-lib"
+DEPENDS += "alsa-lib glib-2.0"
 
-PR = "r2"
+SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
+           file://gcc4-compile-fix.patch;patch=1 \
+           file://volatiles.04_pulse"
 
-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 \
+		--disable-lynx \
 		--without-x \
-		--without-glib \
 		--without-jack \
+		--with-glib \
 		--with-alsa \
 		--with-oss \
 		"
 
 PARALLEL_MAKE = ""
 
-export TARGET_PFPU="${TARGET_FPU}"
+export TARGET_PFPU = "${TARGET_FPU}"
 
+do_stage() {
+	autotools_stage_all
+}
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/default/volatiles
 	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
@@ -39,17 +40,14 @@ do_install_append() {
 	fi
 }
 
+PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
+             pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
 
-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_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.*"
@@ -91,18 +89,10 @@ fi
 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='' )
+        do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
 }
============================================================
--- packages/pulseaudio/pulseaudio_0.9.5.bb	b0aa0216dde0d510631aafbaa74344f1f7e90a29
+++ packages/pulseaudio/pulseaudio_0.9.5.bb	91b2e301a8530a84142cc3ab0bb3f5f35d7b70a3
@@ -1,3 +1,3 @@ require pulse.inc
 require pulse.inc
 
+PR  = "r11"
-PR  = "r10"
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb	5abfc734aa49c822b8c809b2cafd1f43dd35394b
+++ packages/pulseaudio/pulseaudio_0.9.6.bb	5fd2aeb06e04c45caebb9f24c26dc6c080630be7
@@ -1,3 +1,4 @@ require pulse.inc
 require pulse.inc
 
+PR = "r3"
+
-DEFAULT_PREFERENCE = "-1"