diff options
Diffstat (limited to 'tools/depends/target')
46 files changed, 422 insertions, 399 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index c968d71f8d..bdfebac073 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -23,7 +23,6 @@ DEPENDS = \ harfbuzz \ libass \ libbluray \ - libcec \ libffi \ libgcrypt \ libgpg-error \ @@ -40,7 +39,6 @@ DEPENDS = \ nettle \ nghttp2 \ openssl \ - p8-platform \ python3 \ pythonmodule-pil \ pythonmodule-pycryptodome \ @@ -57,9 +55,8 @@ else endif ifeq ($(OS),darwin_embedded) - EXCLUDED_DEPENDS = libcec libusb gtest + EXCLUDED_DEPENDS = libusb gtest ifeq ($(TARGET_PLATFORM),appletvos) - DEPENDS += boblight EXCLUDED_DEPENDS += libshairplay libplist endif DEPENDS += darwin-embedded-entitlements @@ -67,15 +64,11 @@ endif ifeq ($(OS),osx) EXCLUDED_DEPENDS = libusb - ifneq ($(CPU),arm64) - ifeq ($(WINDOW_SYSTEM),sdl) - DEPENDS += libsdl - endif - endif + DEPENDS += smctemp endif ifeq ($(OS),android) - EXCLUDED_DEPENDS = libcec libusb gtest + EXCLUDED_DEPENDS = libusb gtest DEPENDS += dummy-libxbmc libdovi libuuid PYMODULE_DEPS = dummy-libxbmc LIBUUID = libuuid @@ -157,7 +150,7 @@ $(DOWNLOAD_TARGETS): download: $(DOWNLOAD_TARGETS) crossguid: $(LIBUUID) -curl: openssl nghttp2 +curl: openssl nghttp2 $(ZLIB) dbus: expat ffmpeg: $(ICONV) $(ZLIB) bzip2 gnutls dav1d $(LIBVA) fontconfig: freetype2 expat $(ICONV) $(LIBUUID) @@ -169,7 +162,6 @@ libass: fontconfig fribidi harfbuzz libpng freetype2 expat $(ICONV) libbluray: fontconfig freetype2 $(ICONV) udfread libxml2 libcdio-gplv3: $(ICONV) libcdio: $(ICONV) -libcec: p8-platform libdisplay-info: hwdata libevdev: libudev libgcrypt: libgpg-error @@ -182,7 +174,7 @@ libxml2: $(ZLIB) libxslt: libgcrypt libxml2 libzip: bzip2 gnutls $(ZLIB) mariadb: openssl $(ICONV) $(ZLIB) -mesa: libdrm $(MESA_DEPS) +mesa: libdrm $(MESA_DEPS) $(ZLIB) nettle: gmp openssl: $(ZLIB) python3: expat gettext libxml2 sqlite3 openssl libffi bzip2 xz $(ICONV) diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index a1d6b548a1..ffed3ce3f1 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -48,7 +48,7 @@ if(CORE_SYSTEM_NAME STREQUAL darwin_embedded) set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") if(CORE_PLATFORM_NAME STREQUAL tvos) set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "3") - set(CMAKE_XCODE_ATTRIBUTE_TVOS_DEPLOYMENT_TARGET 11.0) + set(CMAKE_XCODE_ATTRIBUTE_TVOS_DEPLOYMENT_TARGET 12.0) else() set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2") set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 11.0) diff --git a/tools/depends/target/boblight/01-fix_fpermissive.patch b/tools/depends/target/boblight/01-fix_fpermissive.patch deleted file mode 100644 index aab4788620..0000000000 --- a/tools/depends/target/boblight/01-fix_fpermissive.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/util/misc.cpp -+++ b/src/util/misc.cpp -@@ -64,7 +64,7 @@ - //convert . or , to the current locale for correct conversion of ascii float - void ConvertFloatLocale(std::string& strfloat) - { -- static struct lconv* locale = localeconv(); -+ static const struct lconv* locale = localeconv(); - - size_t pos = strfloat.find_first_of(",."); - diff --git a/tools/depends/target/boblight/02-fixandroid.patch b/tools/depends/target/boblight/02-fixandroid.patch deleted file mode 100644 index ff4b5b1077..0000000000 --- a/tools/depends/target/boblight/02-fixandroid.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/src/lib/boblight.h -+++ b/src/lib/boblight.h -@@ -61,7 +61,7 @@ - //gets a functionpointer from dlsym, and returns char* from dlerror if it didn't work - #define BOBLIGHT_FUNCTION(returnvalue, name, arguments) \ - name = BOBLIGHT_CAST(returnvalue (*) arguments)(dlsym(p_boblight, #name)); \ -- { char* error = dlerror(); if (error) return error; } -+ { char* error = (char *)dlerror(); if (error) return error; } - - void* p_boblight = NULL; //where we put the lib - -@@ -79,7 +79,7 @@ - - p_boblight = dlopen(filename, RTLD_NOW); - if (p_boblight == NULL) -- return dlerror(); -+ return (char *)dlerror(); - - //generate dlsym lines - #include "boblight-functions.h" ---- a/src/util/daemonize.cpp -+++ b/src/util/daemonize.cpp -@@ -35,10 +35,12 @@ - if (setsid() < 0) - fprintf(stderr, "setsid(): %s", GetErrno().c_str()); - -+#if !defined(__ANDROID__) - //route stdout and stderr to /dev/null - fclose(stdout); - stdout = fopen("/dev/null", "w"); - fclose(stderr); - stderr = fopen("/dev/null", "w"); -+#endif - } - diff --git a/tools/depends/target/boblight/03-fixtvos.patch b/tools/depends/target/boblight/03-fixtvos.patch deleted file mode 100644 index 13f8025568..0000000000 --- a/tools/depends/target/boblight/03-fixtvos.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/device/deviceltbl.cpp -+++ b/src/device/deviceltbl.cpp -@@ -51,7 +51,7 @@ - - bool CDeviceLtbl::WriteOutput() - { -- uint8_t prefix[4] = {0x55, 0xAA, 0x00, m_channels.size()}; -+ uint8_t prefix[4] = {0x55, 0xAA, 0x00, (uint8_t)m_channels.size()}; - - //get the channel values from the clienshandler - int64_t now = GetTimeUs(); -@@ -114,7 +114,7 @@ - uint8_t buff[512]; - uint8_t prefix[2] = {0x55, 0xAA}; - uint8_t open[2] = {0x83, 0x00}; -- uint8_t getvalues[4] = {0x81, 0x02, 0x00, m_channels.size()}; -+ uint8_t getvalues[4] = {0x81, 0x02, 0x00, (uint8_t)m_channels.size()}; - - if (m_isopened) - return true; //nothing to do here ---- a/src/util/daemonize.cpp -+++ b/src/util/daemonize.cpp -@@ -25,7 +25,7 @@ - void Daemonize() - { - //fork a child process -- pid_t pid = fork(); -+ pid_t pid = -1;//fork(); - if (pid == -1) - fprintf(stderr, "fork(): %s", GetErrno().c_str()); - else if (pid > 0) ---- a/src/util/tcpsocket.cpp -+++ b/src/util/tcpsocket.cpp -@@ -31,8 +31,6 @@ - #include "tcpsocket.h" - #include "misc.h" - --using namespace std; -- - void CTcpData::SetData(uint8_t* data, int size, bool append) - { - CopyData(reinterpret_cast<char*>(data), size, append); diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile deleted file mode 100644 index 641061cd38..0000000000 --- a/tools/depends/target/boblight/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 01-fix_fpermissive.patch 02-fixandroid.patch 03-fixtvos.patch ../../download-files.include - -#hint for building a fat lib - "lipo -arch i386 libboblight-i386.dylib -arch x86_64 libboblight-x86_64.dylib -output libboblight-fat.dylib" - -# lib name, version -LIBNAME=libboblight -VERSION=r478 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=382e0b0f1ef2fca676cd64ec4190d3cfb791fed0f9477af8436e461cebfbc268058abc1fbba97a0337d3152a9b292580160b42157b4076d59b3847071deb1881 -include ../../download-files.include - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) \ - --without-opengl \ - --without-portaudio \ - --without-x11 \ - --without-libusb - -LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a - -all: $(LIBDYLIB) .installed-$(PLATFORM) - - -$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) - rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../01-fix_fpermissive.patch - cd $(PLATFORM); patch -p1 -i ../02-fixandroid.patch - cd $(PLATFORM); autoreconf -vif - cd $(PLATFORM); $(CONFIGURE) -ifeq ($(CPU),arm64) - cd $(PLATFORM); patch -p1 -i ../03-fixtvos.patch - cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./libtool - cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./ltmain.sh -endif - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM) - -.installed-$(PLATFORM): $(LIBDYLIB) -ifeq ($(OS),darwin_embedded) -ifeq ($(TARGET_PLATFORM),appletvos) - #deploy into source tree for tvos - we distribute libboblight with the bundle... - cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(CMAKE_SOURCE_DIR)/system/libboblight-tvos.0.dylib -endif -else - echo "libboblight isn't a dependency of XBMC and won't be installed" -endif - touch $@ -clean: - $(MAKE) -C $(PLATFORM) clean - rm -r .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/cec/001-all-cmakelists.patch b/tools/depends/target/cec/001-all-cmakelists.patch new file mode 100644 index 0000000000..370c3a0fe1 --- /dev/null +++ b/tools/depends/target/cec/001-all-cmakelists.patch @@ -0,0 +1,40 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ + set(LIBCEC_VERSION_PATCH 7) + + # cec-client ++if(ENABLE_CLIENT) + add_subdirectory(src/cec-client) + add_dependencies(cec-client cec) + +@@ -15,6 +16,7 @@ + + # pyCecClient + add_subdirectory(src/pyCecClient) ++endif() + + # libCEC + add_subdirectory(src/libcec) +@@ -25,6 +27,7 @@ + + # windows specific files + if(WIN32) ++if(ENABLE_CLIENT) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/project/nsis/libcec-version.nsh.in + ${CMAKE_CURRENT_SOURCE_DIR}/project/nsis/libcec-version.nsh) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnetlib/LibCecSharp/LibCecSharp.rc.in +@@ -40,3 +43,13 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/CecSharpTester.csproj.in + ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/CecSharpTester.csproj) + endif() ++endif() ++ ++# handle version file ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake ++ VERSION "${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}" ++ COMPATIBILITY AnyNewerVersion) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake ++ DESTINATION lib/cmake/${PROJECT_NAME}) diff --git a/tools/depends/target/cec/002-all-libceccmakelists.patch b/tools/depends/target/cec/002-all-libceccmakelists.patch new file mode 100644 index 0000000000..a5b44a6db0 --- /dev/null +++ b/tools/depends/target/cec/002-all-libceccmakelists.patch @@ -0,0 +1,42 @@ +--- a/src/libcec/CMakeLists.txt ++++ b/src/libcec/CMakeLists.txt +@@ -175,7 +175,7 @@ + ${CMAKE_INSTALL_PREFIX}/include) + + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libcec.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ DESTINATION lib/pkgconfig) + endif() + + # install headers +@@ -193,11 +193,25 @@ + # libCEC shared target + add_library(cec SHARED ${CEC_SOURCES}) + install(TARGETS cec +- DESTINATION ${LIB_DESTINATION}) ++ EXPORT libcec ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++ ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libcec-config.cmake ++ DESTINATION lib/cmake/libcec) ++ + set_target_properties(cec PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH} + SOVERSION ${LIBCEC_VERSION_MAJOR}) + target_link_libraries(cec ${cec_depends}) + ++install(EXPORT libcec ++ NAMESPACE ++ libcec:: ++ DESTINATION ++ lib/cmake/libcec ++) ++ + if (MSVC) + # generate pdb in release mode too + set_target_properties(cec +--- /dev/null ++++ b/src/libcec/cmake/libcec-config.cmake +@@ -0,0 +1 @@ ++include(${CMAKE_CURRENT_LIST_DIR}/libcec.cmake) diff --git a/tools/depends/target/libcec/remove_git_info.patch b/tools/depends/target/cec/003-all-remove_git_info.patch index 4ade84bba4..5927552edb 100644 --- a/tools/depends/target/libcec/remove_git_info.patch +++ b/tools/depends/target/cec/003-all-remove_git_info.patch @@ -15,4 +15,4 @@ + endif() # add compilation date to compile info - find_program(HAVE_DATE_BIN date /bin /usr/bin /usr/local/bin) + STRING(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S" UTC) diff --git a/tools/depends/target/cec/004-win-remove_32bit_timet.patch b/tools/depends/target/cec/004-win-remove_32bit_timet.patch new file mode 100644 index 0000000000..4fe2a2f5db --- /dev/null +++ b/tools/depends/target/cec/004-win-remove_32bit_timet.patch @@ -0,0 +1,10 @@ +--- a/src/libcec/cmake/CheckPlatformSupport.cmake ++++ b/src/libcec/cmake/CheckPlatformSupport.cmake +@@ -49,7 +49,6 @@ + + if("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "X86") + set(LIB_INFO "${LIB_INFO} (x86)") +- add_definitions(-D_USE_32BIT_TIME_T) + # force python2 for eventghost + set(PYTHON_USE_VERSION 2) + elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "x64") diff --git a/tools/depends/target/cec/005-win-pdbstatic.patch b/tools/depends/target/cec/005-win-pdbstatic.patch new file mode 100644 index 0000000000..9dfdc17c66 --- /dev/null +++ b/tools/depends/target/cec/005-win-pdbstatic.patch @@ -0,0 +1,58 @@ +--- a/src/libcec/CMakeLists.txt ++++ b/src/libcec/CMakeLists.txt +@@ -213,15 +213,26 @@ + + if (MSVC) + # generate pdb in release mode too ++ # Tell linker to include symbol data ++ target_compile_options(cec PRIVATE $<$<CONFIG:RELEASE>:/Zi>) ++ ++ # Tell linker to include symbol data ++ set_target_properties(cec PROPERTIES ++ LINK_FLAGS_RELEASE "/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ++ ) + set_target_properties(cec + PROPERTIES + COMPILE_PDB_NAME_DEBUG cec${CMAKE_DEBUG_POSTFIX} + COMPILE_PDB_NAME_RELEASE cec + COMPILE_PDB_NAME_MINSIZEREL cec + COMPILE_PDB_NAME_RELWITHDEBINFO cec) ++ ++ # install generated pdb ++ install(FILES $<TARGET_PDB_FILE:cec> DESTINATION lib) + endif(MSVC) + + if(WIN32) ++if(ENABLE_STATIC) + # libCEC static target used by .net wrappers + add_library(cec-static STATIC ${CEC_SOURCES}) + install(TARGETS cec-static +@@ -243,6 +243,12 @@ + + if (MSVC) + # generate pdb in release mode too ++ target_compile_options(cec-static PRIVATE $<$<CONFIG:RELEASE>:/Zi>) ++ ++ # Tell linker to include symbol data ++ set_target_properties(cec-static PROPERTIES ++ LINK_FLAGS_RELEASE "/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ++ ) + set_target_properties(cec-static + PROPERTIES + COMPILE_PDB_NAME_DEBUG cec-static${CMAKE_DEBUG_POSTFIX} +@@ -256,12 +256,10 @@ + COMPILE_PDB_NAME_MINSIZEREL cec-static + COMPILE_PDB_NAME_RELWITHDEBINFO cec-static) + +- # install generated pdb +- install(FILES $<TARGET_FILE_DIR:cec>/cec.pdb +- DESTINATION "${CMAKE_INSTALL_LIBDIR}") +- install(FILES $<TARGET_FILE_DIR:cec-static>/cec-static.pdb +- DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++ install(FILES $<TARGET_PDB_FILE:cec-static> ++ DESTINATION lib) + endif(MSVC) ++endif() + endif(WIN32) + + include(cmake/DisplayPlatformSupport.cmake) diff --git a/tools/depends/target/cec/CEC-VERSION b/tools/depends/target/cec/CEC-VERSION new file mode 100644 index 0000000000..1a726d3bfe --- /dev/null +++ b/tools/depends/target/cec/CEC-VERSION @@ -0,0 +1,6 @@ +LIBNAME=libcec +VERSION=4.0.7 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81 +BYPRODUCT=libcec.so +BYPRODUCT_WIN=cec.lib diff --git a/tools/depends/target/cec/Makefile b/tools/depends/target/cec/Makefile new file mode 100644 index 0000000000..403f4f03f1 --- /dev/null +++ b/tools/depends/target/cec/Makefile @@ -0,0 +1,47 @@ +include ../../Makefile.include CEC-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile CEC-VERSION ../../download-files.include \ + 001-all-cmakelists.patch \ + 002-all-libceccmakelists.patch \ + 003-all-remove_git_info.patch \ + 004-win-remove_32bit_timet.patch \ + 005-win-pdbstatic.patch + +LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(BYPRODUCT) +ifeq (darwin, $(findstring darwin, $(HOST))) + LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(BYPRODUCT_MAC) +endif + +CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=1 \ + -DSKIP_PYTHON_WRAPPER:STRING=1 \ + -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=1 \ + -DCMAKE_INSTALL_PREFIX=$(PREFIX) \ + -DCMAKE_BUILD_TYPE=Debug + +all: .installed-$(PLATFORM) + +$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) + rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build + cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../001-all-cmakelists.patch + cd $(PLATFORM); patch -p1 -i ../002-all-libceccmakelists.patch + cd $(PLATFORM); patch -p1 -i ../003-all-remove_git_info.patch + cd $(PLATFORM); patch -p1 -i ../004-win-remove_32bit_timet.patch + cd $(PLATFORM); patch -p1 -i ../005-win-pdbstatic.patch + cd $(PLATFORM)/build; $(CMAKE) ${CMAKE_OPTIONS} .. + +$(LIBDYLIB): $(PLATFORM) + $(MAKE) -C $(PLATFORM)/build + +.installed-$(PLATFORM): $(LIBDYLIB) + $(MAKE) -C $(PLATFORM)/build install +ifeq (darwin, $(findstring darwin, $(HOST))) + install_name_tool -id $(PREFIX)/lib/$(LIBNAME).dylib $(PREFIX)/lib/$(LIBNAME).dylib +endif + touch $@ + +clean: + rm -rf $(PLATFORM) .installed-$(PLATFORM) + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) + diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile index 446d25218d..52941fa014 100644 --- a/tools/depends/target/cmakebuildsys/Makefile +++ b/tools/depends/target/cmakebuildsys/Makefile @@ -28,21 +28,13 @@ else endif endif -ifeq ($(OS),osx) - ifeq ($(APP_WINDOW_SYSTEM),sdl) - WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=sdl - else - WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native - endif -endif - ifeq ($(BUILD_DIR),) BUILD_DIR=$(CMAKE_SOURCE_DIR)/build endif all: mkdir -p $(BUILD_DIR) - cd $(BUILD_DIR); $(CMAKE) $(CMAKE_BUILD_ARGUMENTS) $(WINDOWSYSTEM) -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FFMPEG=OFF $(CMAKE_EXTRA_ARGUMENTS) $(CMAKE_SOURCE_DIR) + cd $(BUILD_DIR); $(CMAKE) $(CMAKE_BUILD_ARGUMENTS) -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FFMPEG=OFF $(CMAKE_EXTRA_ARGUMENTS) $(CMAKE_SOURCE_DIR) kodi: $(MAKE) -C $(BUILD_DIR) diff --git a/tools/depends/target/curl/CURL-VERSION b/tools/depends/target/curl/CURL-VERSION index 10caf28174..42bdd1d64f 100644 --- a/tools/depends/target/curl/CURL-VERSION +++ b/tools/depends/target/curl/CURL-VERSION @@ -1,5 +1,5 @@ LIBNAME=curl -VERSION=8.1.2 +VERSION=8.4.0 ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz -SHA512=532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +SHA512=7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b BYPRODUCT=libcurl.a diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index 76ddb64e97..896a67ddf4 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -3,9 +3,32 @@ DEPS = ../../Makefile.include Makefile CURL-VERSION ../../download-files.include # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --disable-shared --disable-ldap \ - --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp \ - --without-libidn2 --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX) + ./configure --prefix=$(PREFIX) \ + --disable-shared \ + --disable-ldap \ + --without-libssh2 \ + --disable-ntlm-wb \ + --enable-ipv6 \ + --without-librtmp \ + --without-libidn2 \ + --with-ca-fallback \ + --with-ssl=$(PREFIX) \ + --with-nghttp2=$(PREFIX) \ + --with-zlib \ + --without-libpsl \ + --without-zstd \ + --without-brotli \ + --without-gssapi \ + --without-gsasl \ + --without-hyper \ + --without-ngtcp2 \ + --without-nghttp3 \ + --without-quiche \ + --without-msh3 \ + --without-gnutls \ + --without-nss \ + --without-mbedtls \ + --without-wolfssl LIBDYLIB=$(PLATFORM)/lib/.libs/$(BYPRODUCT) diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index d085978413..f2ba09402e 100644 --- a/tools/depends/target/ffmpeg/FFMPEG-VERSION +++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION @@ -1,5 +1,5 @@ LIBNAME=ffmpeg -VERSION=6.0 +VERSION=6.0.1 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=b3214328f2792364353f38c6b46a71d4970c071d8656b20780abf0e02950167d0933eae825c09102cf8fb19fc679ac444bf1f41a448b624eaa5ea6b0f0bdf4f5 +SHA512=945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 82f86ef008..0a00827ba2 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -35,12 +35,6 @@ else BASE_URL := http://mirrors.kodi.tv/build-deps/sources endif -ifeq ($(OS), android) - ifeq ($(findstring arm64, $(CPU)), arm64) - CMAKE_ARGS+= -DENABLE_NEON=YES - endif -endif - include ../../download-files.include all: .installed-$(PLATFORM) diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile deleted file mode 100644 index 884e9bf1f5..0000000000 --- a/tools/depends/target/libcec/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile remove_git_info.patch ../../download-files.include - -# lib name, version -LIBNAME=libcec -VERSION_MAJOR=4 -VERSION_MINOR=0 -VERSION_PATCH=7 - -VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81 -include ../../download-files.include - -LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(LIBNAME).so -ifeq (darwin, $(findstring darwin, $(HOST))) - LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(LIBNAME).dylib -endif - -all: .installed-$(PLATFORM) - - -$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) - rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../remove_git_info.patch - cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=1 -DSKIP_PYTHON_WRAPPER:STRING=1 -DCMAKE_INSTALL_LIBDIR=$(PREFIX)/lib -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=1 .. - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM)/build - -.installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM)/build install -ifeq (darwin, $(findstring darwin, $(HOST))) - install_name_tool -id $(PREFIX)/lib/$(LIBNAME).dylib $(PREFIX)/lib/$(LIBNAME).dylib -endif - touch $@ - -clean: - rm -rf $(PLATFORM) .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM) - diff --git a/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch b/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch deleted file mode 100644 index 1ecb5a3973..0000000000 --- a/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/include/SDL_video.h -+++ b/include/SDL_video.h -@@ -323,6 +323,11 @@ - */ - extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags); - -+/** -+* Alter the width and height of the current surface to the given sizes. -+*/ -+extern DECLSPEC void SDLCALL SDL_SetWidthHeight(int width, int height); -+ - /** - * Set up a video mode with the specified width, height and bits-per-pixel. - * ---- a/src/video/SDL_video.c -+++ b/src/video/SDL_video.c -@@ -1976,3 +1976,11 @@ - return(0); - } - } -+ -+void SDL_SetWidthHeight(int width, int height) -+{ -+ if (current_video != NULL && current_video->screen != NULL) { -+ current_video->screen->w = width; -+ current_video->screen->h = height; -+ } -+} diff --git a/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch b/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch deleted file mode 100644 index 0a6ef088b5..0000000000 --- a/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzEvents.m -+++ b/src/video/quartz/SDL_QuartzEvents.m -@@ -345,7 +345,11 @@ - the scancode/keysym. - */ - if (SDL_TranslateUNICODE && state == SDL_PRESSED) { -- [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]]; -+ NSResponder *firstResponder = [[NSApp keyWindow] firstResponder]; -+ if ([NSStringFromClass([firstResponder class]) isEqual:@"OSXTextInputResponder"]) -+ [firstResponder interpretKeyEvents:[NSArray arrayWithObject:event]]; -+ else -+ [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]]; - chars = [ event characters ]; - numChars = [ chars length ]; - if (numChars > 0) diff --git a/tools/depends/target/libsdl/03-mavericks-compile.patch b/tools/depends/target/libsdl/03-mavericks-compile.patch deleted file mode 100644 index 1c00140a7f..0000000000 --- a/tools/depends/target/libsdl/03-mavericks-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzVideo.h -+++ b/src/video/quartz/SDL_QuartzVideo.h -@@ -91,7 +91,9 @@ - CGDirectDisplayID display; /* 0 == main display (only support single display) */ - const void *mode; /* current mode of the display */ - const void *save_mode; /* original mode of the display */ -+#ifdef CGDirectPaletteRef - CGDirectPaletteRef palette; /* palette of an 8-bit display */ -+#endif - NSOpenGLContext *gl_context; /* OpenGL rendering context */ - NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */ - Uint32 width, height, bpp; /* frequently used data about the display */ diff --git a/tools/depends/target/libsdl/04-fix_external_screen_crash.patch b/tools/depends/target/libsdl/04-fix_external_screen_crash.patch deleted file mode 100644 index 82bb364b70..0000000000 --- a/tools/depends/target/libsdl/04-fix_external_screen_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzWindow.m -+++ b/src/video/quartz/SDL_QuartzWindow.m -@@ -87,7 +87,7 @@ - SDL_VideoDevice *this = (SDL_VideoDevice*)current_video; - - /* make sure pixels are fully opaque */ -- if (! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) -+ if ( SDL_VideoSurface && ! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) - QZ_SetPortAlphaOpaque (); - - /* save current visible SDL surface */ diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile deleted file mode 100644 index d776b89370..0000000000 --- a/tools/depends/target/libsdl/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch 04-fix_external_screen_crash.patch ../../download-files.include - -# lib name, version -LIBNAME=SDL -VERSION=1.2.15 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc -include ../../download-files.include - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --disable-video-directfb -ifneq ($(OS),linux) -CONFIGURE += --without-x --disable-video-x11 -endif - -LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a - -all: .installed-$(PLATFORM) - - -$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) - rm -rf $(PLATFORM); mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../01-SDL_SetWidthHeight.patch - cd $(PLATFORM); patch -p1 -i ../02-OSX_interpretKeyEvents.patch - cd $(PLATFORM); patch -p1 -i ../03-mavericks-compile.patch - cd $(PLATFORM); patch -p1 -i ../04-fix_external_screen_crash.patch - cd $(PLATFORM); ./autogen.sh - cd $(PLATFORM); $(CONFIGURE) - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -j 1 -C $(PLATFORM) - -.installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install - touch $@ - -clean: - $(MAKE) -C $(PLATFORM) clean - rm -f .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile index 5f2f2c0609..1a3dceb0b7 100644 --- a/tools/depends/target/openssl/Makefile +++ b/tools/depends/target/openssl/Makefile @@ -1,13 +1,6 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 001-android-getauxvalrevert.patch 16-kodi.conf ../../download-files.include - -# lib name, version -LIBNAME=openssl -VERSION=1.1.1n -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4 -include ../../download-files.include +include ../../Makefile.include OPENSSL-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile OPENSSL-VERSION ../../download-files.include \ + 001-android-getauxvalrevert.patch 16-kodi.conf # configuration settings ifeq ($(OS), linux) diff --git a/tools/depends/target/openssl/OPENSSL-VERSION b/tools/depends/target/openssl/OPENSSL-VERSION new file mode 100644 index 0000000000..1712a0c3da --- /dev/null +++ b/tools/depends/target/openssl/OPENSSL-VERSION @@ -0,0 +1,4 @@ +LIBNAME=openssl +VERSION=1.1.1w +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d diff --git a/tools/depends/target/p8-platform/0001-fix-c++17-support.patch b/tools/depends/target/p8-platform/001-all-fix-c++17-support.patch index 25fbe483fe..25fbe483fe 100644 --- a/tools/depends/target/p8-platform/0001-fix-c++17-support.patch +++ b/tools/depends/target/p8-platform/001-all-fix-c++17-support.patch diff --git a/tools/depends/target/p8-platform/002-all-fixcmakeinstall.patch b/tools/depends/target/p8-platform/002-all-fixcmakeinstall.patch new file mode 100644 index 0000000000..be22576415 --- /dev/null +++ b/tools/depends/target/p8-platform/002-all-fixcmakeinstall.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,10 @@ + set_target_properties(p8-platform PROPERTIES VERSION ${p8-platform_VERSION_MAJOR}.${p8-platform_VERSION_MINOR}.${p8-platform_VERSION_PATCH} + SOVERSION ${p8-platform_VERSION_MAJOR}) + +-install(TARGETS p8-platform DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS p8-platform ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) + install(FILES src/os.h DESTINATION include/p8-platform) + IF(WIN32) + INSTALL(FILES src/windows/dlfcn-win32.h +@@ -74,12 +77,12 @@ + IF(NOT WIN32) + configure_file(p8-platform.pc.in p8-platform.pc @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/p8-platform.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ DESTINATION lib/pkgconfig) + ENDIF(NOT WIN32) + + # config mode + configure_file (p8-platform-config.cmake.in + p8-platform-config.cmake @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/p8-platform-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/p8-platform) ++ DESTINATION lib/cmake/p8-platform) + diff --git a/tools/depends/target/p8-platform/003-all-cmake_tweakversion.patch b/tools/depends/target/p8-platform/003-all-cmake_tweakversion.patch new file mode 100644 index 0000000000..24b9a65654 --- /dev/null +++ b/tools/depends/target/p8-platform/003-all-cmake_tweakversion.patch @@ -0,0 +1,21 @@ +--- a/p8-platform-config.cmake.in ++++ b/p8-platform-config.cmake.in +@@ -9,7 +9,7 @@ + # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated + # + # propagate these properties from one build system to the other +-set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") ++set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@.@p8-platform_VERSION_PATCH@.@p8-platform_VERSION_TWEAK@") + set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) + set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") + set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ + set(p8-platform_VERSION_MAJOR 2) + set(p8-platform_VERSION_MINOR 1) + set(p8-platform_VERSION_PATCH 0) ++set(p8-platform_VERSION_TWEAK 1) + + set(CMAKE_POSITION_INDEPENDENT_CODE on) + diff --git a/tools/depends/target/p8-platform/Makefile b/tools/depends/target/p8-platform/Makefile index 649c638b9a..4d3fd00cb4 100644 --- a/tools/depends/target/p8-platform/Makefile +++ b/tools/depends/target/p8-platform/Makefile @@ -1,15 +1,10 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 0001-fix-c++17-support.patch ../../download-files.include +include ../../Makefile.include P8-PLATFORM-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile P8-PLATFORM-VERSION ../../download-files.include \ + 001-all-fix-c++17-support.patch \ + 002-all-fixcmakeinstall.patch \ + 003-all-cmake_tweakversion.patch -# lib name, version -LIBNAME=p8-platform -VERSION=2.1.0.1 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=10f8e3ca8ea7a48923a4cc57d47015b56b4bdbf78997ba77abd9fc2f929198fda16dfb869ba69eec393ab4b635be916c3ed9a07d6989bf8265aa055794e84bf7 -include ../../download-files.include - -LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME).a +LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT) all: .installed-$(PLATFORM) @@ -17,8 +12,10 @@ all: .installed-$(PLATFORM) $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../0001-fix-c++17-support.patch - cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=0 -DCMAKE_INSTALL_LIBDIR=$(PREFIX)/lib .. + cd $(PLATFORM); patch -p1 -i ../001-all-fix-c++17-support.patch + cd $(PLATFORM); patch -p1 -i ../002-all-fixcmakeinstall.patch + cd $(PLATFORM); patch -p1 -i ../003-all-cmake_tweakversion.patch + cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=0 .. $(LIBDYLIB): $(PLATFORM) $(MAKE) -C $(PLATFORM)/build diff --git a/tools/depends/target/p8-platform/P8-PLATFORM-VERSION b/tools/depends/target/p8-platform/P8-PLATFORM-VERSION new file mode 100644 index 0000000000..f9ac55968e --- /dev/null +++ b/tools/depends/target/p8-platform/P8-PLATFORM-VERSION @@ -0,0 +1,6 @@ +LIBNAME=p8-platform +VERSION=2.1.0.1 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=10f8e3ca8ea7a48923a4cc57d47015b56b4bdbf78997ba77abd9fc2f929198fda16dfb869ba69eec393ab4b635be916c3ed9a07d6989bf8265aa055794e84bf7 +BYPRODUCT=libp8-platform.a +BYPRODUCT_WIN=p8-platform.lib diff --git a/tools/depends/target/pcre/004-win-pdb.patch b/tools/depends/target/pcre/004-win-pdb.patch index 2815ca2559..7c1fb26c74 100644 --- a/tools/depends/target/pcre/004-win-pdb.patch +++ b/tools/depends/target/pcre/004-win-pdb.patch @@ -1,20 +1,18 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -969,12 +969,14 @@ +@@ -969,12 +969,12 @@ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) IF(MSVC AND INSTALL_MSVC_PDB) - INSTALL(FILES ${PROJECT_BINARY_DIR}/pcre.pdb - ${PROJECT_BINARY_DIR}/pcreposix.pdb + INSTALL(FILES ${PROJECT_BINARY_DIR}/$<CONFIG>/pcre.pdb -+ ${PROJECT_BINARY_DIR}/$<CONFIG>/pcrecpp.pdb + ${PROJECT_BINARY_DIR}/$<CONFIG>/pcreposix.pdb DESTINATION bin CONFIGURATIONS RelWithDebInfo) - INSTALL(FILES ${PROJECT_BINARY_DIR}/pcred.pdb - ${PROJECT_BINARY_DIR}/pcreposixd.pdb + INSTALL(FILES ${PROJECT_BINARY_DIR}/$<CONFIG>/pcred.pdb -+ ${PROJECT_BINARY_DIR}/$<CONFIG>/pcrecppd.pdb + ${PROJECT_BINARY_DIR}/$<CONFIG>/pcreposixd.pdb DESTINATION bin CONFIGURATIONS Debug) diff --git a/tools/depends/target/python3/PYTHON3-VERSION b/tools/depends/target/python3/PYTHON3-VERSION index 45eb16c7df..c5e1760fb2 100644 --- a/tools/depends/target/python3/PYTHON3-VERSION +++ b/tools/depends/target/python3/PYTHON3-VERSION @@ -1,4 +1,4 @@ LIBNAME=Python -VERSION=3.11.5 +VERSION=3.11.7 ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz -SHA512=93fa640bedcea449060caac8aa691aa315a19f172fd9f0422183d17749c3512d4ecac60e7599f9ef14e3cdb3c8b4b060e484c9061b1e7ee8d958200d6041e408 +SHA512=11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63 diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile index 4037675e0e..c1384e4fb4 100644 --- a/tools/depends/target/pythonmodule-pil/Makefile +++ b/tools/depends/target/pythonmodule-pil/Makefile @@ -58,6 +58,7 @@ BUILD_OPTS=--plat-name $(OS)-$(CPU) --disable-jpeg2000 --disable-webp --disable- export CC CFLAGS export PYTHONXINCLUDE=$(PREFIX)/include/python$(PYTHON_VERSION) export LDSHARED LDFLAGS PYTHONPATH +export SETUPTOOLS_EXT_SUFFIX=.so all: .installed-$(PLATFORM) @@ -89,9 +90,6 @@ else ifeq ($(OS),darwin_embedded) cd $(PILPATH) && rm -rf Pillow-*.egg else ifeq ($(TARGET_PLATFORM),webos) cd $(PILPATHLIB) && unzip -o $(PILPATH)/Pillow-*.egg && rm -f $(PILPATH)/Pillow-*.egg - cd $(PILPATHLIB)/PIL && \ - sed $(SED_FLAG) -e 's/import sys, pkg_resources,/import sys, /' \ - -re "/__file__/ s|=.*(_imaging.*.so).*$$|= 'lib/python3/PIL/\1'|" _imaging*.py endif touch $@ diff --git a/tools/depends/target/pythonmodule-pycryptodome/Makefile b/tools/depends/target/pythonmodule-pycryptodome/Makefile index 3916b58d1a..48b61ae574 100644 --- a/tools/depends/target/pythonmodule-pycryptodome/Makefile +++ b/tools/depends/target/pythonmodule-pycryptodome/Makefile @@ -24,6 +24,7 @@ endif export CC CFLAGS export LDSHARED LDFLAGS export PYTHONPATH=$(PYTHON_SITE_PKG) +export SETUPTOOLS_EXT_SUFFIX=.so all: .installed-$(PLATFORM) diff --git a/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch new file mode 100644 index 0000000000..937d19e8e3 --- /dev/null +++ b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,11 +94,7 @@ + SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install") + SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation") + +-IF(UNIX OR CYGWIN) +- SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") +-ELSEIF(WIN32) +- SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake") +-ENDIF() ++SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") + SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in") + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch index 4bf06da59c..4bf06da59c 100644 --- a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch +++ b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch diff --git a/tools/depends/target/rapidjson/003-win-arm64.patch b/tools/depends/target/rapidjson/004-win-arm64.patch index 2d045dcaf6..2d045dcaf6 100644 --- a/tools/depends/target/rapidjson/003-win-arm64.patch +++ b/tools/depends/target/rapidjson/004-win-arm64.patch diff --git a/tools/depends/target/rapidjson/Makefile b/tools/depends/target/rapidjson/Makefile index 233d3a3571..1e0a2d2e75 100644 --- a/tools/depends/target/rapidjson/Makefile +++ b/tools/depends/target/rapidjson/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.include include RAPIDJSON-VERSION DEPS = Makefile RAPIDJSON-VERSION 001-remove_custom_cxx_flags.patch ../../download-files.include \ - 002-cmake-removedocs-examples.patch \ - 003-win-arm64.patch + 002-cmake-standardise_config_installpath.patch \ + 003-cmake-removedocs-examples.patch \ + 004-win-arm64.patch CMAKE_OPTIONS=-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF @@ -42,8 +43,9 @@ endif cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build cd $(PLATFORM); patch -p1 -i ../001-remove_custom_cxx_flags.patch - cd $(PLATFORM); patch -p1 -i ../002-cmake-removedocs-examples.patch - cd $(PLATFORM); patch -p1 -i ../003-win-arm64.patch + cd $(PLATFORM); patch -p1 -i ../002-cmake-standardise_config_installpath.patch + cd $(PLATFORM); patch -p1 -i ../003-cmake-removedocs-examples.patch + cd $(PLATFORM); patch -p1 -i ../004-win-arm64.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. .installed-$(PLATFORM): $(PLATFORM) diff --git a/tools/depends/target/smctemp/Makefile b/tools/depends/target/smctemp/Makefile new file mode 100644 index 0000000000..b257625403 --- /dev/null +++ b/tools/depends/target/smctemp/Makefile @@ -0,0 +1,30 @@ +include ../../Makefile.include SMCTEMP-VERSION ../../download-files.include +DEPS = ../../Makefile.include SMCTEMP-VERSION Makefile ../../download-files.include \ + +LIBDYLIB=$(PLATFORM)/$(BYPRODUCT) + +ifeq ($(CPU), arm64) + CXXFLAGS += -DARCH_TYPE_ARM64 +else + CXXFLAGS += -DARCH_TYPE_X86_64 +endif + +all: .installed-$(PLATFORM) + +$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) + rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + +$(LIBDYLIB): $(PLATFORM) + $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" AR=$(AR) RANLIB=$(RANLIB) -C $(PLATFORM) staticlib + +.installed-$(PLATFORM): $(LIBDYLIB) + $(MAKE) DEST_PREFIX=$(PREFIX) -C $(PLATFORM) installstaticlib + touch $@ + +clean: + $(MAKE) -C $(PLATFORM) clean + rm -f .installed-$(PLATFORM) + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/smctemp/SMCTEMP-VERSION b/tools/depends/target/smctemp/SMCTEMP-VERSION new file mode 100644 index 0000000000..4eb38567cb --- /dev/null +++ b/tools/depends/target/smctemp/SMCTEMP-VERSION @@ -0,0 +1,5 @@ +LIBNAME=smctemp +VERSION=0.2.1 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=8671836ed3f16122ffc84a1e91b463c8405526b1500fa9f5816a9f9eff1fd598c86958e894d2b8b25ae798da57b536766729b28dcc6b7c69fe2dc3c818f18290 +BYPRODUCT=libsmctemp.a diff --git a/tools/depends/target/wayland-protocols/Makefile b/tools/depends/target/wayland-protocols/Makefile index 0364867fdf..e3cc1b62ca 100644 --- a/tools/depends/target/wayland-protocols/Makefile +++ b/tools/depends/target/wayland-protocols/Makefile @@ -3,10 +3,10 @@ DEPS =Makefile ../../download-files.include # lib name, version LIBNAME=wayland-protocols -VERSION=1.24 +VERSION=1.32 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.xz -SHA512=4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15 +SHA512=90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 ifeq ($(PLATFORM),) # Building stand-alone diff --git a/tools/depends/target/wayland/Makefile b/tools/depends/target/wayland/Makefile index c079d9c1d6..0a0f616125 100644 --- a/tools/depends/target/wayland/Makefile +++ b/tools/depends/target/wayland/Makefile @@ -1,16 +1,33 @@ -include ../../Makefile.include -DEPS =../../Makefile.include Makefile ../../download-files.include +include ../../Makefile.include WAYLAND-VERSION ../../download-files.include +DEPS =../../Makefile.include Makefile WAYLAND-VERSION ../../download-files.include -# lib name, version -LIBNAME=wayland -VERSION=1.18.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.xz -SHA512=e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc -include ../../download-files.include +MESON_BUILD_TYPE=release + +ifeq ($(DEBUG_BUILD), yes) + MESON_BUILD_TYPE=debug +endif # configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --with-host-scanner --disable-documentation --disable-dtd-validation +CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson setup \ + --prefix $(PREFIX) \ + --libdir $(PREFIX)/lib \ + --buildtype=$(MESON_BUILD_TYPE) \ + -Dscanner=false \ + -Dtests=false \ + -Ddocumentation=false \ + -Ddtd_validation=false + +ifeq ($(CROSS_COMPILING), yes) + CONFIGURE += --cross-file $(PREFIX)/share/cross-file.meson +endif + +export CC +export CXX +export CFLAGS +export CXXFLAGS +export LDFLAGS + +export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig all: .installed-$(PLATFORM) @@ -18,14 +35,17 @@ all: .installed-$(PLATFORM) $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); $(CONFIGURE) + cd $(PLATFORM); rm -rf build; mkdir -p build + # symlink native wayland scanner pkg-config to allow meson to find + rm -f $(PREFIX)/lib/pkgconfig/wayland-scanner.pc + ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner.pc $(PREFIX)/lib/pkgconfig/wayland-scanner.pc + cd $(PLATFORM); $(CONFIGURE) . build .installed-$(PLATFORM): $(PLATFORM) - $(MAKE) -C $(PLATFORM) - $(MAKE) -C $(PLATFORM) install + cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v + cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install - # remove the target wayland scanner from the sysroot. We only want to use the native one - rm -f $(PREFIX)/bin/wayland-scanner + # symlink native wayland scanner rm -f $(PREFIX)/lib/pkgconfig/wayland-scanner.pc ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner.pc $(PREFIX)/lib/pkgconfig/wayland-scanner.pc touch $@ diff --git a/tools/depends/target/wayland/WAYLAND-VERSION b/tools/depends/target/wayland/WAYLAND-VERSION new file mode 100644 index 0000000000..580ede5ca1 --- /dev/null +++ b/tools/depends/target/wayland/WAYLAND-VERSION @@ -0,0 +1,4 @@ +LIBNAME=wayland +VERSION=1.22.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile index 4631a4668e..6a4689e6f8 100644 --- a/tools/depends/target/waylandpp/Makefile +++ b/tools/depends/target/waylandpp/Makefile @@ -1,12 +1,6 @@ -include ../../Makefile.include -DEPS =Makefile ../../download-files.include 001-fix-gcc13-build.patch - -# lib name, version -LIBNAME=waylandpp -VERSION=0.2.8 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832 +include WAYLANDPP-VERSION ../../download-files.include +DEPS =Makefile ../../download-files.include WAYLANDPP-VERSION 001-fix-gcc13-build.patch LIBDYLIB=$(PLATFORM)/build/libwayland-client++.so @@ -31,7 +25,6 @@ endif CMAKE_OPTIONS := -DBUILD_DOCUMENTATION=OFF -DBUILD_LIBRARIES=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF $(CMAKE_OPTIONS) BUILDDIR = $(PLATFORM)/build -include ../../download-files.include all: .installed-$(PLATFORM) diff --git a/tools/depends/target/waylandpp/WAYLANDPP-VERSION b/tools/depends/target/waylandpp/WAYLANDPP-VERSION new file mode 100644 index 0000000000..b87fb9bbe7 --- /dev/null +++ b/tools/depends/target/waylandpp/WAYLANDPP-VERSION @@ -0,0 +1,4 @@ +LIBNAME=waylandpp +VERSION=1.0.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039 |