On Sat, 2010-12-04 at 14:07 +0000, Colin Guthrie wrote: > Hi, > > As we had some issues running make distcheck with the latest release can > someone give some feedback on the following three patches (against > stable queue for now but will also go into master).
Nice! It'll be good to be able to test build system patches with this and possibly avoid breakage. > The first patch basically just introduces some dummy Makefile.am's to > ensure that the necessary directories are created in the build directory > (for out of tree builds). This prevents the cc warnings about not being > able to find an directory (a minor annoyance) but also allows the build > to complete and do the necessary i18n stuff on the .desktop files which > normally fail due to src/daemon not being a directory in the build tree > (this is a bug in intl-tool as noted in the commit message). > > The second patch fixes a problem when running make distcheck related to > the udev rules. It insists on using the system folder and does not seem > to honour DESTDIR. I guess a distcheck doesn't actually use a DESTDIR > but a custom prefix and thus it fails. I'm not sure this is the best > approach to fixing this but it seems to work for me. Feel free to test > without this patch to see if it "just works" for you without it. I think this patch makes sense as well. > And thirdly this patch ensures the .version file is included in the > tarball as stated in the docs of git-version-gen. Without this make > distcheck fails as the source tree is read-only and thus the .version > file cannot be created. By including it in the tarball, it does not get > overwritten and the build works fine. > > Comments welcome as I'm no autofoo expert and am just blundering around > until things generally work. Tried your patches against master, and make distcheck goes through fine with a couple of minor patches (attached). Cheers, Arun
>From 2ac986d89ccec35566ceefb298e75768e3622d82 Mon Sep 17 00:00:00 2001 From: Arun Raghavan <[email protected]> Date: Sun, 5 Dec 2010 15:47:17 +0530 Subject: [PATCH 1/2] i18n: Update POTFILES.* Add new modules, and skip module-virtual-sink for i18n since it's really meant to be a template for writing other modules. --- po/POTFILES.in | 2 ++ po/POTFILES.skip | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index e661bfe..db7ae90 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -195,3 +195,5 @@ src/modules/bluetooth/module-bluetooth-device.c src/modules/reserve-wrap.c src/modules/module-rygel-media-server.c src/modules/alsa/alsa-mixer.c +src/modules/echo-cancel/module-echo-cancel.c +src/modules/module-equalizer-sink.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 4622d2f..8afd0d6 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1,3 @@ src/pulsecore/atomic.h +src/modules/module-virtual-sink.c +src/modules/module-virtual-source.c -- 1.7.3.2
>From 933eba8a03f57376774de50c3fcf8659c9211bfc Mon Sep 17 00:00:00 2001 From: Arun Raghavan <[email protected]> Date: Sun, 5 Dec 2010 16:08:32 +0530 Subject: [PATCH 2/2] build-sys: Fix a warning during distcheck This adds a dummy Makefile.am to the dubs module to eliminate missing directory warnings during distcheck. --- configure.ac | 1 + src/modules/Makefile.am | 2 +- src/modules/dbus/Makefile.am | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) create mode 100644 src/modules/dbus/Makefile.am diff --git a/configure.ac b/configure.ac index c858689..5216c01 100644 --- a/configure.ac +++ b/configure.ac @@ -1485,6 +1485,7 @@ src/modules/alsa/mixer/Makefile src/modules/alsa/mixer/paths/Makefile src/modules/alsa/mixer/profile-sets/Makefile src/modules/bluetooth/Makefile +src/modules/dbus/Makefile src/modules/gconf/Makefile src/modules/jack/Makefile src/modules/oss/Makefile diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index e99451d..d8dc152 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -17,4 +17,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -SUBDIRS = alsa bluetooth gconf jack oss raop rtp x11 +SUBDIRS = alsa bluetooth dbus gconf jack oss raop rtp x11 diff --git a/src/modules/dbus/Makefile.am b/src/modules/dbus/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/dbus/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. -- 1.7.3.2
_______________________________________________ pulseaudio-discuss mailing list [email protected] https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss
