[Buildroot] [git commit branch/next] package/kodi: fix filenames of kodi host utils
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Sun Aug 6 16:04:34 UTC 2023
commit: https://git.buildroot.net/buildroot/commit/?id=0d8c70e93d1835c97d797ce1f390e6acc0adb225
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
The variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as
directories:
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake
and during configure kodi searches these directories for usable
binaries with the name scheme.
${APP_NAME_LC}-JsonSchemaBuilder
${APP_NAME_LC}-TexturePacker
which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker.
This is an improvement to follow upstream's expections and it does
neither fix a build nor a runtime error.
Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +-
package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +-
package/kodi-texturepacker/kodi-texturepacker.mk | 2 +-
package/kodi/kodi.mk | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
index 569bde8cd2..e017aa8d9c 100644
--- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -20,7 +20,7 @@ HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \
define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS
$(INSTALL) -m 755 -D \
$(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
- $(HOST_DIR)/bin/JsonSchemaBuilder
+ $(HOST_DIR)/bin/kodi-JsonSchemaBuilder
endef
$(eval $(host-cmake-package))
diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk
index 43d0c4bff6..58e51ffc8a 100644
--- a/package/kodi-skin-confluence/kodi-skin-confluence.mk
+++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk
@@ -11,7 +11,7 @@ KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt
KODI_SKIN_CONFLUENCE_DEPENDENCIES = kodi
define KODI_SKIN_CONFLUENCE_BUILD_CMDS
- $(HOST_DIR)/bin/TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none
+ $(HOST_DIR)/bin/kodi-TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none
endef
define KODI_SKIN_CONFLUENCE_INSTALL_TARGET_CMDS
diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk
index 44eba85d75..c0bc767dd4 100644
--- a/package/kodi-texturepacker/kodi-texturepacker.mk
+++ b/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -35,7 +35,7 @@ HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS
$(INSTALL) -m 755 -D \
$(@D)/tools/depends/native/TexturePacker/TexturePacker \
- $(HOST_DIR)/bin/TexturePacker
+ $(HOST_DIR)/bin/kodi-TexturePacker
endef
$(eval $(host-cmake-package))
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index aff272d014..4fe6ea46cc 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -88,8 +88,8 @@ KODI_CONF_OPTS += \
-DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
-DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
-DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \
- -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \
- -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
+ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/ \
+ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/ \
-DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \
-DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \
-DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz
More information about the buildroot
mailing list