diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk index 14ff8cc93c..a4cae45c93 100644 --- a/packages/audio/pulseaudio/package.mk +++ b/packages/audio/pulseaudio/package.mk @@ -69,7 +69,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ --disable-esound \ --disable-solaris \ --disable-waveout \ - --disable-glib2 \ + --enable-glib2 \ --disable-gtk3 \ --disable-gconf \ $PULSEAUDIO_AVAHI \ diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index f75dc3e738..d8bbad598c 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="5c40b5c" +PKG_VERSION="4d93228" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/patches/kodi-100.19-dont-link-pulseaudio-mainloop.patch b/packages/mediacenter/kodi/patches/kodi-100.19-dont-link-pulseaudio-mainloop.patch deleted file mode 100644 index 17e86470db..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.19-dont-link-pulseaudio-mainloop.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur a/project/cmake/modules/FindPulseAudio.cmake b/project/cmake/modules/FindPulseAudio.cmake ---- a/project/cmake/modules/FindPulseAudio.cmake 2016-09-17 08:35:33.000000000 -0700 -+++ b/project/cmake/modules/FindPulseAudio.cmake 2016-09-22 22:36:22.818788337 -0700 -@@ -29,9 +29,6 @@ - find_library(PULSEAUDIO_LIBRARY NAMES pulse libpulse - PATHS ${PC_PULSEAUDIO_LIBDIR} ${PC_PULSEAUDIO_LIBRARY_DIRS}) - --find_library(PULSEAUDIO_MAINLOOP_LIBRARY NAMES pulse-mainloop pulse-mainloop-glib libpulse-mainloop-glib -- PATHS ${PC_PULSEAUDIO_LIBDIR} ${PC_PULSEAUDIO_LIBRARY_DIRS}) -- - if(PC_PULSEAUDIO_VERSION) - set(PULSEAUDIO_VERSION_STRING ${PC_PULSEAUDIO_VERSION}) - elseif(PULSEAUDIO_INCLUDE_DIR AND EXISTS "${PULSEAUDIO_INCLUDE_DIR}/pulse/version.h") -@@ -42,19 +39,14 @@ - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(PulseAudio -- REQUIRED_VARS PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY PULSEAUDIO_INCLUDE_DIR -+ REQUIRED_VARS PULSEAUDIO_LIBRARY PULSEAUDIO_INCLUDE_DIR - VERSION_VAR PULSEAUDIO_VERSION_STRING) - - if(PULSEAUDIO_FOUND) - set(PULSEAUDIO_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIR}) -- set(PULSEAUDIO_LIBRARIES ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) -+ set(PULSEAUDIO_LIBRARIES ${PULSEAUDIO_LIBRARY}) - set(PULSEAUDIO_DEFINITIONS -DHAVE_LIBPULSE=1) - -- if(NOT TARGET PulseAudio::PulseAudioMainloop) -- add_library(PulseAudio::PulseAudioMainloop UNKNOWN IMPORTED) -- set_target_properties(PulseAudio::PulseAudioMainloop PROPERTIES -- IMPORTED_LOCATION "${PULSEAUDIO_MAINLOOP_LIBRARY}") -- endif() - if(NOT TARGET PulseAudio::PulseAudio) - add_library(PulseAudio::PulseAudio UNKNOWN IMPORTED) - set_target_properties(PulseAudio::PulseAudio PROPERTIES -@@ -65,4 +57,4 @@ - endif() - endif() - --mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY) -+mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY) diff --git a/packages/mediacenter/kodi/patches/kodi-100.20-remove-intl-and-gmp.patch b/packages/mediacenter/kodi/patches/kodi-100.20-remove-intl-and-gmp.patch deleted file mode 100644 index 57f39e4a7f..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.20-remove-intl-and-gmp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/project/cmake/modules/FindPython.cmake b/project/cmake/modules/FindPython.cmake ---- a/project/cmake/modules/FindPython.cmake 2016-11-30 13:39:56.000000000 -0800 -+++ b/project/cmake/modules/FindPython.cmake 2016-11-30 20:55:52.581465246 -0800 -@@ -16,8 +16,6 @@ - if(CMAKE_CROSSCOMPILING) - find_library(FFI_LIBRARY ffi REQUIRED) - find_library(EXPAT_LIBRARY expat REQUIRED) -- find_library(INTL_LIBRARY intl REQUIRED) -- find_library(GMP_LIBRARY gmp REQUIRED) - - if(NOT CORE_SYSTEM_NAME STREQUAL android) - set(PYTHON_DEP_LIBRARIES -lpthread -ldl -lutil) diff --git a/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch b/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch index 655eafc2ff..44b9d5864c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch @@ -1,6 +1,7 @@ -diff -Naur a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake ---- a/project/cmake/modules/FindSmbClient.cmake 2016-09-17 08:35:33.000000000 -0700 -+++ b/project/cmake/modules/FindSmbClient.cmake 2016-09-25 13:38:38.969125892 -0700 +diff --git a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake +index 6455cce..379d79c 100644 +--- a/project/cmake/modules/FindSmbClient.cmake ++++ b/project/cmake/modules/FindSmbClient.cmake @@ -14,7 +14,7 @@ # # SmbClient::SmbClient - The SmbClient library @@ -10,40 +11,24 @@ diff -Naur a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/F pkg_check_modules(PC_SMBCLIENT smbclient QUIET) endif() -@@ -23,15 +23,35 @@ - find_library(SMBCLIENT_LIBRARY NAMES smbclient - PATHS ${PC_SMBCLIENT_LIBDIR}) - -+# check if smbclient libs are statically linked -+set(SMBCLIENT_LIB_TYPE SHARED) -+if(PC_SMBCLIENT_STATIC_LDFLAGS) -+ set(SMBCLIENT_LDFLAGS ${PC_SMBCLIENT_STATIC_LDFLAGS} CACHE STRING "smbclient linker flags" FORCE) -+ set(SMBCLIENT_LIB_TYPE STATIC) -+# string(REGEX REPLACE ";" " " SMBCLIENT_STATIC_LIBRARIES ${PC_SMBCLIENTS_STATIC_LIBRARIES}) -+# foreach(_smblib IN LISTS ${SMBCLIENT_STATIC_LIBRARIES}) -+# string(TOUPPER ${_smblib}_LIBRARY SMBCLIENT_STATIC_LIBRARIES) -+# find_library(${SMBCLIENT_STATIC_LIBRARIES} ${_smblib}) -+# endforeach() -+ -+ find_library(TALLOC_LIBRARY talloc) -+ find_library(TDB_LIBRARY tdb) -+ find_library(TEVENT_LIBRARY tevent) -+ find_library(WBCLIENT_LIBRARY wbclient) -+ find_library(RESOLV_LIBRARY resolv) -+ -+endif() -+ - set(SMBCLIENT_VERSION ${PC_SMBCLIENT_VERSION}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SmbClient - REQUIRED_VARS SMBCLIENT_LIBRARY SMBCLIENT_INCLUDE_DIR -+ TALLOC_LIBRARY TDB_LIBRARY TEVENT_LIBRARY WBCLIENT_LIBRARY RESOLV_LIBRARY +@@ -31,7 +31,19 @@ find_package_handle_standard_args(SmbClient VERSION_VAR SMBCLIENT_VERSION) if(SMBCLIENT_FOUND) - set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY}) -+ set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY} ${TALLOC_LIBRARY} ${TDB_LIBRARY} ${TEVENT_LIBRARY} ${WBCLIENT_LIBRARY} ${RESOLV_LIBRARY}) ++ # check if smbclient libs are statically linked ++ set(SMBCLIENT_LIB_TYPE SHARED) ++ if(PC_SMBCLIENT_STATIC_LDFLAGS) ++ set(SMBCLIENT_LDFLAGS ${PC_SMBCLIENT_STATIC_LDFLAGS} CACHE STRING "smbclient linker flags" FORCE) ++ set(SMBCLIENT_LIB_TYPE STATIC) ++ find_library(TALLOC_LIBRARY talloc) ++ find_library(TDB_LIBRARY tdb) ++ find_library(TEVENT_LIBRARY tevent) ++ find_library(WBCLIENT_LIBRARY wbclient) ++ find_library(RESOLV_LIBRARY resolv) ++ set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY} ${TALLOC_LIBRARY} ${TDB_LIBRARY} ${TEVENT_LIBRARY} ${WBCLIENT_LIBRARY} ${RESOLV_LIBRARY}) ++ endif() ++ set(SMBCLIENT_INCLUDE_DIRS ${SMBCLIENT_INCLUDE_DIR}) set(SMBCLIENT_DEFINITIONS -DHAVE_LIBSMBCLIENT=1) diff --git a/packages/mediacenter/kodi/patches/kodi-100.23-add-findimx-cmake-module.patch b/packages/mediacenter/kodi/patches/kodi-100.23-add-findimx-cmake-module.patch deleted file mode 100644 index e4f0c975f5..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.23-add-findimx-cmake-module.patch +++ /dev/null @@ -1,118 +0,0 @@ -commit 0e78af21ce3fff4c9f4424e1ce99880a79ef4113 -Author: Lukas Rusak -Date: Sun Sep 25 15:26:18 2016 -0700 - - [cmake][IMX] fix imx cmake build - -diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt -index 76870a4..8602a52 100644 ---- a/project/cmake/CMakeLists.txt -+++ b/project/cmake/CMakeLists.txt -@@ -56,6 +56,7 @@ if(UNIX) - if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) - option(ENABLE_X11 "Enable X11 support?" ON) - option(ENABLE_AML "Enable AML?" OFF) -+ option(ENABLE_IMX "Enable IMX?" OFF) - endif() - endif() - # System options -@@ -216,6 +217,7 @@ endif() - - if(CORE_SYSTEM_NAME STREQUAL android OR CORE_SYSTEM_NAME STREQUAL linux) - core_optional_dep(AML) -+ core_optional_dep(IMX) - elseif(CORE_SYSTEM_NAME STREQUAL rbpi) - core_require_dep(MMAL) - endif() -diff --git a/project/cmake/modules/FindIMX.cmake b/project/cmake/modules/FindIMX.cmake -new file mode 100644 -index 0000000..4e1e838 ---- /dev/null -+++ b/project/cmake/modules/FindIMX.cmake -@@ -0,0 +1,35 @@ -+#.rst: -+# FindIMX -+# ------- -+# Finds the IMX codec -+# -+# This will will define the following variables:: -+# -+# IMX_FOUND - system has IMX -+# IMX_INCLUDE_DIRS - the IMX include directory -+# IMX_DEFINITIONS - the IMX definitions -+# IMX_LIBRARIES - the IMX libraries -+ -+if(PKG_CONFIG_FOUND) -+ pkg_check_modules(IMX fslvpuwrap QUIET) -+endif() -+ -+if(NOT IMX_FOUND) -+ find_path(IMX_INCLUDE_DIR vpu_wrapper.h -+ PATH_SUFFIXES imx-mm/vpu) -+ -+ find_library(FSLVPUWRAP_LIBRARY fslvpuwrap) -+ find_library(VPU_LIBRARY vpu) -+ find_library(G2D_LIBRARY g2d) -+ -+ set(IMX_LIBRARIES ${FSLVPUWRAP_LIBRARY} ${VPU_LIBRARY} ${G2D_LIBRARY} -+ CACHE STRING "imx libraries" FORCE) -+endif() -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(IMX -+ REQUIRED_VARS IMX_INCLUDE_DIR IMX_LIBRARIES) -+ -+list(APPEND IMXVPU_DEFINITIONS -DHAS_IMXVPU=1 -DLINUX -DEGL_API_FB) -+ -+mark_as_advanced(IMX_INCLUDE_DIR IMX_LIBRARIES IMX_DEFINITIONS) -diff --git a/xbmc/linux/CMakeLists.txt b/xbmc/linux/CMakeLists.txt -index 754cc1e..931c10d 100644 ---- a/xbmc/linux/CMakeLists.txt -+++ b/xbmc/linux/CMakeLists.txt -@@ -40,4 +40,8 @@ if(OMXLIB_FOUND) - OMXCore.h) - endif() - -+if(IMX_FOUND) -+ add_subdirectory(imx) -+endif() -+ - core_add_library(linuxsupport) -diff --git a/xbmc/video/videosync/CMakeLists.txt b/xbmc/video/videosync/CMakeLists.txt -index 421af44..82f7169 100644 ---- a/xbmc/video/videosync/CMakeLists.txt -+++ b/xbmc/video/videosync/CMakeLists.txt -@@ -35,6 +35,11 @@ if(CORE_SYSTEM_NAME STREQUAL android) - list(APPEND HEADERS VideoSyncAndroid.h) - endif() - -+if(IMX_FOUND) -+ list(APPEND SOURCES VideoSyncIMX.cpp) -+ list(APPEND HEADERS VideoSyncIMX.h) -+endif() -+ - if(SOURCES AND HEADERS) - core_add_library(video_sync) - endif() -diff --git a/xbmc/windowing/egl/CMakeLists.txt b/xbmc/windowing/egl/CMakeLists.txt -index 3ab603e..51e13ab 100644 ---- a/xbmc/windowing/egl/CMakeLists.txt -+++ b/xbmc/windowing/egl/CMakeLists.txt -@@ -1,4 +1,4 @@ --if(OPENGLES_FOUND OR AML_FOUND OR MMAL_FOUND) -+if(OPENGLES_FOUND OR AML_FOUND OR IMX_FOUND OR MMAL_FOUND) - set(SOURCES EGLWrapper.cpp) - - set(HEADERS EGLNativeType.h -@@ -30,6 +30,11 @@ if(MMAL_FOUND) - list(APPEND HEADERS EGLNativeTypeRaspberryPI.h) - endif() - -+if(IMX_FOUND) -+ list(APPEND SOURCES EGLNativeTypeIMX.cpp) -+ list(APPEND HEADERS EGLNativeTypeIMX.h) -+endif() -+ - if(SOURCES) - core_add_library(windowing_egl) - endif() diff --git a/packages/mediacenter/kodi/patches/kodi-100.24-disable-bluetooth.patch b/packages/mediacenter/kodi/patches/kodi-100.24-disable-bluetooth.patch deleted file mode 100644 index aab9213bac..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.24-disable-bluetooth.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur a/project/cmake/scripts/linux/ExtraTargets.cmake b/project/cmake/scripts/linux/ExtraTargets.cmake ---- a/project/cmake/scripts/linux/ExtraTargets.cmake 2016-09-17 08:35:33.000000000 -0700 -+++ b/project/cmake/scripts/linux/ExtraTargets.cmake 2016-09-28 00:29:12.861577741 -0700 -@@ -5,8 +5,3 @@ - add_executable(${APP_NAME_LC}-xrandr ${CORE_SOURCE_DIR}/xbmc-xrandr.c) - target_link_libraries(kodi-xrandr ${SYSTEM_LDFLAGS} ${X_LIBRARIES} m ${XRANDR_LIBRARIES}) - endif() -- --# WiiRemote --if(ENABLE_EVENTCLIENTS) -- add_subdirectory(${CORE_SOURCE_DIR}/tools/EventClients/Clients/WiiRemote build/WiiRemote) --endif() -diff -Naur a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake ---- a/project/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:17.791608457 -0800 -+++ b/project/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:44.860880383 -0800 -@@ -256,11 +256,6 @@ - DESTINATION ${bindir} - COMPONENT kodi-eventclients-ps3) - -- # Install kodi-eventclients-wiiremote -- install(PROGRAMS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/WiiRemote/${APP_NAME_LC}-wiiremote -- DESTINATION ${bindir} -- COMPONENT kodi-eventclients-wiiremote) -- - # Install kodi-eventclients-xbmc-send - install(PROGRAMS "${CORE_SOURCE_DIR}/tools/EventClients/Clients/Kodi Send/kodi-send.py" - RENAME ${APP_NAME_LC}-send