Re: QtMoko pulseaudio patches

2012-11-22 Thread Neil Jerram 
Gilles Filippini  writes:

> Hi Neil,
>
> Neil Jerram a écrit , Le 22/11/2012 20:09:
>> diff --git a/debian/control b/debian/control
>> index 61f4a62..3904775 100644
>> --- a/debian/control
>> +++ b/debian/control
>> @@ -2,7 +2,7 @@ Source: qtmoko
>>  Section: comm
>>  Priority: optional
>>  Maintainer: Radek Polak 
>> -Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, 
>> libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, 
>> libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, 
>> libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, 
>> libvorbis-dev
>> +Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, 
>> libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, 
>> libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, 
>> libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, 
>> libvorbis-dev, libpulse-dev
>>  Standards-Version: 3.9.2
>>  Homepage: http://www.qtmoko.org
>>  Vcs-Git: git://github.com/radekp/qtmoko.git
>
> This hunk is not needed: debian/control is a generated file, from
> debian/control-src and debian/control-{gta04,neo,pc}. See debian/rules.
>
> The build dependencies in debian/control-src already have libpulse-dev.

Ah thanks.  I suspected something like that, but hadn't worked out the
details.  A revised patch is attached without that hunk.

Regards,
Neil

>From a6231bf384a7fb1b6016e2ea164262c02b0359b4 Mon Sep 17 00:00:00 2001
From: Neil Jerram 
Date: Sun, 18 Nov 2012 22:47:05 +
Subject: [PATCH] Add libpulse-dev as build-dep for qt

---
 scripts/qtmoko-chroot.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/qtmoko-chroot.sh b/scripts/qtmoko-chroot.sh
index 8dce56f..f0eb0b8 100755
--- a/scripts/qtmoko-chroot.sh
+++ b/scripts/qtmoko-chroot.sh
@@ -34,7 +34,7 @@ then
 fi
 
 echo "Installing chroot packages"
-until cdebootstrap --flavour=minimal --include=build-essential,git,openssh-client,ccache,locales,procps,psmisc,libxext-dev,libasound2-dev,libdbus-1-dev,libssl-dev,libts-dev,libbluetooth-dev,libxtst-dev,libpng12-dev,libjpeg8-dev,libv4l-dev,libspeexdsp-dev,libglib2.0-dev,libsqlite3-dev,quilt,libgstreamer0.10-dev,libgstreamer-plugins-base0.10-dev squeeze ../qtmoko-chroot http://cdn.debian.net/debian/; do
+until cdebootstrap --flavour=minimal --include=build-essential,git,openssh-client,ccache,locales,procps,psmisc,libxext-dev,libasound2-dev,libdbus-1-dev,libssl-dev,libts-dev,libbluetooth-dev,libxtst-dev,libpng12-dev,libjpeg8-dev,libv4l-dev,libspeexdsp-dev,libglib2.0-dev,libsqlite3-dev,quilt,libgstreamer0.10-dev,libgstreamer-plugins-base0.10-dev,libpulse-dev squeeze ../qtmoko-chroot http://cdn.debian.net/debian/; do
 	:
 done
 fi
@@ -80,7 +80,7 @@ apt-get install g++-4.4-arm-linux-gnueabi
 
 echo "Installing xapt and ARM qtmoko dependencies"
 apt-get install xapt
-xapt -a armel -m libxext-dev libasound2-dev libdbus-1-dev libssl-dev libts-dev libbluetooth-dev libxtst-dev libpng12-dev libjpeg8-dev libv4l-dev libspeexdsp-dev libglib2.0-dev libsqlite3-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libvorbis-dev
+xapt -a armel -m libxext-dev libasound2-dev libdbus-1-dev libssl-dev libts-dev libbluetooth-dev libxtst-dev libpng12-dev libjpeg8-dev libv4l-dev libspeexdsp-dev libglib2.0-dev libsqlite3-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libvorbis-dev libpulse-dev
 
 echo "export PATH=/usr/lib/ccache:\$PATH" >> /root/.bashrc
 echo "PS1='qtmoko-chroot:\w\\\$ '" >> /root/.bashrc
-- 
1.7.10.4

___
Openmoko community mailing list
community@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/community

Re: QtMoko pulseaudio patches

2012-11-22 Thread Gilles Filippini 
Hi Neil,

Neil Jerram a écrit , Le 22/11/2012 20:09:
> diff --git a/debian/control b/debian/control
> index 61f4a62..3904775 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,7 @@ Source: qtmoko
>  Section: comm
>  Priority: optional
>  Maintainer: Radek Polak 
> -Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, 
> libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, 
> libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, 
> libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, 
> libvorbis-dev
> +Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, 
> libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, 
> libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, 
> libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, 
> libvorbis-dev, libpulse-dev
>  Standards-Version: 3.9.2
>  Homepage: http://www.qtmoko.org
>  Vcs-Git: git://github.com/radekp/qtmoko.git

This hunk is not needed: debian/control is a generated file, from
debian/control-src and debian/control-{gta04,neo,pc}. See debian/rules.

The build dependencies in debian/control-src already have libpulse-dev.

Thanks,

_g.



signature.asc
Description: OpenPGP digital signature
___
Openmoko community mailing list
community@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/community

QtMoko pulseaudio patches

2012-11-22 Thread Neil Jerram 
Hi Radek,

Here are some minor patches related to pulseaudio, for your
consideration.

The first one may not be quite right, because my impression from Gilles'
recent change is that perhaps debian/control should now be generated
from some other file?  (or perhaps the same change should be made in
other places?)  So please either tweak or bounce that back to me for
revision.

The other two are straightforward, I believe.

