KXStudio
/
Repository
mirror of https://github.com/KXStudio/Repository
1
0
Fork 0
Code Releases 2 Activity
Browse Source

Update flac to 1.5.0 

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 5 months ago
parent
29f56bd9af
commit
eac66b7553
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
8 changed files with 54 additions and 112 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -0
      sources/libs/flac-static/debian/changelog
  2. +7
    -6
      sources/libs/flac-static/debian/patches/0001-remove-build-path-from-generated-FLAC.tag-file.patch
  3. +0
    -23
      sources/libs/flac-static/debian/patches/0020-libFLAC-bitreader.c-Fix-out-of-bounds-read.patch
  4. +1
    -1
      sources/libs/flac-static/debian/patches/9001-fix-libs.patch
  5. +39
    -36
      sources/libs/flac-static/debian/patches/9002-hidden-flac-api.patch
  6. +0
    -27
      sources/libs/flac-static/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
  7. +0
    -15
      sources/libs/flac-static/debian/patches/privacy-breach-logo.patch
  8. +1
    -4
      sources/libs/flac-static/debian/patches/series

+ 6
- 0
sources/libs/flac-static/debian/changelog View File

@@ -1,3 +1,9 @@
flac-static (6:1.5.0-1kxstudio1) focal; urgency=medium

* Update

-- falkTX <falktx@falktx.com> Sun, 08 Jun 2025 09:52:14 +0200

flac-static (6:1.3.3-1kxstudio2) focal; urgency=medium flac-static (6:1.3.3-1kxstudio2) focal; urgency=medium


* Initial package * Initial package


+ 7
- 6
sources/libs/flac-static/debian/patches/0001-remove-build-path-from-generated-FLAC.tag-file.patch View File

@@ -1,4 +1,3 @@
>From 0533326767646c6970bca03f895af81c75c05baf Mon Sep 17 00:00:00 2001
From: Dafydd Harries <daf@rhydd.org> From: Dafydd Harries <daf@rhydd.org>
Date: Sat, 3 Dec 2016 16:58:53 -0500 Date: Sat, 3 Dec 2016 16:58:53 -0500
Subject: [PATCH] remove build path from generated FLAC.tag file Subject: [PATCH] remove build path from generated FLAC.tag file
@@ -9,13 +8,15 @@ locations in the source directory at build time.
doc/Makefile.am | 1 + doc/Makefile.am | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)


diff --git a/doc/Makefile.am b/doc/Makefile.am
index 593d691..b7bfd7a 100644
--- a/doc/Makefile.am --- a/doc/Makefile.am
+++ b/doc/Makefile.am +++ b/doc/Makefile.am
@@ -25,6 +25,7 @@ FLAC.tag: Doxyfile @@ -25,6 +25,7 @@ FLAC.tag: Doxyfile
rm -rf html/api
mv doxytmp/html html/api
rm -rf api
mv doxytmp/html api
rm -rf doxytmp rm -rf doxytmp
+ sed -ie 's,>.*/include/,>/usr/include/,' FLAC.tag + sed -ie 's,>.*/include/,>/usr/include/,' FLAC.tag
else
FLAC.tag:
touch $@
doc_DATA = \
FLAC.tag

+ 0
- 23
sources/libs/flac-static/debian/patches/0020-libFLAC-bitreader.c-Fix-out-of-bounds-read.patch View File

@@ -1,23 +0,0 @@
From 2e7931c27eb15e387da440a37f12437e35b22dd4 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Mon, 7 Oct 2019 12:55:58 +1100
Subject: [PATCH 20/63] libFLAC/bitreader.c: Fix out-of-bounds read

Credit: Oss-Fuzz
Issue: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17069
Testcase: fuzzer_decoder-5670265022840832
---
src/libFLAC/bitreader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/src/libFLAC/bitreader.c
+++ b/src/libFLAC/bitreader.c
@@ -864,7 +864,7 @@ incomplete_lsbs:
cwords = br->consumed_words;
words = br->words;
ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
- b = br->buffer[cwords] << br->consumed_bits;
+ b = cwords < br->capacity ? br->buffer[cwords] << br->consumed_bits : 0;
} while(cwords >= words && val < end);
}

sources/libs/flac-static/debian/patches/9001-Fix-libs.patch → sources/libs/flac-static/debian/patches/9001-fix-libs.patch View File

@@ -15,5 +15,5 @@
Requires.private: @OGG_PACKAGE@ Requires.private: @OGG_PACKAGE@
-Libs: -L${libdir} -lFLAC -Libs: -L${libdir} -lFLAC
+Libs: -L${libdir} -lFLAC -logg -lm +Libs: -L${libdir} -lFLAC -logg -lm
Libs.private: -lm
Libs.private: -lm @FLAC_STATIC_LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}

+ 39
- 36
sources/libs/flac-static/debian/patches/9002-hidden-flac-api.patch View File

