[Buildroot] [PATCH 1/3] package/libplacebo: add optional dependencies to lcms & xxhash

[Buildroot] [PATCH 1/3] package/libplacebo: add optional dependencies to lcms & xxhash

[Bernd Kuhls]

Buildroot commit 006aab8d64d2179d77df9a696b3fd8636f541640 added the
package at version v7.351.0.

This version includes optional upstream support for

lcms, added in v0.5.0:
https://code.videolan.org/videolan/libplacebo/-/commit/eb14d3bdf22605263a9b6025ed6280eb1515a89a

xxhash, added in v6.338.0:
https://code.videolan.org/videolan/libplacebo/-/commit/cb1009d1455e64787e52c5c3b6f7042aa37e5c14

This patch adds handling of these optional dependencies.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/libplacebo/libplacebo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/libplacebo/libplacebo.mk b/package/libplacebo/libplacebo.mk
index e03f224971..c3a2822fb5 100644
--- a/package/libplacebo/libplacebo.mk
+++ b/package/libplacebo/libplacebo.mk
@@ -12,4 +12,18 @@ LIBPLACEBO_LICENSE = LGPL-2.1+
 LIBPLACEBO_LICENSE_FILES = LICENSE
 LIBPLACEBO_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+LIBPLACEBO_DEPENDENCIES += lcms2
+LIBPLACEBO_CONF_OPTS += -Dlcms=disabled
+else
+LIBPLACEBO_CONF_OPTS += -Dlcms=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_XXHASH),y)
+LIBPLACEBO_DEPENDENCIES += xxhash
+LIBPLACEBO_CONF_OPTS += -Dxxhash=disabled
+else
+LIBPLACEBO_CONF_OPTS += -Dxxhash=disabled
+endif
+
 $(eval $(meson-package))
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/3] package/xxhash: fix prefix in libxxhash.pc

[Bernd Kuhls]

PREFIX defaults to /usr/local according to
https://github.com/Cyan4973/xxHash/blob/v0.8.3/Makefile#L549

libxxhash.pc contains "prefix=/usr/local" without this patch causing a
build error with libplacebo when xxhash was built before libplacebo:

Run-time dependency libxxhash found: YES 0.8.3
Configuring config.h using configuration
Configuring config_internal.h using configuration

../output-1/build/libplacebo-v7.360.1/src/meson.build:247:6: ERROR:
 Include dir
 /home/thomas/autobuild/instance-0/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/local/include
 does not exist.

Fixes:
https://autobuild.buildroot.net/results/344/344af8504a77ae96e4009d76a77572180cf49b14/

No changes were made in upstream libplacebo to src/meson.build since its
addition with commit 006aab8d64d2179d77df9a696b3fd8636f541640 so a
backport to LTS branches should be considered.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/xxhash/xxhash.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk
index 51bf6ce855..fc2084c878 100644
--- a/package/xxhash/xxhash.mk
+++ b/package/xxhash/xxhash.mk
@@ -31,7 +31,7 @@ endif
 
 define XXHASH_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS)
+		PREFIX=/usr MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS)
 endef
 
 define XXHASH_INSTALL_STAGING_CMDS
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/xxhash: fix prefix in libxxhash.pc

[Thomas Petazzoni via buildroot]

Hello Bernd,

Wow, the timing is crazy, I sent the same patch at:

Date: Wed, 21 Oct 2026 20:35:32 +0200

Just a few minutes before you did!

On Wed, Oct 21, 2026 at 08:41:38PM +0200, Bernd Kuhls wrote:
> PREFIX defaults to /usr/local according to
> https://github.com/Cyan4973/xxHash/blob/v0.8.3/Makefile#L549
> 
> libxxhash.pc contains "prefix=/usr/local" without this patch causing a
> build error with libplacebo when xxhash was built before libplacebo:
> 
> Run-time dependency libxxhash found: YES 0.8.3
> Configuring config.h using configuration
> Configuring config_internal.h using configuration
> 
> ../output-1/build/libplacebo-v7.360.1/src/meson.build:247:6: ERROR:
>  Include dir
>  /home/thomas/autobuild/instance-0/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/local/include
>  does not exist.
> 
> Fixes:
> https://autobuild.buildroot.net/results/344/344af8504a77ae96e4009d76a77572180cf49b14/
> 
> No changes were made in upstream libplacebo to src/meson.build since its
> addition with commit 006aab8d64d2179d77df9a696b3fd8636f541640 so a
> backport to LTS branches should be considered.

