[SCM] flac/master: Remove all patches, they have either been merged upstream or do not apply anymore (tested).
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Thu Jun 6 07:59:21 UTC 2013
The following commit has been merged in the master branch:
commit d747efdc9658c2339fcf93bb28fc84ebffd61f61
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Thu Jun 6 09:53:17 2013 +0200
Remove all patches, they have either been merged upstream or do not apply anymore (tested).
diff --git a/debian/patches/02_doc_path.patch b/debian/patches/02_doc_path.patch
deleted file mode 100644
index 7f8e8a7..0000000
--- a/debian/patches/02_doc_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Joshua Kwan <joshk at triplehelix.org>
-Description: Correct path to documentation. closes: #413411.
---- flac.orig/man/flac.sgml
-+++ flac/man/flac.sgml
-@@ -697,7 +697,7 @@
-
- <para>metaflac(1).</para>
-
-- <para>The programs are documented fully by HTML format documentation, available in <filename>/usr/share/doc/flac/html</filename> on &debian; systems.</para>
-+ <para>The programs are documented fully by HTML format documentation, available in <filename>/usr/share/doc/libflac-doc/html</filename> on &debian; systems.</para>
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
diff --git a/debian/patches/03_cosmetic_flac_stats.patch b/debian/patches/03_cosmetic_flac_stats.patch
deleted file mode 100644
index e25016e..0000000
--- a/debian/patches/03_cosmetic_flac_stats.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Joshua Kwan <joshk at triplehelix.org>
-Description: Fix misuse of \r (potentially) in flac -d or -t output, closes: #138828
---- flac.orig/src/flac/decode.c
-+++ flac/src/flac/decode.c
-@@ -1355,6 +1355,7 @@ void print_error_with_state(const Decode
-
- void print_stats(const DecoderSession *decoder_session)
- {
-+ static int count = 0;
- if(flac__utils_verbosity_ >= 2) {
- #if defined _MSC_VER || defined __MINGW32__
- /* with MSVC you have to spoon feed it the casting */
-@@ -1363,7 +1364,13 @@ void print_stats(const DecoderSession *d
- const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0;
- #endif
- if(decoder_session->total_samples > 0) {
-- fprintf(stderr, "\r%s: %s%u%% complete",
-+ while (count > 0 && count--)
-+ fprintf(stderr, "\b");
-+
-+ if ((unsigned)floor(progress + 0.5) == 100)
-+ return;
-+
-+ count = fprintf(stderr, "%s: %s%u%% complete",
- decoder_session->inbasefilename,
- decoder_session->test_only? "testing, " : decoder_session->analysis_mode? "analyzing, " : "",
- (unsigned)floor(progress + 0.5)
diff --git a/debian/patches/07_metaflac_error_exit.patch b/debian/patches/07_metaflac_error_exit.patch
deleted file mode 100644
index 6a646a1..0000000
--- a/debian/patches/07_metaflac_error_exit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Joshua Kwan <joshk at triplehelix.org>
-Description: Exit with error if invalid option is passed. #329979
---- flac.orig/src/metaflac/main.c
-+++ flac/src/metaflac/main.c
-@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
- setlocale(LC_ALL, "");
- init_options(&options);
-
-- if(parse_options(argc, argv, &options))
-+ if ((ret = parse_options(argc, argv, &options)) == 0)
- ret = !do_operations(&options);
- else
- ret = 1;
---- flac.orig/src/metaflac/options.c
-+++ flac/src/metaflac/options.c
-@@ -249,7 +249,7 @@ FLAC__bool parse_options(int argc, char
- }
- }
-
-- return !had_error;
-+ return had_error;
- }
-
- void free_options(CommandLineOptions *options)
diff --git a/debian/patches/08_gcc-4.3_fixes.patch b/debian/patches/08_gcc-4.3_fixes.patch
deleted file mode 100644
index 711a17e..0000000
--- a/debian/patches/08_gcc-4.3_fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Description: Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455304).
---- flac.orig/examples/cpp/encode/file/main.cpp
-+++ flac/examples/cpp/encode/file/main.cpp
-@@ -33,6 +33,8 @@
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-
-+#include <cstring>
-+
- class OurEncoder: public FLAC::Encoder::File {
- public:
- OurEncoder(): FLAC::Encoder::File() { }
diff --git a/debian/patches/09_noexec-stack.patch b/debian/patches/09_noexec-stack.patch
deleted file mode 100644
index 54afb3a..0000000
--- a/debian/patches/09_noexec-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Russell Coker <russell at coker.com.au>
-Description: The following patch adds a section to the libFLAC.so file to indicate that
-it doesn't need an executable stack. This allows programs using it to run
-correctly on SE Linux systems, and with exec-shield.
---- flac.orig/src/libFLAC/ia32/nasm.h
-+++ flac/src/libFLAC/ia32/nasm.h
-@@ -73,3 +73,6 @@
- _%1:
- %1:
- %endmacro
-+
-+section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+
diff --git a/debian/patches/10_empty_-L_flag.patch b/debian/patches/10_empty_-L_flag.patch
deleted file mode 100644
index 1f815b9..0000000
--- a/debian/patches/10_empty_-L_flag.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fix libFLAC.m4 may set empty -L flag when configure is called without
-arguments, provided of course that the target package's configure script
-is properly re-generated against the fixed libFLAC.m4
---- flac.orig/src/libFLAC/libFLAC.m4
-+++ flac/src/libFLAC/libFLAC.m4
-@@ -14,14 +14,18 @@ AC_ARG_WITH(libFLAC-includes,[ --with-l
- AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes)
-
- if test "x$libFLAC_libraries" != "x" ; then
-- LIBFLAC_LIBDIR="$libFLAC_libraries"
-+ LIBFLAC_LIBS="-L$libFLAC_libraries"
-+ elif test "x$libFLAC_prefix" = "xno" || test "x$libFLAC_prefix" = "xyes" ; then
-+ LIBFLAC_LIBS=""
- elif test "x$libFLAC_prefix" != "x" ; then
-- LIBFLAC_LIBDIR="$libFLAC_prefix/lib"
-- elif test "x$prefix" != "xNONE" ; then
-- LIBFLAC_LIBDIR="$libdir"
-+ LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
-+ elif test "x$prefix" != "xNONE"; then
-+ LIBFLAC_LIBS="-L$prefix/lib"
- fi
-
-- LIBFLAC_LIBS="-L$LIBFLAC_LIBDIR -lFLAC $OGG_LIBS -lm"
-+ if test "x$libFLAC_prefix" != "xno" ; then
-+ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC $OGG_LIBS -lm"
-+ fi
-
- if test "x$libFLAC_includes" != "x" ; then
- LIBFLAC_CFLAGS="-I$libFLAC_includes"
diff --git a/debian/patches/11_no-altivec-on-SPE.patch b/debian/patches/11_no-altivec-on-SPE.patch
deleted file mode 100644
index a1f3ccd..0000000
--- a/debian/patches/11_no-altivec-on-SPE.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
-Description: Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
-AltiVec is not available at all. This triplet uses SPE which is
-incompatible with AltiVec shares the same opcode range and can't be used
-at all.
---- flac.orig/configure.in
-+++ flac/configure.in
-@@ -82,6 +82,14 @@ case "$host" in
- *) OBJ_FORMAT=elf ;;
- esac
- AC_SUBST(OBJ_FORMAT)
-+case "$host" in
-+ *-gnuspe)
-+ abi_spe=true
-+ AC_DEFINE(FLAC__CPU_PPC_SPE)
-+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for PowerPC with SPE ABI])
-+ ;;
-+esac
-+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
-
- # only needed because of ntohl() usage, can get rid of after that's gone:
- case "$host" in
---- flac.orig/src/libFLAC/Makefile.am
-+++ flac/src/libFLAC/Makefile.am
-@@ -40,8 +40,13 @@ if FLaC__SYS_DARWIN
- CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
- else
- # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
-+CPUCFLAGS =
-+if FLaC__CPU_PPC_SPE
-+else
-+CPUCFLAGS += -maltivec -mabi=altivec
-+endif
- #@@@ PPC optimizations temporarily disabled
--CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS += -DFLAC__NO_ASM
- endif
- endif
-
-@@ -58,6 +63,8 @@ endif
- if FLaC__CPU_PPC
- ARCH_SUBDIRS = ppc
- if FLaC__HAS_AS__TEMPORARILY_DISABLED
-+if FLaC__CPU_PPC_SPE
-+else
- LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
- else
-@@ -67,6 +74,7 @@ LOCAL_EXTRA_LDFLAGS = ""
- endif
- endif
- endif
-+endif
- endif
-
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
diff --git a/debian/patches/12_ac_config_macro_dir.patch b/debian/patches/12_ac_config_macro_dir.patch
deleted file mode 100644
index 45f1056..0000000
--- a/debian/patches/12_ac_config_macro_dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Subject: Fixes "undefined macro: AM_PATH_XMMS" and similar errors which cause
- autoreconf to fail.
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3027361&group_id=13478&atid=113478
-
---- flac.orig/Makefile.am
-+++ flac/Makefile.am
-@@ -30,6 +30,8 @@
-
- AUTOMAKE_OPTIONS = foreign 1.7
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = doc include m4 man src examples test build obj
-
- DISTCLEANFILES = libtool-disable-static
---- flac.orig/configure.in
-+++ flac/configure.in
-@@ -33,6 +33,7 @@ sed -e 's/^build_old_libs=yes/build_old_
- chmod +x libtool-disable-static
-
- AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-+AC_CONFIG_MACRO_DIR([m4])
-
- AM_PROG_AS
- AC_PROG_CXX
diff --git a/debian/patches/13_replaygain_c_locale.patch b/debian/patches/13_replaygain_c_locale.patch
deleted file mode 100644
index b242fe5..0000000
--- a/debian/patches/13_replaygain_c_locale.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: hhaamu at gmail.com
-Description: flac should not use locales when running with 'replaygain' option.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=498050
-Forwarded: Bug: https://sourceforge.net/support/tracker.php?aid=3288157
----
- src/share/grabbag/replaygain.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
---- flac.orig/src/share/grabbag/replaygain.c
-+++ flac/src/share/grabbag/replaygain.c
-@@ -625,6 +625,8 @@ static FLAC__bool parse_double_(const FL
- FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadata *block, FLAC__bool album_mode, FLAC__bool strict, double *reference, double *gain, double *peak)
- {
- int reference_offset, gain_offset, peak_offset;
-+ char *saved_locale;
-+ FLAC__bool res = true;
-
- FLAC__ASSERT(0 != block);
- FLAC__ASSERT(0 != reference);
-@@ -637,20 +639,36 @@ FLAC__bool grabbag__replaygain_load_from
- */
- *reference = ReplayGainReferenceLoudness;
-
-+ /*
-+ * We need to save the old locale and switch to "C" because the locale
-+ * influences the formatting of %f and we want it a certain way.
-+ */
-+ saved_locale = strdup(setlocale(LC_ALL, 0));
-+ if (0 == saved_locale)
-+ return false;
-+ setlocale(LC_ALL, "C");
-+
- if(0 <= (reference_offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, /*offset=*/0, (const char *)GRABBAG__REPLAYGAIN_TAG_REFERENCE_LOUDNESS)))
- (void)parse_double_(block->data.vorbis_comment.comments + reference_offset, reference);
-
- if(0 > (gain_offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, /*offset=*/0, (const char *)(album_mode? GRABBAG__REPLAYGAIN_TAG_ALBUM_GAIN : GRABBAG__REPLAYGAIN_TAG_TITLE_GAIN))))
-- return !strict && grabbag__replaygain_load_from_vorbiscomment(block, !album_mode, /*strict=*/true, reference, gain, peak);
-+ res = false;
- if(0 > (peak_offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, /*offset=*/0, (const char *)(album_mode? GRABBAG__REPLAYGAIN_TAG_ALBUM_PEAK : GRABBAG__REPLAYGAIN_TAG_TITLE_PEAK))))
-- return !strict && grabbag__replaygain_load_from_vorbiscomment(block, !album_mode, /*strict=*/true, reference, gain, peak);
-+ res = false;
-+
-+ if(res && !parse_double_(block->data.vorbis_comment.comments + gain_offset, gain))
-+ res = false;
-+ if(res && !parse_double_(block->data.vorbis_comment.comments + peak_offset, peak))
-+ res = false;
-+
-+ setlocale(LC_ALL, saved_locale);
-+ free(saved_locale);
-
-- if(!parse_double_(block->data.vorbis_comment.comments + gain_offset, gain))
-- return !strict && grabbag__replaygain_load_from_vorbiscomment(block, !album_mode, /*strict=*/true, reference, gain, peak);
-- if(!parse_double_(block->data.vorbis_comment.comments + peak_offset, peak))
-- return !strict && grabbag__replaygain_load_from_vorbiscomment(block, !album_mode, /*strict=*/true, reference, gain, peak);
-+ /* something failed; retry with strict */
-+ if (!res && !strict)
-+ res = grabbag__replaygain_load_from_vorbiscomment(block, !album_mode, /*strict=*/true, reference, gain, peak);
-
-- return true;
-+ return res;
- }
-
- double grabbag__replaygain_compute_scale_factor(double peak, double gain, double preamp, FLAC__bool prevent_clipping)
diff --git a/debian/patches/14_metadata_iterators_memleak.patch b/debian/patches/14_metadata_iterators_memleak.patch
deleted file mode 100644
index eafb25d..0000000
--- a/debian/patches/14_metadata_iterators_memleak.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Memoy leak at line in metadata_iterators.c, 'node' is not freed.
-From: https://sourceforge.net/tracker/?func=detail&aid=2946736&group_id=13478&atid=313478
----
- src/libFLAC/metadata_iterators.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- flac.orig/src/libFLAC/metadata_iterators.c
-+++ flac/src/libFLAC/metadata_iterators.c
-@@ -1217,6 +1217,7 @@ static FLAC__bool chain_read_cb_(FLAC__M
- }
-
- if(!read_metadata_block_header_cb_(handle, read_cb, &is_last, &type, &length)) {
-+ node_delete_(node);
- chain->status = FLAC__METADATA_CHAIN_STATUS_READ_ERROR;
- return false;
- }
diff --git a/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch b/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch
deleted file mode 100644
index 38a4b01..0000000
--- a/debian/patches/15_format-not-a-string-literal-and-no-format-arguments.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fixes "format not a string literal and no format arguments
- [-Werror=format-security]" errors
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643377
-
---- flac.orig/src/test_grabbag/cuesheet/main.c
-+++ flac/src/test_grabbag/cuesheet/main.c
-@@ -115,12 +115,12 @@ int main(int argc, char *argv[])
- const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n";
-
- if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
-- printf(usage);
-+ printf("%s", usage);
- return 0;
- }
-
- if(argc < 3 || argc > 4) {
-- fprintf(stderr, usage);
-+ fprintf(stderr, "%s", usage);
- return 255;
- }
-
-@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
- if(0 == strcmp(argv[3], "cdda"))
- is_cdda = true;
- else {
-- fprintf(stderr, usage);
-+ fprintf(stderr, "%s", usage);
- return 255;
- }
- }
---- flac.orig/src/test_grabbag/picture/main.c
-+++ flac/src/test_grabbag/picture/main.c
-@@ -211,12 +211,12 @@ int main(int argc, char *argv[])
- const char *usage = "usage: test_pictures path_prefix\n";
-
- if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
-- printf(usage);
-+ printf("%s", usage);
- return 0;
- }
-
- if(argc != 2) {
-- fprintf(stderr, usage);
-+ fprintf(stderr, "%s", usage);
- return 255;
- }
-
---- flac.orig/src/test_seeking/main.c
-+++ flac/src/test_seeking/main.c
-@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
- static const char * const usage = "usage: test_seeking file.flac [#seeks] [#samples-in-file.flac] [file.raw]\n";
-
- if (argc < 2 || argc > 5) {
-- fprintf(stderr, usage);
-+ fprintf(stderr, "%s", usage);
- return 1;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9369fab..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,11 +0,0 @@
-02_doc_path.patch
-03_cosmetic_flac_stats.patch
-07_metaflac_error_exit.patch
-08_gcc-4.3_fixes.patch
-09_noexec-stack.patch
-10_empty_-L_flag.patch
-11_no-altivec-on-SPE.patch
-12_ac_config_macro_dir.patch
-13_replaygain_c_locale.patch
-14_metadata_iterators_memleak.patch
-15_format-not-a-string-literal-and-no-format-arguments.patch
--
flac packaging
More information about the pkg-multimedia-commits
mailing list