I have made the following changes intended for : CE:MW:Shared / pulseaudio-policy-enforcement
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6777 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 6777: Messages from BOSS: State: review at 2012-09-25T08:10:17 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:jhamalai:branches:CE:MW:Shared / pulseaudio-policy-enforcement -> CE:MW:Shared / pulseaudio-policy-enforcement changes files: -------------- --- pulseaudio-policy-enforcement.changes +++ pulseaudio-policy-enforcement.changes @@ -0,0 +1,6 @@ +* Mon Sep 24 2012 Juho Hamalainen <[email protected]> - 1.1.11 +- Drop multiple audio support for HDMI and WiDi. +- Added correct LGPLv2.1 license. +- Multiple enhancements and fixes to ports, classification, streams, etc. +- Build fixes to be able to compile against new PulseAudio. + old: ---- pulseaudio-policy-enforcement-1.1.10.tar.gz support_multiple_audio_output.patch new: ---- don-t-try-to-build-documentation-if-build-support-is.patch include-local-config.h-instead-of-pulsecore-config.h.patch pulseaudio-policy-enforcement-8aeb6c71.tar.gz replace-standard-memory-allocation-and-freeing-calls.patch update-configure.ac-detection-of-ports-in-pulseaudio.patch spec files: ----------- --- pulseaudio-policy-enforcement.spec +++ pulseaudio-policy-enforcement.spec @@ -1,26 +1,30 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: pulseaudio-policy-enforcement + # >> macros # << macros -Name: pulseaudio-policy-enforcement Summary: Pulseaudio module for enforcing policy decisions in the audio domain -Version: 1.1.10 +Version: 1.1.11 Release: 0 Group: System/Daemons License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/pulseaudio-policy-enforcement -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-8aeb6c71.tar.gz Source100: pulseaudio-policy-enforcement.yaml -Patch0: support_multiple_audio_output.patch +Patch0: replace-standard-memory-allocation-and-freeing-calls.patch +Patch1: include-local-config.h-instead-of-pulsecore-config.h.patch +Patch2: update-configure.ac-detection-of-ports-in-pulseaudio.patch +Patch3: don-t-try-to-build-documentation-if-build-support-is.patch BuildRequires: pkgconfig(pulsecore) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: libtool-ltdl-devel - +BuildRequires: libatomic_ops-devel %description This package contains a pulseaudio module that enforces (mostly audio) routing, @@ -28,12 +32,17 @@ - %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name} -# support_multiple_audio_output.patch +# replace-standard-memory-allocation-and-freeing-calls.patch %patch0 -p1 +# include-local-config.h-instead-of-pulsecore-config.h.patch +%patch1 -p1 +# update-configure.ac-detection-of-ports-in-pulseaudio.patch +%patch2 -p1 +# don-t-try-to-build-documentation-if-build-support-is.patch +%patch3 -p1 # >> setup # << setup @@ -51,6 +60,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -62,14 +72,8 @@ # << install post - - - - %files %defattr(-,root,root,-) # >> files %{_libdir}/pulse-*/modules/module-*.so # << files - - other changes: -------------- ++++++ don-t-try-to-build-documentation-if-build-support-is.patch (new) --- don-t-try-to-build-documentation-if-build-support-is.patch +++ don-t-try-to-build-documentation-if-build-support-is.patch @@ -0,0 +1,38 @@ +From a4ac6ec87ec835902cc40327f5249451e11da892 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Mon, 24 Sep 2012 16:07:16 +0300 +Subject: [PATCH] Don't try to build documentation if build support isn't found. + +--- + Makefile.am | 6 +++++- + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 13e101d..4e15753 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,8 @@ +-SUBDIRS = src doc ++SUBDIRS = src ++ ++if PD_SUPPORT ++SUBDIRS += doc ++endif + + MAINTAINERCLEANFILES = \ + Makefile.in src/Makefile.in config.h.in configure \ +diff --git a/configure.ac b/configure.ac +index 3dffe6c..8c8fe93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,5 +110,5 @@ echo " + PULSEAUDIO_HAS_PORTS: ${PULSEAUDIO_HAS_PORTS} + DBUS_CFLAGS: ${DBUS_CFLAGS} + DBUS_LIBS: ${DBUS_LIBS} +- PD_SUPPORT: ${PD_SUPPORT} ++ PD_SUPPORT: ${doc_support} + " +-- +1.7.0.4 + ++++++ include-local-config.h-instead-of-pulsecore-config.h.patch (new) --- include-local-config.h-instead-of-pulsecore-config.h.patch +++ include-local-config.h-instead-of-pulsecore-config.h.patch @@ -0,0 +1,227 @@ +From 357a848fe34d822c9e9b9039a73dd232c3343bf5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Mon, 24 Sep 2012 11:29:41 +0300 +Subject: [PATCH] Include local config.h instead of pulsecore-config.h + +Older Harmattanish PulseAudio dev package had copy of +PulseAudio's config.h included as pulsecore-config.h. +Later PulseAudio doesn't export that header and it isn't +really needed either, so let's use local config.h instead. +--- + src/card-ext.c | 4 +++- + src/classify.c | 4 +++- + src/client-ext.c | 4 +++- + src/config-file.c | 4 +++- + src/context.c | 4 +++- + src/dbusif.c | 4 +++- + src/index-hash.c | 3 +++ + src/module-ext.c | 4 +++- + src/module-policy-enforcement.c | 4 +++- + src/policy-group.c | 4 +++- + src/sink-ext.c | 4 +++- + src/sink-input-ext.c | 4 +++- + src/source-ext.c | 4 +++- + src/source-output-ext.c | 4 +++- + 14 files changed, 42 insertions(+), 13 deletions(-) + +diff --git a/src/card-ext.c b/src/card-ext.c +index 5bd6aa2..48732f1 100644 +--- a/src/card-ext.c ++++ b/src/card-ext.c +@@ -1,4 +1,6 @@ +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulse/def.h> + #include <pulsecore/card.h> +diff --git a/src/classify.c b/src/classify.c +index 7ab272d..93b9711 100644 +--- a/src/classify.c ++++ b/src/classify.c +@@ -1,6 +1,8 @@ + #include <stdio.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulsecore/client.h> + #include <pulsecore/core-util.h> +diff --git a/src/client-ext.c b/src/client-ext.c +index 1e8fd19..bc509d9 100644 +--- a/src/client-ext.c ++++ b/src/client-ext.c +@@ -5,7 +5,9 @@ + #include <unistd.h> + #include <errno.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <pulse/def.h> + + #include "userdata.h" +diff --git a/src/config-file.c b/src/config-file.c +index 4439ac1..ef26230 100644 +--- a/src/config-file.c ++++ b/src/config-file.c +@@ -17,7 +17,9 @@ + #include <ctype.h> + #endif + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulsecore/core-util.h> + #include <pulsecore/log.h> +diff --git a/src/context.c b/src/context.c +index 7ea4b29..7f60ea3 100644 +--- a/src/context.c ++++ b/src/context.c +@@ -1,6 +1,8 @@ + #include <stdarg.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include "context.h" + #include "module-ext.h" +diff --git a/src/dbusif.c b/src/dbusif.c +index cf2b8bc..f7a3e76 100644 +--- a/src/dbusif.c ++++ b/src/dbusif.c +@@ -3,7 +3,9 @@ + #include <sys/types.h> + #include <sys/stat.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <pulsecore/dbus-shared.h> + #include <pulsecore/core-util.h> + +diff --git a/src/index-hash.c b/src/index-hash.c +index ff17a28..d5143e6 100644 +--- a/src/index-hash.c ++++ b/src/index-hash.c +@@ -2,6 +2,9 @@ + #include <sys/types.h> + #include <errno.h> + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulsecore/macro.h> + #include <pulse/xmalloc.h> +diff --git a/src/module-ext.c b/src/module-ext.c +index 699b0da..5119eec 100644 +--- a/src/module-ext.c ++++ b/src/module-ext.c +@@ -1,4 +1,6 @@ +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulse/def.h> + #include <pulsecore/module.h> +diff --git a/src/module-policy-enforcement.c b/src/module-policy-enforcement.c +index 43c1481..e34286c 100644 +--- a/src/module-policy-enforcement.c ++++ b/src/module-policy-enforcement.c +@@ -11,7 +11,9 @@ + #include <sys/types.h> + #include <sys/socket.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulse/timeval.h> + #include <pulse/xmalloc.h> +diff --git a/src/policy-group.c b/src/policy-group.c +index be7e5c4..bbd2e07 100644 +--- a/src/policy-group.c ++++ b/src/policy-group.c +@@ -1,4 +1,6 @@ +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulsecore/namereg.h> + #include <pulsecore/core-util.h> +diff --git a/src/sink-ext.c b/src/sink-ext.c +index cc7da92..3666e8a 100644 +--- a/src/sink-ext.c ++++ b/src/sink-ext.c +@@ -3,7 +3,9 @@ + #include <unistd.h> + #include <errno.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulse/def.h> + +diff --git a/src/sink-input-ext.c b/src/sink-input-ext.c +index 62c9b9a..ba119c9 100644 +--- a/src/sink-input-ext.c ++++ b/src/sink-input-ext.c +@@ -3,7 +3,9 @@ + #include <unistd.h> + #include <errno.h> + +-#include <pulsecore/pulsecore-config.h> ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif + + #include <pulse/def.h> + #include <pulse/proplist.h> +diff --git a/src/source-ext.c b/src/source-ext.c +index a1618ec..7275720 100644 +--- a/src/source-ext.c ++++ b/src/source-ext.c +@@ -3,7 +3,9 @@ (28 more lines skipped) ++++++ pulseaudio-policy-enforcement-8aeb6c71.tar.gz (new) ++++++ pulseaudio-policy-enforcement.yaml --- pulseaudio-policy-enforcement.yaml +++ pulseaudio-policy-enforcement.yaml @@ -1,25 +1,28 @@ Name: pulseaudio-policy-enforcement Summary: Pulseaudio module for enforcing policy decisions in the audio domain -Version: 1.1.10 +Version: 1.1.11 Release: 0 Group: System/Daemons License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/pulseaudio-policy-enforcement Sources: - - "%{name}-%{version}.tar.gz" + - "%{name}-8aeb6c71.tar.gz" Patches: - - support_multiple_audio_output.patch + - replace-standard-memory-allocation-and-freeing-calls.patch + - include-local-config.h-instead-of-pulsecore-config.h.patch + - update-configure.ac-detection-of-ports-in-pulseaudio.patch + - don-t-try-to-build-documentation-if-build-support-is.patch Description: | This package contains a pulseaudio module that enforces (mostly audio) routing, corking and muting policy decisions in MeeGo. PkgBR: - libtool-ltdl-devel + - libatomic_ops-devel PkgConfigBR: - pulsecore - libpulse - dbus-1 - - glib-2.0 Configure: autogen ConfigOptions: - --with-module-dir=%{_libdir}/pulse-$PAVER/modules ++++++ replace-standard-memory-allocation-and-freeing-calls.patch (new) --- replace-standard-memory-allocation-and-freeing-calls.patch +++ replace-standard-memory-allocation-and-freeing-calls.patch @@ -0,0 +1,72 @@ +From 1ac9571c66f8ece46c2c0d39d072019535fe49db Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <[email protected]> +Date: Mon, 27 Feb 2012 13:12:40 +0200 +Subject: [PATCH] Replace standard memory allocation and freeing calls with + the pulse/xmalloc.h counterparts. + +Using the pulse/xmalloc.h functions everywhere makes memory +debugging easier, because the standard calls need to be +replaced only in one place. +--- + src/context.c | 4 ++-- + src/sink-ext.c | 14 +++++--------- + 2 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/src/context.c b/src/context.c +index 7ea4b29..6889081 100644 +--- a/src/context.c ++++ b/src/context.c +@@ -413,7 +413,7 @@ static void delete_action(struct pa_policy_context_rule *rule, + setprop = &action->setprop; + + match_cleanup(&setprop->object.match); +- free(setprop->property); ++ pa_xfree(setprop->property); + value_cleanup(&setprop->value); + + break; +@@ -424,7 +424,7 @@ static void delete_action(struct pa_policy_context_rule *rule, + return; /* better to leak than corrupt :) */ + } + +- free(action); ++ pa_xfree(action); + + return; + } +diff --git a/src/sink-ext.c b/src/sink-ext.c +index cc7da92..03dd66e 100644 +--- a/src/sink-ext.c ++++ b/src/sink-ext.c +@@ -27,15 +27,11 @@ static void handle_removed_sink(struct userdata *, struct pa_sink *); + + struct pa_null_sink *pa_sink_ext_init_null_sink(const char *name) + { +- struct pa_null_sink *null_sink; ++ struct pa_null_sink *null_sink = pa_xnew0(struct pa_null_sink, 1); + +- if ((null_sink = malloc(sizeof(*null_sink))) != NULL) { +- memset(null_sink, 0, sizeof(*null_sink)); +- +- /* sink.null is temporary to de-couple PA releases from ours */ +- null_sink->name = pa_xstrdup(name ? name : /* "null" */ "sink.null"); +- null_sink->sink = NULL; +- } ++ /* sink.null is temporary to de-couple PA releases from ours */ ++ null_sink->name = pa_xstrdup(name ? name : /* "null" */ "sink.null"); ++ null_sink->sink = NULL; + + return null_sink; + } +@@ -148,7 +144,7 @@ int pa_sink_ext_set_ports(struct userdata *u, const char *type) + continue; + + if (ext->overridden_port) { +- free(ext->overridden_port); ++ pa_xfree(ext->overridden_port); + ext->overridden_port = pa_xstrdup(port); + continue; + } +-- +1.7.10 + ++++++ update-configure.ac-detection-of-ports-in-pulseaudio.patch (new) --- update-configure.ac-detection-of-ports-in-pulseaudio.patch +++ update-configure.ac-detection-of-ports-in-pulseaudio.patch @@ -0,0 +1,25 @@ +From 277470b64c51d3600ba0553c7ca4e3bb74a4682b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Mon, 24 Sep 2012 11:45:40 +0300 +Subject: [PATCH] Update configure.ac detection of ports in PulseAudio. + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4c4c94b..3dffe6c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,7 @@ AC_ARG_WITH( + [modlibexecdir=$withval], [modlibexecdir=${LIBDIR}/pulse-${PA_MAJORMINOR}/modules]) + + PULSEAUDIO_HAS_PORTS=0 +-echo -e "#include <pulsecore/pulsecore-config.h>\n #include <pulsecore/sink.h>\nint main() {\nreturn pa_sink_set_port((struct pa_sink *)0,\"\",0);\n}" | ${CC} ${CFLAGS} ${LIBPULSECORE_CFLAGS} ${LIBPULSE_CFLAGS} ${AM_LIBADD} ${LIBPULSECORE_LIBS} ${LIBPULSE_LIBS} -Wmissing-declarations -Werror -x c -o /dev/null - && PULSEAUDIO_HAS_PORTS=1 ++echo -e "#define PACKAGE 1\n#include <pulsecore/sink.h>\nint main() {\nreturn pa_sink_set_port((struct pa_sink *)0,\"\",0);\n}" | ${CC} ${CFLAGS} ${LIBPULSECORE_CFLAGS} ${LIBPULSE_CFLAGS} ${AM_LIBADD} ${LIBPULSECORE_LIBS} ${LIBPULSE_LIBS} -Wmissing-declarations -Werror -x c -o /dev/null - && PULSEAUDIO_HAS_PORTS=1 + AC_SUBST(PULSEAUDIO_HAS_PORTS) + + +-- +1.7.0.4 + ++++++ deleted files: --- pulseaudio-policy-enforcement-1.1.10.tar.gz --- support_multiple_audio_output.patch
