[meta-multimedia][PATCH 1/2] librtmp: add a patch to fix build with nettle-4

[meta-multimedia][PATCH 1/2] librtmp: add a patch to fix build with nettle-4

[Markus Volk]

This was taken from Archlinux:
https://gitlab.archlinux.org/archlinux/packaging/packages/rtmpdump/-/blob/main/nettle-4.patch

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../rtmpdump/rtmpdump/nettle-4.patch          | 78 +++++++++++++++++++
 .../rtmpdump/rtmpdump_2.6.bb                  |  1 +
 2 files changed, 79 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/nettle-4.patch

diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/nettle-4.patch b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/nettle-4.patch
new file mode 100644
index 0000000000..8850b35d5c
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/nettle-4.patch
@@ -0,0 +1,78 @@
+This patch was taken from Archlinux
+
+Upstream-Status: Inappropriate [https://gitlab.archlinux.org/archlinux/packaging/packages/rtmpdump/-/blob/main/nettle-4.patch]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+diff --git a/librtmp/handshake.h b/librtmp/handshake.h
+index ac38c88..53301c7 100644
+--- a/librtmp/handshake.h
++++ b/librtmp/handshake.h
+@@ -45,6 +45,7 @@ typedef arc4_context *	RC4_handle;
+ #elif defined(USE_GNUTLS)
+ #include <nettle/hmac.h>
+ #include <nettle/arcfour.h>
++#include <nettle/version.h>
+ #ifndef SHA256_DIGEST_LENGTH
+ #define SHA256_DIGEST_LENGTH	32
+ #endif
+@@ -52,7 +53,11 @@ typedef arc4_context *	RC4_handle;
+ #define HMAC_CTX	struct hmac_sha256_ctx
+ #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
+ #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
++#if NETTLE_VERSION_MAJOR > 3
++#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
++#else
+ #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#endif
+ #define HMAC_close(ctx)
+ 
+ typedef struct arcfour_ctx*	RC4_handle;
+diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
+index fc5f824..3ab1d3f 100644
+--- a/librtmp/hashswf.c
++++ b/librtmp/hashswf.c
+@@ -44,6 +44,7 @@
+ #define HMAC_close(ctx)
+ #elif defined(USE_GNUTLS)
+ #include <nettle/hmac.h>
++#include <nettle/version.h>
+ #ifndef SHA256_DIGEST_LENGTH
+ #define SHA256_DIGEST_LENGTH	32
+ #endif
+@@ -51,7 +52,11 @@
+ #define HMAC_CTX	struct hmac_sha256_ctx
+ #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
+ #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
++#if NETTLE_VERSION_MAJOR > 3
++#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
++#else
+ #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#endif
+ #define HMAC_close(ctx)
+ #else	/* USE_OPENSSL */
+ #include <openssl/ssl.h>
+diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
+index cf1de70..a53ed9f 100644
+--- a/librtmp/rtmp.c
++++ b/librtmp/rtmp.c
+@@ -57,6 +57,7 @@ static const char *my_dhm_G = "4";
+ #define MD5_DIGEST_LENGTH 16
+ #include <nettle/base64.h>
+ #include <nettle/md5.h>
++#include <nettle/version.h>
+ #else	/* USE_OPENSSL */
+ #include <openssl/ssl.h>
+ #include <openssl/rc4.h>
+@@ -2492,7 +2493,11 @@ b64enc(const unsigned char *input, int length, char *output, int maxsize)
+ typedef struct md5_ctx	MD5_CTX;
+ #define MD5_Init(ctx)	md5_init(ctx)
+ #define MD5_Update(ctx,data,len)	md5_update(ctx,len,data)
++#if NETTLE_VERSION_MAJOR > 3
++#define MD5_Final(dig,ctx)	md5_digest(ctx,dig)
++#else
+ #define MD5_Final(dig,ctx)	md5_digest(ctx,MD5_DIGEST_LENGTH,dig)
++#endif
+ #else
+ #endif
+ 
diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb
index c02b45054f..d6c5886b95 100644
--- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb
+++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb
@@ -11,6 +11,7 @@ PV .= "+git"
 SRCREV = "6f6bb1353fc84f4cc37138baa99f586750028a01"
 SRC_URI = " \
     git://git.ffmpeg.org/rtmpdump;branch=master \
+    file://nettle-4.patch \
 "
 
 
-- 
2.54.0

[meta-multimedia][PATCH 2/2] packagegroup-meta-multimedia: add libdvdread to RDEPENDS

[Markus Volk]

libdvdread has recently been moved to meta-multimedia and the 'libdvdred' runtime
dependency was removed from packagegroup-meta-oe
Add the runtime dependency to packagegroup-meta-multimedia so that is included in
world builds again.

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../packagegroups/packagegroup-meta-multimedia.bb                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index 4da9de3ff9..4e4f58f14a 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -43,6 +43,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
     pipewire \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
     libcamera \
+    libdvdread \
     vorbis-tools \
     libopenmpt \
     mimic \
-- 
2.54.0

Re: [oe] [meta-multimedia][PATCH 2/2] packagegroup-meta-multimedia: add libdvdread to RDEPENDS

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]

This results in

ERROR: packagegroup-meta-multimedia-1.0-r0 do_package_write_ipk: An allarch
packagegroup shouldn't depend on packages which are dynamically renamed
(libdvdread to libdvdread8)

On Wed, Jun 24, 2026 at 6:31 AM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:

> libdvdread has recently been moved to meta-multimedia and the 'libdvdred'
> runtime
> dependency was removed from packagegroup-meta-oe
> Add the runtime dependency to packagegroup-meta-multimedia so that is
> included in
> world builds again.
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../packagegroups/packagegroup-meta-multimedia.bb                | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-multimedia/recipes-multimedia/packagegroups/
> packagegroup-meta-multimedia.bb
> b/meta-multimedia/recipes-multimedia/packagegroups/
> packagegroup-meta-multimedia.bb
> index 4da9de3ff9..4e4f58f14a 100644
> --- a/meta-multimedia/recipes-multimedia/packagegroups/
> packagegroup-meta-multimedia.bb
> +++ b/meta-multimedia/recipes-multimedia/packagegroups/
> packagegroup-meta-multimedia.bb
> @@ -43,6 +43,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
>      pipewire \
>      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial",
> bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
>      libcamera \
> +    libdvdread \
>      vorbis-tools \
>      libopenmpt \
>      mimic \
> --
> 2.54.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#127715):
> https://lists.openembedded.org/g/openembedded-devel/message/127715
> Mute This Topic: https://lists.openembedded.org/mt/119956631/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 3457 bytes --]

Re: [oe] [meta-multimedia][PATCH 2/2] packagegroup-meta-multimedia: add libdvdread to RDEPENDS

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 2735 bytes --]

I have added PACKAGE_ARCH = "${MACHINE_ARCH}" from 
packagegroup-meta-oe. Hopefully this setting will fix the error

