NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/kodi: fix filenames of kodi host utils

Browse Source 
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@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2023-07-19 00:11:20 +02:00 committed by Thomas Petazzoni
parent 78039eb59a
commit 0d8c70e93d
4 changed files with 5 additions and 5 deletions
package
kodi-jsonschemabuilder
kodi-jsonschemabuilder.mk
kodi-skin-confluence
kodi-skin-confluence.mk
kodi-texturepacker
kodi-texturepacker.mk
kodi
kodi.mk

2
package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
View File

@ -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))

2
package/kodi-skin-confluence/kodi-skin-confluence.mk
View File

@ -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

2
package/kodi-texturepacker/kodi-texturepacker.mk
View File

@ -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))

4
package/kodi/kodi.mk
View File

@ -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