libplacebo doesn't matter here, what matters is xxhash, placebo
failing is just one illustration of the libxxhash.pc issue. So the
research on since when the problem exists should have focused on
xxhash, not libplacebo.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/xxhash: fix prefix in libxxhash.pc

[Julien Olivain via buildroot]

Hi Thomas,

On 21/10/2026 20:46, Thomas Petazzoni via buildroot wrote:
> Hello Bernd,
> 
> Wow, the timing is crazy, I sent the same patch at:
> 
> Date: Wed, 21 Oct 2026 20:35:32 +0200
> 
> Just a few minutes before you did!
> 
> On Wed, Oct 21, 2026 at 08:41:38PM +0200, Bernd Kuhls wrote:
>> PREFIX defaults to /usr/local according to
>> https://github.com/Cyan4973/xxHash/blob/v0.8.3/Makefile#L549
>> 
>> libxxhash.pc contains "prefix=/usr/local" without this patch causing a
>> build error with libplacebo when xxhash was built before libplacebo:
>> 
>> Run-time dependency libxxhash found: YES 0.8.3
>> Configuring config.h using configuration
>> Configuring config_internal.h using configuration
>> 
>> ../output-1/build/libplacebo-v7.360.1/src/meson.build:247:6: ERROR:
>>  Include dir
>>  
>> /home/thomas/autobuild/instance-0/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/local/include
>>  does not exist.
>> 
>> Fixes:
>> https://autobuild.buildroot.net/results/344/344af8504a77ae96e4009d76a77572180cf49b14/
>> 
>> No changes were made in upstream libplacebo to src/meson.build since 
>> its
>> addition with commit 006aab8d64d2179d77df9a696b3fd8636f541640 so a
>> backport to LTS branches should be considered.
> 
> libplacebo doesn't matter here, what matters is xxhash, placebo
> failing is just one illustration of the libxxhash.pc issue. So the
> research on since when the problem exists should have focused on
> xxhash, not libplacebo.

I applied your proposal
https://lore.kernel.org/buildroot/20261021183533.2649298-1-thomas.petazzoni@bootlin.com/T/#u

instead of this patch. I also applied the rest of this series.

> 
> Thanks!
> 
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/3] package/xxhash: bump version to 0.8.4

[Bernd Kuhls]

https://github.com/Cyan4973/xxHash/releases/tag/v0.8.4

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/xxhash/xxhash.hash | 2 +-
 package/xxhash/xxhash.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash
index fb8e384122..c2697a1054 100644
--- a/package/xxhash/xxhash.hash
+++ b/package/xxhash/xxhash.hash
@@ -1,4 +1,4 @@
 # locally computed
-sha256  aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80  xxhash-0.8.3.tar.gz
+sha256  5738270935e7c3d38a79b3adf7c9692566ce7895a25f67de43ad52ab504acd32  xxhash-0.8.4.tar.gz
 sha256  6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a  LICENSE
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  cli/COPYING
diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk
index fc2084c878..80bb81dbf7 100644
--- a/package/xxhash/xxhash.mk
+++ b/package/xxhash/xxhash.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XXHASH_VERSION = 0.8.3
+XXHASH_VERSION = 0.8.4
 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION))
 XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum)
 XXHASH_LICENSE_FILES = LICENSE cli/COPYING
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/libplacebo: add optional dependencies to lcms & xxhash

[Julien Olivain via buildroot]

On 21/10/2026 20:41, Bernd Kuhls wrote:
> Buildroot commit 006aab8d64d2179d77df9a696b3fd8636f541640 added the
> package at version v7.351.0.
> 
> This version includes optional upstream support for
> 
> lcms, added in v0.5.0:
> https://code.videolan.org/videolan/libplacebo/-/commit/eb14d3bdf22605263a9b6025ed6280eb1515a89a
> 
> xxhash, added in v6.338.0:
> https://code.videolan.org/videolan/libplacebo/-/commit/cb1009d1455e64787e52c5c3b6f7042aa37e5c14
> 
> This patch adds handling of these optional dependencies.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

I applied patch 1 and 3 on master.
I applied the patch proposed in:
https://lore.kernel.org/buildroot/20261021183533.2649298-1-thomas.petazzoni@bootlin.com/T/#u
instead of patch 2 (which does essentially the same fix).

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot