Skip to content

Commit d4e4a69

Browse files
Michael Opdenackerrpurdie
Michael Opdenacker
authored andcommitted
flac: upgrade 1.4.3 -> 1.5.0
License-Update: GFDL 1.2 -> 1.3, copyright years update Add patch that fixes a new documentation generation issue in 1.5.0 xiph/flac#824 Remove the check for NASM, no longer used in 1.5.0 Signed-off-by: Michael Opdenacker <[email protected]> CC: Peter Marko <[email protected]> CC: Ross Burton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
1 parent d20d89b commit d4e4a69

File tree

2 files changed

+56
-9
lines changed

2 files changed

+56
-9
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 6ad5b6a9ce81383ef75e6f7b88f54d3c29294e63 Mon Sep 17 00:00:00 2001
2+
From: Michael Opdenacker <[email protected]>
3+
Date: Sat, 15 Mar 2025 11:50:08 +0100
4+
Subject: [PATCH] API documentation: replace modules.html by topics.html
5+
6+
This fixes the issue reported on
7+
https://lists.xiph.org/pipermail/flac-dev/2025-February/006696.html
8+
9+
Newer Doxygen versions call what was previously api/modules.html
10+
api/topics.html instead.
11+
12+
Signed-off-by: Michael Opdenacker <[email protected]>
13+
Suggested-by: Christian Weisgerber <[email protected]>
14+
Upstream-Status: Submitted [[email protected]]
15+
---
16+
configure.ac | 2 +-
17+
include/FLAC/all.h | 2 +-
18+
2 files changed, 2 insertions(+), 2 deletions(-)
19+
20+
diff --git a/configure.ac b/configure.ac
21+
index 8eb82320..74295eec 100644
22+
--- a/configure.ac
23+
+++ b/configure.ac
24+
@@ -296,7 +296,7 @@ if test "x$enable_doxygen_docs" != xfalse ; then
25+
fi
26+
AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
27+
28+
-if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/modules.html" ; then
29+
+if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/topics.html" ; then
30+
HAS_PREBUILT_DOXYGEN=yes
31+
fi
32+
AM_CONDITIONAL(FLaC__HAS_PREBUILT_DOXYGEN, test "x$HAS_PREBUILT_DOXYGEN" = xyes)
33+
diff --git a/include/FLAC/all.h b/include/FLAC/all.h
34+
index f29aa010..0be26fd7 100644
35+
--- a/include/FLAC/all.h
36+
+++ b/include/FLAC/all.h
37+
@@ -102,7 +102,7 @@
38+
* \section getting_started Getting Started
39+
*
40+
* A good starting point for learning the API is to browse through
41+
- * the <A HREF="modules.html">modules</A>. Modules are logical
42+
+ * the <A HREF="topics.html">modules</A>. Modules are logical
43+
* groupings of related functions or classes, which correspond roughly
44+
* to header files or sections of header files. Each module includes a
45+
* detailed description of the general usage of its functions or

meta/recipes-multimedia/flac/flac_1.4.3.bb renamed to meta/recipes-multimedia/flac/flac_1.5.0.bb

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,27 @@ DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a lossless audio compr
33
HOMEPAGE = "https://xiph.org/flac/"
44
BUGTRACKER = "https://github.com/xiph/flac/issues"
55
SECTION = "libs"
6-
LICENSE = "GFDL-1.2 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
7-
LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
8-
file://src/Makefile.am;beginline=1;endline=17;md5=b1dab2704be7f01bfbd9b7f6d5f000a9 \
6+
LICENSE = "GFDL-1.3 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
7+
LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=802e79e394e372d01e863e3f4058cf40 \
8+
file://src/Makefile.am;beginline=1;endline=17;md5=9c882153132df8f3a1cb1a8ca1f2350f \
99
file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10-
file://src/flac/main.c;beginline=1;endline=18;md5=23099119c034d894bd1bf7ef5bd22101 \
10+
file://src/flac/main.c;beginline=1;endline=18;md5=1e826b5083ba1e028852fe7ceec6a8ad \
1111
file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
12-
file://COPYING.Xiph;md5=0c90e41ab2fa7e69ca9391330d870221 \
13-
file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea"
12+
file://COPYING.Xiph;md5=78a131b2ea50675d245d280ccc34f8b6 \
13+
file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea \
14+
"
1415

15-
SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz"
16-
SRC_URI[sha256sum] = "6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70"
16+
SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
17+
file://0001-API-documentation-replace-modules.html-by-topics.htm.patch"
18+
19+
SRC_URI[sha256sum] = "f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920"
1720

1821
CVE_PRODUCT = "libflac flac"
1922

2023
inherit autotools gettext
2124

2225
EXTRA_OECONF = "--disable-oggtest \
2326
--without-libiconv-prefix \
24-
ac_cv_prog_NASM="" \
2527
"
2628

2729
PACKAGECONFIG ??= " \

0 commit comments

Comments
 (0)