mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
kodi: update to kodi-14-a693300
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
8e45336ea0
commit
443b4fd6a6
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi-theme-Confluence"
|
||||
PKG_VERSION="14-ba267af"
|
||||
PKG_VERSION="14-a693300"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="14-ba267af"
|
||||
PKG_VERSION="14-a693300"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,416 +0,0 @@
|
||||
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)
|
||||
@ -1,334 +0,0 @@
|
||||
From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Mon, 27 Oct 2014 14:42:30 +0100
|
||||
Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte
|
||||
|
||||
---
|
||||
system/peripherals.xml | 2 +-
|
||||
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/system/peripherals.xml b/system/peripherals.xml
|
||||
index 57af5d1..5fcff7c 100644
|
||||
--- a/system/peripherals.xml
|
||||
+++ b/system/peripherals.xml
|
||||
@@ -30,7 +30,7 @@
|
||||
<setting key="device_type" type="int" value="1" configurable="0" />
|
||||
<setting key="wake_devices_advanced" type="string" value="" configurable="0" />
|
||||
<setting key="standby_devices_advanced" type="string" value="" configurable="0" />
|
||||
- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
|
||||
+ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
|
||||
</peripheral>
|
||||
|
||||
<peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
|
||||
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
index 9907ba2..1d068dc 100644
|
||||
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
|
||||
m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0;
|
||||
m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
|
||||
|
||||
- // double tap prevention timeout in ms
|
||||
- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
|
||||
+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
|
||||
+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50;
|
||||
}
|
||||
|
||||
void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
|
||||
|
||||
From c82453eaf7af90d1c0a8846776d77fb62bd14246 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Mon, 27 Oct 2014 12:29:09 +0100
|
||||
Subject: [PATCH 2/8] [CEC] bump libCEC to 2.2.0
|
||||
|
||||
---
|
||||
project/BuildDependencies/scripts/libcec_d.txt | 2 +-
|
||||
tools/depends/target/libcec/Makefile | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt
|
||||
index a126c74..3d0265e 100644
|
||||
--- a/project/BuildDependencies/scripts/libcec_d.txt
|
||||
+++ b/project/BuildDependencies/scripts/libcec_d.txt
|
||||
@@ -1,3 +1,3 @@
|
||||
; filename source of the file
|
||||
|
||||
-libcec-2.1.4.zip http://mirrors.xbmc.org/build-deps/win32/
|
||||
+libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/
|
||||
diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile
|
||||
index 16fec1b..0f54921 100644
|
||||
--- a/tools/depends/target/libcec/Makefile
|
||||
+++ b/tools/depends/target/libcec/Makefile
|
||||
@@ -3,9 +3,9 @@ DEPS= ../../Makefile.include Makefile
|
||||
|
||||
# lib name, version
|
||||
LIBNAME=libcec
|
||||
-VERSION=2.1.4
|
||||
-SOURCE=$(LIBNAME)-$(VERSION)-2
|
||||
-ARCHIVE=$(SOURCE).tar.gz
|
||||
+VERSION=2.2.0
|
||||
+SOURCE=$(LIBNAME)-$(VERSION)
|
||||
+ARCHIVE=$(SOURCE)-2.tar.gz
|
||||
|
||||
# configuration settings
|
||||
CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \
|
||||
|
||||
From b5f567522961409e70eceba9629f7906069b1e0f Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Mon, 27 Oct 2014 15:32:36 +0100
|
||||
Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter
|
||||
cannot be removed
|
||||
|
||||
---
|
||||
xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
|
||||
index b02535a..4941ae6 100644
|
||||
--- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
|
||||
+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
|
||||
@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results)
|
||||
break;
|
||||
case ADAPTERTYPE_RPI:
|
||||
result.m_mappedBusType = PERIPHERAL_BUS_RPI;
|
||||
+ /** the Pi's adapter cannot be removed, no need to rescan */
|
||||
+ m_bNeedsPolling = false;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
From 9b573e0fdb666339beb1f4cc6104c8c0d0f93829 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Mon, 27 Oct 2014 21:01:00 +0100
|
||||
Subject: [PATCH 4/8] [CEC] fixed: don't return garbage from CEC related app
|
||||
messenger methods see
|
||||
https://github.com/xbmc/xbmc/commit/19d37944ca2a2ac2f3e71a40a94e9ea289d8f2db#commitcomment-8248480
|
||||
|
||||
---
|
||||
xbmc/Application.cpp | 14 ++++++++------
|
||||
xbmc/ApplicationMessenger.cpp | 20 +++++---------------
|
||||
xbmc/ApplicationMessenger.h | 4 ++--
|
||||
3 files changed, 15 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
||||
index d5604dc..4d26183 100644
|
||||
--- a/xbmc/Application.cpp
|
||||
+++ b/xbmc/Application.cpp
|
||||
@@ -2366,16 +2366,18 @@ bool CApplication::OnKey(const CKey& key)
|
||||
|
||||
if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState") || StringUtils::StartsWithNoCase(action.GetName(),"CECStandby"))
|
||||
{
|
||||
- bool ret = true;
|
||||
-
|
||||
- CLog::LogF(LOGDEBUG, "action %s [%d], toggling state of playing device", action.GetName().c_str(), action.GetID());
|
||||
// do not wake up the screensaver right after switching off the playing device
|
||||
if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState"))
|
||||
- ret = CApplicationMessenger::Get().CECToggleState();
|
||||
+ {
|
||||
+ CLog::LogF(LOGDEBUG, "action %s [%d], toggling state of playing device", action.GetName().c_str(), action.GetID());
|
||||
+ if (!CApplicationMessenger::Get().CECToggleState())
|
||||
+ return true;
|
||||
+ }
|
||||
else
|
||||
- ret = CApplicationMessenger::Get().CECStandby();
|
||||
- if (!ret) /* display is switched off */
|
||||
+ {
|
||||
+ CApplicationMessenger::Get().CECStandby();
|
||||
return true;
|
||||
+ }
|
||||
}
|
||||
|
||||
ResetScreenSaver();
|
||||
diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
|
||||
index 1a59c5c..d228273 100644
|
||||
--- a/xbmc/ApplicationMessenger.cpp
|
||||
+++ b/xbmc/ApplicationMessenger.cpp
|
||||
@@ -843,12 +843,12 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
|
||||
}
|
||||
case TMSG_CECACTIVATESOURCE:
|
||||
{
|
||||
- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE);
|
||||
+ g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE);
|
||||
break;
|
||||
}
|
||||
case TMSG_CECSTANDBY:
|
||||
{
|
||||
- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_STANDBY);
|
||||
+ g_peripherals.ToggleDeviceState(STATE_STANDBY);
|
||||
break;
|
||||
}
|
||||
case TMSG_START_ANDROID_ACTIVITY:
|
||||
@@ -1396,29 +1396,19 @@ bool CApplicationMessenger::CECToggleState()
|
||||
|
||||
ThreadMessage tMsg = {TMSG_CECTOGGLESTATE};
|
||||
tMsg.lpVoid = (void*)&result;
|
||||
- SendMessage(tMsg, false);
|
||||
+ SendMessage(tMsg, true);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
-bool CApplicationMessenger::CECActivateSource()
|
||||
+void CApplicationMessenger::CECActivateSource()
|
||||
{
|
||||
- bool result;
|
||||
-
|
||||
ThreadMessage tMsg = {TMSG_CECACTIVATESOURCE};
|
||||
- tMsg.lpVoid = (void*)&result;
|
||||
SendMessage(tMsg, false);
|
||||
-
|
||||
- return result;
|
||||
}
|
||||
|
||||
-bool CApplicationMessenger::CECStandby()
|
||||
+void CApplicationMessenger::CECStandby()
|
||||
{
|
||||
- bool result;
|
||||
-
|
||||
ThreadMessage tMsg = {TMSG_CECSTANDBY};
|
||||
- tMsg.lpVoid = (void*)&result;
|
||||
SendMessage(tMsg, false);
|
||||
-
|
||||
- return result;
|
||||
}
|
||||
diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
|
||||
index 9013567..543e065 100644
|
||||
--- a/xbmc/ApplicationMessenger.h
|
||||
+++ b/xbmc/ApplicationMessenger.h
|
||||
@@ -219,8 +219,8 @@ class CApplicationMessenger
|
||||
|
||||
void LoadProfile(unsigned int idx);
|
||||
bool CECToggleState();
|
||||
- bool CECActivateSource();
|
||||
- bool CECStandby();
|
||||
+ void CECActivateSource();
|
||||
+ void CECStandby();
|
||||
|
||||
CStdString GetResponse();
|
||||
int SetResponse(CStdString response);
|
||||
|
||||
From 3e0a6a3d083fbc3773517b6d8846a5bd86e03004 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Tue, 28 Oct 2014 14:52:16 +0100
|
||||
Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC
|
||||
for clarity. does not change binary compatibility
|
||||
|
||||
---
|
||||
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
index 1d068dc..ad123d9 100644
|
||||
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
|
||||
m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0;
|
||||
m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
|
||||
|
||||
+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
|
||||
// double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
|
||||
- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50;
|
||||
+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
|
||||
+#else
|
||||
+ // backwards compatibility. will be removed once the next major release of libCEC is out
|
||||
+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
|
||||
+#endif
|
||||
}
|
||||
|
||||
void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
|
||||
|
||||
From 3d6cc38152adbd67cb2ef633e0e5a6f098ec619c Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Tue, 28 Oct 2014 16:08:00 +0100
|
||||
Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for
|
||||
the client version, because it will lead to issues when XBMC is rebuilt after
|
||||
a libCEC bump that changes something
|
||||
|
||||
---
|
||||
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
index ad123d9..015daef 100644
|
||||
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
|
||||
@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
|
||||
|
||||
void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
|
||||
{
|
||||
- // use the same client version as libCEC version
|
||||
- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
|
||||
+ // client version matches the version of libCEC that we originally used the API from
|
||||
+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0;
|
||||
|
||||
// device name 'XBMC'
|
||||
snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
|
||||
|
||||
From da8c086eb4f644c5c607d7a721511230e9a078c0 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||
Date: Fri, 31 Oct 2014 12:08:03 +0100
|
||||
Subject: [PATCH 7/8] [CEC] use device name 'Kodi' instead of 'XBMC'
|
||||
|
||||
---
|
||||
system/peripherals.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/system/peripherals.xml b/system/peripherals.xml
|
||||
index 5fcff7c..a67dc2f 100644
|
||||
--- a/system/peripherals.xml
|
||||
+++ b/system/peripherals.xml
|
||||
@@ -26,7 +26,7 @@
|
||||
<setting key="port" type="string" value="" label="36022" order="15" />
|
||||
|
||||
<setting key="tv_vendor" type="int" value="0" configurable="0" />
|
||||
- <setting key="device_name" type="string" value="XBMC" configurable="0" />
|
||||
+ <setting key="device_name" type="string" value="Kodi" configurable="0" />
|
||||
<setting key="device_type" type="int" value="1" configurable="0" />
|
||||
<setting key="wake_devices_advanced" type="string" value="" configurable="0" />
|
||||
<setting key="standby_devices_advanced" type="string" value="" configurable="0" />
|
||||
|
||||
From b38a4e4aeebe43d76045fb376f2f9dcb18c4f78f Mon Sep 17 00:00:00 2001
|
||||
From: Karlson2k <k2k@narod.ru>
|
||||
Date: Fri, 31 Oct 2014 13:54:00 +0300
|
||||
Subject: [PATCH 8/8] [cec] [win32] Use new package format
|
||||
|
||||
---
|
||||
project/BuildDependencies/scripts/0_package.list | 1 +
|
||||
project/BuildDependencies/scripts/libcec_d.bat | 15 ---------------
|
||||
2 files changed, 1 insertion(+), 15 deletions(-)
|
||||
delete mode 100644 project/BuildDependencies/scripts/libcec_d.bat
|
||||
|
||||
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
|
||||
index 8127b15..e2a4a1f 100644
|
||||
--- a/project/BuildDependencies/scripts/0_package.list
|
||||
+++ b/project/BuildDependencies/scripts/0_package.list
|
||||
@@ -12,6 +12,7 @@ gnutls-3.2.3-win32.zip
|
||||
jsonschemabuilder-1.0.0-win32-3.7z
|
||||
libass-0.10.2-win32.7z
|
||||
libbluray-0.4.0-win32.zip
|
||||
+libcec-2.2.0-win32-1.7z
|
||||
libiconv-1.14-win32-vc120.7z
|
||||
libjpeg-turbo-1.2.0-win32.7z
|
||||
libnfs-1.6.2-win32.7z
|
||||
diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat
|
||||
deleted file mode 100644
|
||||
index b5104c3..0000000
|
||||
--- a/project/BuildDependencies/scripts/libcec_d.bat
|
||||
+++ /dev/null
|
||||
@@ -1,15 +0,0 @@
|
||||
-@ECHO OFF
|
||||
-
|
||||
-SET LOC_PATH=%CD%
|
||||
-SET FILES=%LOC_PATH%\libcec_d.txt
|
||||
-
|
||||
-CALL dlextract.bat libcec %FILES%
|
||||
-
|
||||
-cd %TMP_PATH%
|
||||
-
|
||||
-mkdir "%CUR_PATH%\include\libcec"
|
||||
-xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y
|
||||
-
|
||||
-copy libcec\libcec.dll "%APP_PATH%\system\."
|
||||
-
|
||||
-cd %LOC_PATH%
|
||||
@ -3702,34 +3702,6 @@ index f139433..4183a2b 100644
|
||||
{
|
||||
// If dvd is an mpeg2 and hint.stills
|
||||
|
||||
From 50e4589c1be698538bb96904709b3ed7f5781c2f Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Wed, 5 Feb 2014 11:46:33 +0000
|
||||
Subject: [PATCH 28/95] [rbp/settings] Allow av sync type to be enabled
|
||||
|
||||
It works for dvdplayer
|
||||
---
|
||||
system/settings/rbp.xml | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
|
||||
index 5985517..f572eed 100644
|
||||
--- a/system/settings/rbp.xml
|
||||
+++ b/system/settings/rbp.xml
|
||||
@@ -1,13 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<settings>
|
||||
<section id="videos">
|
||||
- <category id="videoplayer">
|
||||
- <group id="2">
|
||||
- <setting id="videoplayer.synctype">
|
||||
- <visible>false</visible>
|
||||
- </setting>
|
||||
- </group>
|
||||
- </category>
|
||||
<category id="videoacceleration">
|
||||
<group id="1">
|
||||
<visible>false</visible>
|
||||
|
||||
From 17c0d521016319411e73ee63397b28dea205f7aa Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
@ -7712,29 +7684,6 @@ index 5ceec72..20fbdef 100644
|
||||
OpenStream(m_CurrentVideo, m_CurrentVideo.id, m_CurrentVideo.source);
|
||||
if (m_State.canseek)
|
||||
|
||||
From 41525fca8fa9fdaaebd9bd6995fa368810e1b5f0 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sun, 26 Oct 2014 16:20:35 +0000
|
||||
Subject: [PATCH 82/95] [omxplayer] Request 3 render buffers
|
||||
|
||||
This avoids stuttering when using subtitle and avoids a warning of too few render buffers
|
||||
---
|
||||
xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
|
||||
index 5c4a515..783ac20 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
|
||||
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
|
||||
@@ -786,7 +786,7 @@ void OMXPlayerVideo::ResolutionUpdateCallBack(uint32_t width, uint32_t height, f
|
||||
|
||||
if(!g_renderManager.Configure(width, height,
|
||||
iDisplayWidth, iDisplayHeight, m_fFrameRate, flags, format, 0,
|
||||
- m_hints.orientation, 0))
|
||||
+ m_hints.orientation, 3))
|
||||
{
|
||||
CLog::Log(LOGERROR, "%s - failed to configure renderer", __FUNCTION__);
|
||||
return;
|
||||
|
||||
From aa3b9a73c1684d5806106c2e5167c1e30d1b23b1 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user