Regards,
Neil

>From b96f37d7614f13bee2bd25682360e71b302f4d4a Mon Sep 17 00:00:00 2001
From: Neil Jerram 
Date: Sun, 18 Nov 2012 22:47:05 +
Subject: [PATCH 08/13] Add libpulse-dev as build-dep for qt

---
 debian/control   |2 +-
 scripts/qtmoko-chroot.sh |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 61f4a62..3904775 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qtmoko
 Section: comm
 Priority: optional
 Maintainer: Radek Polak 
-Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, libvorbis-dev
+Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libasound2-dev, libdbus-1-dev, libssl-dev, libts-dev, libbluetooth-dev, libxtst-dev, libpng12-dev, libv4l-dev, libspeexdsp-dev, libglib2.0-dev, libsqlite3-dev, libgstreamer-plugins-base0.10-dev, libtiff4-dev, libmng-dev, quilt, libvorbis-dev, libpulse-dev
 Standards-Version: 3.9.2
 Homepage: http://www.qtmoko.org
 Vcs-Git: git://github.com/radekp/qtmoko.git
diff --git a/scripts/qtmoko-chroot.sh b/scripts/qtmoko-chroot.sh
index 8dce56f..f0eb0b8 100755
--- a/scripts/qtmoko-chroot.sh
+++ b/scripts/qtmoko-chroot.sh
@@ -34,7 +34,7 @@ then
 fi
 
 echo "Installing chroot packages"
-until cdebootstrap --flavour=minimal --include=build-essential,git,openssh-client,ccache,locales,procps,psmisc,libxext-dev,libasound2-dev,libdbus-1-dev,libssl-dev,libts-dev,libbluetooth-dev,libxtst-dev,libpng12-dev,libjpeg8-dev,libv4l-dev,libspeexdsp-dev,libglib2.0-dev,libsqlite3-dev,quilt,libgstreamer0.10-dev,libgstreamer-plugins-base0.10-dev squeeze ../qtmoko-chroot http://cdn.debian.net/debian/; do
+until cdebootstrap --flavour=minimal --include=build-essential,git,openssh-client,ccache,locales,procps,psmisc,libxext-dev,libasound2-dev,libdbus-1-dev,libssl-dev,libts-dev,libbluetooth-dev,libxtst-dev,libpng12-dev,libjpeg8-dev,libv4l-dev,libspeexdsp-dev,libglib2.0-dev,libsqlite3-dev,quilt,libgstreamer0.10-dev,libgstreamer-plugins-base0.10-dev,libpulse-dev squeeze ../qtmoko-chroot http://cdn.debian.net/debian/; do
 	:
 done
 fi
@@ -80,7 +80,7 @@ apt-get install g++-4.4-arm-linux-gnueabi
 
 echo "Installing xapt and ARM qtmoko dependencies"
 apt-get install xapt
-xapt -a armel -m libxext-dev libasound2-dev libdbus-1-dev libssl-dev libts-dev libbluetooth-dev libxtst-dev libpng12-dev libjpeg8-dev libv4l-dev libspeexdsp-dev libglib2.0-dev libsqlite3-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libvorbis-dev
+xapt -a armel -m libxext-dev libasound2-dev libdbus-1-dev libssl-dev libts-dev libbluetooth-dev libxtst-dev libpng12-dev libjpeg8-dev libv4l-dev libspeexdsp-dev libglib2.0-dev libsqlite3-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libvorbis-dev libpulse-dev
 
 echo "export PATH=/usr/lib/ccache:\$PATH" >> /root/.bashrc
 echo "PS1='qtmoko-chroot:\w\\\$ '" >> /root/.bashrc
-- 
1.7.10.4

>From 333b1f301fdc1d3a590546db013a466693b6c23c Mon Sep 17 00:00:00 2001
From: Neil Jerram 
Date: Tue, 20 Nov 2012 22:54:13 +
Subject: [PATCH 10/13] Kill pulse.sh and pulseaudio when stopping QtMoko

Otherwise there are two copies of pulse.sh when QtMoko is started up
again.
---
 debian/qtmoko-gta04.init |2 ++
 debian/qtmoko-neo.init   |2 ++
 debian/qtmoko-pc.init|2 ++
 3 files changed, 6 insertions(+)

diff --git a/debian/qtmoko-gta04.init b/debian/qtmoko-gta04.init
index 90fe4c6..f67ba2e 100644
--- a/debian/qtmoko-gta04.init
+++ b/debian/qtmoko-gta04.init
@@ -47,6 +47,8 @@ do_stop()
 {
 rm -f /tmp/restart-qtopia
 killall -q qpe atd quicklauncher mediaserver mediaplayer sipagent telepathyagent
+killall -q pulse.sh
+killall -q pulseaudio
 return 0
 }
 
diff --git a/debian/qtmoko-neo.init b/debian/qtmoko-neo.init
index 90fe4c6..f67ba2e 100644
--- a/debian/qtmoko-neo.init
+++ b/debian/qtmoko-neo.init
@@ -47,6 +47,8 @@ do_stop()
 {
 rm -f /tmp/restart-qtopia
 killall -q qpe atd quicklauncher mediaserver mediaplayer sipagent telepathyagent
+killall -q pulse.sh
+killall -q pulseaudio
 return 0
 }
 
diff --git a/debian/qtmoko-pc.init b/debian/qtmoko-pc.init
index 90fe4c6..f67ba2e 100644
--- a/debian/qtmoko-pc.init
+++ b/debian/qtmoko-pc.init
@@ -47,6 +47,8 @@ do_stop()
 {
 rm -f /tmp/restart-qtopia
 killall -q qpe atd quicklauncher mediaserver mediapla