mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #9923 from heitbaum/addon
Fix Addon builds against libxml2-2.14.0
This commit is contained in:
commit
56ea394eeb
@ -14,4 +14,5 @@ PKG_BUILD_FLAGS="-sysroot"
|
||||
PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${SYSROOT_PREFIX}/usr/include \
|
||||
-DBUILD_UNIT_TESTS=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON"
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DUSE_INTERNAL_TINYXML=OFF"
|
||||
|
@ -0,0 +1,25 @@
|
||||
From 40253d13dbeb8ad09547f29dc7a4d7fe0acfa7a5 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 28 Mar 2025 23:40:09 +1100
|
||||
Subject: [PATCH] Allow build with cmake 4.0.0
|
||||
|
||||
use min...max syntax to allow build with newer cmake.
|
||||
|
||||
ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f9d0f05..b04c8846 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
||||
|
||||
# 3.0.2 preferred, but we can often get by with 2.8.
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 2.8...3.10)
|
||||
if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} LESS 3.0.2)
|
||||
message(WARNING "You should use cmake 3.0.2 or newer for configuration to run correctly.")
|
||||
endif()
|
@ -0,0 +1,27 @@
|
||||
From 7a4014b1e239fc34ef130487620545f1e8e69299 Mon Sep 17 00:00:00 2001
|
||||
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
||||
Date: Wed, 5 Mar 2025 18:05:23 -0500
|
||||
Subject: [PATCH] Update minimum CMake version to 3.12; support CMake 4.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
CMake 4.0 drops support for CMake <3.5, so minimum versions need to be
|
||||
adjusted for forward compatibility. As long as we are touching the
|
||||
minimum version, let’s advance to 3.12, which can be considered the
|
||||
oldest “modern” CMake release, and which is available in all known
|
||||
supported Linux distributions today.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt b/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
|
||||
index 538cc8a0b..265b0b380 100644
|
||||
--- a/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
|
||||
+++ b/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 3.12)
|
||||
|
||||
project(Easyloggingpp CXX)
|
||||
|
@ -2,10 +2,10 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="patch"
|
||||
PKG_VERSION="2.7.6"
|
||||
PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd"
|
||||
PKG_VERSION="2.8"
|
||||
PKG_SHA256="f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://savannah.gnu.org/projects/patch/"
|
||||
PKG_SITE="https://savannah.gnu.org/projects/patch"
|
||||
PKG_URL="https://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff."
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="unrar"
|
||||
PKG_VERSION="7.1.5"
|
||||
PKG_SHA256="d1acac7ed5b45db587294b357fdd6e74982ce21f5edfcb113c4ca263bc0c666d"
|
||||
PKG_VERSION="7.1.6"
|
||||
PKG_SHA256="ca5e1da37dd6fa1b78bb5ed675486413f79e4a917709744aa04b6f93dfd914f0"
|
||||
PKG_LICENSE="free"
|
||||
PKG_SITE="https://www.rarlab.com/rar_add.htm"
|
||||
PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz"
|
||||
|
@ -0,0 +1,34 @@
|
||||
From 1d1df90bc57455453e0561885aed4680f6561d3a Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 28 Mar 2025 07:54:49 +0000
|
||||
Subject: [PATCH] [cmake] allow build with cmake-4.0.0
|
||||
|
||||
use min...max syntax to allow build with newer cmake.
|
||||
ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
|
||||
|
||||
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/demuxer/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dff9943..5473bba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 2.8...3.10)
|
||||
project(robotv)
|
||||
|
||||
set(PLUGIN "robotv")
|
||||
diff --git a/src/demuxer/CMakeLists.txt b/src/demuxer/CMakeLists.txt
|
||||
index 8b53c75..7906a0a 100644
|
||||
--- a/src/demuxer/CMakeLists.txt
|
||||
+++ b/src/demuxer/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 2.8...3.10)
|
||||
project(robotvdmx)
|
||||
|
||||
# set C++11 for robotv
|
@ -4,8 +4,8 @@
|
||||
PKG_NAME="chrome"
|
||||
PKG_VERSION="1.0"
|
||||
# curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version
|
||||
PKG_VERSION_NUMBER="131.0.6778.139"
|
||||
PKG_REV="2"
|
||||
PKG_VERSION_NUMBER="134.0.6998.165"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="Custom"
|
||||
PKG_SITE="http://www.google.com/chrome"
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="mariadb"
|
||||
PKG_VERSION="11.8.1"
|
||||
PKG_REV="4"
|
||||
PKG_REV="5"
|
||||
PKG_SHA256="c58e9e96e8e69dba09aa179b9bea63fc2775f3194efb72dfc2c277abfb9936e5"
|
||||
PKG_LICENSE="GPL2"
|
||||
PKG_SITE="https://mariadb.org"
|
||||
|
@ -5,7 +5,7 @@ PKG_NAME="tvheadend42"
|
||||
PKG_VERSION="5bdcfd8ac97b3337e1c7911ae24127df76fa693a"
|
||||
PKG_SHA256="b562a26248cdc02dc94cc62038deea172668fa4c079b2ea4e1b4220f3b1d34f5"
|
||||
PKG_VERSION_NUMBER="4.2.8-36"
|
||||
PKG_REV="8"
|
||||
PKG_REV="9"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
|
@ -5,7 +5,7 @@ PKG_NAME="tvheadend43"
|
||||
PKG_VERSION="653bd0400b4413db96b80c807f0f7524f9248adb"
|
||||
PKG_SHA256="9c2e13a70f97cf4c9b37cd93bfd03a7a1e0b7f3b18080c40ef99b8917642dbd7"
|
||||
PKG_VERSION_NUMBER="4.3-2375"
|
||||
PKG_REV="8"
|
||||
PKG_REV="9"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
PKG_NAME="vdr-addon"
|
||||
PKG_VERSION="2.7.4"
|
||||
PKG_REV="6"
|
||||
PKG_REV="7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="ffmpeg-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="6"
|
||||
PKG_REV="7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="system-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="8"
|
||||
PKG_REV="9"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
@ -4,7 +4,7 @@
|
||||
PKG_NAME="inputstream.ffmpegdirect"
|
||||
PKG_VERSION="22.1.0-Piers"
|
||||
PKG_SHA256="93be6d64857951c41c4f82518da556dc6b9d090dfb58b3c9044ce4aeeab10e57"
|
||||
PKG_REV="2"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL2+"
|
||||
PKG_SITE="https://github.com/xbmc/inputstream.ffmpegdirect"
|
||||
|
@ -5,7 +5,7 @@
|
||||
PKG_NAME="pvr.stalker"
|
||||
PKG_VERSION="22.2.1-Piers"
|
||||
PKG_SHA256="be8fc0147481ed85ad0ac40d500e094e1a7c4bbe7ce946d741b733cdb6a8d33f"
|
||||
PKG_REV="1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/kodi-pvr/pvr.stalker"
|
||||
|
Loading…
x
Reference in New Issue
Block a user