--- madplay-0.15.2b.orig/debian/changelog +++ madplay-0.15.2b/debian/changelog @@ -0,0 +1,293 @@ +madplay (0.15.2b-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS by --add-missing to automake call (Closes: #818528) + + -- Paul Gevers Fri, 22 Apr 2016 21:58:24 +0200 + +madplay (0.15.2b-8) unstable; urgency=high + + * Fix buffer overflow in the alsa output code (Closes: #619341) + Thanks to Ben Winslow + * Only build with alsa on linux (Closes: #625649) + + -- Kurt Roeckx Sat, 07 Apr 2012 17:03:39 +0200 + +madplay (0.15.2b-7) unstable; urgency=low + + * Switch to automake1.11 (Closes: #541531) + + -- Kurt Roeckx Fri, 14 Aug 2009 20:00:10 +0200 + +madplay (0.15.2b-6) unstable; urgency=low + + * libtoolize no longer updates config.guess/sub, and cdbs's handling + got fixes a long time ago. Just let cdbs do it now. (Closes: #533968) + * Call automake with the --foreign option, so that we don't need + to create empty files that would be needed with --gnu. + * Enable ALSA support. (Closes: #494865) + * Configure options weren't working because: + - You need to tell it to cdbs after the includes + - :+= was being used to set the options. + * Add patch to handle some LAME tags. (Closes: #494866) + * Remove config.h.in in clean target. + * New libtool creates new files in diff, remove the in clean target. + * Set compat level to 5. cdbs autogenerates this, but it wasn't + under cvs control. + + -- Kurt Roeckx Sun, 21 Jun 2009 19:59:04 +0200 + +madplay (0.15.2b-5) unstable; urgency=low + + * Switch from automake1.8 to automake1.10. (Closes: #473335) + * Don't tell libtool to disable shared libraries. This results + in not linking to libaudiofile and libz. + * Update Clément Stenac email address to zorglub@debian.org + + -- Kurt Roeckx Sun, 30 Mar 2008 15:11:48 +0200 + +madplay (0.15.2b-4) unstable; urgency=low + + * Sam Clegg: + * debian/control: set new Maintainer: and Uploaders: + pkg-mad-maintainers@list.alioth.debian.org (Closes: #300095) + * debian/rules: convert to cdbs + * debian/control: depend to cdbs + * debian/madplay.files: replaced with madplay.install + (cdbs install target disabled.. but we could just let this + handle installing the files rather than use debhelper) + * Kurt Roeckx: + * Added autotools-dev, libtool, autoconf, automake1.8 build dependency + and regenerate all those files on build. + * Add -Werror to CFLAGS + * Corrected the copyright file. + * Fixed typo in the description of the package (Closes: #300052) + * Convert an ucs4 string to a wchar_t string first. id3_ucs4_t is + of type unsigned long while wchar_t of type int. (Closes: #295424) + * Install CREDITS files. + * Add a watch file. + + -- Sam Clegg Mon, 28 Mar 2005 22:14:59 +0100 + +madplay (0.15.2b-3.1) unstable; urgency=low + + * Orphaning this package, setting maintainer to QA. + + -- Kyle McMartin Thu, 17 Mar 2005 10:59:11 -0500 + +madplay (0.15.2b-3) unstable; urgency=low + + * Applied fixed patch from Tobias Diedrich, this fixes + a memory leak his previous patch caused. (closes: #276928) + + -- Kyle McMartin Tue, 19 Oct 2004 23:01:42 -0400 + +madplay (0.15.2b-2) unstable; urgency=low + + * Applied patch from Tobias Diedrich which fixes the display + of id3tags on non-iso8859-1 locales (ie: UTF-8). (closes: #276928). + + -- Kyle McMartin Sun, 17 Oct 2004 11:58:19 -0400 + +madplay (0.15.2b-1) unstable; urgency=low + + * New upstream version. + + -- Kyle McMartin Sat, 5 Jun 2004 19:23:28 -0400 + +madplay (0.15.0b-3) unstable; urgency=low + + * Add versioned dependency on libmad0(-dev) to fix FTBFS caused + by missing symbols. (closes: #200943) + + -- Kyle McMartin Sat, 12 Jul 2003 11:00:57 -0400 + +madplay (0.15.0b-2) unstable; urgency=low + + * Add versioned dependency on libid3tag0, as libid3tag0 < 0.15 did + not link against zlib. (closes: #199289) + + -- Kyle McMartin Sun, 29 Jun 2003 18:17:12 -0400 + +madplay (0.15.0b-1) unstable; urgency=low + + * New upstream version(s). + * Split package into each library, as upstream has done. + + -- Kyle McMartin Sat, 21 Jun 2003 14:21:42 -0400 + +mad (0.14.2b-7) unstable; urgency=low + + * Clean up some lintian warnings. + * Fixed id3tag.pc, accidently had -L instead of -I. + + -- Kyle McMartin Tue, 28 Jan 2003 09:45:02 -0500 + +mad (0.14.2b-6) unstable; urgency=medium + + * Updated config.* (closes: #168663) + + -- Kyle McMartin Thu, 14 Nov 2002 18:41:29 -0500 + +mad (0.14.2b-5) unstable; urgency=medium + + * Added build-dep on libesd0-dev, this should fix some + problems people have been having when using esd as the + output device... (closes: #150823) + + -- Kyle McMartin Wed, 06 Nov 2002 18:20:18 -0500 + +mad (0.14.2b-4) unstable; urgency=low + + * added pkgconfig entry, and dependancy on pkg-config. (closes: #144481) + + -- Kyle McMartin Mon, 05 Aug 2002 14:37:00 -0400 + +mad (0.14.2b-3) unstable; urgency=high + + * updated libid3tag0-dev depends to account for zlib1g-dev (closes: #142611) + + -- Kyle McMartin Thu, 18 Apr 2002 19:37:00 -0500 + +mad (0.14.2b-2) unstable; urgency=high + + * fix for the shlibs rc bug (closes: #136196) + + -- Kyle McMartin Thu, 28 Feb 2002 18:21:40 -0500 + +mad (0.14.2b-1) unstable; urgency=low + + * new upstream version + * new maintainer + * new version fixes enum (closes: #129178) + * closing old fixed bug [missing symlink to libmad.so.0] (closes: #119350) + + -- Kyle McMartin Wed, 16 Jan 2002 22:09:58 -0500 + +mad (0.14.1b-4) unstable; urgency=low + + * yet another stupid maintainer mistakes release + * fix the call to dh_makeshlibs, I neglected to add proper + arguments for the new libid3tag0 library (closes: #119146) + * now that the shlibs are sorted out, madplay will have the correct depends + (closes: #119792) + + -- Sean 'Shaleh' Perry Thu, 15 Nov 2001 22:11:24 -0800 + +mad (0.14.1b-3) unstable; urgency=medium + + * duh, id3tag's headers ended up in libmad-dev. Closes: #118625. + + -- Sean 'Shaleh' Perry Wed, 7 Nov 2001 13:45:53 -0800 + +mad (0.14.1b-2) unstable; urgency=medium + + * Added versioned depends info for piecemeal updaters. (Closes: #117646) + + -- Sean 'Shaleh' Perry Wed, 7 Nov 2001 08:10:42 -0800 + +mad (0.14.1b-1) unstable; urgency=low + + * reverted package name to libmad0(-dev). The upstream fixed it's SONAME + issues, yay. + * added libid3tag(-dev), the upstream now supports the installation of this + as a separate entity (closes: #116321) + * -dev packages are now in Section: devel (closes: #116710) + * supports DEB_BUILD_OPTIONS for debug (closes: #104013) + + -- Sean 'Shaleh' Perry Tue, 23 Oct 2001 11:08:53 -0700 + +mad (0.14.0b-3) unstable; urgency=low + + * added a conflicts on libmad0 to the lib and -dev packages, closes: #116581 + * updated config.{sub,guess}, closes: #116577 + + -- Sean 'Shaleh' Perry Sun, 21 Oct 2001 16:26:39 -0700 + +mad (0.14.0b-2) unstable; urgency=low + + * D'oh, not binary compatible. The every changing SONAME problem. + * chnaged library package name to match SONAME. This is horrible because + now I have to change the package name for every release. However there + is no alternative. closes: 116305. + + -- Sean 'Shaleh' Perry Fri, 19 Oct 2001 14:30:29 -0700 + +mad (0.14.0b-1) unstable; urgency=low + + * New upstream release + * source now build-depends on zlib + + -- Sean 'Shaleh' Perry Thu, 18 Oct 2001 21:59:28 -0700 + +mad (0.13.0b-2.1) unstable; urgency=low + * Run libtoolize to get support for new architectures. Closes: #96616 + + -- LaMont Jones Mon, 9 Jul 2001 21:39:34 -0600 + +mad (0.13.0b-2) unstable; urgency=low + + * Now build-depend on gettext (closes: #94964) + + -- Sean 'Shaleh' Perry Mon, 23 Apr 2001 11:29:21 -0700 + +mad (0.13.0b-1) unstable; urgency=low + + * new upstream release + * manpage cleaned up, Closes: #87165 + + -- Sean 'Shaleh' Perry Wed, 11 Apr 2001 18:40:08 -0700 + +mad (0.12.5b-1) unstable; urgency=low + + * New upstream, closes: #92825 + * updated upstream changelog + + -- Sean 'Shaleh' Perry Tue, 3 Apr 2001 15:11:05 -0700 + +mad (0.12.4b-1) unstable; urgency=low + + * New upstream version + + -- Sean 'Shaleh' Perry Mon, 12 Feb 2001 14:16:21 -0800 + +mad (0.12.3b-2) unstable; urgency=low + + * Oops, wrong section + * left off the Closes: #84103 + + -- Sean 'Shaleh' Perry Thu, 8 Feb 2001 12:17:12 -0800 + +mad (0.12.3b-1) unstable; urgency=low + + * New upstream version + * added a madplay package + + -- Sean 'Shaleh' Perry Wed, 7 Feb 2001 12:04:28 -0800 + +mad (0.11.4b-1) unstable; urgency=low + + * New upstream release + * added libmad0 package containing the shared library + + -- Sean 'Shaleh' Perry Mon, 2 Oct 2000 17:38:01 -0700 + +mad (0.11.0b-0) unstable; urgency=low + + * New upstream release + + -- Sean 'Shaleh' Perry Mon, 5 Jun 2000 14:25:39 -0700 + +mad (0.10.3b-0) unstable; urgency=low + + * New upstream release + + -- Sean 'Shaleh' Perry Thu, 1 Jun 2000 15:05:02 -0700 + +mad (0.10.2b-0) unstable; urgency=low + + * Initial Release. + + -- Sean 'Shaleh' Perry Tue, 23 May 2000 12:25:00 -0700 + + --- madplay-0.15.2b.orig/debian/compat +++ madplay-0.15.2b/debian/compat @@ -0,0 +1 @@ +5 --- madplay-0.15.2b.orig/debian/control +++ madplay-0.15.2b/debian/control @@ -0,0 +1,19 @@ +Source: madplay +Priority: optional +Section: sound +Build-Depends: cdbs, debhelper (>= 4.1.0), gettext, zlib1g-dev, libesd0-dev, libmad0-dev (>= 0.15.0), libid3tag0-dev (>= 0.15.0), autotools-dev, libtool, autoconf, automake1.11, libasound2-dev +Maintainer: Mad Maintainers +Uploaders: Sam Clegg , Kurt Roeckx , Clément Stenac +Standards-Version: 3.6.1 + +Package: madplay +Architecture: any +Section: sound +Depends: ${shlibs:Depends} +Description: MPEG audio player in fixed point + MAD is an MPEG audio decoder. It currently only supports the MPEG 1 + standard, but fully implements all three audio layers (Layer I, Layer II, + and Layer III, the latter often colloquially known as MP3.). There is also + full support for ID3 tags. + . + All work is done in fixed point, so it even works on machines without an FPU. --- madplay-0.15.2b.orig/debian/copyright +++ madplay-0.15.2b/debian/copyright @@ -0,0 +1,45 @@ +This package was debianized by Sean 'Shaleh' Perry on +Tue, 23 May 2000 12:25:00 -0700. + +It was downloaded from http://www.mars.org/home/rob/proj/mpeg/ + +Most of the program is copyright by Robert Leslie 2000-2004 +The depcomp file is copyright by Free Software Foundation, Inc. 1999, 2000 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The getopt.c and getopt1.c files are: + + The GNU C Library 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.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + --- madplay-0.15.2b.orig/debian/madplay.dirs +++ madplay-0.15.2b/debian/madplay.dirs @@ -0,0 +1 @@ +usr/bin --- madplay-0.15.2b.orig/debian/madplay.docs +++ madplay-0.15.2b/debian/madplay.docs @@ -0,0 +1 @@ +CREDITS --- madplay-0.15.2b.orig/debian/madplay.install +++ madplay-0.15.2b/debian/madplay.install @@ -0,0 +1 @@ +madplay /usr/bin --- madplay-0.15.2b.orig/debian/madplay.manpages +++ madplay-0.15.2b/debian/madplay.manpages @@ -0,0 +1 @@ +madplay.1 --- madplay-0.15.2b.orig/debian/patches/00_ucs4.diff +++ madplay-0.15.2b/debian/patches/00_ucs4.diff @@ -0,0 +1,119 @@ +Convert an ucs4 string to the current locale instead of to converting it +to "latin1". This should make it possible to display it on an UTF-8 locale. + +--- madplay-0.15.2b.orig/player.c ++++ madplay-0.15.2b/player.c +@@ -28,6 +28,8 @@ + # include + # include + # include ++# include ++ + + # ifdef HAVE_SYS_TYPES_H + # include +@@ -598,6 +600,77 @@ + return 0; + } + ++/* Note: id3_ucs4_length and id3_ucs4_size are duplicated from ++ * libid3tag because they are not exported. */ ++ ++/* ++ * NAME: ucs4->length() ++ * DESCRIPTION: return the number of ucs4 chars represented by a ucs4 string ++ */ ++id3_length_t id3_ucs4_length(id3_ucs4_t const *ucs4) ++{ ++ id3_ucs4_t const *ptr = ucs4; ++ ++ while (*ptr) ++ ++ptr; ++ ++ return ptr - ucs4; ++} ++ ++/* ++ * NAME: ucs4->size() ++ * DESCRIPTION: return the encoding size of a ucs4 string ++ */ ++id3_length_t id3_ucs4_size(id3_ucs4_t const *ucs4) ++{ ++ return id3_ucs4_length(ucs4) + 1; ++} ++ ++/* NAME: ucs4_to_wchar_strdup() ++ * DESCRIPTION: convert an ucs4 string to a wchar_t string ++ */ ++static ++wchar_t *ucs4_to_wchar_strdup(const id3_ucs4_t *ucs4) ++{ ++ id3_length_t size = id3_ucs4_size(ucs4); ++ wchar_t *s = malloc(size * sizeof(wchar_t)); ++ id3_length_t i; ++ ++ for (i = 0; i < size; i++) ++ { ++ s[i] = ucs4[i]; ++ } ++ return s; ++} ++ ++/* ++ * NAME: ucs4_to_locale_strdup() ++ * DESCRIPTION: convert ucs4 string to locale encoding ++ */ ++static ++char *ucs4_to_locale_strdup(const id3_ucs4_t *ucs4) ++#ifndef HAVE_WCSLEN ++{ ++ return id3_ucs4_latin1duplicate(ucs4); ++} ++#else ++{ ++ /* ++ * UTF8 is at most 5 bytes per character and should be the worst ++ * case encoding, so we use this here. ++ */ ++ wchar_t *ws = ucs4_to_wchar_strdup(ucs4); ++ int len = wcslen(ws)*5; ++ char *s = malloc(len); ++ ++ snprintf(s, len, "%ls", ws); ++ s[len - 1] = 0; ++ free(ws); ++ ++ return s; ++} ++#endif ++ + /* + * NAME: show_id3() + * DESCRIPTION: display ID3 tag information +@@ -652,7 +725,7 @@ + if (strcmp(info[i].id, ID3_FRAME_GENRE) == 0) + ucs4 = id3_genre_name(ucs4); + +- latin1 = id3_ucs4_latin1duplicate(ucs4); ++ latin1 = ucs4_to_locale_strdup(ucs4); + if (latin1 == 0) + goto fail; + +@@ -685,7 +758,7 @@ + ucs4 = id3_field_getfullstring(id3_frame_field(frame, 3)); + assert(ucs4); + +- latin1 = id3_ucs4_latin1duplicate(ucs4); ++ latin1 = ucs4_to_locale_strdup(ucs4); + if (latin1 == 0) + goto fail; + +@@ -1211,7 +1284,7 @@ + if (nstrings > 0) { + id3_latin1_t *latin1; + +- latin1 = id3_ucs4_latin1duplicate(id3_field_getstrings(field, 0)); ++ latin1 = ucs4_to_locale_strdup(id3_field_getstrings(field, 0)); + if (latin1) { + signed long ms; + --- madplay-0.15.2b.orig/debian/patches/01_shared.diff +++ madplay-0.15.2b/debian/patches/01_shared.diff @@ -0,0 +1,10 @@ +--- configure.ac.orig 2008-03-30 18:47:29.000000000 +0000 ++++ configure.ac 2008-03-30 18:47:41.000000000 +0000 +@@ -60,7 +60,6 @@ + + dnl Support for libtool. + +-AC_DISABLE_SHARED + AC_PROG_LIBTOOL + + AC_SUBST(LIBTOOL_DEPS) --- madplay-0.15.2b.orig/debian/patches/02_lame-tag.diff +++ madplay-0.15.2b/debian/patches/02_lame-tag.diff @@ -0,0 +1,24 @@ + +The following patch corrects a problem in madplay that can cause it to fail to +decode some frames encoded with LAME (ancillary data contains a LAME tag +marker, but without any tag data). + +Robert Leslie +20-Nov-2006 + + +--- player.c.orig 2006-11-20 00:42:12.609647678 -0800 ++++ player.c 2006-11-20 00:43:05.741871716 -0800 +@@ -1156,8 +1156,10 @@ + stream->next_frame - stream->this_frame) + player->stats.total_bytes -= frame_size; + +- return (player->options & PLAYER_OPTION_SHOWTAGSONLY) ? +- MAD_FLOW_STOP : MAD_FLOW_IGNORE; ++ if (player->options & PLAYER_OPTION_SHOWTAGSONLY) ++ return MAD_FLOW_STOP; ++ else if (tag->flags) ++ return MAD_FLOW_IGNORE; + } + else if (player->options & PLAYER_OPTION_SHOWTAGSONLY) + return MAD_FLOW_STOP; --- madplay-0.15.2b.orig/debian/patches/03_alsa-bufsize-fix.diff +++ madplay-0.15.2b/debian/patches/03_alsa-bufsize-fix.diff @@ -0,0 +1,20 @@ +--- madplay-0.15.2b.orig/audio_alsa.c 2004-02-23 16:35:23.000000000 -0500 ++++ madplay-0.15.2b/audio_alsa.c 2012-04-04 00:07:44.965023179 -0400 +@@ -241,7 +241,7 @@ + return -1; + } + +- buf = malloc(buffer_size); ++ buf = malloc(MAX_NSAMPLES * 4 * 2); + if (buf == NULL) { + audio_error="unable to allocate output buffer table"; + return -1; +@@ -343,6 +343,8 @@ + audio_error = snd_strerror(err); + return -1; + } ++ ++ free(buf); + + return 0; + --- madplay-0.15.2b.orig/debian/rules +++ madplay-0.15.2b/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_AUTO_UPDATE_LIBTOOL:=pre +DEB_AUTO_UPDATE_ACLOCAL:=1.11 +DEB_AUTO_UPDATE_AUTOHEADER:=1.11 +DEB_AUTO_UPDATE_AUTOMAKE:=1.11 +DEB_AUTO_UPDATE_AUTOCONF:=yes +DEB_AUTOMAKE_ARGS:=--foreign --add-missing + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_MAKE_INSTALL_TARGET:= + +ifeq (linux, $(DEB_HOST_ARCH_OS)) +DEB_CONFIGURE_EXTRA_FLAGS:=--with-alsa +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-profiling --enable-debugging +endif + +clean:: + # Remove auto generated / updated files so they don't show in the + # the diff. + -rm m4/Makefile.in Makefile.in msvc++/Makefile.in + -rm aclocal.m4 configure ltmain.sh config.h.in + -rm -r autom4te.cache + -rm m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 + -rm m4/lt~obsolete.m4 + +post-patches:: + # touch aclocal.m4 so we have that file and cdbs regenerates it. + touch aclocal.m4 + --- madplay-0.15.2b.orig/debian/watch +++ madplay-0.15.2b/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.mars.org/mpeg/madplay-(.*)\.tar\.gz debian uupdate