[Buildroot] [PATCH 1/1] package/kodi: fix libudfread dependency

[Buildroot] [PATCH 1/1] package/kodi: fix libudfread dependency

[Bernd Kuhls]

Buildroot c61934611111cb3ea04604707052b1387bde5134 commit added a broken
dependency to libudfread. In fact libudfread is still an optional
dependency, just the configure options changes due to upstream
commit https://github.com/xbmc/xbmc/commit/5f9b9cfa26f274e381e92d73cfa33fb55582436e

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/kodi/Config.in | 1 -
 package/kodi/kodi.mk   | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 10f46802a8..6c48168bf8 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -166,7 +166,6 @@ config BR2_PACKAGE_KODI_EVENTCLIENTS
 config BR2_PACKAGE_KODI_LIBBLURAY
 	bool "blu-ray"
 	select BR2_PACKAGE_LIBBLURAY
-	select BR2_PACKAGE_LIBUDFREAD
 	help
 	  Enable Blu-ray input support.
 	  Select this if you want to play back Blu-ray content.
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 09342ea1f0..62463b731e 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -45,7 +45,6 @@ KODI_DEPENDENCIES = \
 	libfribidi \
 	libplist \
 	libpng \
-	libudfread \
 	lzo \
 	openssl \
 	pcre \
@@ -388,6 +387,13 @@ else
 KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
+KODI_CONF_OPTS += -DENABLE_UDFREAD=ON
+KODI_DEPENDENCIES += libudfread
+else
+KODI_CONF_OPTS += -DENABLE_UDFREAD=OFF
+endif
+
 # Remove versioncheck addon, updating Kodi is done by building a new
 # buildroot image.
 KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml
-- 
2.39.2

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

Re: [Buildroot] [PATCH 1/1] package/kodi: fix libudfread dependency

[Yann E. MORIN]

Bernd, All,

On 2024-05-11 14:58 +0200, Bernd Kuhls spake thusly:
> Buildroot c61934611111cb3ea04604707052b1387bde5134 commit added a broken
> dependency to libudfread. In fact libudfread is still an optional
> dependency, just the configure options changes due to upstream
> commit https://github.com/xbmc/xbmc/commit/5f9b9cfa26f274e381e92d73cfa33fb55582436e
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

It looks like it is a correct patch, and the c onfigure step succeeds
in detecting whther udefread is needed and present, or not needed.

However, I was not able to test-build, because of the libatomic issue I
already mentioned earlier.

Regards,
Yann E. MORIN.

> ---
>  package/kodi/Config.in | 1 -
>  package/kodi/kodi.mk   | 8 +++++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/package/kodi/Config.in b/package/kodi/Config.in
> index 10f46802a8..6c48168bf8 100644
> --- a/package/kodi/Config.in
> +++ b/package/kodi/Config.in
> @@ -166,7 +166,6 @@ config BR2_PACKAGE_KODI_EVENTCLIENTS
>  config BR2_PACKAGE_KODI_LIBBLURAY
>  	bool "blu-ray"
>  	select BR2_PACKAGE_LIBBLURAY
> -	select BR2_PACKAGE_LIBUDFREAD
>  	help
>  	  Enable Blu-ray input support.
>  	  Select this if you want to play back Blu-ray content.
> diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
> index 09342ea1f0..62463b731e 100644
> --- a/package/kodi/kodi.mk
> +++ b/package/kodi/kodi.mk
> @@ -45,7 +45,6 @@ KODI_DEPENDENCIES = \
>  	libfribidi \
>  	libplist \
>  	libpng \
> -	libudfread \
>  	lzo \
>  	openssl \
>  	pcre \
> @@ -388,6 +387,13 @@ else
>  KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
> +KODI_CONF_OPTS += -DENABLE_UDFREAD=ON
> +KODI_DEPENDENCIES += libudfread
> +else
> +KODI_CONF_OPTS += -DENABLE_UDFREAD=OFF
> +endif
> +
>  # Remove versioncheck addon, updating Kodi is done by building a new
>  # buildroot image.
>  KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot