[SCM] lame/master: Update get orig source script to create orig tarball for new release. Include patches of original source in debian/patches.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Dec 11 17:28:36 UTC 2011
The following commit has been merged in the master branch:
commit d7fcb30951ff67d40443262e66256526d324c0a0
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Dec 11 09:24:14 2011 -0500
Update get orig source script to create orig tarball for new release.
Include patches of original source in debian/patches.
diff --git a/debian/lame-get-orig-source b/debian/lame-get-orig-source
index ed41cd6..f5c512c 100755
--- a/debian/lame-get-orig-source
+++ b/debian/lame-get-orig-source
@@ -4,10 +4,10 @@ set -e
# Script used to generate the orig source tarball for lame.
-LAME_UPSTREAM_VERSION="3.98.4"
-LAME_DOWNLOAD_URL="http://downloads.sourceforge.net/project/lame/lame/${LAME_UPSTREAM_VERSION}/lame-${LAME_UPSTREAM_VERSION}.tar.gz"
-LAME_VERSION="${LAME_UPSTREAM_VERSION}+repack2"
-LAME_TARBALL_CHECKSUM="ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8"
+LAME_UPSTREAM_VERSION="3.99.3"
+LAME_DOWNLOAD_URL="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_UPSTREAM_VERSION}.tar.gz"
+LAME_VERSION="${LAME_UPSTREAM_VERSION}+repack1"
+LAME_TARBALL_CHECKSUM="d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf"
# Download and verify lame upstream tarball
test -f "lame-${LAME_UPSTREAM_VERSION}.tar.gz" || wget -c "${LAME_DOWNLOAD_URL}"
@@ -21,1487 +21,14 @@ else
fi
tar -xzf "lame-${LAME_UPSTREAM_VERSION}.tar.gz"
rm -rf "lame-${LAME_VERSION}"
-mv "lame-${LAME_UPSTREAM_VERSION}" "lame-${LAME_VERSION}"
+mv "lame-${LAME_UPSTREAM_VERSION}" "lame-${LAME_VERSION}"
cd "lame-${LAME_VERSION}"
-# Modify build system to remove AM_PATH_GTK and debian directory.
-# Also insert build fix for arm.
-sed -i 's/AM_PATH_GTK/dnl AM_PATH_GTK/g' "configure.in"
-sed -i 's/@GTK_CFLAGS@ //g' "frontend/Makefile.am"
-sed -i 's/debian //g' "Makefile.am"
-sed -i 's/debian\/Makefile //g' "configure.in"
-sed -i 's/ -static//g' "frontend/Makefile.am"
+# Modify build system to remove debian directory and include GTK-1 autoconf
+# directives.
rm -rf "debian/"
-
-TMP="$(mktemp)"
-cat >"$TMP" <<EOF
---- a/configure.in
-+++ b/configure.in
-@@ -918,6 +918,13 @@
- OPTIMIZATION="\${OPTIMIZATION} -march=generic \\
- -mtune=native"
- ;;
-+ arm*-gnueabi)
-+ if [ -z "\$(echo \${GCC_version} | awk '/4\.0/')" ]; then
-+ # Work round buggy softfloat optimization in ARM EABI compilers
-+ # -gnueabi in only gcc-4.1 onwards
-+ OPTIMIZATION="\${OPTIMIZATION} -fno-finite-math-only"
-+ fi
-+ ;;
- esac
- ;;
- *)
-EOF
-patch -p1 <"$TMP"
-
-# Patching in all LGPL clarification changes from upstream.
-cat >"$TMP" <<EOF
---- a/README
-+++ b/README
-@@ -1,26 +1,29 @@
-- LAME 3.xx
-+ LAME 3.xx
- LAME Ain't an MP3 Encoder
-- http://www.mp3dev.org
-- March 2001
-+ http://lame.sf.net
-+ May 2011
-
--Originally developed by Mike Cheng (www.uq.net.au/~zzmcheng). Now
--maintained by Mark Taylor (www.mp3dev.org).
-+Originally developed by Mike Cheng (www.uq.net.au/~zzmcheng) and was
-+latter developed by Mark Taylor (www.mp3dev.org). Currently maintained
-+by The LAME Project.
-
--This code is distributed under the GNU LESSER PUBLIC LICENSE
--(LGPL, see www.gnu.org) with the following modification:
-+This code is distributed under the GNU LIBRARY GENERAL PUBLIC LICENSE
-+(LGPL, see www.gnu.org), version 2.
-
--1. If you determine that distribution of LAME requires a patent license,
-- and you obtain a patent license, you may distribute LAME even though
-- redistribution of LAME may also require a patent license.
--
--2. You agree not to enforce any patent claims for any aspect of
-- MPEG audio compression, or any other techniques contained in
-- the LAME source code.
-+As LAME may contain software for which some companies may claim software
-+patents, if you are in a location where software patents are recognized, it is
-+suggested that you seek legal advice before deploying and/or redistributing
-+LAME.
-
-+In particular, it is suggested to visit
-+
-+ http://www.mp3licensing.com/
-+
-+if it applies to your jurisdiction.
-
- ============================================================================
-
--see the file "INSTALL" for installation (compiling) instructions.
-+see the file "INSTALL" for installation (compiling) instructions.
- see the file "USAGE" for the most up-to-date guide to the command line options.
- see the file "LICENSE" for details on how to use LAME in non-GPL programs.
- see the file "HACKING" if you are interested in working on LAME
-@@ -33,11 +36,9 @@
- LAME uses the MPGLIB decoding engine, from the MPG123 package, written
- by: Michael Hipp (www.mpg123.de) MPGLIB is released under the GPL.
-
--Copyrights (c) 1999-1007 by The LAME Project
--Copyrights (c) 1999,2000,2001 by Mark Taylor
-+Copyrights (c) 1999-2011 by The LAME Project
- Copyrights (c) 1999,2000,2001 by Mark Taylor
- Copyrights (c) 1998 by Michael Cheng
- Copyrights (c) 1995,1996,1997 by Michael Hipp: mpglib
-
--As well as additional copyrights as documented in the source code.
--
-+As well as additional copyrights as documented in the source code.
---- a/frontend/brhist.c
-+++ b/frontend/brhist.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/brhist.h
-+++ b/frontend/brhist.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/get_audio.c
-+++ b/frontend/get_audio.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Albert L Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/get_audio.h
-+++ b/frontend/get_audio.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Albert L Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/gpkplotting.c
-+++ b/frontend/gpkplotting.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/gpkplotting.h
-+++ b/frontend/gpkplotting.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/gtkanal.c
-+++ b/frontend/gtkanal.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/gtkanal.h
-+++ b/frontend/gtkanal.h
-@@ -1,7 +1,7 @@
- /*
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -10,7 +10,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/lametime.c
-+++ b/frontend/lametime.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/lametime.h
-+++ b/frontend/lametime.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/main.c
-+++ b/frontend/main.c
-@@ -5,7 +5,7 @@
- * 2000 Takehiro TOMINAGA
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/main.h
-+++ b/frontend/main.h
-@@ -5,7 +5,7 @@
- * 2000 Takehiro TOMIANGA
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/parse.c
-+++ b/frontend/parse.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/timestatus.c
-+++ b/frontend/timestatus.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/timestatus.h
-+++ b/frontend/timestatus.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/include/lame.h
-+++ b/include/lame.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/VbrTag.c
-+++ b/libmp3lame/VbrTag.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2001 Jonathan Dee
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/VbrTag.h
-+++ b/libmp3lame/VbrTag.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/bitstream.c
-+++ b/libmp3lame/bitstream.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 1999-2002 Takehiro Tominaga
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/bitstream.h
-+++ b/libmp3lame/bitstream.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Takehiro TOMINAGA
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/encoder.c
-+++ b/libmp3lame/encoder.c
-@@ -8,7 +8,7 @@
- * Copyright (c) 2001 John Dahlstrom
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -17,7 +17,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/encoder.h
-+++ b/libmp3lame/encoder.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/fft.h
-+++ b/libmp3lame/fft.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/id3tag.c
-+++ b/libmp3lame/id3tag.c
-@@ -4,7 +4,7 @@
- * Copyright (C) 2000 Don Melton.
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
---- a/libmp3lame/l3side.h
-+++ b/libmp3lame/l3side.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/lame-analysis.h
-+++ b/libmp3lame/lame-analysis.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/lame.c
-+++ b/libmp3lame/lame.c
-@@ -9,7 +9,7 @@
- * Copyright (c) 2000-2004 Alexander Leidinger
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -18,7 +18,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/machine.h
-+++ b/libmp3lame/machine.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/mpglib_interface.c
-+++ b/libmp3lame/mpglib_interface.c
-@@ -7,7 +7,7 @@
- * Copyright (c) 2008 Robert Hegemann
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -16,7 +16,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/newmdct.c
-+++ b/libmp3lame/newmdct.c
-@@ -5,7 +5,7 @@
- *
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
---- a/libmp3lame/newmdct.h
-+++ b/libmp3lame/newmdct.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Takehiro TOMINAGA
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
---- a/libmp3lame/presets.c
-+++ b/libmp3lame/presets.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2007-2008 Robert Hegemann
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
---- a/libmp3lame/psymodel.c
-+++ b/libmp3lame/psymodel.c
-@@ -9,7 +9,7 @@
- * Copyright (c) 2000-2005 Alexander Leidinger
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -18,7 +18,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/psymodel.h
-+++ b/libmp3lame/psymodel.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
---- a/libmp3lame/quantize.c
-+++ b/libmp3lame/quantize.c
-@@ -7,7 +7,7 @@
- * Copyright (c) 2001-2005 Gabriel Bouvigne
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -16,7 +16,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/quantize.h
-+++ b/libmp3lame/quantize.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/quantize_pvt.c
-+++ b/libmp3lame/quantize_pvt.c
-@@ -7,7 +7,7 @@
- * Copyright (c) 2002-2005 Gabriel Bouvigne
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -16,7 +16,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/quantize_pvt.h
-+++ b/libmp3lame/quantize_pvt.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Takehiro TOMINAGA
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/reservoir.c
-+++ b/libmp3lame/reservoir.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999-2000 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/reservoir.h
-+++ b/libmp3lame/reservoir.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/set_get.c
-+++ b/libmp3lame/set_get.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2001-2005 Alexander Leidinger
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/set_get.h
-+++ b/libmp3lame/set_get.h
-@@ -4,7 +4,7 @@
- * Copyright (C) 2003 Gabriel Bouvigne / Lame project
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
---- a/libmp3lame/tables.c
-+++ b/libmp3lame/tables.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Albert L Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/tables.h
-+++ b/libmp3lame/tables.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Albert L Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/takehiro.c
-+++ b/libmp3lame/takehiro.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2002-2005 Gabriel Bouvigne
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/util.c
-+++ b/libmp3lame/util.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2000-2005 Alexander Leidinger
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/util.h
-+++ b/libmp3lame/util.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Albert L Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/vbrquantize.c
-+++ b/libmp3lame/vbrquantize.c
-@@ -5,7 +5,7 @@
- * Copyright (c) 2000-2007 Robert Hegemann
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -14,7 +14,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/vbrquantize.h
-+++ b/libmp3lame/vbrquantize.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 Mark Taylor
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/version.c
-+++ b/libmp3lame/version.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/version.h
-+++ b/libmp3lame/version.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 1999 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/vector/lame_intrin.h
-+++ b/libmp3lame/vector/lame_intrin.h
-@@ -4,7 +4,7 @@
- * Copyright (c) 2006 Gabriel Bouvigne
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/libmp3lame/vector/xmm_quantize_sub.c
-+++ b/libmp3lame/vector/xmm_quantize_sub.c
-@@ -4,7 +4,7 @@
- * Copyright (c) 2005-2006 Gabriel Bouvigne
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
-@@ -13,7 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/mp3rtp.c
-+++ b/frontend/mp3rtp.c
-@@ -1,3 +1,27 @@
-+/*
-+ * mp3rtp command line frontend program
-+ *
-+ * initially contributed by Felix von Leitner
-+ *
-+ * Copyright (c) 2000 Mark Taylor
-+ * 2010 Robert Hegemann
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
- /* \$Id: mp3rtp.c,v 1.25.8.1 2008/08/05 14:16:06 robert Exp $ */
-
- /* Still under work ..., need a client for test, where can I get one? */
---- a/Dll/BladeMP3EncDLL.c
-+++ b/Dll/BladeMP3EncDLL.c
-@@ -4,16 +4,16 @@
- * Copyright (c) 1999 - 2002 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
--* modify it under the terms of the GNU Lesser General Public
-+* modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This 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.
-+* Library General Public License for more details.
- *
--* You should have received a copy of the GNU Lesser General Public
-+* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/Dll/BladeMP3EncDLL.h
-+++ b/Dll/BladeMP3EncDLL.h
-@@ -5,16 +5,16 @@
- * Based on bladedll.h version 1.0 written by Jukka Poikolainen
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This 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.
-+ * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/Dll/Example.cpp
-+++ b/Dll/Example.cpp
-@@ -4,16 +4,16 @@
- * Copyright (c) 2000 A.L. Faber
- *
- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-+ * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This 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.
-+ * Library General Public License for more details.
- *
-- * You should have received a copy of the GNU Lesser General Public
-+ * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
---- a/frontend/rtp.c
-+++ b/frontend/rtp.c
-@@ -1,3 +1,27 @@
-+/*
-+ * rtp socket communication functions
-+ *
-+ * initially contributed by Felix von Leitner
-+ *
-+ * Copyright (c) 2000 Mark Taylor
-+ * 2010 Robert Hegemann
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
- /* \$Id: rtp.c,v 1.16.8.1 2008/08/05 14:16:06 robert Exp $ */
-
- #ifdef HAVE_CONFIG_H
---- a/frontend/rtp.h
-+++ b/frontend/rtp.h
-@@ -1,3 +1,27 @@
-+/*
-+ * rtp socket communication include file
-+ *
-+ * initially contributed by Felix von Leitner
-+ *
-+ * Copyright (c) 2000 Mark Taylor
-+ * 2010 Robert Hegemann
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This 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
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
- #ifndef LAME_RTP_H
- #define LAME_RTP_H
-
-EOF
-patch -p1 <"$TMP"
-
-# Removing LICENSE file as COPYING file has LGPL-2 text.
-rm -f "LICENSE"
-
-# Replace portableio code.
-rm -f "frontend/portableio.c"
-cat >"$TMP" <<EOF
-/* Simple I/O Function header file
- *
- * Copyright (C) 2011 Andres Mejia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LAME_PORTABLEIO_H
-#define LAME_PORTABLEIO_H
-
-#include <stdio.h>
-#include <stdint.h>
-#include <math.h>
-
-#include "config.h"
-
-static inline int ReadByte(FILE * fp)
-{
- int val = (getc(fp)) & 0xFF;
- return (val & 0x80) ? (val - 0x100) & 0xFF : val;
-}
-
-static inline int Read16BitsLowHigh(FILE * fp)
-{
- int val = ReadByte(fp);
- val |= ReadByte(fp) << 8;
- return (val & 0x8000) ? (val - 0x10000) & 0xFFFF : val;
-}
-
-static inline int Read16BitsHighLow(FILE * fp)
-{
- int val = (ReadByte(fp) << 8) | ReadByte(fp);
- return (val & 0x8000) ? (val - 0x10000) & 0xFFFF : val;
-}
-
-static inline void Write8Bits(FILE * fp, int i)
-{
- putc(i & 0xFF, fp);
-}
-
-static inline void Write16BitsLowHigh(FILE * fp, int i)
-{
- Write8Bits(fp, i & 0xFF);
- Write8Bits(fp, (i >> 8) & 0xFF);
-}
-
-static inline void Write16BitsHighLow(FILE * fp, int i)
-{
- Write8Bits(fp, (i >> 8) & 0xFF);
- Write8Bits(fp, i & 0xFF);
-}
-
-static inline int Read24BitsHighLow(FILE * fp)
-{
- int val = (ReadByte(fp) << 16) | (ReadByte(fp) << 8) | ReadByte(fp);
- return (val & 0x800000) ? (val - 0x1000000) & 0xFFFFFF : val;
-}
-
-static inline int Read32Bits(FILE * fp)
-{
- int val = Read16BitsLowHigh(fp);
- val |= Read16BitsLowHigh(fp) << 16;
- return val;
-}
-
-static inline int Read32BitsHighLow(FILE * fp)
-{
- return (Read16BitsHighLow(fp) << 16) | Read16BitsHighLow(fp);
-}
-
-static inline void Write32Bits(FILE * fp, int i)
-{
- Write16BitsLowHigh(fp, i & 0xFFFF);
- Write16BitsLowHigh(fp, (i >> 16) & 0xFFFF);
-}
-
-static inline void Write32BitsHighLow(FILE * fp, int i)
-{
- Write16BitsHighLow(fp, (i >> 16) & 0xFFFF);
- Write16BitsHighLow(fp, i & 0xFFFF);
-}
-
-static inline void ReadBytes(FILE * fp, char *p, int n)
-{
- while (!feof(fp) && (n-- > 0))
- *p++ = ReadByte(fp);
- while (n-- > 0)
- *p++ = 0;
-}
-
-static inline void ReadBytesSwapped(FILE * fp, char *p, int n)
-{
- char *tmp = p;
- while (!feof(fp) && (n-- > 0))
- *tmp++ = ReadByte(fp);
- while (n-- > 0)
- *tmp++ = 0;
- tmp--;
- while (p < tmp)
- {
- n = *p;
- *p++ = *tmp;
- *tmp-- = n;
- }
-}
-
-static inline void WriteBytes(FILE * fp, char *p, int n)
-{
- while (n-- > 0)
- Write8Bits(fp, *p++);
-}
-
-static inline void WriteBytesSwapped(FILE * fp, char *p, int n)
-{
- p += n;
- while (n-- > 0)
- Write8Bits(fp, *p--);
-}
-
-static inline long double BytesToLongDouble(void *d)
-{
- long double val = *((long double *)d);
- return val;
-}
-
-static inline double ReadIeeeExtendedHighLow(FILE * fp)
-{
- char bytes[10];
-#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-#ifdef WORDS_BIGENDIAN
- ReadBytes(fp, bytes, sizeof(bytes));
-#else
- ReadBytesSwapped(fp, bytes, sizeof(bytes));
-#endif
- /* Take advantage of 80-bit precision of long double from GNU C compiler */
- return BytesToLongDouble(&bytes);
-#else
- ReadBytes(fp, &bytes, sizeof(bytes));
- double val;
- uint32_t mantissa_high, mantissa_low;
- int16_t exponent;
- exponent = ((bytes[0] & 0x7F) << 8) | bytes[1];
- mantissa_high = (bytes[2] << 24) |
- (bytes[3] << 16) |
- (bytes[4] << 8) |
- bytes[5];
- mantissa_low = (bytes[6] << 24) |
- (bytes[7] << 16) |
- (bytes[8] << 8) |
- bytes[9];
- if (exponent == 0 && mantissa_high == 0 && mantissa_low == 0)
- val = 0;
- else
- {
- /* TODO: Perhaps this should also detect NaN */
- if (exponent == 0x7FFF)
- val = HUGE_VAL;
- else
- {
- exponent -= 0x3FFF; /* Bias for long double precision */
- val = ldexp(mantissa_high, (exponent -= 31));
- val += ldexp(mantissa_low, (exponent -= 32));
- }
- }
- return (bytes[0] & 0x80) ? -val : val;
-#endif
-}
-
-#define Read32BitsLowHigh(f) Read32Bits(f)
-#define Write32BitsLowHigh(f, i) Write32Bits(f, i)
-
-#endif
-EOF
-mv -f "$TMP" "frontend/portableio.h"
-sed -i 's/^.*portableio.c.*$/\t\\/g' "frontend/Makefile.am"
-
+patch -p1 <"../$(dirname $0)/patches/debian-as-extra-dist.patch"
+patch -p1 <"../$(dirname $0)/patches/gtk1-ac-directives.patch"
autoreconf -vif
cd ..
diff --git a/debian/patches/debian-as-extra-dist.patch b/debian/patches/debian-as-extra-dist.patch
new file mode 100644
index 0000000..5487ef5
--- /dev/null
+++ b/debian/patches/debian-as-extra-dist.patch
@@ -0,0 +1,37 @@
+Description: Include debian as extra directory instead of directory part of
+ subdirectories used in build.
+Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
+
+diff --git a/Makefile.am b/Makefile.am
+index 3379849..ae646f9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.global
+
+ .PHONY: test
+
+-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
++SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
+ mac macosx vc_solution
+
+ CLEANFILES = testcase.new.mp3
+@@ -22,6 +22,7 @@ EXTRA_DIST = \
+ STYLEGUIDE \
+ USAGE \
+ configMS.h \
++ debian \
+ lame.bat \
+ lame.spec.in \
+ lame.spec \
+diff --git a/configure.in b/configure.in
+index a83666a..d52c542 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1147,6 +1147,6 @@ AC_SUBST(CPUCCODE)
+
+ AC_SUBST(CONFIG_DEFS)
+
+-AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile])
++AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile])
+
+ AC_OUTPUT
diff --git a/debian/patches/gtk1-ac-directives.patch b/debian/patches/gtk1-ac-directives.patch
new file mode 100644
index 0000000..035b854
--- /dev/null
+++ b/debian/patches/gtk1-ac-directives.patch
@@ -0,0 +1,205 @@
+Description: Include GTK-1 autoconf directives in build system.
+Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 0b8f869..eef0c3d 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -85,4 +85,197 @@ int main(void)
+ [AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)]
+ )])]) # alex_IEEE854_FLOAT80
+
++# Configure paths for GTK+
++# Owen Taylor 97-11-3
+
++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
++dnl
++AC_DEFUN([AM_PATH_GTK],
++[dnl
++dnl Get the cflags and libraries from the gtk-config script
++dnl
++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
++ gtk_config_prefix="$withval", gtk_config_prefix="")
++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
++ , enable_gtktest=yes)
++
++ for module in . $4
++ do
++ case "$module" in
++ gthread)
++ gtk_config_args="$gtk_config_args gthread"
++ ;;
++ esac
++ done
++
++ if test x$gtk_config_exec_prefix != x ; then
++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
++ if test x${GTK_CONFIG+set} != xset ; then
++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++ fi
++ fi
++ if test x$gtk_config_prefix != x ; then
++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
++ if test x${GTK_CONFIG+set} != xset ; then
++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++ fi
++ fi
++
++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++ min_gtk_version=ifelse([$1], ,0.99.7,$1)
++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
++ no_gtk=""
++ if test "$GTK_CONFIG" = "no" ; then
++ no_gtk=yes
++ else
++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_gtktest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $GTK_CFLAGS"
++ LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK is sufficiently new. (Also sanity
++dnl checks the results of gtk-config to some extent
++dnl
++ rm -f conf.gtktest
++ AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int
++main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.gtktest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = g_strdup("$min_gtk_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_gtk_version");
++ exit(1);
++ }
++
++ if ((gtk_major_version != $gtk_config_major_version) ||
++ (gtk_minor_version != $gtk_config_minor_version) ||
++ (gtk_micro_version != $gtk_config_micro_version))
++ {
++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ printf ("*** was found! If gtk-config was correct, then it is best\n");
++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
++ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++ (gtk_minor_version != GTK_MINOR_VERSION) ||
++ (gtk_micro_version != GTK_MICRO_VERSION))
++ {
++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++ printf("*** library (version %d.%d.%d)\n",
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ }
++#endif /* defined (GTK_MAJOR_VERSION) ... */
++ else
++ {
++ if ((gtk_major_version > major) ||
++ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++ major, minor, micro);
++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
++ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_gtk" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$GTK_CONFIG" = "no" ; then
++ echo "*** The gtk-config script installed by GTK could not be found"
++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the GTK_CONFIG environment variable to the"
++ echo "*** full path to gtk-config."
++ else
++ if test -f conf.gtktest ; then
++ :
++ else
++ echo "*** Could not run GTK test program, checking why..."
++ CFLAGS="$CFLAGS $GTK_CFLAGS"
++ LIBS="$LIBS $GTK_LIBS"
++ AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding GTK or finding the wrong"
++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"
++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++ echo "*** came with the system with the command"
++ echo "***"
++ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
++ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ GTK_CFLAGS=""
++ GTK_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(GTK_CFLAGS)
++ AC_SUBST(GTK_LIBS)
++ rm -f conf.gtktest
++])
--
lame packaging
More information about the pkg-multimedia-commits
mailing list