tag 528552 pending thanks Aurelien Jarno <aure...@debian.org> (13/05/2009): > libcanberra fails to build on GNU/kFreeBSD, as alsa is > unconditionally enabled. The simple patch below fixes the > problem. Could you please apply it in the next upload? Thanks in > advance.
I've slightly tweaked the patch as discussed on IRC. Please find attached the source debdiff for my NMU, uploaded to DELAYED/2. It's been some months without NACK, kfreebsd-* support is a release goal, and as you can see by running the following command on the attached dot file, libcanberra is a blocker for a number of packages. $ dot -Tpng libcanberra.dot -o libcanberra.png Mraw, KiBi.
diff -u libcanberra-0.12/debian/rules libcanberra-0.12/debian/rules --- libcanberra-0.12/debian/rules +++ libcanberra-0.12/debian/rules @@ -5,6 +5,8 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + common-install-arch:: find $(DEB_DESTDIR) -name "*.la" | xargs rm -f @@ -19,11 +21,18 @@ DEB_CONFIGURE_EXTRA_FLAGS = \ --enable-pulse \ - --enable-alsa \ --enable-gtk \ --enable-gtk-doc \ --enable-tdb \ --with-builtin=dso + +# Linux-specific flags: +ifeq ($(DEB_HOST_ARCH_OS), linux) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-alsa +else +DEB_CONFIGURE_EXTRA_FLAGS += --disable-alsa +endif + DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/gtk-2.0/modules DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=/usr/lib/libcanberra-0.12 DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -V "libcanberra0 (>= 0.11)" -- -c4 diff -u libcanberra-0.12/debian/changelog libcanberra-0.12/debian/changelog --- libcanberra-0.12/debian/changelog +++ libcanberra-0.12/debian/changelog @@ -1,3 +1,21 @@ +libcanberra (0.12-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS on GNU/kFreeBSD, based on a patch by Aurélien Jarno + (Closes: #528552): + - Tweak DEB_CONFIGURE_EXTRA_FLAGS so as to use --enable-alsa on Linux + only, and --disable-alsa elsewhere (using DEB_HOST_ARCH_OS). + - Use debian/libcanberra0.install.kfreebsd to install files on + kfreebsd-* (alsa is replaced by oss). + * Not bumping the versioned Build-Depends on debhelper to the first + version having introduced support for .install.$os for the following + reasons: + - It is only needed on kfreebsd-*, which only have unstable and + testing, and their chroots are uptodate. + - It might make it harder to backport the package for no reasons. + + -- Cyril Brulebois <k...@debian.org> Mon, 17 Aug 2009 00:01:06 +0200 + libcanberra (0.12-1) unstable; urgency=low * New Upstream Version only in patch2: unchanged: --- libcanberra-0.12.orig/debian/libcanberra0.install.kfreebsd +++ libcanberra-0.12/debian/libcanberra0.install.kfreebsd @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libcanberra.so.* +debian/tmp/usr/lib/libcanberra-*/libcanberra-oss.so
libcanberra.dot
Description: MS-Word document
signature.asc
Description: Digital signature
