jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[xbmc-rebrand] xbmc: update to xbmc-14-31ce987; add patch to fix building (audio)addons after XBMC rebrand; rename scripts, configfiles and systemd services; move install locations

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-10-20 04:43:25 +02:00
parent bef5be3b13
commit 48a0560489
28 changed files with 561 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/mediacenter/xbmc-theme-Confluence/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="14-31ce987" PKG_VERSION="14-71f2030"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -26,8 +26,8 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain xbmc" PKG_DEPENDS_TARGET="toolchain xbmc"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="mediacenter" PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc-theme-Confluence: XBMC Mediacenter default theme" PKG_SHORTDESC="xbmc-theme-Confluence: Kodi Mediacenter default theme"
PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
PKG_IS_ADDON="no" PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
@ -40,13 +40,13 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence mkdir -p $INSTALL/usr/share/kodi/addons/skin.confluence
cp -R */ $INSTALL/usr/share/xbmc/addons/skin.confluence cp -R */ $INSTALL/usr/share/kodi/addons/skin.confluence
cp *.txt $INSTALL/usr/share/xbmc/addons/skin.confluence cp *.txt $INSTALL/usr/share/kodi/addons/skin.confluence
cp *.xml $INSTALL/usr/share/xbmc/addons/skin.confluence cp *.xml $INSTALL/usr/share/kodi/addons/skin.confluence
cp *.png $INSTALL/usr/share/xbmc/addons/skin.confluence cp *.png $INSTALL/usr/share/kodi/addons/skin.confluence
rm -rf $INSTALL/usr/share/xbmc/addons/skin.confluence/media rm -rf $INSTALL/usr/share/kodi/addons/skin.confluence/media
mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence/media mkdir -p $INSTALL/usr/share/kodi/addons/skin.confluence/media
cp Textures.xbt $INSTALL/usr/share/xbmc/addons/skin.confluence/media cp Textures.xbt $INSTALL/usr/share/kodi/addons/skin.confluence/media
} }

0
packages/mediacenter/xbmc/debug.d/xbmc.conf → packages/mediacenter/xbmc/debug.d/kodi.conf
View File

