[SCM] bristol packaging branch, master, updated. debian/0.60.0-1-1-gf2ff7f7

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Wed Apr 21 16:07:16 UTC 2010


The following commit has been merged in the master branch:
commit f2ff7f739a6b5cfde77cc32b62508d4370d8113b
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Apr 21 18:06:57 2010 +0200

    Add patch to fix FTBFS on kfreebsd architectures (Closes: #578443).

diff --git a/debian/patches/03-kfreebsd_ftbfs.patch b/debian/patches/03-kfreebsd_ftbfs.patch
new file mode 100644
index 0000000..7d4ab3e
--- /dev/null
+++ b/debian/patches/03-kfreebsd_ftbfs.patch
@@ -0,0 +1,26 @@
+Origin: backport
+Description: Prevent FTBFS on kfreebsd architectures.
+Bug: http://bugs.debian.org/578443
+From: https://sourceforge.net/tracker/index.php?func=detail&aid=2989865&group_id=157415&atid=803734
+---
+ include/slab/slabmixer.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- bristol.orig/include/slab/slabmixer.h
++++ bristol/include/slab/slabmixer.h
+@@ -24,7 +24,6 @@
+ /*
+  * This should be set up according to system type.
+  */
+-#if (MACHINE == FreeBSD || MACHINE == linux)
+ #ifndef INC_SOURCE
+ #define SLAB_NULL			-1
+ #define SLAB_TREBLE			SOUND_MIXER_TREBLE
+@@ -93,7 +92,6 @@
+ #define SLAB_VOL_PCM_MASK		1<<SLAB_VOL_PCM
+ 
+ #define SLAB_REC_SRC	0xff
+-#endif
+ 
+ /*
+  * These allow the same parameters to be used for either 0-100 ranges (this
diff --git a/debian/patches/series b/debian/patches/series
index ae0f722..66c01e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-spelling_errors.patch
 02-implicit_pointer_conversion.patch
+03-kfreebsd_ftbfs.patch

-- 
bristol packaging



More information about the pkg-multimedia-commits mailing list