Patchwork [RFC,1/1] qt4: disable pulseaudio

login
register
mail settings
Submitter Paul Eggleton
Date Nov. 18, 2011, 3:03 p.m.
Message ID <dee6ab006094693ede5ec6669fa5616a3a00b067.1321628513.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/15141/
State New
Headers show

Comments

Paul Eggleton - Nov. 18, 2011, 3:03 p.m.
Disable pulseaudio support in phonon within Qt4; otherwise it
auto-detects it and it may be enabled or disabled depending on what gets
built first.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt4/files/pulseaudio-config.patch |   31 +++++++++++++++++++++
 meta/recipes-qt/qt4/qt-4.7.4.inc                  |    3 +-
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb         |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb         |    2 +-
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/pulseaudio-config.patch
Koen Kooi - Nov. 18, 2011, 3:22 p.m.
Op 18 nov. 2011, om 16:03 heeft Paul Eggleton het volgende geschreven:

> Disable pulseaudio support in phonon within Qt4; otherwise it
> auto-detects it and it may be enabled or disabled depending on what gets
> built first.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta/recipes-qt/qt4/files/pulseaudio-config.patch |   31 +++++++++++++++++++++
> meta/recipes-qt/qt4/qt-4.7.4.inc                  |    3 +-
> meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb         |    2 +-
> meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb         |    2 +-
> 4 files changed, 35 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/files/pulseaudio-config.patch
> 
> diff --git a/meta/recipes-qt/qt4/files/pulseaudio-config.patch b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
> new file mode 100644
> index 0000000..5b32815
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
> @@ -0,0 +1,31 @@
> +# Allows disabling pulseaudio support within phonon at configure time
> +# 
> +# Upstream-status: pending
> +#
> +# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

What follows is a generic question and in no way a criticism or comment on your RFC: Have you thought about using git am'able patches for these things?Upstream for QT is using git, so it would be nice to use somethings as close to the upstream submission as we can get. I've been trying to do this for meta-oe and found it helpfull when coming back to do the actual upstream push later.

regards,

Koen
Paul Eggleton - Nov. 18, 2011, 3:28 p.m.
On Friday 18 November 2011 16:22:37 Koen Kooi wrote:
> What follows is a generic question and in no way a criticism or comment on
> your RFC: Have you thought about using git am'able patches for these
> things?Upstream for QT is using git, so it would be nice to use somethings
> as close to the upstream submission as we can get. I've been trying to do
> this for meta-oe and found it helpfull when coming back to do the actual
> upstream push later.

I hadn't thought about it, but anything that makes these patches easier to 
upstream sounds like a good idea to me, and I would have thought this 
particular one would definitely be a candidate so I'll do it for this one once 
people have had a chance to comment.

Cheers,
Paul
Otavio Salvador - Nov. 19, 2011, 2:55 p.m.
On Fri, Nov 18, 2011 at 13:28, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Friday 18 November 2011 16:22:37 Koen Kooi wrote:
>> What follows is a generic question and in no way a criticism or comment on
>> your RFC: Have you thought about using git am'able patches for these
>> things?Upstream for QT is using git, so it would be nice to use somethings
>> as close to the upstream submission as we can get. I've been trying to do
>> this for meta-oe and found it helpfull when coming back to do the actual
>> upstream push later.
>
> I hadn't thought about it, but anything that makes these patches easier to
> upstream sounds like a good idea to me, and I would have thought this
> particular one would definitely be a candidate so I'll do it for this one once
> people have had a chance to comment.

I think this needs to be a distro option, not enforced.

I agree this needs to be explicitly added or removed but I'd like it
to be optional ... many embedded systems now depends on pulseaudio and
if one is using it, phonon ought to use it too.
Paul Eggleton - Nov. 21, 2011, 11:46 a.m.
On Saturday 19 November 2011 12:55:04 Otavio Salvador wrote:
> I think this needs to be a distro option, not enforced.
> 
> I agree this needs to be explicitly added or removed but I'd like it
> to be optional ... many embedded systems now depends on pulseaudio and
> if one is using it, phonon ought to use it too.

So, is this a DISTRO_FEATURE? Or do we use PACKAGECONFIG?

Cheers,
Paul
Otavio Salvador - Nov. 21, 2011, 12:02 p.m.
On Mon, Nov 21, 2011 at 09:46, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Saturday 19 November 2011 12:55:04 Otavio Salvador wrote:
>> I think this needs to be a distro option, not enforced.
>>
>> I agree this needs to be explicitly added or removed but I'd like it
>> to be optional ... many embedded systems now depends on pulseaudio and
>> if one is using it, phonon ought to use it too.
>
> So, is this a DISTRO_FEATURE? Or do we use PACKAGECONFIG?

