All of lore.kernel.org
 help / color / mirror / Atom feed
From: michael.opdenacker@rootcommit.com
To: openembedded-core@lists.openembedded.org
Cc: Michael Opdenacker <michael.opdenacker@rootcommit.com>,
	Peter Marko <peter.marko@siemens.com>,
	Ross Burton <Ross.Burton@arm.com>
Subject: [PATCH] flac: upgrade 1.4.3 -> 1.5.0
Date: Fri, 28 Mar 2025 21:59:57 +0000 (UTC)	[thread overview]
Message-ID: <20250328215955.95519-1-michael.opdenacker@rootcommit.com> (raw)

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

License-Update: GFDL 1.2 -> 1.3, copyright years update

Add patch that fixes a new documentation generation issue in 1.5.0
https://github.com/xiph/flac/pull/824

Remove the check for NASM, no longer used in 1.5.0

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
CC: Peter Marko <peter.marko@siemens.com>
CC: Ross Burton <Ross.Burton@arm.com>
---
 ...n-replace-modules.html-by-topics.htm.patch | 45 +++++++++++++++++++
 .../flac/{flac_1.4.3.bb => flac_1.5.0.bb}     | 20 +++++----
 2 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch
 rename meta/recipes-multimedia/flac/{flac_1.4.3.bb => flac_1.5.0.bb} (70%)

diff --git a/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch b/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch
new file mode 100644
index 0000000000..31ca645c27
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch
@@ -0,0 +1,45 @@
+From 6ad5b6a9ce81383ef75e6f7b88f54d3c29294e63 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
+Date: Sat, 15 Mar 2025 11:50:08 +0100
+Subject: [PATCH] API documentation: replace modules.html by topics.html
+
+This fixes the issue reported on
+https://lists.xiph.org/pipermail/flac-dev/2025-February/006696.html
+
+Newer Doxygen versions call what was previously api/modules.html
+api/topics.html instead.
+
+Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
+Suggested-by: Christian Weisgerber <naddy@mips.inka.de>
+Upstream-Status: Submitted [flac-dev@xiph.org]
+---
+ configure.ac       | 2 +-
+ include/FLAC/all.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8eb82320..74295eec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -296,7 +296,7 @@ if test "x$enable_doxygen_docs" != xfalse ; then
+ fi
+ AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
+ 
+-if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/modules.html" ; then
++if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/topics.html" ; then
+ 	HAS_PREBUILT_DOXYGEN=yes
+ fi
+ AM_CONDITIONAL(FLaC__HAS_PREBUILT_DOXYGEN, test "x$HAS_PREBUILT_DOXYGEN" = xyes)
+diff --git a/include/FLAC/all.h b/include/FLAC/all.h
+index f29aa010..0be26fd7 100644
+--- a/include/FLAC/all.h
++++ b/include/FLAC/all.h
+@@ -102,7 +102,7 @@
+  * \section getting_started Getting Started
+  *
+  * A good starting point for learning the API is to browse through
+- * the <A HREF="modules.html">modules</A>.  Modules are logical
++ * the <A HREF="topics.html">modules</A>.  Modules are logical
+  * groupings of related functions or classes, which correspond roughly
+  * to header files or sections of header files.  Each module includes a
+  * detailed description of the general usage of its functions or
diff --git a/meta/recipes-multimedia/flac/flac_1.4.3.bb b/meta/recipes-multimedia/flac/flac_1.5.0.bb
similarity index 70%
rename from meta/recipes-multimedia/flac/flac_1.4.3.bb
rename to meta/recipes-multimedia/flac/flac_1.5.0.bb
index 87b67bee1f..d6df801aec 100644
--- a/meta/recipes-multimedia/flac/flac_1.4.3.bb
+++ b/meta/recipes-multimedia/flac/flac_1.5.0.bb
@@ -3,17 +3,20 @@ DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a lossless audio compr
 HOMEPAGE = "https://xiph.org/flac/"
 BUGTRACKER = "https://github.com/xiph/flac/issues"
 SECTION = "libs"
-LICENSE = "GFDL-1.2 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
-                    file://src/Makefile.am;beginline=1;endline=17;md5=b1dab2704be7f01bfbd9b7f6d5f000a9 \
+LICENSE = "GFDL-1.3 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=802e79e394e372d01e863e3f4058cf40 \
+                    file://src/Makefile.am;beginline=1;endline=17;md5=9c882153132df8f3a1cb1a8ca1f2350f \
                     file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://src/flac/main.c;beginline=1;endline=18;md5=23099119c034d894bd1bf7ef5bd22101 \
+                    file://src/flac/main.c;beginline=1;endline=18;md5=1e826b5083ba1e028852fe7ceec6a8ad \
                     file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
-                    file://COPYING.Xiph;md5=0c90e41ab2fa7e69ca9391330d870221 \
-                    file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea"
+                    file://COPYING.Xiph;md5=78a131b2ea50675d245d280ccc34f8b6 \
+                    file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea \
+                    "
 
-SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz"
-SRC_URI[sha256sum] = "6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70"
+SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
+           file://0001-API-documentation-replace-modules.html-by-topics.htm.patch"
+
+SRC_URI[sha256sum] = "f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920"
 
 CVE_PRODUCT = "libflac flac"
 
@@ -21,7 +24,6 @@ inherit autotools gettext
 
 EXTRA_OECONF = "--disable-oggtest \
                 --without-libiconv-prefix \
-                ac_cv_prog_NASM="" \
                 "
 
 PACKAGECONFIG ??= " \


             reply	other threads:[~2025-03-28 22:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-28 21:59 michael.opdenacker [this message]
2025-03-31  8:55 ` [OE-core] [PATCH] flac: upgrade 1.4.3 -> 1.5.0 Quentin Schulz
2025-03-31  9:04   ` Michael Opdenacker
  -- strict thread matches above, loose matches on Subject: below --
2025-02-27 10:34 michael.opdenacker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250328215955.95519-1-michael.opdenacker@rootcommit.com \
    --to=michael.opdenacker@rootcommit.com \
    --cc=Ross.Burton@arm.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=peter.marko@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.