Am Fr, 26. Jun 2026 um 00:08:52 -07:00:00 schrieb Khem Raj 
<raj.khem@gmail.com>:
> This results in
> 
> ERROR: packagegroup-meta-multimedia-1.0-r0 do_package_write_ipk: An 
> allarch packagegroup shouldn't depend on packages which are 
> dynamically renamed (libdvdread to libdvdread8)
> 
> On Wed, Jun 24, 2026 at 6:31 AM Markus Volk via 
> lists.openembedded.org <http://lists.openembedded.org/> 
> <f_l_k=t-online.de@lists.openembedded.org 
> <mailto:t-online.de@lists.openembedded.org>> wrote:
>> libdvdread has recently been moved to meta-multimedia and the 
>> 'libdvdred' runtime
>>  dependency was removed from packagegroup-meta-oe
>>  Add the runtime dependency to packagegroup-meta-multimedia so that 
>> is included in
>>  world builds again.
>> 
>>  Signed-off-by: Markus Volk <f_l_k@t-online.de 
>> <mailto:f_l_k@t-online.de>>
>>  ---
>>   .../packagegroups/packagegroup-meta-multimedia.bb 
>> <http://packagegroup-meta-multimedia.bb/>                | 1 +
>>   1 file changed, 1 insertion(+)
>> 
>>  diff --git 
>> a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb 
>> <http://packagegroup-meta-multimedia.bb/> 
>> b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb 
>> <http://packagegroup-meta-multimedia.bb/>
>>  index 4da9de3ff9..4e4f58f14a 100644
>>  --- 
>> a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb 
>> <http://packagegroup-meta-multimedia.bb/>
>>  +++ 
>> b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb 
>> <http://packagegroup-meta-multimedia.bb/>
>>  @@ -43,6 +43,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
>>       pipewire \
>>       ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", 
>> bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", 
>> d)} \
>>       libcamera \
>>  +    libdvdread \
>>       vorbis-tools \
>>       libopenmpt \
>>       mimic \
>>  --
>>  2.54.0
>> 
>> 
>>  -=-=-=-=-=-=-=-=-=-=-=-
>>  Links: You receive all messages sent to this group.
>>  View/Reply Online (#127715): 
>> <https://lists.openembedded.org/g/openembedded-devel/message/127715>
>>  Mute This Topic: 
>> <https://lists.openembedded.org/mt/119956631/1997914>
>>  Group Owner: openembedded-devel+owner@lists.openembedded.org 
>> <mailto:openembedded-devel%2Bowner@lists.openembedded.org>
>>  Unsubscribe: 
>> <https://lists.openembedded.org/g/openembedded-devel/unsub> 
>> [raj.khem@gmail.com <mailto:raj.khem@gmail.com>]
>>  -=-=-=-=-=-=-=-=-=-=-=-
>> 


[-- Attachment #2: Type: text/html, Size: 3876 bytes --]

Re: [oe] [meta-multimedia][PATCH 2/2] packagegroup-meta-multimedia: add libdvdread to RDEPENDS

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2456 bytes --]

These are libraries, they should be pulled by shlibs code, I am not sure if
its needed to be added to packagegroups explicitly.

On Fri, Jun 26, 2026 at 7:08 AM Markus Volk <f_l_k@t-online.de> wrote:

> I have added PACKAGE_ARCH = "${MACHINE_ARCH}" from packagegroup-meta-oe.
> Hopefully this setting will fix the error
>
> Am Fr, 26. Jun 2026 um 00:08:52 -07:00:00 schrieb Khem Raj <
> raj.khem@gmail.com>:
>
> This results in
>
> ERROR: packagegroup-meta-multimedia-1.0-r0 do_package_write_ipk: An
> allarch packagegroup shouldn't depend on packages which are dynamically
> renamed (libdvdread to libdvdread8)
>
> On Wed, Jun 24, 2026 at 6:31 AM Markus Volk via lists.openembedded.org
> <f_l_k=t-online.de@lists.openembedded.org> wrote:
>
>> libdvdread has recently been moved to meta-multimedia and the 'libdvdred'
>> runtime
>> dependency was removed from packagegroup-meta-oe
>> Add the runtime dependency to packagegroup-meta-multimedia so that is
>> included in
>> world builds again.
>>
>> Signed-off-by: Markus Volk <f_l_k@t-online.de>
>> ---
>>  .../packagegroups/packagegroup-meta-multimedia.bb                | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/meta-multimedia/recipes-multimedia/packagegroups/
>> packagegroup-meta-multimedia.bb
>> b/meta-multimedia/recipes-multimedia/packagegroups/
>> packagegroup-meta-multimedia.bb
>> index 4da9de3ff9..4e4f58f14a 100644
>> --- a/meta-multimedia/recipes-multimedia/packagegroups/
>> packagegroup-meta-multimedia.bb
>> +++ b/meta-multimedia/recipes-multimedia/packagegroups/
>> packagegroup-meta-multimedia.bb
>> @@ -43,6 +43,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
>>      pipewire \
>>      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial",
>> bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
>>      libcamera \
>> +    libdvdread \
>>      vorbis-tools \
>>      libopenmpt \
>>      mimic \
>> --
>> 2.54.0
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#127715):
>> https://lists.openembedded.org/g/openembedded-devel/message/127715
>> Mute This Topic: https://lists.openembedded.org/mt/119956631/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
>> raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>

[-- Attachment #2: Type: text/html, Size: 4469 bytes --]

Re: [oe] [meta-multimedia][PATCH 2/2] packagegroup-meta-multimedia: add libdvdread to RDEPENDS

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

Am Fr, 26. Jun 2026 um 08:00:14 -07:00:00 schrieb Khem Raj via 
lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org>:
> These are libraries, they should be pulled by shlibs code, I am not 
> sure if its needed to be added to packagegroups explicitly

I added libdvdread only, because I had removed it earlier. If thats not 
needed, even better!


[-- Attachment #2: Type: text/html, Size: 464 bytes --]