diff mbox series

flac: upgrade 1.4.3 -> 1.5.0

Message ID 20250227103351.1990659-1-michael.opdenacker@rootcommit.com
State New
Headers show
Series flac: upgrade 1.4.3 -> 1.5.0 | expand

Commit Message

Michael Opdenacker Feb. 27, 2025, 10:34 a.m. UTC 
From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

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

Remove the do_install additional code fixing absolute paths
in doc files. Such files are no longer created on 1.5.0.

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
CC: Peter Marko <peter.marko@siemens.com>
---
 .../flac/{flac_1.4.3.bb => flac_1.5.0.bb}     | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)
 rename meta/recipes-multimedia/flac/{flac_1.4.3.bb => flac_1.5.0.bb} (61%)

Comments

Ross Burton March 3, 2025, 6:09 p.m. UTC | #1 
On 27 Feb 2025, at 10:34, Michael Opdenacker via lists.openembedded.org <michael.opdenacker=rootcommit.com@lists.openembedded.org> wrote:
> 
> From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
> 
> License-Update: GFDL 1.2 -> 1.3, copyright years update
> 
> Remove the do_install additional code fixing absolute paths
> in doc files. Such files are no longer created on 1.5.0.

I asked myself why these files are no longer created, and luckily the autobuilder had already done the build and comparison for me:

https://git.yoctoproject.org/poky-buildhistory/diff/packages/cortexa15t2hf-neon-poky-linux-gnueabi/flac/flac-doc/latest?h=poky/master-next/qemuarm-alt&id=6c8904bceaa1987edffc16823c12b43e86384dea

-PKGSIZE = 5362415
+PKGSIZE = 87538

The files are no longer created because none of the documentation is installed anymore.

This turns out to be a bug in the configure.ac script:

https://lists.xiph.org/pipermail/flac-dev/2025-February/006698.html

So I suggest we apply that fix and continue installing the documentation.

Also, whilst we’re here…

>                ac_cv_prog_NASM="” \

The nasm code was removed in 1.4.2, so you can delete this line.

Ross
Michael Opdenacker March 10, 2025, 10:24 a.m. UTC | #2 
Hi Ross

Thanks for having a look at my patch and finding out why the 
documentation is broken.

On 3/3/25 19:09, Ross Burton wrote:
> On 27 Feb 2025, at 10:34, Michael Opdenacker via lists.openembedded.org <michael.opdenacker=rootcommit.com@lists.openembedded.org> wrote:
>> From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
>>
>> License-Update: GFDL 1.2 -> 1.3, copyright years update
>>
>> Remove the do_install additional code fixing absolute paths
>> in doc files. Such files are no longer created on 1.5.0.
> I asked myself why these files are no longer created, and luckily the autobuilder had already done the build and comparison for me:
>
> https://git.yoctoproject.org/poky-buildhistory/diff/packages/cortexa15t2hf-neon-poky-linux-gnueabi/flac/flac-doc/latest?h=poky/master-next/qemuarm-alt&id=6c8904bceaa1987edffc16823c12b43e86384dea
>
> -PKGSIZE = 5362415
> +PKGSIZE = 87538
>
> The files are no longer created because none of the documentation is installed anymore.
>
> This turns out to be a bug in the configure.ac script:
>
> https://lists.xiph.org/pipermail/flac-dev/2025-February/006698.html
>
> So I suggest we apply that fix and continue installing the documentation.


Good catch, I'll take care of it.

>
> Also, whilst we’re here…
>
>>                 ac_cv_prog_NASM="” \
> The nasm code was removed in 1.4.2, so you can delete this line.

Great, will do it too.
More soon...
Thanks again!
Michael.
Michael Opdenacker March 16, 2025, 5:38 p.m. UTC | #3 
Greetings,

