diff mbox series

[meta-multimedia,04/15] fdk-aac: upgrade 2.0.3 -> 3.0.0

Message ID 20261115165955.3485789-4-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-multimedia,01/15] aom: upgrade 3.15.1 -> 3.15.3 | expand

Commit Message

Khem Raj Nov. 15, 2026, 4:59 p.m. UTC
3.0.0 adds a separate library, libfdk-xhe-aac, for xHE-AAC encoding,
which comes with its own Fraunhofer license (xhe-aac/NOTICE). Add that
license to the layer, list it in LICENSE and ship the new library in
its own libfdk-xhe-aac package. libfdk-aac keeps its soname.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...Fraunhofer-FDK-xHE-AAC-Encoder-for-Android | 96 +++++++++++++++++++
 .../{fdk-aac_2.0.3.bb => fdk-aac_3.0.0.bb}    | 13 ++-
 2 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 meta-multimedia/licenses/Fraunhofer-FDK-xHE-AAC-Encoder-for-Android
 rename meta-multimedia/recipes-multimedia/fdk-aac/{fdk-aac_2.0.3.bb => fdk-aac_3.0.0.bb} (61%)
diff mbox series

Patch

diff --git a/meta-multimedia/licenses/Fraunhofer-FDK-xHE-AAC-Encoder-for-Android b/meta-multimedia/licenses/Fraunhofer-FDK-xHE-AAC-Encoder-for-Android
new file mode 100644
index 0000000000..d529786ef4
--- /dev/null
+++ b/meta-multimedia/licenses/Fraunhofer-FDK-xHE-AAC-Encoder-for-Android
@@ -0,0 +1,96 @@ 
+
+/* -----------------------------------------------------------------------------
+Software Copyright License for The Fraunhofer FDK Extended High Efficiency AAC
+Encoder Software for Android
+
+© Copyright 1995 - 2025 Fraunhofer-Gesellschaft zur Förderung der angewandten
+Forschung e.V. and Contributors
+All rights reserved.
+
+1.    INTRODUCTION
+
+The Fraunhofer FDK Extended High Efficiency AAC Encoder Software for Android
+("FDK Extended High Efficiency AAC Encoder") is software that implements the
+encoding of digital audio according to the MPEG-D Unified Speech and Audio
+Coding (USAC) standard and MPEG-D Dynamic Range Control (DRC) standard. This FDK
+Extended High Efficiency AAC Encoder Software is intended to be used on a wide
+variety of Android devices. It is technically not suited to encode content for
+digital radio broadcasting services, including DRM and similar standards.
+
+Patent licenses for necessary patent claims for the FDK Extended High Efficiency
+AAC Encoder Software (including those of Fraunhofer), for the use in commercial
+products and services, may be obtained from the respective patent owners
+individually and/or from Via Licensing Alliance (www.via-la.com).
+
+Fraunhofer supports the development of Extended High Efficiency AAC products and
+services by offering additional software, documentation, and technical advice.
+In addition, it operates the xHE-AAC Trademark Program to ease interoperability
+testing of end products. Please visit http://www.xhe-aac.com for more
+information.
+
+2.    COPYRIGHT LICENSE
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted without payment of copyright license fees, provided that you
+satisfy the following conditions:
+
+You must retain the complete text of this software license in redistributions of
+the FDK Extended High Efficiency AAC Encoder Software or your modifications
+thereto in source code form.
+
+You must retain the complete text of this software license in the documentation
+and/or other materials provided with redistributions of the FDK Extended High
+Efficiency AAC Encoder Software or your modifications thereto in binary form.
+You must make available free of charge copies of the complete source code of the
+FDK Extended High Efficiency AAC Encoder Software and your modifications thereto
+to recipients of copies in binary form.
+
+The name of Fraunhofer may not be used to endorse or promote products derived
+from this software without prior written permission.
+
+You may not charge copyright license fees for anyone to use, copy or distribute
+the FDK Extended High Efficiency AAC Encoder Software or your modifications
+thereto.
+
+Your modified versions of the FDK Extended High Efficiency AAC Encoder Software
+must carry prominent notices stating that you changed the software and the date
+of any change. For modified versions of the FDK Extended High Efficiency AAC
+Encoder Software, the term "Fraunhofer FDK Extended High Efficiency AAC Encoder
+Software for Android" must be replaced by the term "Third-Party Modified Version
+of the Fraunhofer FDK Extended High Efficiency AAC Encoder Software for
+Android."
+
+3.    NO PATENT LICENSE
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
+limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
+Fraunhofer provides no warranty for patent non-infringement with respect to this
+software. You may use this FDK Extended High Efficiency AAC Encoder Software or
+modifications thereto only for purposes that are authorized by appropriate
+patent licenses.
+
+4.    DISCLAIMER
+
+This FDK Extended High Efficiency AAC Encoder Software is provided by Fraunhofer
+on behalf of the copyright holders and contributors "AS IS" and WITHOUT ANY
+EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied
+warranties of merchantability and fitness for a particular purpose. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE for any direct, indirect,
+incidental, special, exemplary, or consequential damages, including but not
+limited to procurement of substitute goods or services; loss of use, data, or
+profits, or business interruption, however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence), arising in any way out of the use of this software, even if advised
+of the possibility of such damage.
+
+5.    CONTACT INFORMATION
+
+Fraunhofer Institute for Integrated Circuits IIS
+Attention: Division Audio and Media Technologies - FDK Extended High Efficiency
+AAC Encoder
+Am Wolfsmantel 33
+91058 Erlangen, Germany
+
+www.iis.fraunhofer.de/amm
+amm-info@iis.fraunhofer.de
+----------------------------------------------------------------------------- */
\ No newline at end of file
diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.3.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_3.0.0.bb
similarity index 61%
rename from meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.3.bb
rename to meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_3.0.0.bb
index 1168161a93..22fd88f9fc 100644
--- a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.3.bb
+++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_3.0.0.bb
@@ -7,15 +7,22 @@  for digital audio."

 HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html"

-LICENSE = "LicenseRef-Fraunhofer-FDK-AAC-Codec-Library-for-Android"
+LICENSE = "LicenseRef-Fraunhofer-FDK-AAC-Codec-Library-for-Android AND LicenseRef-Fraunhofer-FDK-xHE-AAC-Encoder-for-Android"
 LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875"
+LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875 \
+                    file://xhe-aac/NOTICE;md5=096ee69e4afc742d2f471c565d72ebb5"

 SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=https;branch=master;tag=v${PV}"
-SRCREV = "716f4394641d53f0d79c9ddac3fa93b03a49f278"
+SRCREV = "a68a51aa45d86a43c7b228e3d45624af09dcdd8d"


 SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7"
 SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e"

 inherit autotools
+
+PACKAGES =+ "libfdk-xhe-aac"
+FILES:libfdk-xhe-aac = "${libdir}/libfdk-xhe-aac${SOLIBS}"
+
+LICENSE:${PN} = "LicenseRef-Fraunhofer-FDK-AAC-Codec-Library-for-Android"
+LICENSE:libfdk-xhe-aac = "LicenseRef-Fraunhofer-FDK-xHE-AAC-Encoder-for-Android"