@@ -1,54 +1,57 @@
--- flac-static-1.3.3.orig/include/FLAC++/export.h
+++ flac-static-1.3.3/include/FLAC++/export.h
@@ -56,24 +56,8 @@
* \{
diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index cde72b7..3a60cf0 100644
--- a/include/FLAC/export.h
+++ b/include/FLAC/export.h
@@ -61,26 +61,8 @@
* build static, shared or **both**. Therefore, DLL_EXPORT, which is set
* by libtool, must override FLAC__NO_DLL on building shared components
*/ */
-#if defined(FLAC__NO_DLL)
#define FLACPP_API
-#elif defined(_MSC_VER)
-#ifdef FLACPP_API_EXPORTS
-#define FLACPP_API __declspec(dllexport)
-#if defined(_WIN32)
-
-#if defined(FLAC__NO_DLL) && !(defined(DLL_EXPORT))
-#define FLAC_API
-#else -#else
-#define FLACPP_API __declspec(dllimport)
-#ifdef FLAC_API_EXPORTS
-#define FLAC_API __declspec(dllexport)
-#else
-#define FLAC_API __declspec(dllimport)
-#endif
-#endif -#endif
- -
-#elif defined(FLAC__USE_VISIBILITY_ATTR) -#elif defined(FLAC__USE_VISIBILITY_ATTR)
-#define FLACPP_API __attribute__ ((visibility ("default")))
-#define FLAC_API __attribute__ ((visibility ("default")))
- -
-#else -#else
-#define FLACPP_API
-
#define FLAC_API
-#endif -#endif
- -
/* These #defines will mirror the libtool-based library version number, see
/** These \#defines will mirror the libtool-based library version number, see
* http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
*/ */
--- flac-static-1.3.3.orig/include/FLAC/export.h
+++ flac-static-1.3.3/include/FLAC/export.h
@@ -56,24 +56,8 @@
* \{
diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
index 19370fa..45b4752 100644
--- a/include/FLAC++/export.h
+++ b/include/FLAC++/export.h
@@ -72,21 +72,7 @@
* build static, shared or **both**. Therefore, DLL_EXPORT, which is set
* by libtool, must override FLAC__NO_DLL on building shared components
*/ */
-#if defined(FLAC__NO_DLL)
#define FLAC_API
-#elif defined(_MSC_VER)
-#ifdef FLAC_API_EXPORTS
-#define FLAC_API __declspec(dllexport)
-#if defined(_WIN32)
-#if defined(FLAC__NO_DLL) && !(defined(DLL_EXPORT))
#define FLACPP_API
-#else -#else
-#define FLAC_API __declspec(dllimport)
-#ifdef FLACPP_API_EXPORTS
-#define FLACPP_API __declspec(dllexport)
-#else
-#define FLACPP_API __declspec(dllimport)
-#endif
-#endif -#endif
-
-#elif defined(FLAC__USE_VISIBILITY_ATTR) -#elif defined(FLAC__USE_VISIBILITY_ATTR)
-#define FLAC_API __attribute__ ((visibility ("default")))
-
-#define FLACPP_API __attribute__ ((visibility ("default")))
-#else -#else
-#define FLAC_API
-
-#define FLACPP_API
-#endif -#endif
-
/** These #defines will mirror the libtool-based library version number, see
/** These \#defines will mirror the libtool-based library version number, see
* http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
*/

+ 0
- 27
sources/libs/flac-static/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch View File

@@ -1,27 +0,0 @@
From f19bf6e040c11ba5535cf141ab7a76af64614a97 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Thu, 6 Jun 2013 12:07:58 +0200
Subject: [PATCH] Revert "man/Makefile : Fail more gracefully."

This reverts commit 023f06f6cbc316127ca1a4fb4178ef344a413bd5.
---
man/Makefile.am | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,12 +18,10 @@
if FLaC__HAS_DOCBOOK_TO_MAN
flac.1: flac.sgml
- docbook-to-man $? > $@
- (docbook2man $? && mv FLAC.1 $@)
+ docbook-to-man $? > $@ || (docbook2man $? && mv FLAC.1 $@)
metaflac.1: metaflac.sgml
- docbook-to-man $? > $@
- (docbook2man $? && mv METAFLAC.1 $@)
+ docbook-to-man $? > $@ || (docbook2man $? && mv METAFLAC.1 $@)
else
flac.1:
echo "*** Warning: docbook-to-man not found; man pages will not be built."

+ 0
- 15
sources/libs/flac-static/debian/patches/privacy-breach-logo.patch View File

@@ -1,15 +0,0 @@
Description: Fix "privacy-breach-logo" lintian error.
Author: Fabian Greffrath <fabian+debian@greffrath.com>

--- a/doc/doxygen.footer.html
+++ b/doc/doxygen.footer.html
@@ -8,9 +8,6 @@
Copyright (c) 2000-2009 Josh Coalson
Copyright (c) 2011-2016 Xiph.Org Foundation
</td>
- <td width="1%" align="right">
- <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
- </td>
</tr>
</table>
</div>

+ 1
- 4
sources/libs/flac-static/debian/patches/series View File

@@ -1,6 +1,3 @@
Revert-man-Makefile-Fail-more-gracefully.patch
privacy-breach-logo.patch
0001-remove-build-path-from-generated-FLAC.tag-file.patch 0001-remove-build-path-from-generated-FLAC.tag-file.patch
0020-libFLAC-bitreader.c-Fix-out-of-bounds-read.patch
9001-Fix-libs.patch
9001-fix-libs.patch
9002-hidden-flac-api.patch 9002-hidden-flac-api.patch

Write Preview
Loading…
Cancel
Save