[SCM] audiofile/master: Remove debian/patches, all patches are obsolete or adopted upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Jan 5 09:45:29 UTC 2012


The following commit has been merged in the master branch:
commit 727a3bca03ee2481043a6b45194712888fc67c8f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 5 10:44:20 2012 +0100

    Remove debian/patches, all patches are obsolete or adopted upstream.

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 258b7f0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,18 +0,0 @@
-10_update_docs
-10_update_libtool
-10_export_vfs
-10_pack_real_char3
-10_incorrect_wav_size
-10_au_length_unspecified
-10_support_nonstandard_aiffc
-10_sfinfo_no_options
-10_sfconvert_add_nist_support
-10_warning_fixes
-10_m4_quoting_fix
-10_include_audiofile_in_af_vfs
-10_pkgconfig_privlibs
-10_float_size_calculation_fix
-20_exports_vpath_fix
-21_exports_vpath_fixup
-
-22_CVE-2008-5824
diff --git a/debian/patches/10_au_length_unspecified.patch b/debian/patches/10_au_length_unspecified.patch
deleted file mode 100644
index efc43af..0000000
--- a/debian/patches/10_au_length_unspecified.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: https://github.com/mpruett/audiofile/issues/2#issuecomment-1819258
-Description:
- AU specifies a length of 0xffffffff as unspecified, so we need a bit
- more legwork to obtain the total number of frames. Code adapted from
- wave.c.
----
- libaudiofile/next.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- audiofile-0.2.7.orig/libaudiofile/next.c
-+++ audiofile-0.2.7/libaudiofile/next.c
-@@ -64,6 +64,8 @@ _AFfilesetup _af_next_default_filesetup
- 	NULL			/* miscellaneous */
- };
- 
-+static const uint32_t _AU_LENGTH_UNSPECIFIED = 0xffffffff;
-+
- status _af_next_read_init (AFfilesetup setup, AFfilehandle file)
- {
- 	uint32_t	id, offset, length, encoding, sampleRate, channelCount;
-@@ -111,7 +113,11 @@ status _af_next_read_init (AFfilesetup s
- 	track->f.compressionType = AF_COMPRESSION_NONE;
- 
- 	track->fpos_first_frame = offset;
--	track->data_size = af_flength(file->fh) - offset;
-+
-+	off_t lengthAvailable = af_flength(file->fh) - offset;
-+	if (length == _AU_LENGTH_UNSPECIFIED || length > lengthAvailable)
-+		length = lengthAvailable;
-+	track->data_size = length;
- 
- 	switch (encoding)
- 	{
diff --git a/debian/patches/10_include_audiofile_in_af_vfs.patch b/debian/patches/10_include_audiofile_in_af_vfs.patch
deleted file mode 100644
index 5f351d0..0000000
--- a/debian/patches/10_include_audiofile_in_af_vfs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Daniel Kobras <kobras at debian.org>
-Description: af_vfs.h relies on audiofile.h being included already,
- so force it this way.
----
- libaudiofile/af_vfs.h |    1 +
- 1 file changed, 1 insertion(+)
-
---- audiofile-0.2.7.orig/libaudiofile/af_vfs.h
-+++ audiofile-0.2.7/libaudiofile/af_vfs.h
-@@ -28,6 +28,7 @@
- #define AUDIOFILE_VFS_H 1
- 
- #include <stdio.h>
-+#include <audiofile.h>
- 
- struct _AFvirtualfile
- {
diff --git a/debian/patches/10_pack_real_char3.patch b/debian/patches/10_pack_real_char3.patch
deleted file mode 100644
index 975da7b..0000000
--- a/debian/patches/10_pack_real_char3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Daniel Kobras <kobras at debian.org>
-Description:
- sizeof(real_char3) must equal 3 because 24bit support relies on it.
- As gcc on ARM pads to 4 bytes by default, we need to define the type
- as packed. Had better be a accompanied by a configure check, though.
----
- libaudiofile/modules.h |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- audiofile-0.2.7.orig/libaudiofile/modules.h
-+++ audiofile-0.2.7/libaudiofile/modules.h
-@@ -44,7 +44,11 @@ typedef int16_t schar2;
- typedef int32_t schar3;
- typedef int32_t schar4;
- 
--typedef struct real_char3 { uchar1 c0; uchar1 c1; uchar1 c2; } real_char3;
-+typedef struct real_char3 { uchar1 c0; uchar1 c1; uchar1 c2; }
-+#ifdef __GNUC__
-+	__attribute__((__packed__))
-+#endif
-+	real_char3;
- typedef union char3u
- {
- 	struct { schar4 i; } schar4;
diff --git a/debian/patches/10_sfinfo_no_options.patch b/debian/patches/10_sfinfo_no_options.patch
deleted file mode 100644
index a56407e..0000000
--- a/debian/patches/10_sfinfo_no_options.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Daniel Kobras <kobras at debian.org>
-Description: The documented options are not implemented.
----
- docs/sfinfo |    8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
---- audiofile-0.2.7.orig/docs/sfinfo
-+++ audiofile-0.2.7/docs/sfinfo
-@@ -1,9 +1,3 @@
--sfinfo [options] file1 file2...
--
--options can be any combination of -reporterror and -short.
-+sfinfo file1 file2...
- 
- sfinfo prints information regarding the file in question.
--
---short prints one-line information.
--
---reporterror prints errors if files are not valid audio files.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6c8a1dd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-10_pack_real_char3.patch
-10_au_length_unspecified.patch
-10_sfinfo_no_options.patch
-10_include_audiofile_in_af_vfs.patch

-- 
audiofile packaging



More information about the pkg-multimedia-commits mailing list