[SCM] lame/master: Refresh all patches, remove patches applied upstreamed.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Dec 11 17:28:38 UTC 2011
The following commit has been merged in the master branch:
commit 358c309c58daee3393a1262928a7033279f57ddb
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Dec 11 11:01:14 2011 -0500
Refresh all patches, remove patches applied upstreamed.
diff --git a/debian/patches/04-exec-stac.patch b/debian/patches/04-exec-stac.patch
deleted file mode 100644
index 4b9a364..0000000
--- a/debian/patches/04-exec-stac.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: New patch from Russell Coker to disable executable stack.
- This patch is from Marillat's package.
-Origin: other
-Forwarded: commit:1.6
-Applied-Upstream: commit:1.6
-
---- a/libmp3lame/i386/nasm.h
-+++ b/libmp3lame/i386/nasm.h
-@@ -18,6 +18,8 @@
-
- BITS 32
-
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+
- %ifdef YASM
- %define segment_code segment .text align=16 use32
- %define segment_data segment .data align=16 use32
diff --git a/debian/patches/06-sndfile-stdin.patch b/debian/patches/06-sndfile-stdin.patch
deleted file mode 100644
index 09ed2c8..0000000
--- a/debian/patches/06-sndfile-stdin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Support reading from stdin with sndfile
-Author: Naohiro Aota <naota at elisp.net>
-Acked-by: Jérôme Poulin <jeromepoulin at gmail.com>
-Origin: http://bugs.gentoo.org/attachment.cgi?id=194905&action=view
-Bug: http://bugs.gentoo.org/show_bug.cgi?id=274255
-Forwarded: not-needed,
- this code has been removed from current upstream CVS as per revision 1.146
-
---- a/frontend/get_audio.c
-+++ b/frontend/get_audio.c
-@@ -606,12 +606,17 @@
- }
- #endif
- #ifdef HAVE_MPGLIB
-- if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
-+ if (!strcmp(lpszFileName, "-")) {
-+ lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */
-+ }
-+ else {
-+ if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
- if (silent < 10) {
-- error_printf("Could not find \"%s\".\n", lpszFileName);
-+ error_printf("Could not find \"%s\".\n", lpszFileName);
- }
- exit(1);
-- }
-+ }
-+ }
- if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) {
- if (silent < 10) {
- error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch
index 991e618..2801e5f 100644
--- a/debian/patches/07-field-width-fix.patch
+++ b/debian/patches/07-field-width-fix.patch
@@ -6,7 +6,7 @@ Applied-Upstream: commit:1.282
--- a/frontend/parse.c
+++ b/frontend/parse.c
-@@ -500,11 +500,11 @@
+@@ -369,11 +369,11 @@
const char *b = get_lame_os_bitness();
const char *v = get_lame_version();
const char *u = get_lame_url();
diff --git a/debian/patches/alpha-build-fix.patch b/debian/patches/alpha-build-fix.patch
index 1aa5853..a4fa834 100644
--- a/debian/patches/alpha-build-fix.patch
+++ b/debian/patches/alpha-build-fix.patch
@@ -3,7 +3,7 @@ Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=deb
--- a/configure.in
+++ b/configure.in
-@@ -27,6 +27,11 @@
+@@ -28,6 +28,11 @@
dnl automake
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
@@ -28,7 +28,7 @@ Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=deb
/* debug define */
#undef ABORTFP
-@@ -373,3 +378,5 @@
+@@ -367,3 +372,5 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
@@ -36,7 +36,7 @@ Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=deb
+#endif /* LAME_CONFIG_H */
--- a/configure
+++ b/configure
-@@ -3088,6 +3088,8 @@
+@@ -3101,6 +3101,8 @@
ac_config_headers="$ac_config_headers config.h"
diff --git a/debian/patches/license-ouput-change.patch b/debian/patches/license-ouput-change.patch
deleted file mode 100644
index bf800c7..0000000
--- a/debian/patches/license-ouput-change.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Print simple license information.
-Origin: upstream
-Forwarded: commit:1.284
-Applied-Upstream: commit:1.284
-
---- a/frontend/parse.c
-+++ b/frontend/parse.c
-@@ -531,39 +531,24 @@
- { /* print version & license */
- lame_version_print(fp);
- fprintf(fp,
-- "Can I use LAME in my commercial program?\n"
-+ "Copyright (c) 1999-2011 by The LAME Project\n"
-+ "Copyright (c) 1999,2000,2001 by Mark Taylor\n"
-+ "Copyright (c) 1998 by Michael Cheng\n"
-+ "Copyright (c) 1995,1996,1997 by Michael Hipp: mpglib\n" "\n");
-+ fprintf(fp,
-+ "This library is free software; you can redistribute it and/or\n"
-+ "modify it under the terms of the GNU Library General Public\n"
-+ "License as published by the Free Software Foundation; either\n"
-+ "version 2 of the License, or (at your option) any later version.\n"
- "\n"
-- "Yes, you can, under the restrictions of the LGPL. In particular, you\n"
-- "can include a compiled version of the LAME library (for example,\n"
-- "lame.dll) with a commercial program. Some notable requirements of\n"
-- "the LGPL:\n" "\n");
-- fprintf(fp,
-- "1. In your program, you cannot include any source code from LAME, with\n"
-- " the exception of files whose only purpose is to describe the library\n"
-- " interface (such as lame.h).\n" "\n");
-- fprintf(fp,
-- "2. Any modifications of LAME must be released under the LGPL.\n"
-- " The LAME project (www.mp3dev.org) would appreciate being\n"
-- " notified of any modifications.\n" "\n");
-- fprintf(fp,
-- "3. You must give prominent notice that your program is:\n"
-- " A. using LAME (including version number)\n"
-- " B. LAME is under the LGPL\n"
-- " C. Provide a copy of the LGPL. (the file COPYING contains the LGPL)\n"
-- " D. Provide a copy of LAME source, or a pointer where the LAME\n"
-- " source can be obtained (such as www.mp3dev.org)\n"
-- " An example of prominent notice would be an \"About the LAME encoding engine\"\n"
-- " button in some pull down menu within the executable of your program.\n" "\n");
-- fprintf(fp,
-- "4. If you determine that distribution of LAME requires a patent license,\n"
-- " you must obtain such license.\n" "\n" "\n");
-- fprintf(fp,
-- "*** IMPORTANT NOTE ***\n"
-+ "This library is distributed in the hope that it will be useful,\n"
-+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
-+ "Library General Public License for more details.\n"
- "\n"
-- "The decoding functions provided in LAME use the mpglib decoding engine which\n"
-- "is under the GPL. They may not be used by any program not released under the\n"
-- "GPL unless you obtain such permission from the MPG123 project (www.mpg123.de).\n"
-- "\n");
-+ "You should have received a copy of the GNU Library General Public\n"
-+ "License along with this program. If not, see\n"
-+ "<http://www.gnu.org/licenses/>.\n");
- return 0;
- }
-
diff --git a/debian/patches/parallel-builds-fix.patch b/debian/patches/parallel-builds-fix.patch
index 5bf137a..6a43e31 100644
--- a/debian/patches/parallel-builds-fix.patch
+++ b/debian/patches/parallel-builds-fix.patch
@@ -11,11 +11,11 @@ Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches
am_liblameasmroutines_la_OBJECTS = \
choose_table$U.lo \
cpu_feat$U.lo \
-@@ -52,11 +53,10 @@
+@@ -53,11 +54,10 @@
$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
.nas.lo: $< nasm.h
-- test -d .libs || mkdir .libs
+- mkdir -p .libs
$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
- $(ECHO) "pic_object='.libs/$*.o'" >>$@
- $(ECHO) "non_pic_object='.libs/$*.o'" >>$@
@@ -28,7 +28,7 @@ Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/libmp3lame/i386/Makefile.in
+++ b/libmp3lame/i386/Makefile.in
-@@ -213,6 +213,7 @@
+@@ -218,6 +218,7 @@
@HAVE_NASM_TRUE at noinst_LTLIBRARIES = liblameasmroutines.la
@HAVE_NASM_TRUE at liblameasmroutines_la_SOURCES = $(nasm_sources)
@@ -36,11 +36,11 @@ Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches
@HAVE_NASM_TRUE at am_liblameasmroutines_la_OBJECTS = \
@HAVE_NASM_TRUE@ choose_table$U.lo \
@HAVE_NASM_TRUE@ cpu_feat$U.lo \
-@@ -515,11 +516,10 @@
+@@ -521,11 +522,10 @@
$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
.nas.lo: $< nasm.h
-- test -d .libs || mkdir .libs
+- mkdir -p .libs
$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
- $(ECHO) "pic_object='.libs/$*.o'" >>$@
- $(ECHO) "non_pic_object='.libs/$*.o'" >>$@
diff --git a/debian/patches/portableio-compiler-warning-fix.patch b/debian/patches/portableio-compiler-warning-fix.patch
deleted file mode 100644
index 74b97ed..0000000
--- a/debian/patches/portableio-compiler-warning-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix compiler warning on machines other than i386 and amd64.
-Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
-
---- a/frontend/portableio.h
-+++ b/frontend/portableio.h
-@@ -146,7 +146,7 @@
- /* Take advantage of 80-bit precision of long double from GNU C compiler */
- return BytesToLongDouble(&bytes);
- #else
-- ReadBytes(fp, &bytes, sizeof(bytes));
-+ ReadBytes(fp, bytes, sizeof(bytes));
- double val;
- uint32_t mantissa_high, mantissa_low;
- int16_t exponent;
diff --git a/debian/patches/series b/debian/patches/series
index 9fa2916..396427c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
-04-exec-stac.patch
-06-sndfile-stdin.patch
07-field-width-fix.patch
-license-ouput-change.patch
parallel-builds-fix.patch
-portableio-compiler-warning-fix.patch
alpha-build-fix.patch
unbreak-ftbfs-gcc4.4.patch
diff --git a/debian/patches/unbreak-ftbfs-gcc4.4.patch b/debian/patches/unbreak-ftbfs-gcc4.4.patch
index d061b9b..e765f91 100644
--- a/debian/patches/unbreak-ftbfs-gcc4.4.patch
+++ b/debian/patches/unbreak-ftbfs-gcc4.4.patch
@@ -8,9 +8,9 @@ Author: Reinhard Tartler <siretart at tauware.de>
---- lame-3.98.4+repack2.orig/config.h.in
-+++ lame-3.98.4+repack2/config.h.in
-@@ -54,12 +54,14 @@
+--- a/config.h.in
++++ b/config.h.in
+@@ -56,12 +56,14 @@
/* add ieee754_float32_t type */
#undef HAVE_IEEE754_FLOAT32_T
#ifndef HAVE_IEEE754_FLOAT32_T
@@ -25,7 +25,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef double ieee754_float64_t;
#endif
-@@ -69,6 +71,7 @@
+@@ -71,6 +73,7 @@
/* add ieee854_float80_t type */
#undef HAVE_IEEE854_FLOAT80_T
#ifndef HAVE_IEEE854_FLOAT80_T
@@ -33,9 +33,9 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef long double ieee854_float80_t;
#endif
---- lame-3.98.4+repack2.orig/configure.in
-+++ lame-3.98.4+repack2/configure.in
-@@ -141,6 +141,7 @@ AH_VERBATIM([HAVE_UINT8_T],
+--- a/configure.in
++++ b/configure.in
+@@ -147,6 +147,7 @@
[/* add uint8_t type */
#undef HAVE_UINT8_T
#ifndef HAVE_UINT8_T
@@ -43,7 +43,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef unsigned char uint8_t;
#endif])
-@@ -148,6 +149,7 @@ AH_VERBATIM([HAVE_INT8_T],
+@@ -154,6 +155,7 @@
[/* add int8_t type */
#undef HAVE_INT8_T
#ifndef HAVE_INT8_T
@@ -51,7 +51,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef char int8_t;
#endif])
-@@ -155,6 +157,7 @@ AH_VERBATIM([HAVE_UINT16_T],
+@@ -161,6 +163,7 @@
[/* add uint16_t type */
#undef HAVE_UINT16_T
#ifndef HAVE_UINT16_T
@@ -59,7 +59,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef unsigned short uint16_t;
#endif])
-@@ -162,6 +165,7 @@ AH_VERBATIM([HAVE_INT16_T],
+@@ -168,6 +171,7 @@
[/* add int16_t type */
#undef HAVE_INT16_T
#ifndef HAVE_INT16_T
@@ -67,7 +67,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef short int16_t;
#endif])
-@@ -269,6 +273,7 @@ if test "${alex_cv_ieee854_float80}" = "
+@@ -275,6 +279,7 @@
[/* add ieee854_float80_t type */
#undef HAVE_IEEE854_FLOAT80_T
#ifndef HAVE_IEEE854_FLOAT80_T
@@ -75,7 +75,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef long double ieee854_float80_t;
#endif])
-@@ -281,6 +286,7 @@ AH_VERBATIM([HAVE_IEEE754_FLOAT64_T],
+@@ -287,6 +292,7 @@
[/* add ieee754_float64_t type */
#undef HAVE_IEEE754_FLOAT64_T
#ifndef HAVE_IEEE754_FLOAT64_T
@@ -83,7 +83,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
typedef double ieee754_float64_t;
#endif])
-@@ -288,6 +294,7 @@ AH_VERBATIM([HAVE_IEEE754_FLOAT32_T],
+@@ -294,6 +300,7 @@
[/* add ieee754_float32_t type */
#undef HAVE_IEEE754_FLOAT32_T
#ifndef HAVE_IEEE754_FLOAT32_T
--
lame packaging
More information about the pkg-multimedia-commits
mailing list