forked from ports/contrib
kodi-wayland: updated dependency: openjdk20-jdk -> openjdk21-jdk; added patch for swig 4.3.0
This commit is contained in:
parent
53475a55c5
commit
157f94d175
@ -1,6 +1,7 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF39TLoocOGDsBwi8nLaWHB6eEc4vzx6Z5vk4h3rsRrp9RJlTr6iHVFBv6JqFqSgQoXaK1aD7rvrehA0+iauSfDQE=
|
||||
SHA256 (Pkgfile) = 2bf930b3a6130b9ba1a3ebcef8999bb4f5cd185f4edf0bb6b540428152130877
|
||||
RWSagIOpLGJF34syMo4L8Vis6UrCAh2SX/lYH8m33ZYjK77hdCFR8gmREQTGqmvKuy+G82kX5HWoGhC00JrivPMy2Dvs4AreAA8=
|
||||
SHA256 (Pkgfile) = 9e969bdef3a021d6318b8cdd4a749bb9911bacb97d76a7496143458c5a620593
|
||||
SHA256 (.footprint) = a57a215c30cfd3240a1da120d489fcd874fdab18fa46992a7825811c42d5b4bb
|
||||
SHA256 (xbmc-21.1-Omega.tar.gz) = ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
|
||||
SHA256 (25863.patch) = 626de84ffb1785054044f2e47e28a93ada17cdf7ca6681c977b5e5f82abe754b
|
||||
SHA256 (24972.patch) = abcad95b0b5decba67ea4612b315a690e257cb9485ea2d5e774c012789ddf0a1
|
||||
|
26
kodi-wayland/25863.patch
Normal file
26
kodi-wayland/25863.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 4ff0ba903bed472cddb0d6e5c53c8176cded6b09 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Mon, 21 Oct 2024 22:10:29 +1100
|
||||
Subject: [PATCH] [swig] Fix building with swig 4.3.0
|
||||
|
||||
swig 4.3.0 has dropped the -xmllang option used with -xml, which had no effect on the output.
|
||||
|
||||
Ref:
|
||||
- https://github.com/swig/swig/commit/86498e46c6a6218a3d091c12513c40076ac2ce63
|
||||
---
|
||||
xbmc/interfaces/swig/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
|
||||
index 1951b2a336789..46c84c7f7efc5 100644
|
||||
--- a/xbmc/interfaces/swig/CMakeLists.txt
|
||||
+++ b/xbmc/interfaces/swig/CMakeLists.txt
|
||||
@@ -22,7 +22,7 @@ function(generate_file file)
|
||||
|
||||
add_custom_command(OUTPUT ${CPP_FILE}
|
||||
COMMAND ${SWIG_EXECUTABLE}
|
||||
- ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
|
||||
+ ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
|
||||
COMMAND ${Java_JAVA_EXECUTABLE}
|
||||
ARGS ${JAVA_OPEN_OPTS} -cp "${classpath}" groovy.ui.GroovyMain ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
|
||||
${CLANG_FORMAT_COMMAND}
|
@ -1,15 +1,16 @@
|
||||
# Description: Open source home theater software, wayland native version
|
||||
# URL: https://kodi.tv/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: crossguid dbus ffmpeg flatbuffers fstrcmp glu libass libcdio libdisplay-info libdvdread libinput libxkbcommon openjdk20-jdk rapidjson spdlog swig taglib tinyxml tinyxml2 waylandpp xkeyboard-config
|
||||
# Depends on: crossguid dbus ffmpeg flatbuffers fstrcmp glu libass libcdio libdisplay-info libdvdread libinput libxkbcommon openjdk21-jdk rapidjson spdlog swig taglib tinyxml tinyxml2 waylandpp xkeyboard-config
|
||||
# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
|
||||
|
||||
name=kodi-wayland
|
||||
version=21.1
|
||||
release=1
|
||||
release=2
|
||||
_codename=Omega
|
||||
|
||||
source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$_codename.tar.gz
|
||||
25863.patch
|
||||
24972.patch)
|
||||
|
||||
build() {
|
||||
@ -19,7 +20,7 @@ build() {
|
||||
fi
|
||||
# }}}
|
||||
unset PATH
|
||||
export PATH="/usr/lib/java/openjdk20-jdk/bin:/usr/bin:/bin:/usr/sbin:/sbin"
|
||||
export PATH="/usr/lib/java/openjdk21-jdk/bin:/usr/bin:/bin:/usr/sbin:/sbin"
|
||||
|
||||
# optionals {{{
|
||||
prt-get isinst alsa-lib && KODI_EXTRA+=' -D ENABLE_ALSA=ON' || KODI_EXTRA+=' -D ENABLE_ALSA=OFF'
|
||||
@ -49,6 +50,7 @@ build() {
|
||||
xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
|
||||
|
||||
patch -Np1 -d xbmc-$version-$_codename -i $SRC/24972.patch
|
||||
patch -Np1 -d xbmc-$version-$_codename -i $SRC/25863.patch
|
||||
|
||||
cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
|
Loading…
x
Reference in New Issue
Block a user