101
packages/mediacenter/xbmc/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="14-31ce987" PKG_VERSION="14-71f2030"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -400,10 +400,10 @@ make_target() {
sed -i -e "s|skin.confluence|$SKIN_DIR|g" $ROOT/$PKG_BUILD/xbmc/settings/Settings.h sed -i -e "s|skin.confluence|$SKIN_DIR|g" $ROOT/$PKG_BUILD/xbmc/settings/Settings.h
make externals make externals
make xbmc.bin make kodi.bin
if [ "$DISPLAYSERVER" = "x11" ]; then if [ "$DISPLAYSERVER" = "x11" ]; then
make xbmc-xrandr make kodi-xrandr
fi fi
make -C tools/TexturePacker make -C tools/TexturePacker
@ -411,14 +411,16 @@ make_target() {
} }
post_makeinstall_target() { post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/kodi
rm -rf $INSTALL/usr/bin/kodi-standalone
rm -rf $INSTALL/usr/bin/xbmc rm -rf $INSTALL/usr/bin/xbmc
rm -rf $INSTALL/usr/bin/xbmc-standalone rm -rf $INSTALL/usr/bin/xbmc-standalone
rm -rf $INSTALL/usr/lib/xbmc/*.cmake rm -rf $INSTALL/usr/lib/kodi/*.cmake
mkdir -p $INSTALL/usr/lib/xbmc mkdir -p $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/xbmc-config $INSTALL/usr/lib/xbmc cp $PKG_DIR/scripts/kodi-config $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/xbmc-hacks $INSTALL/usr/lib/xbmc cp $PKG_DIR/scripts/kodi-hacks $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/xbmc-sources $INSTALL/usr/lib/xbmc cp $PKG_DIR/scripts/kodi-sources $INSTALL/usr/lib/kodi
mkdir -p $INSTALL/usr/lib/openelec mkdir -p $INSTALL/usr/lib/openelec
cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec
@ -427,80 +429,81 @@ post_makeinstall_target() {
cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin
ln -sf cputemp $INSTALL/usr/bin/gputemp ln -sf cputemp $INSTALL/usr/bin/gputemp
cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin
cp tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send cp tools/EventClients/Clients/Kodi\ Send/kodi-send.py $INSTALL/usr/bin/kodi-send
if [ ! "$DISPLAYSERVER" = "x11" ]; then if [ ! "$DISPLAYSERVER" = "x11" ]; then
rm -rf $INSTALL/usr/lib/xbmc/xbmc-xrandr rm -rf $INSTALL/usr/lib/kodi/kodi-xrandr
fi fi
if [ ! "$KODI_SCR_RSXS" = yes ]; then if [ ! "$KODI_SCR_RSXS" = yes ]; then
rm -rf $INSTALL/usr/share/xbmc/addons/screensaver.rsxs.* rm -rf $INSTALL/usr/share/kodi/addons/screensaver.rsxs.*
fi fi
if [ ! "$KODI_VIS_PROJECTM" = yes ]; then if [ ! "$KODI_VIS_PROJECTM" = yes ]; then
rm -rf $INSTALL/usr/share/xbmc/addons/visualization.projectm rm -rf $INSTALL/usr/share/kodi/addons/visualization.projectm
fi fi
rm -rf $INSTALL/usr/share/applications rm -rf $INSTALL/usr/share/applications
rm -rf $INSTALL/usr/share/icons rm -rf $INSTALL/usr/share/icons
rm -rf $INSTALL/usr/share/xbmc/addons/repository.pvr-* rm -rf $INSTALL/usr/share/kodi/addons/service.xbmc.versioncheck
rm -rf $INSTALL/usr/share/xbmc/addons/script.module.simplejson
rm -rf $INSTALL/usr/share/xbmc/addons/visualization.dxspectrum
rm -rf $INSTALL/usr/share/xbmc/addons/visualization.milkdrop
rm -rf $INSTALL/usr/share/xbmc/addons/service.xbmc.versioncheck
rm -rf $INSTALL/usr/share/xsessions rm -rf $INSTALL/usr/share/xsessions
mkdir -p $INSTALL/usr/share/xbmc/addons mkdir -p $INSTALL/usr/share/kodi/addons
cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/kodi/addons
$SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml $SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.openelec.tv/addon.xml
cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/xbmc/addons cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/kodi/addons
$SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/xbmc/addons/repository.openelec.tv/addon.xml $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.openelec.tv/addon.xml
mkdir -p $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/xbmc mkdir -p $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/xbmc
cp -R tools/EventClients/lib/python/* $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/xbmc cp -R tools/EventClients/lib/python/* $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/xbmc
# install project specific configs # install project specific configs
mkdir -p $INSTALL/usr/share/xbmc/config mkdir -p $INSTALL/usr/share/kodi/config
if [ -f $PROJECT_DIR/$PROJECT/xbmc/guisettings.xml ]; then if [ -f $PROJECT_DIR/$PROJECT/kodi/guisettings.xml ]; then
cp -R $PROJECT_DIR/$PROJECT/xbmc/guisettings.xml $INSTALL/usr/share/xbmc/config cp -R $PROJECT_DIR/$PROJECT/kodi/guisettings.xml $INSTALL/usr/share/kodi/config
fi fi
if [ -f $PROJECT_DIR/$PROJECT/xbmc/sources.xml ]; then if [ -f $PROJECT_DIR/$PROJECT/kodi/sources.xml ]; then
cp -R $PROJECT_DIR/$PROJECT/xbmc/sources.xml $INSTALL/usr/share/xbmc/config cp -R $PROJECT_DIR/$PROJECT/kodi/sources.xml $INSTALL/usr/share/kodi/config
fi fi
mkdir -p $INSTALL/usr/share/xbmc/system/ mkdir -p $INSTALL/usr/share/kodi/system/
if [ -f $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml ]; then if [ -f $PROJECT_DIR/$PROJECT/kodi/advancedsettings.xml ]; then
cp $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml $INSTALL/usr/share/xbmc/system/ cp $PROJECT_DIR/$PROJECT/kodi/advancedsettings.xml $INSTALL/usr/share/kodi/system/
else else
cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/ cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/kodi/system/
fi fi
mkdir -p $INSTALL/usr/share/xbmc/system/settings mkdir -p $INSTALL/usr/share/kodi/system/settings
if [ -f $PROJECT_DIR/$PROJECT/xbmc/appliance.xml ]; then if [ -f $PROJECT_DIR/$PROJECT/kodi/appliance.xml ]; then
cp $PROJECT_DIR/$PROJECT/xbmc/appliance.xml $INSTALL/usr/share/xbmc/system/settings cp $PROJECT_DIR/$PROJECT/kodi/appliance.xml $INSTALL/usr/share/kodi/system/settings
else else
cp $PKG_DIR/config/appliance.xml $INSTALL/usr/share/xbmc/system/settings cp $PKG_DIR/config/appliance.xml $INSTALL/usr/share/kodi/system/settings
fi fi
if [ "$KODI_EXTRA_FONTS" = yes ]; then if [ "$KODI_EXTRA_FONTS" = yes ]; then
mkdir -p $INSTALL/usr/share/xbmc/media/Fonts mkdir -p $INSTALL/usr/share/kodi/media/Fonts
cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/kodi/media/Fonts
fi fi
} }
post_install() { post_install() {
# link default.target to xbmc.target # link default.target to kodi.target
ln -sf xbmc.target $INSTALL/usr/lib/systemd/system/default.target ln -sf kodi.target $INSTALL/usr/lib/systemd/system/default.target
enable_service xbmc-autostart.service # TODO: for compatibility to be removed soon
enable_service xbmc-cleanlogs.service ln -sf kodi.target $INSTALL/usr/lib/systemd/system/xbmc.target
enable_service xbmc-hacks.service ln -sf kodi.service $INSTALL/usr/lib/systemd/system/xbmc.service
enable_service xbmc-sources.service
enable_service xbmc-halt.service # enable default services
enable_service xbmc-poweroff.service enable_service kodi-autostart.service
enable_service xbmc-reboot.service enable_service kodi-cleanlogs.service
enable_service xbmc-waitonnetwork.service enable_service kodi-hacks.service
enable_service xbmc.service enable_service kodi-sources.service
enable_service xbmc-lirc-suspend.service enable_service kodi-halt.service
enable_service kodi-poweroff.service
enable_service kodi-reboot.service
enable_service kodi-waitonnetwork.service
enable_service kodi.service
enable_service kodi-lirc-suspend.service
} }

416
packages/mediacenter/xbmc/patches/xbmc-001.01-xbmc-rebrand.patch Normal file
View File

@ -0,0 +1,416 @@
diff -Naur xbmc-14-31ce987/configure.in xbmc-14-31ce987.patch/configure.in
--- xbmc-14-31ce987/configure.in 2014-10-20 02:31:03.259864060 +0200
+++ xbmc-14-31ce987.patch/configure.in 2014-10-20 12:49:16.126851321 +0200
@@ -2501,7 +2501,7 @@
xbmc/osx/Info.plist \
xbmc/osx/ios/XBMCIOS-Info.plist \
xbmc/osx/atv2/XBMCATV2-Info.plist \
- project/cmake/xbmc-config.cmake \
+ project/cmake/kodi-config.cmake \
tools/android/packaging/xbmc/AndroidManifest.xml \
tools/android/packaging/Makefile \
tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java \
diff -Naur xbmc-14-31ce987/.gitignore xbmc-14-31ce987.patch/.gitignore
--- xbmc-14-31ce987/.gitignore 2014-10-20 02:31:03.272864215 +0200
+++ xbmc-14-31ce987.patch/.gitignore 2014-10-20 12:49:03.991834753 +0200
@@ -337,7 +337,7 @@
/project/output
# /project/cmake
-/project/cmake/xbmc-config.cmake
+/project/cmake/kodi-config.cmake
/project/cmake/*.error
/project/cmake/addons/build
/project/cmake/addons/depends/build
diff -Naur xbmc-14-31ce987/project/cmake/addons/CMakeLists.txt xbmc-14-31ce987.patch/project/cmake/addons/CMakeLists.txt
--- xbmc-14-31ce987/project/cmake/addons/CMakeLists.txt 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/addons/CMakeLists.txt 2014-10-20 12:47:44.298691059 +0200
@@ -70,14 +70,14 @@
endif()
if(NOT WIN32)
- # copy the xbmc-prepare-env.cmake script to the depends path so that we can include it
- file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-prepare-env.cmake DESTINATION ${DEPENDS_PATH}/lib/xbmc)
+ # copy the kodi-prepare-env.cmake script to the depends path so that we can include it
+ file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-prepare-env.cmake DESTINATION ${DEPENDS_PATH}/lib/kodi)
- # add the location of xbmc-prepare-env.cmake to CMAKE_MODULE_PATH so that it is found
- list(APPEND CMAKE_MODULE_PATH ${DEPENDS_PATH}/lib/xbmc)
+ # add the location of kodi-prepare-env.cmake to CMAKE_MODULE_PATH so that it is found
+ list(APPEND CMAKE_MODULE_PATH ${DEPENDS_PATH}/lib/kodi)
- # include xbmc-prepare-env.cmake which contains the logic to install the addon header bindings etc
- include(xbmc-prepare-env)
+ # include kodi-prepare-env.cmake which contains the logic to install the addon header bindings etc
+ include(kodi-prepare-env)
endif()
### get and build all the binary addons
diff -Naur xbmc-14-31ce987/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt xbmc-14-31ce987.patch/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt
--- xbmc-14-31ce987/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt 2014-10-20 12:46:06.181514316 +0200
@@ -21,11 +21,11 @@
get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
### prepare the environment
-# set the DEPENDS_PATH variable used by xbmc-prepare-env
+# set the DEPENDS_PATH variable used by kodi-prepare-env
set(DEPENDS_PATH "${CMAKE_INSTALL_PREFIX}")
-# copy the xbmc-prepare-env.cmake script so that we can include it
-file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-prepare-env.cmake DESTINATION ${CMAKE_BINARY_DIR})
+# copy the kodi-prepare-env.cmake script so that we can include it
+file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-prepare-env.cmake DESTINATION ${CMAKE_BINARY_DIR})
-# include xbmc-prepare-env.cmake which contains the logic to install the addon header bindings etc
-include(xbmc-prepare-env)
\ Kein Zeilenumbruch am Dateiende.
+# include kodi-prepare-env.cmake which contains the logic to install the addon header bindings etc
+include(kodi-prepare-env)
\ Kein Zeilenumbruch am Dateiende.
diff -Naur xbmc-14-31ce987/project/cmake/addons/README xbmc-14-31ce987.patch/project/cmake/addons/README
--- xbmc-14-31ce987/project/cmake/addons/README 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/addons/README 2014-10-20 12:44:44.880370598 +0200
@@ -33,8 +33,8 @@
* XBMCROOT points to the root directory of the xbmc project (default is the
absolute representation of ../../.. starting from this directory).
* PACKAGE_ZIP=1 will mean the add-ons will be 'packaged' into a common folder,
- rather than being placed in <CMAKE_INSTALL_PREFIX>/lib/xbmc/addons and
- <CMAKE_INSTALL_PREFIX>/share/xbmc/addons.
+ rather than being placed in <CMAKE_INSTALL_PREFIX>/lib/kodi/addons and
+ <CMAKE_INSTALL_PREFIX>/share/kodi/addons.
* ARCH_DEFINES specifies the platform-specific C/C++ preprocessor defines
(defaults to empty).
diff -Naur xbmc-14-31ce987/project/cmake/kodi-config.cmake.in xbmc-14-31ce987.patch/project/cmake/kodi-config.cmake.in
--- xbmc-14-31ce987/project/cmake/kodi-config.cmake.in 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-14-31ce987.patch/project/cmake/kodi-config.cmake.in 2014-10-20 13:11:45.147629367 +0200
@@ -0,0 +1,8 @@
+SET(XBMC_INCLUDE_DIR @prefix@/include)
+SET(APP_NAME @APP_NAME@)
+SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
+SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
+LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/kodi)
+ADD_DEFINITIONS(@ARCH_DEFINES@)
+
+include(kodi-addon-helpers)
diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/kodi-addon-helpers.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-addon-helpers.cmake
--- xbmc-14-31ce987/project/cmake/scripts/common/kodi-addon-helpers.cmake 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-addon-helpers.cmake 2014-10-20 02:39:16.065509547 +0200
@@ -0,0 +1,99 @@
+# Workaround for the fact that cpack's filenames are not customizable.
+# Each add-on is added as a separate component to facilitate zip/tgz packaging.
+# The filenames are always of the form basename-component, which is
+# incompatible with the addonid-version scheme we want. This hack renames
+# the files from the file names generated by the 'package' target.
+# Sadly we cannot extend the 'package' target, as it is a builtin target, see
+# http://public.kitware.com/Bug/view.php?id=8438
+# Thus, we have to add an 'addon-package' target.
+add_custom_target(addon-package
+ COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+
+macro(add_cpack_workaround target version ext)
+ add_custom_command(TARGET addon-package PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E rename addon-${target}-${version}.${ext} ${target}-${version}.${ext})
+endmacro()
+
+# Grab the version from a given add-on's addon.xml
+macro (addon_version dir prefix)
+ FILE(READ ${dir}/addon.xml ADDONXML)
+ STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML})
+ STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
+ message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
+endmacro()
+
+# Build, link and optionally package an add-on
+macro (build_addon target prefix libs)
+ ADD_LIBRARY(${target} ${${prefix}_SOURCES})
+ TARGET_LINK_LIBRARIES(${target} ${${libs}})
+ addon_version(${target} ${prefix})
+ SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${${prefix}_VERSION}
+ SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
+ PREFIX "")
+ IF(OS STREQUAL "android")
+ SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib")
+ ENDIF(OS STREQUAL "android")
+
+ # set zip as default if addon-package is called without PACKAGE_XXX
+ SET(CPACK_GENERATOR "ZIP")
+ SET(ext "zip")
+ IF(PACKAGE_ZIP OR PACKAGE_TGZ)
+ IF(PACKAGE_TGZ)
+ SET(CPACK_GENERATOR "TGZ")
+ SET(ext "tar.gz")
+ ENDIF(PACKAGE_TGZ)
+ SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
+ set(CPACK_PACKAGE_FILE_NAME addon)
+ IF(CMAKE_BUILD_TYPE STREQUAL "Release")
+ SET(CPACK_STRIP_FILES TRUE)
+ ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
+ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+ set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+ list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
+ # Pack files together to create an archive
+ INSTALL(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION})
+ IF(WIN32)
+ INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/${target}.dll
+ DESTINATION ${target}
+ COMPONENT ${target}-${${prefix}_VERSION})
+ ELSE(WIN32)
+ INSTALL(TARGETS ${target} DESTINATION ${target}
+ COMPONENT ${target}-${${prefix}_VERSION})
+ ENDIF(WIN32)
+ add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
+ ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
+ INSTALL(TARGETS ${target} DESTINATION lib/kodi/addons/${target})
+ INSTALL(DIRECTORY ${target} DESTINATION share/kodi/addons)
+ ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
+endmacro()
+
+# finds a path to a given file (recursive)
+function (xbmc_find_path var_name filename search_path strip_file)
+ file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
+ if(strip_file)
+ string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
+ endif(strip_file)
+ set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
+endfunction()
+
+# Cmake build options
+include(addoptions)
+include(TestCXXAcceptsFlag)
+OPTION(PACKAGE_ZIP "Package Zip file?" OFF)
+OPTION(PACKAGE_TGZ "Package TGZ file?" OFF)
+OPTION(BUILD_SHARED_LIBS "Build shared libs?" ON)
+
+# LTO support?
+CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
+IF(HAVE_LTO)
+ OPTION(USE_LTO "use link time optimization" OFF)
+ IF(USE_LTO)
+ add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
+ ENDIF(USE_LTO)
+ENDIF(HAVE_LTO)
+
+# set this to try linking dependencies as static as possible
+IF(ADDONS_PREFER_STATIC_LIBS)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ENDIF(ADDONS_PREFER_STATIC_LIBS)
+
diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/kodi-prepare-env.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-prepare-env.cmake
--- xbmc-14-31ce987/project/cmake/scripts/common/kodi-prepare-env.cmake 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-prepare-env.cmake 2014-10-20 12:42:39.118143975 +0200
@@ -0,0 +1,46 @@
+# parse version.txt to get the version info
+if(EXISTS "${XBMCROOT}/version.txt")
+ file(STRINGS "${XBMCROOT}/version.txt" versions)
+ foreach (version ${versions})
+ string(REGEX MATCH "^[^ ]+" version_name ${version})
+ string(REPLACE "${version_name} " "" version_value ${version})
+ set(APP_${version_name} "${version_value}")
+ endforeach()
+endif()
+
+# bail if we can't parse versions
+if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
+ message(FATAL_ERROR "Could not determine app version! make sure that ${XBMCROOT}/version.txt exists")
+endif()
+
+### copy all the addon binding header files to include/kodi
+# make sure include/kodi exists and is empty
+set(XBMC_LIB_DIR ${DEPENDS_PATH}/lib/kodi)
+if(NOT EXISTS "${XBMC_LIB_DIR}/")
+ file(MAKE_DIRECTORY ${XBMC_LIB_DIR})
+endif()
+
+set(XBMC_INCLUDE_DIR ${DEPENDS_PATH}/include/kodi)
+if(NOT EXISTS "${XBMC_INCLUDE_DIR}/")
+ file(MAKE_DIRECTORY ${XBMC_INCLUDE_DIR})
+endif()
+
+# kodi-config.cmake.in (further down) expects a "prefix" variable
+get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
+
+# generate the proper kodi-config.cmake file
+configure_file(${XBMCROOT}/project/cmake/kodi-config.cmake.in ${XBMC_LIB_DIR}/kodi-config.cmake @ONLY)
+# copy cmake helpers to lib/kodi
+file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-addon-helpers.cmake ${XBMCROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${XBMC_LIB_DIR})
+
+### copy all the addon binding header files to include/kodi
+# parse addon-bindings.mk to get the list of header files to copy
+file(STRINGS ${XBMCROOT}/xbmc/addons/addon-bindings.mk bindings)
+string(REPLACE "\n" ";" bindings "${bindings}")
+foreach(binding ${bindings})
+ string(REPLACE " =" ";" binding "${binding}")
+ string(REPLACE "+=" ";" binding "${binding}")
+ list(GET binding 1 header)
+ # copy the header file to include/kodi
+ file(COPY ${XBMCROOT}/${header} DESTINATION ${XBMC_INCLUDE_DIR})
+endforeach()
\ Kein Zeilenumbruch am Dateiende.
diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/xbmc-addon-helpers.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-addon-helpers.cmake
--- xbmc-14-31ce987/project/cmake/scripts/common/xbmc-addon-helpers.cmake 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-addon-helpers.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-# Workaround for the fact that cpack's filenames are not customizable.
-# Each add-on is added as a separate component to facilitate zip/tgz packaging.
-# The filenames are always of the form basename-component, which is
-# incompatible with the addonid-version scheme we want. This hack renames
-# the files from the file names generated by the 'package' target.
-# Sadly we cannot extend the 'package' target, as it is a builtin target, see
-# http://public.kitware.com/Bug/view.php?id=8438
-# Thus, we have to add an 'addon-package' target.
-add_custom_target(addon-package
- COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
-
-macro(add_cpack_workaround target version ext)
- add_custom_command(TARGET addon-package PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E rename addon-${target}-${version}.${ext} ${target}-${version}.${ext})
-endmacro()
-
-# Grab the version from a given add-on's addon.xml
-macro (addon_version dir prefix)
- FILE(READ ${dir}/addon.xml ADDONXML)
- STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML})
- STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
- message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
-endmacro()
-
-# Build, link and optionally package an add-on
-macro (build_addon target prefix libs)
- ADD_LIBRARY(${target} ${${prefix}_SOURCES})
- TARGET_LINK_LIBRARIES(${target} ${${libs}})
- addon_version(${target} ${prefix})
- SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${${prefix}_VERSION}
- SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
- PREFIX "")
- IF(OS STREQUAL "android")
- SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib")
- ENDIF(OS STREQUAL "android")
-
- # set zip as default if addon-package is called without PACKAGE_XXX
- SET(CPACK_GENERATOR "ZIP")
- SET(ext "zip")
- IF(PACKAGE_ZIP OR PACKAGE_TGZ)
- IF(PACKAGE_TGZ)
- SET(CPACK_GENERATOR "TGZ")
- SET(ext "tar.gz")
- ENDIF(PACKAGE_TGZ)
- SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
- set(CPACK_PACKAGE_FILE_NAME addon)
- IF(CMAKE_BUILD_TYPE STREQUAL "Release")
- SET(CPACK_STRIP_FILES TRUE)
- ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
- set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
- set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
- list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
- # Pack files together to create an archive
- INSTALL(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION})
- IF(WIN32)
- INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/${target}.dll
- DESTINATION ${target}
- COMPONENT ${target}-${${prefix}_VERSION})
- ELSE(WIN32)
- INSTALL(TARGETS ${target} DESTINATION ${target}
- COMPONENT ${target}-${${prefix}_VERSION})
- ENDIF(WIN32)
- add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
- ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
- INSTALL(TARGETS ${target} DESTINATION lib/xbmc/addons/${target})
- INSTALL(DIRECTORY ${target} DESTINATION share/xbmc/addons)
- ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
-endmacro()
-
-# finds a path to a given file (recursive)
-function (xbmc_find_path var_name filename search_path strip_file)
- file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
- if(strip_file)
- string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
- endif(strip_file)
- set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
-endfunction()
-
-# Cmake build options
-include(addoptions)
-include(TestCXXAcceptsFlag)
-OPTION(PACKAGE_ZIP "Package Zip file?" OFF)
-OPTION(PACKAGE_TGZ "Package TGZ file?" OFF)
-OPTION(BUILD_SHARED_LIBS "Build shared libs?" ON)
-
-# LTO support?
-CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
-IF(HAVE_LTO)
- OPTION(USE_LTO "use link time optimization" OFF)
- IF(USE_LTO)
- add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
- ENDIF(USE_LTO)
-ENDIF(HAVE_LTO)
-
-# set this to try linking dependencies as static as possible
-IF(ADDONS_PREFER_STATIC_LIBS)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-ENDIF(ADDONS_PREFER_STATIC_LIBS)
-
diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/xbmc-prepare-env.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-prepare-env.cmake
--- xbmc-14-31ce987/project/cmake/scripts/common/xbmc-prepare-env.cmake 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-prepare-env.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-# parse version.txt to get the version info
-if(EXISTS "${XBMCROOT}/version.txt")
- file(STRINGS "${XBMCROOT}/version.txt" versions)
- foreach (version ${versions})
- string(REGEX MATCH "^[^ ]+" version_name ${version})
- string(REPLACE "${version_name} " "" version_value ${version})
- set(APP_${version_name} "${version_value}")
- endforeach()
-endif()
-
-# bail if we can't parse versions
-if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
- message(FATAL_ERROR "Could not determine app version! make sure that ${XBMCROOT}/version.txt exists")
-endif()
-
-### copy all the addon binding header files to include/xbmc
-# make sure include/xbmc exists and is empty
-set(XBMC_LIB_DIR ${DEPENDS_PATH}/lib/xbmc)
-if(NOT EXISTS "${XBMC_LIB_DIR}/")
- file(MAKE_DIRECTORY ${XBMC_LIB_DIR})
-endif()
-
-set(XBMC_INCLUDE_DIR ${DEPENDS_PATH}/include/xbmc)
-if(NOT EXISTS "${XBMC_INCLUDE_DIR}/")
- file(MAKE_DIRECTORY ${XBMC_INCLUDE_DIR})
-endif()
-
-# xbmc-config.cmake.in (further down) expects a "prefix" variable
-get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
-
-# generate the proper xbmc-config.cmake file
-configure_file(${XBMCROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
-# copy cmake helpers to lib/xbmc
-file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-addon-helpers.cmake ${XBMCROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${XBMC_LIB_DIR})
-
-### copy all the addon binding header files to include/xbmc
-# parse addon-bindings.mk to get the list of header files to copy
-file(STRINGS ${XBMCROOT}/xbmc/addons/addon-bindings.mk bindings)
-string(REPLACE "\n" ";" bindings "${bindings}")
-foreach(binding ${bindings})
- string(REPLACE " =" ";" binding "${binding}")
- string(REPLACE "+=" ";" binding "${binding}")
- list(GET binding 1 header)
- # copy the header file to include/xbmc
- file(COPY ${XBMCROOT}/${header} DESTINATION ${XBMC_INCLUDE_DIR})
-endforeach()
\ Kein Zeilenumbruch am Dateiende.
diff -Naur xbmc-14-31ce987/project/cmake/xbmc-config.cmake.in xbmc-14-31ce987.patch/project/cmake/xbmc-config.cmake.in
--- xbmc-14-31ce987/project/cmake/xbmc-config.cmake.in 2014-10-18 12:14:11.000000000 +0200
+++ xbmc-14-31ce987.patch/project/cmake/xbmc-config.cmake.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-SET(XBMC_INCLUDE_DIR @prefix@/include)
-SET(APP_NAME @APP_NAME@)
-SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
-SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
-LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/xbmc)
-ADD_DEFINITIONS(@ARCH_DEFINES@)
-
-include(xbmc-addon-helpers)

40
packages/mediacenter/xbmc/patches/xbmc-999.04-bye-bye-libflac.patch
View File

@ -1,40 +0,0 @@
From 0e26e69497c0977f6a0efbf48d199f6313c539cf Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 3 Aug 2014 13:03:44 +0300
Subject: [PATCH] bye bye libflac
---
configure.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/configure.in b/configure.in
index a9d5f46..702f086 100644
--- a/configure.in
+++ b/configure.in
@@ -1056,7 +1056,6 @@ AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
-AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library))
XB_FIND_SONAME([CURL], [curl])
@@ -1219,7 +1218,6 @@ fi
fi
XB_FIND_SONAME([OGG], [ogg])
-XB_FIND_SONAME([FLAC], [FLAC])
XB_FIND_SONAME([VORBIS], [vorbis])
XB_FIND_SONAME([VORBISFILE], [vorbisfile])
XB_FIND_SONAME([MODPLUG], [modplug])
@@ -2596,7 +2594,6 @@ AC_SUBST(OUTPUT_FILES)
AC_SUBST(HAVE_XBMC_NONFREE)
AC_SUBST(USE_ASAP_CODEC)
AC_SUBST(LIBCURL_BASENAME)
-AC_SUBST(LIBFLAC_BASENAME)
AC_SUBST(LIBVORBISFILE_BASENAME)
AC_SUBST(LIBMODPLUG_BASENAME)
AC_SUBST(LIBOGG_BASENAME)
--
1.9.1

4
packages/mediacenter/xbmc/profile.d/02-xbmc.conf → packages/mediacenter/xbmc/profile.d/02-kodi.conf
View File

@ -17,13 +17,13 @@
################################################################################ ################################################################################
# PATH # PATH
for addon in /storage/.xbmc/addons/*/bin /usr/lib/xbmc/addons/*/bin; do for addon in /storage/.kodi/addons/*/bin /usr/lib/kodi/addons/*/bin; do
[ -d "$addon" ] && PATH="$PATH:$addon" [ -d "$addon" ] && PATH="$PATH:$addon"
done done
export PATH export PATH
# LD_LIBRARY_PATH # LD_LIBRARY_PATH
for addon in /storage/.xbmc/addons/*/lib /usr/lib/xbmc/addons/*/lib; do for addon in /storage/.kodi/addons/*/lib /usr/lib/kodi/addons/*/lib; do
[ -d "$addon" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon" [ -d "$addon" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
done done
export LD_LIBRARY_PATH export LD_LIBRARY_PATH

8
packages/mediacenter/xbmc/profile.d/03-addons.conf
View File

@ -18,12 +18,12 @@
oe_setup_addon() { oe_setup_addon() {
if [ ! -z $1 ] ; then if [ ! -z $1 ] ; then
DEF="/storage/.xbmc/addons/$1/settings-default.xml" DEF="/storage/.kodi/addons/$1/settings-default.xml"
CUR="/storage/.xbmc/userdata/addon_data/$1/settings.xml" CUR="/storage/.kodi/userdata/addon_data/$1/settings.xml"
# export some useful variables # export some useful variables
ADDON_DIR="$HOME/.xbmc/addons/$1" ADDON_DIR="$HOME/.kodi/addons/$1"
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$1" ADDON_HOME="$HOME/.kodi/userdata/addon_data/$1"
ADDON_LOG_FILE="$ADDON_HOME/service.log" ADDON_LOG_FILE="$ADDON_HOME/service.log"
[ ! -d $ADDON_HOME ] && mkdir -p $ADDON_HOME [ ! -d $ADDON_HOME ] && mkdir -p $ADDON_HOME

2
packages/mediacenter/xbmc/scripts/xbmc-config → packages/mediacenter/xbmc/scripts/kodi-config
View File

@ -23,4 +23,4 @@ else
KODI_ARGS="--lircdev /run/lirc/lircd" KODI_ARGS="--lircdev /run/lirc/lircd"
fi fi
echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/openelec/xbmc.conf echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/openelec/kodi.conf

6
packages/mediacenter/xbmc/scripts/xbmc-hacks → packages/mediacenter/xbmc/scripts/kodi-hacks
View File

@ -18,10 +18,10 @@
################################################################################ ################################################################################
# hack: make addon-bins executable # hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* chmod +x /storage/.kodi/addons/*/bin/*
# hack: update RSSnews.xml in userdata # hack: update RSSnews.xml in userdata
if [ -f /storage/.xbmc/userdata/RssFeeds.xml ]; then if [ -f /storage/.kodi/userdata/RssFeeds.xml ]; then
sed -e "s,http://openelec.tv/news?format=feed&type=rss,http://feeds.openelec.tv/news,g" \ sed -e "s,http://openelec.tv/news?format=feed&type=rss,http://feeds.openelec.tv/news,g" \
-i /storage/.xbmc/userdata/RssFeeds.xml -i /storage/.kodi/userdata/RssFeeds.xml
fi fi

20
packages/mediacenter/xbmc/scripts/xbmc-sources → packages/mediacenter/xbmc/scripts/kodi-sources
View File

@ -23,12 +23,12 @@
# setup XBMC sources # setup XBMC sources
# #
if [ ! -f $HOME/.xbmc/userdata/sources.xml ]; then if [ ! -f $HOME/.kodi/userdata/sources.xml ]; then
if [ -f /usr/share/xbmc/config/sources.xml ]; then if [ -f /usr/share/kodi/config/sources.xml ]; then
# include project specific sources # include project specific sources
cp /usr/share/xbmc/config/sources.xml $HOME/.xbmc/userdata cp /usr/share/kodi/config/sources.xml $HOME/.kodi/userdata
else else
cat > $HOME/.xbmc/userdata/sources.xml << EOF cat > $HOME/.kodi/userdata/sources.xml << EOF
<sources> <sources>
<video> <video>
<default pathversion="1"></default> <default pathversion="1"></default>
@ -68,10 +68,10 @@ EOF
# common setup guisettings # common setup guisettings
# #
if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then if [ ! -f $HOME/.kodi/userdata/guisettings.xml ] ; then
echo "<settings>" > $HOME/.xbmc/userdata/guisettings.xml echo "<settings>" > $HOME/.kodi/userdata/guisettings.xml
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF cat >> $HOME/.kodi/userdata/guisettings.xml << EOF
<debug> <debug>
<screenshotpath pathversion="1">$HOME/screenshots/</screenshotpath> <screenshotpath pathversion="1">$HOME/screenshots/</screenshotpath>
</debug> </debug>
@ -81,9 +81,9 @@ EOF
# include project specific options # include project specific options
# #
if [ -f /usr/share/xbmc/config/guisettings.xml ]; then if [ -f /usr/share/kodi/config/guisettings.xml ]; then
cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml cat /usr/share/kodi/config/guisettings.xml >> $HOME/.kodi/userdata/guisettings.xml
fi fi
echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml echo "</settings>" >> $HOME/.kodi/userdata/guisettings.xml
fi fi

6
packages/mediacenter/xbmc/scripts/systemd-addon-wrapper
View File

@ -21,14 +21,14 @@ if [ ! -d /storage/.config/system.d ] ; then
mkdir -p /storage/.config/system.d mkdir -p /storage/.config/system.d
fi fi
if [ -f "/storage/.xbmc/addons/$1/system.d/$1.service" ] ; then if [ -f "/storage/.kodi/addons/$1/system.d/$1.service" ] ; then
if [ $2 -eq 1 ] ; then if [ $2 -eq 1 ] ; then
# disable = true: cleanup # disable = true: cleanup
systemctl stop "$1.service" systemctl stop "$1.service"
systemctl disable "/storage/.xbmc/addons/$1/system.d/$1.service" systemctl disable "/storage/.kodi/addons/$1/system.d/$1.service"
else else
# disable = false: setup # disable = false: setup
systemctl enable "/storage/.xbmc/addons/$1/system.d/$1.service" systemctl enable "/storage/.kodi/addons/$1/system.d/$1.service"
systemctl start "$1.service" systemctl start "$1.service"
fi fi
fi fi

2
packages/mediacenter/xbmc/sleep.d.serial/10-addon-sleep.sh
View File

@ -22,7 +22,7 @@
# see https://wiki.archlinux.org/index.php/Power_Management#Hooks_in_.2Fusr.2Flib.2Fsystemd.2Fsystem-sleep # see https://wiki.archlinux.org/index.php/Power_Management#Hooks_in_.2Fusr.2Flib.2Fsystemd.2Fsystem-sleep
for script in $HOME/.xbmc/addons/*/sleep.d/*.power; do for script in $HOME/.kodi/addons/*/sleep.d/*.power; do
progress "running addon sleep script $script ($@)..." progress "running addon sleep script $script ($@)..."
sh $script $@ sh $script $@
done done

6
packages/mediacenter/xbmc/system.d/xbmc-autostart.service → packages/mediacenter/xbmc/system.d/kodi-autostart.service
View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=XBMC user autostart script Description=Kodi user autostart script
Before=xbmc.service Before=kodi.service
After=graphical.target After=graphical.target
[Service] [Service]
@ -10,4 +10,4 @@ ExecStart=-/bin/sh -c ". /etc/profile; exec /bin/sh /storage/.config/autostart.s
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]
WantedBy=xbmc.service WantedBy=kodi.service

13
packages/mediacenter/xbmc/system.d/kodi-cleanlogs.service Normal file
View File

@ -0,0 +1,13 @@
[Unit]
Description=Kodi clean debug logs
ConditionKernelCommandLine=!debugging
ConditionPathExists=!/storage/.cache/debug.openelec
Before=kodi.service
[Service]
Type=oneshot
ExecStart=-/bin/sh -c 'rm -rf /storage/.kodi/userdata/addon_data/*/*.log /storage/.kodi/userdata/addon_data/*/log/*'
RemainAfterExit=yes
[Install]
WantedBy=kodi.service

12
packages/mediacenter/xbmc/system.d/kodi-hacks.service Normal file
View File

@ -0,0 +1,12 @@
[Unit]
Description=Kodi hacks
Before=kodi.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/kodi/kodi-hacks
RemainAfterExit=yes
[Install]
WantedBy=kodi.service

4
packages/mediacenter/xbmc/system.d/xbmc-halt.service → packages/mediacenter/xbmc/system.d/kodi-halt.service
View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=XBMC halt script Description=Kodi halt script
After=xbmc.service After=kodi.service
Before=systemd-halt.service Before=systemd-halt.service
DefaultDependencies=no DefaultDependencies=no

4
packages/mediacenter/xbmc/system.d/xbmc-lirc-suspend.service → packages/mediacenter/xbmc/system.d/kodi-lirc-suspend.service
View File

@ -6,8 +6,8 @@ StopWhenUnneeded=yes
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=-/usr/bin/xbmc-send --host=127.0.0.1 -a "LIRC.Stop" ExecStart=-/usr/bin/kodi-send --host=127.0.0.1 -a "LIRC.Stop"
ExecStop=-/usr/bin/xbmc-send --host=127.0.0.1 -a "LIRC.Start" ExecStop=-/usr/bin/kodi-send --host=127.0.0.1 -a "LIRC.Start"
[Install] [Install]
WantedBy=sleep.target WantedBy=sleep.target

4
packages/mediacenter/xbmc/system.d/xbmc-poweroff.service → packages/mediacenter/xbmc/system.d/kodi-poweroff.service
View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=XBMC poweroff script Description=Kodi poweroff script
After=xbmc.service After=kodi.service
Before=systemd-poweroff.service Before=systemd-poweroff.service
DefaultDependencies=no DefaultDependencies=no

4
packages/mediacenter/xbmc/system.d/xbmc-reboot.service → packages/mediacenter/xbmc/system.d/kodi-reboot.service
View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=XBMC reboot script Description=Kodi reboot script
After=xbmc.service After=kodi.service
Before=systemd-reboot.service Before=systemd-reboot.service
DefaultDependencies=no DefaultDependencies=no

12
packages/mediacenter/xbmc/system.d/kodi-sources.service Normal file
View File

@ -0,0 +1,12 @@
[Unit]
Description=Kodi sources Setup
Before=kodi.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/kodi/kodi-sources
RemainAfterExit=yes
[Install]
WantedBy=kodi.service

2
packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service → packages/mediacenter/xbmc/system.d/kodi-waitonnetwork.service
View File

@ -14,4 +14,4 @@ StandardOutput=tty
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]
WantedBy=xbmc.service WantedBy=kodi.service

12
packages/mediacenter/xbmc/system.d/xbmc.service → packages/mediacenter/xbmc/system.d/kodi.service
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=XBMC Media Center Description=Kodi Media Center
After=graphical.target After=graphical.target
Requires=graphical.target Requires=graphical.target
@ -7,10 +7,10 @@ Requires=graphical.target
Environment=DISPLAY=:0.0 Environment=DISPLAY=:0.0
Environment=SDL_MOUSE_RELATIVE=0 Environment=SDL_MOUSE_RELATIVE=0
Environment=HOME=/storage Environment=HOME=/storage
EnvironmentFile=-/run/openelec/xbmc.conf EnvironmentFile=-/run/openelec/kodi.conf
EnvironmentFile=-/run/openelec/debug/xbmc.conf EnvironmentFile=-/run/openelec/debug/kodi.conf
ExecStartPre=-/usr/lib/xbmc/xbmc-config ExecStartPre=-/usr/lib/kodi/kodi-config
ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $KODI_ARGS $KODI_DEBUG" ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/kodi/kodi.bin --standalone -fs $KODI_ARGS $KODI_DEBUG"
# keep KillMode=process unless there is no good reason to switch to cgroup # keep KillMode=process unless there is no good reason to switch to cgroup
KillMode=process KillMode=process
TimeoutStopSec=5 TimeoutStopSec=5
@ -19,4 +19,4 @@ RestartSec=2
StartLimitInterval=0 StartLimitInterval=0
[Install] [Install]
WantedBy=xbmc.target WantedBy=kodi.target

2
packages/mediacenter/xbmc/system.d/xbmc.target → packages/mediacenter/xbmc/system.d/kodi.target
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=XBMC Mediacenter Interface Description=Kodi Mediacenter Interface
Requires=multi-user.target graphical.target Requires=multi-user.target graphical.target
After=graphical.target After=graphical.target
Conflicts=rescue.target Conflicts=rescue.target

13
packages/mediacenter/xbmc/system.d/xbmc-cleanlogs.service
View File

@ -1,13 +0,0 @@
[Unit]
Description=XBMC clean debug logs
ConditionKernelCommandLine=!debugging
ConditionPathExists=!/storage/.cache/debug.openelec
Before=xbmc.service
[Service]
Type=oneshot
ExecStart=-/bin/sh -c 'rm -rf /storage/.xbmc/userdata/addon_data/*/*.log /storage/.xbmc/userdata/addon_data/*/log/*'
RemainAfterExit=yes
[Install]
WantedBy=xbmc.service

12
packages/mediacenter/xbmc/system.d/xbmc-hacks.service
View File

@ -1,12 +0,0 @@
[Unit]
Description=XBMC hacks
Before=xbmc.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/xbmc/xbmc-hacks
RemainAfterExit=yes
[Install]
WantedBy=xbmc.service

12
packages/mediacenter/xbmc/system.d/xbmc-sources.service
View File

@ -1,12 +0,0 @@
[Unit]
Description=XBMC sources Setup
Before=xbmc.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/xbmc/xbmc-sources
RemainAfterExit=yes
[Install]
WantedBy=xbmc.service

2
packages/mediacenter/xbmc/tmpfiles.d/xbmc-userdirs.conf → packages/mediacenter/xbmc/tmpfiles.d/kodi-userdirs.conf
View File

@ -16,7 +16,7 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
d /storage/.xbmc/userdata 0755 root root - - d /storage/.kodi/userdata 0755 root root - -
d /storage/music 0755 root root - - d /storage/music 0755 root root - -
d /storage/pictures 0755 root root - - d /storage/pictures 0755 root root - -
d /storage/tvshows 0755 root root - - d /storage/tvshows 0755 root root - -

2
packages/mediacenter/xbmc/tmpfiles.d/xbmc.conf → packages/mediacenter/xbmc/tmpfiles.d/kodi.conf
View File

@ -16,4 +16,4 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
d /run/xbmc 0755 root root - - d /run/kodi 0755 root root - -