I'd say it is a distro feature.
Saul Wold - Nov. 22, 2011, 8:45 p.m.
On 11/18/2011 07:03 AM, Paul Eggleton wrote:
> Disable pulseaudio support in phonon within Qt4; otherwise it
> auto-detects it and it may be enabled or disabled depending on what gets
> built first.
>
> Signed-off-by: Paul Eggleton<paul.eggleton@linux.intel.com>
> ---
>   meta/recipes-qt/qt4/files/pulseaudio-config.patch |   31 +++++++++++++++++++++
>   meta/recipes-qt/qt4/qt-4.7.4.inc                  |    3 +-
>   meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb         |    2 +-
>   meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb         |    2 +-
>   4 files changed, 35 insertions(+), 3 deletions(-)
>   create mode 100644 meta/recipes-qt/qt4/files/pulseaudio-config.patch
>
> diff --git a/meta/recipes-qt/qt4/files/pulseaudio-config.patch b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
> new file mode 100644
> index 0000000..5b32815
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
> @@ -0,0 +1,31 @@
> +# Allows disabling pulseaudio support within phonon at configure time
> +#
> +# Upstream-status: pending
> +#
Small nit-pick here, status start with Caps, so this should be Pending

Sau!

> +# Signed-off-by: Paul Eggleton<paul.eggleton@linux.intel.com>
> +#
> +--- qt-everywhere-opensource-src-4.7.4.orig/configure
> ++++ qt-everywhere-opensource-src-4.7.4/configure
> +@@ -941,7 +941,7 @@ while [ "$#" -gt 0 ]; do
> +         VAL=no
> +         ;;
> +     #Qt style yes options
> +-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
> ++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
> +         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
> +         VAL=yes
> +         ;;
> +@@ -1866,6 +1866,13 @@ while [ "$#" -gt 0 ]; do
> +             UNKNOWN_OPT=yes
> +         fi
> +         ;;
> ++    pulseaudio)
> ++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
> ++            CFG_PULSEAUDIO="$VAL"
> ++        else
> ++            UNKNOWN_OPT=yes
> ++        fi
> ++        ;;
> +     gtkstyle)
> +         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
> +             CFG_QGTKSTYLE="$VAL"
> diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
> index bc33b6b..bd3409c 100644
> --- a/meta/recipes-qt/qt4/qt-4.7.4.inc
> +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
> @@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
>              file://g++.conf \
>              file://linux.conf \
>              file://fix-qtbug-20925.patch \
> +           file://pulseaudio-config.patch \
>              "
>
>   SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
> @@ -43,7 +44,7 @@ do_configure_prepend() {
>   }
>
>   QT_GLFLAGS ?= ""
> -QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
> +QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations --disable-pulseaudio -silent ${QT_GLFLAGS}"
>
>   do_compile() {
>       # Fixup missing wsegl header in some SGX SDKs
> diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> index e34ec8d..6b9f97a 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> @@ -1,7 +1,7 @@
>   require qt-${PV}.inc
>   require qt4-embedded.inc
>
> -PR = "${INC_PR}.3"
> +PR = "${INC_PR}.4"
>
>   QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> index 8c48936..0db090f 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> @@ -1,7 +1,7 @@
>   require qt4-x11-free.inc
>   require qt-${PV}.inc
>
> -PR = "${INC_PR}.3"
> +PR = "${INC_PR}.4"
>
>   QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
>
Paul Eggleton - Nov. 22, 2011, 9:24 p.m.
On Tuesday 22 November 2011 12:45:30 Saul Wold wrote:
> On 11/18/2011 07:03 AM, Paul Eggleton wrote:
> > +# Upstream-status: pending
> > +#
> 
> Small nit-pick here, status start with Caps, so this should be Pending

OK, when I rework this as a DISTRO_FEATURE I will fix this up as well.

Cheers,
Paul

Patch

diff --git a/meta/recipes-qt/qt4/files/pulseaudio-config.patch b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
new file mode 100644
index 0000000..5b32815
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/pulseaudio-config.patch
@@ -0,0 +1,31 @@ 
+# Allows disabling pulseaudio support within phonon at configure time
+# 
+# Upstream-status: pending
+#
+# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+#
+--- qt-everywhere-opensource-src-4.7.4.orig/configure
++++ qt-everywhere-opensource-src-4.7.4/configure
+@@ -941,7 +941,7 @@ while [ "$#" -gt 0 ]; do
+         VAL=no
+         ;;
+     #Qt style yes options
+-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         VAL=yes
+         ;;
+@@ -1866,6 +1866,13 @@ while [ "$#" -gt 0 ]; do
+             UNKNOWN_OPT=yes
+         fi
+         ;;
++    pulseaudio)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_PULSEAUDIO="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
++        ;;
+     gtkstyle)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_QGTKSTYLE="$VAL"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index bc33b6b..bd3409c 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -17,6 +17,7 @@  SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://g++.conf \
            file://linux.conf \
            file://fix-qtbug-20925.patch \
+           file://pulseaudio-config.patch \
            "
 
 SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
@@ -43,7 +44,7 @@  do_configure_prepend() {
 }
 
 QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations --disable-pulseaudio -silent ${QT_GLFLAGS}"
 
 do_compile() {
     # Fixup missing wsegl header in some SGX SDKs
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index e34ec8d..6b9f97a 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@ 
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 8c48936..0db090f 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@ 
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "