diff -u xmp-2.6.1/debian/changelog xmp-2.6.1/debian/changelog --- xmp-2.6.1/debian/changelog +++ xmp-2.6.1/debian/changelog @@ -1,3 +1,10 @@ +xmp (2.6.1-1ubuntu2) karmic; urgency=low + + * RFE Compile with 128 bit mixer (LP: #393717). Thanks to kevin otte + for the patch(which I modified a bit and was missed in last merge). + + -- Bhavani Shankar Mon, 13 Jul 2009 10:57:36 +0530 + xmp (2.6.1-1ubuntu1) karmic; urgency=low * Merge from debian unstable (LP: #394058), remaining changes: diff -u xmp-2.6.1/debian/control xmp-2.6.1/debian/control --- xmp-2.6.1/debian/control +++ xmp-2.6.1/debian/control @@ -1,7 +1,7 @@ Source: xmp Section: sound Priority: optional -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Gürkan Sengün Uploaders: William Pitcock Standards-Version: 3.8.2 diff -u xmp-2.6.1/debian/patches/00list xmp-2.6.1/debian/patches/00list --- xmp-2.6.1/debian/patches/00list +++ xmp-2.6.1/debian/patches/00list @@ -1,0 +2 @@ +02-rfe_compile_128bit only in patch2: unchanged: --- xmp-2.6.1.orig/debian/patches/02-rfe_compile_128bit.dpatch +++ xmp-2.6.1/debian/patches/02-rfe_compile_128bit.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/xmp/+bug/393717 +## Patch: http://launchpadlibrarian.net/28538057/xmp-mixer128.patch +## Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536740 +## Description: Compile with 128-bit channel mixer + +@DPATCH@ + +diff -urN xmp-2.6.1.orig/src/include/mixer.h xmp-2.6.1/src/include/mixer.h +--- xmp-2.6.1.orig/src/include/mixer.h ++++ xmp-2.6.1/src/include/mixer.h +@@ -5,7 +5,7 @@ + /*#define SMIX_C4NOTE 6947*/ + #define SMIX_C4NOTE 6864 + +-#define SMIX_NUMVOC 64 /* default number of softmixer voices */ ++#define SMIX_NUMVOC 128 /* default number of softmixer voices */ + #define SMIX_MAXRATE 48000 /* max sampling rate (Hz) */ + #define SMIX_MINBPM 0x10 /* min BPM */ + #define SMIX_RESMAX (sizeof (int16)) /* max output resolution */ +