On 3/10/25 11:24, Michael Opdenacker via lists.openembedded.org wrote:
> Hi Ross
>
> Thanks for having a look at my patch and finding out why the 
> documentation is broken.
>
> On 3/3/25 19:09, Ross Burton wrote:
>> On 27 Feb 2025, at 10:34, Michael Opdenacker via 
>> lists.openembedded.org 
>> <michael.opdenacker=rootcommit.com@lists.openembedded.org> wrote:
>>> From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
>>>
>>> License-Update: GFDL 1.2 -> 1.3, copyright years update
>>>
>>> Remove the do_install additional code fixing absolute paths
>>> in doc files. Such files are no longer created on 1.5.0.
>> I asked myself why these files are no longer created, and luckily the 
>> autobuilder had already done the build and comparison for me:
>>
>> https://git.yoctoproject.org/poky-buildhistory/diff/packages/cortexa15t2hf-neon-poky-linux-gnueabi/flac/flac-doc/latest?h=poky/master-next/qemuarm-alt&id=6c8904bceaa1987edffc16823c12b43e86384dea 
>>
>>
>> -PKGSIZE = 5362415
>> +PKGSIZE = 87538
>>
>> The files are no longer created because none of the documentation is 
>> installed anymore.
>>
>> This turns out to be a bug in the configure.ac script:
>>
>> https://lists.xiph.org/pipermail/flac-dev/2025-February/006698.html
>>
>> So I suggest we apply that fix and continue installing the 
>> documentation.
>
>
> Good catch, I'll take care of it.
>
>>
>> Also, whilst we’re here…
>>
>>>                 ac_cv_prog_NASM="” \
>> The nasm code was removed in 1.4.2, so you can delete this line.
>
> Great, will do it too.


I have a patch for upstream, but even though the documentation gets 
generated, there are still issues in it:
https://lists.xiph.org/pipermail/flac-dev/2025-March/006705.html

Shall I submit a new version of the recipe for 1.5.0 to allow people to 
test and use it, even if there are remaining issues in the docs?
Cheers
Michael.
Michael Opdenacker March 28, 2025, 11:04 a.m. UTC | #4 
Hi Ross

On 3/10/25 11:24, Michael Opdenacker wrote:
> Hi Ross
>
> Thanks for having a look at my patch and finding out why the 
> documentation is broken.
>
> On 3/3/25 19:09, Ross Burton wrote:
>> On 27 Feb 2025, at 10:34, Michael Opdenacker via 
>> lists.openembedded.org 
>> <michael.opdenacker=rootcommit.com@lists.openembedded.org> wrote:
>>> From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
>>>
>>> License-Update: GFDL 1.2 -> 1.3, copyright years update
>>>
>>> Remove the do_install additional code fixing absolute paths
>>> in doc files. Such files are no longer created on 1.5.0.
>> I asked myself why these files are no longer created, and luckily the 
>> autobuilder had already done the build and comparison for me:
>>
>> https://git.yoctoproject.org/poky-buildhistory/diff/packages/cortexa15t2hf-neon-poky-linux-gnueabi/flac/flac-doc/latest?h=poky/master-next/qemuarm-alt&id=6c8904bceaa1987edffc16823c12b43e86384dea 
>>
>>
>> -PKGSIZE = 5362415
>> +PKGSIZE = 87538
>>
>> The files are no longer created because none of the documentation is 
>> installed anymore.
>>
>> This turns out to be a bug in the configure.ac script:
>>
>> https://lists.xiph.org/pipermail/flac-dev/2025-February/006698.html
>>
>> So I suggest we apply that fix and continue installing the 
>> documentation.
>
>
> Good catch, I'll take care of it.


Done at last. There was an issue in the fix but I eventually managed to 
fix it.

Now that the patch has been submitted upstream, I can now fill the 
"Upstream-Status" property :)

>
>>
>> Also, whilst we’re here…
>>
>>>                 ac_cv_prog_NASM="” \
>> The nasm code was removed in 1.4.2, so you can delete this line.

Done too.
New patch coming soon.
Thanks
Michael.
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/flac/flac_1.4.3.bb b/meta/recipes-multimedia/flac/flac_1.5.0.bb
similarity index 61%
rename from meta/recipes-multimedia/flac/flac_1.4.3.bb
rename to meta/recipes-multimedia/flac/flac_1.5.0.bb
index 87b67bee1f..ce86779ff8 100644
--- a/meta/recipes-multimedia/flac/flac_1.4.3.bb
+++ b/meta/recipes-multimedia/flac/flac_1.5.0.bb
@@ -3,17 +3,18 @@  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[sha256sum] = "f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920"
 
 CVE_PRODUCT = "libflac flac"
 
@@ -34,10 +35,3 @@  PACKAGES += "libflac libflac++"
 FILES:${PN} = "${bindir}/*"
 FILES:libflac = "${libdir}/libFLAC.so.*"
 FILES:libflac++ = "${libdir}/libFLAC++.so.*"
-
-do_install:append() {
-    # make the links in documentation relative to avoid buildpaths reproducibility problem
-    sed -i "s#${S}/include#${includedir}#g" ${D}${docdir}/flac/FLAC.tag ${D}${docdir}/flac/api/*.html
-    # there is also one root path without trailing slash
-    sed -i "s#${S}#/#g" ${D}${docdir}/flac/api/*.html
-}