diff -u xmp-3.2.0/Makefile.rules xmp-3.2.0/Makefile.rules --- xmp-3.2.0/Makefile.rules +++ xmp-3.2.0/Makefile.rules @@ -8,9 +8,9 @@ MANDIR = ${prefix}/share/man/man1 SYSCONFDIR = /etc/xmp -CC = i486-linux-gnu-gcc -CFLAGS = -c -g -Wall -O2 -Wall -finline-functions -U_FORTIFY_SOURCE -DHAVE_CONFIG_H #-D_DEBUG -LD = i486-linux-gnu-gcc +CC = x86_64-linux-gnu-gcc +CFLAGS = -c -g -Wall -O2 -D_REENTRANT -Wall -finline-functions -U_FORTIFY_SOURCE -DHAVE_CONFIG_H #-D_DEBUG +LD = x86_64-linux-gnu-gcc LDFLAGS = -o $@ RANLIB = ranlib INSTALL = /usr/bin/install -c @@ -27,13 +27,13 @@ # [2.95.2 as supplied by the freeware.sgi.com site] has problems # resolving the audio-symbols otherwise. -LIBS = $(XLIBS) $(LIBM) -lasound +LIBS = $(XLIBS) $(LIBM) -lasound -lpulse-simple -lpulse SHELL = /bin/sh -PLATFORM = i486-pc-linux-gnu +PLATFORM = x86_64-pc-linux-gnu LIBM = -lm -DRIVERS = oss.o oss_seq.o alsa.o +DRIVERS = oss.o oss_seq.o alsa.o pulseaudio.o dummy: diff -u xmp-3.2.0/debian/changelog xmp-3.2.0/debian/changelog --- xmp-3.2.0/debian/changelog +++ xmp-3.2.0/debian/changelog @@ -1,3 +1,10 @@ +xmp (3.2.0-0.1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add PulseAudio support. (LP: #604235) + + -- Artur Rona Sat, 10 Jul 2010 21:22:29 +0200 + xmp (3.2.0-0.1) unstable; urgency=low * NMU @@ -10,6 +17,30 @@ -- Hideki Yamane Tue, 29 Jun 2010 00:06:50 +0900 +xmp (3.0.0+20090923-1ubuntu2) lucid; urgency=low + + * debian/control: Update build-dependency of audacious-plugins-dev to + audacious-dev since the former was dropped with 2.3. + * src/plugin/audacious.c: Make it compile with audacious 2.3. Taken from + upstream git together with two additional changes (LP: #564092). + * debian/control, debian/rules: drop dpatch build-dependency and remove + the dpatch setup, as it didn't work in the first place. + * debian/patches: removed, the change for the 128 bit mixer wasn't applied + with the last revision, and is not necessarily needed (cf, discussion at + debian bug #536740). + + -- Stefan Potyra Sun, 18 Apr 2010 14:47:20 +0200 + +xmp (3.0.0+20090923-1ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #507732). Reamining changes: + + Add PulseAudio support: + - debian/rules: Add --enable-pulseaudio to ./configure + + RFE Compile with 128 bit mixer: + - dpatch support + + -- Artur Rona Fri, 15 Jan 2010 01:15:22 +0100 + xmp (3.0.0+20090923-1) unstable; urgency=low * New upstream version. @@ -35,6 +66,54 @@ -- Gürkan Sengün Tue, 21 Jul 2009 09:19:14 +0200 +xmp (2.7.0-0ubuntu1) karmic; urgency=low + + * New upstream release: + - add StarTrekker packer loader (untested, need samples) + - extended key range to IT octave 9 (fixes beek-my_eleventh_year.it, + reported by Mirko Buffoni) + - ignore tempo/bpm settings to 0 in module scan (fixes albacore.it, + reported by Storlek) + - implement IT T0x and T1x tempo slides + - process effects in IT muted channels (Storlek test #10) + - generalized delayed event support (Storlek test #8) + - emulate "always store instrument" IT bug (Storlek test #8) + - add extra click removal step in mixer routines + - fix loop size in GMC loader (reported by Mirko Buffoni) + - GMC loader code cleanup + - store in-file comments + - apply amplification in the final downmix + - set sample format to unsigned on 8-bit wav file output + - attempt to handle BPM-based MED tempos a bit better + - add option to use the IT LPF as a click/noise filter + - deprecate $HOME/.xmprc, use $HOME/.xmp/xmp.conf instead + - reintroduce modules.conf, move SYSCONFDIR back to /etc/xmp + - display checksum for platforms where cksum(1) not readily available + - add filter quirk for rn-alone.it + - reintroduce manual setting for vblank timing in Amiga modules + - add vblank quirk for mod.siedler ii (by Daniel Åkerud) + - don't crash if SoundSmith instruments not found + + -- Andreas Moog Mon, 13 Jul 2009 17:16:13 +0200 + +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: + - Remove arts from dependencies. + + debian/control: Remove libartsc0-dev from build depends. + + debian/rules: Remove --enable-arts from ./configure + * debian/rules: Add --enable-pulseaudio from ./configure to provide + PulseAudio support. Patch provided by Kevin Otte. (LP: #393718) + + -- Andres Rodriguez Tue, 30 Jun 2009 23:47:36 -0500 + xmp (2.6.1-1) unstable; urgency=low * New upstream version. @@ -45,6 +124,14 @@ -- Gürkan Sengün Mon, 29 Jun 2009 22:20:49 +0200 +xmp (2.5.1-1ubuntu1) jaunty; urgency=low + + * Remove arts from dependencies. (LP: #320915) + - debian/control: Remove libartsc0-dev from build depends. + - debian/rules: Remove --enable-arts from ./configure + + -- Andreas Wenning Thu, 29 Jan 2009 17:48:13 +0100 + xmp (2.5.1-1) unstable; urgency=low * New upstream version. diff -u xmp-3.2.0/debian/rules xmp-3.2.0/debian/rules --- xmp-3.2.0/debian/rules +++ xmp-3.2.0/debian/rules @@ -25,6 +25,7 @@ --prefix=/usr \ --mandir='$${prefix}/share/man' \ --enable-dynamic \ + --enable-pulseaudio \ --enable-audacious-plugin $(MAKE) touch build-stamp diff -u xmp-3.2.0/debian/control xmp-3.2.0/debian/control --- xmp-3.2.0/debian/control +++ xmp-3.2.0/debian/control @@ -1,7 +1,8 @@ Source: xmp Section: sound Priority: optional -Maintainer: Gürkan Sengün +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gürkan Sengün Uploaders: William Pitcock Standards-Version: 3.8.4 Build-Depends: debhelper (>= 7.0.50~), libxext-dev, libx11-dev, libxt-dev, diff -u xmp-3.2.0/src/include/config.h xmp-3.2.0/src/include/config.h --- xmp-3.2.0/src/include/config.h +++ xmp-3.2.0/src/include/config.h @@ -47,7 +47,7 @@ /* #undef DRIVER_NAS */ /* Define to enable PulseAudio support */ -/* #undef DRIVER_PULSEAUDIO */ +#define DRIVER_PULSEAUDIO 1 /* Define to enable ALSA support */ /* #undef DRIVER_ALSA_SEQ */