1
0
forked from ports/contrib

kodi-gbm: updated footprint for python 3.12

This commit is contained in:
Tim Biermann 2023-11-05 12:09:30 +01:00
parent 854fb2a07b
commit b87a10bf92
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 108 additions and 50 deletions

View File

@ -170,53 +170,53 @@ drwxr-xr-x root/root usr/lib/kodi/system/
drwxr-xr-x root/root usr/lib/kodi/system/players/
drwxr-xr-x root/root usr/lib/kodi/system/players/VideoPlayer/
-rwxr-xr-x root/root usr/lib/kodi/system/players/VideoPlayer/libdvdnav-x86_64-linux.so
drwxr-xr-x root/root usr/lib/python3.11/
drwxr-xr-x root/root usr/lib/python3.11/site-packages/
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/__init__.py
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/__pycache__/
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/__init__.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/__init__.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/defs.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/defs.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/ps3_remote.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/ps3_remote.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/xbmcclient.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/xbmcclient.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/zeroconf.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/__pycache__/zeroconf.cpython-311.pyc
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/bt/
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/bt/__init__.py
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/__init__.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/__init__.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/bt.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/bt.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/hid.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/bt/__pycache__/hid.cpython-311.pyc
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/bt/bt.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/bt/hid.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/defs.py
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/__init__.py
drwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/__init__.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/__init__.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/keymaps.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/keymaps.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixpair.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixpair.cpython-311.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-311.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.11/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-311.pyc
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/keymaps.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/sixaxis.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/sixpair.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3/sixwatch.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/ps3_remote.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/xbmcclient.py
-rwxr-xr-x root/root usr/lib/python3.11/site-packages/kodi/zeroconf.py
drwxr-xr-x root/root usr/lib/python3.12/
drwxr-xr-x root/root usr/lib/python3.12/site-packages/
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/__init__.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/__pycache__/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/__init__.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/__init__.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/defs.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/defs.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/ps3_remote.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/ps3_remote.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/xbmcclient.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/xbmcclient.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/zeroconf.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/__pycache__/zeroconf.cpython-312.pyc
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/bt/
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/bt/__init__.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/__init__.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/__init__.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/bt.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/bt.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/hid.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/bt/__pycache__/hid.cpython-312.pyc
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/bt/bt.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/bt/hid.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/defs.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/__init__.py
drwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/__init__.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/__init__.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/keymaps.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/keymaps.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixpair.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixpair.cpython-312.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-312.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.12/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-312.pyc
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/keymaps.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/sixaxis.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/sixpair.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3/sixwatch.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/ps3_remote.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/xbmcclient.py
-rwxr-xr-x root/root usr/lib/python3.12/site-packages/kodi/zeroconf.py
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/kodi.desktop

View File

@ -1,11 +1,12 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF384ODC/LdO4xTcv06Va0U6xnmxx+0U01PXYvBxtpt7ZDBYe0+PHR/WaBpT1BBk1EPZWcApGgAkdGsku92cYG6A0=
SHA256 (Pkgfile) = 8d4af4282dfe1593bd2d247f010ce56318b9ffa9037ba35455e9ac2a6b3b2d23
SHA256 (.footprint) = 5c4a4e395e443bb1172299cc4ca44c17bedeebb5bd75b9a7585a5df9ab587cbd
RWSagIOpLGJF30TxAj5H/GkzHfhdDxdPG/4JMVreJv3+606wCixzIc0sKtBMdi53Rt1JEKYW0E5yMI4lPjNn0K5SpMpEwbp0iQU=
SHA256 (Pkgfile) = 72408140e607d9b576f8d9312c97e71ea99abafd2dde8045f29d642b257c5084
SHA256 (.footprint) = 818afc3eaec27b7b6f3d5d5b6d9d0a3dfb4e318259f9f5b017c4412056e9907d
SHA256 (xbmc-20.2-Nexus.tar.gz) = 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23
SHA256 (ffmpeg-4.4.1-Nexus-Alpha1.tar.gz) = abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed
SHA256 (kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
SHA256 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
SHA256 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
SHA256 (0001-ffmpeg-fix-build-with-binutils-update.patch) = f7d56582d04e0787f9e82c5b685073b962c9de07933db0bce1c113cce5421c6a
SHA256 (23508.patch) = c1f987f8d118694ecb2e099ee5b0aaa13c91c487c84867a6b72ba7c903c349d4
SHA256 (23453.patch) = 0c7ce50029029a937b970a79cfd468d0c336a6be80dcf048b33380d1ed39a66b

55
kodi-gbm/23508.patch Normal file
View File

@ -0,0 +1,55 @@
From 3b5697982b16514d2acf234f7dd5cb50a98355b9 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 13 Jul 2023 08:57:38 -0700
Subject: [PATCH 1/2] swig.cpp: add clang-format formatting
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
---
xbmc/interfaces/python/swig.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
index 1ef41db17fde2..a73d0ebcd74cc 100644
--- a/xbmc/interfaces/python/swig.cpp
+++ b/xbmc/interfaces/python/swig.cpp
@@ -18,8 +18,8 @@ namespace PythonBindings
{
TypeInfo::TypeInfo(const std::type_info& ti) : swigType(NULL), parentType(NULL), typeIndex(ti)
{
- static PyTypeObject py_type_object_header =
- { PyVarObject_HEAD_INIT(nullptr, 0) 0,
+ static PyTypeObject py_type_object_header = {
+ PyVarObject_HEAD_INIT(nullptr, 0) 0,
0,
0,
0,
From 597dd302768b22d209dc44fddb2b5fa5e3ef9b34 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 12 Jul 2023 19:58:08 -0700
Subject: [PATCH 2/2] PythonBindings: TypeInfo: add initialization of
tp_watched for PyTypeObject
This member was added in upstream commit https://github.com/python/cpython/commit/82ccbf69a842db25d8117f1c41b47aa5b4ed96ab
This change first appeared in Python v3.12.0a1
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
---
xbmc/interfaces/python/swig.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
index a73d0ebcd74cc..20b97ac0463e8 100644
--- a/xbmc/interfaces/python/swig.cpp
+++ b/xbmc/interfaces/python/swig.cpp
@@ -71,6 +71,9 @@ namespace PythonBindings
#endif
#if PY_VERSION_HEX < 0x03090000
0,
+#endif
+#if PY_VERSION_HEX >= 0x030C00A1
+ 0,
#endif
};

View File

@ -22,6 +22,7 @@ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$
https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-gbm/}-libdvdnav-$_libdvdnav_version.tar.gz
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm}-libdvdread-$_libdvdread_version.tar.gz
0001-ffmpeg-fix-build-with-binutils-update.patch
23508.patch
23453.patch)
# }}}
# unpack_source() {{{
@ -76,6 +77,7 @@ build() {
xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
patch -Np1 -d xbmc-$version-$_codename -i $SRC/23453.patch
patch -Np1 -d xbmc-$version-$_codename -i $SRC/23508.patch
patch -Np1 -d xbmc-$version-$_codename -i $SRC/0001-ffmpeg-fix-build-with-binutils-update.patch
cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \