forked from ports/contrib
kodi-wayland: updated footprint for python 3.11
This commit is contained in:
parent
db36e45623
commit
f321987a17
GPG Key ID:
42F8B4E30B673606
@ -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.10/
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/__init__.py
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/__pycache__/
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.pyc
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/__init__.py
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.pyc
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/bt.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/hid.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/defs.py
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/__init__.py
|
||||
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.pyc
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/keymaps.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/sixaxis.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/sixpair.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/sixwatch.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3_remote.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/xbmcclient.py
|
||||
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/zeroconf.py
|
||||
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/share/
|
||||
drwxr-xr-x root/root usr/share/applications/
|
||||
-rw-r--r-- root/root usr/share/applications/kodi.desktop
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF30Jlr2k7YGIlUwAawQT1cPixWpUhjNplMHEqY+q+rjVESRWM9vAm1QIyZLNocS7Qajlp3qiCCrPFs9SScRGCdAQ=
|
||||
SHA256 (Pkgfile) = 7c3d8ac74a6227595dfaafc8eb1d7b621e69b91895665a61a274dd7ee30c14ee
|
||||
SHA256 (.footprint) = b7344ab259de5a27ce4cae98f25bc6ff4a07609b949d8813bc71eefc64572440
|
||||
RWSagIOpLGJF30ta6K28/9jJRSJwpLCNcQQnOU7Jbta/ngL8rf0PeIQlbyoj+A6XqfQ1Dr/kgu7vrOUvMagK3PZPJ8CWyJAWMQI=
|
||||
SHA256 (Pkgfile) = b3777f930ef553d853164a9054e92943cdb940e04c1a68e97418085e7f6fa553
|
||||
SHA256 (.footprint) = e94f279367656642acdd5a8e867bbd721bb2ac3c894b5a3ae807f8671a0871f9
|
||||
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 (23453.patch) = 0c7ce50029029a937b970a79cfd468d0c336a6be80dcf048b33380d1ed39a66b
|
||||
|
||||
112
kodi-wayland/0001-ffmpeg-fix-build-with-binutils-update.patch
Normal file
112
kodi-wayland/0001-ffmpeg-fix-build-with-binutils-update.patch
Normal file
@ -0,0 +1,112 @@
|
||||
From 6a83b674531d980a459057a8fd7c8b5050ba2f7c Mon Sep 17 00:00:00 2001
|
||||
From: graysky <therealgraysky AT proton DOT me>
|
||||
Date: Wed, 2 Aug 2023 14:43:24 -0400
|
||||
Subject: [PATCH] ffmpeg: fix build with binutils update
|
||||
|
||||
---
|
||||
cmake/modules/FindFFMPEG.cmake | 5 +-
|
||||
...1-Fixes-assembling-w-binutil-as-2.41.patch | 76 +++++++++++++++++++
|
||||
2 files changed, 80 insertions(+), 1 deletion(-)
|
||||
create mode 100644 tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||||
|
||||
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
|
||||
index e53a121..eca8e27 100644
|
||||
--- a/cmake/modules/FindFFMPEG.cmake
|
||||
+++ b/cmake/modules/FindFFMPEG.cmake
|
||||
@@ -85,7 +85,10 @@ macro(buildFFMPEG)
|
||||
-DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig)
|
||||
set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy
|
||||
${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
|
||||
- <SOURCE_DIR>)
|
||||
+ <SOURCE_DIR> &&
|
||||
+ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch &&
|
||||
+ echo "########################################## patched ffmpeg ##############################"
|
||||
+ )
|
||||
|
||||
if(CMAKE_GENERATOR STREQUAL Xcode)
|
||||
set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles")
|
||||
diff --git a/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||||
new file mode 100644
|
||||
index 0000000..33fd3d4
|
||||
--- /dev/null
|
||||
+++ b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||||
@@ -0,0 +1,76 @@
|
||||
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
||||
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
+Date: Sun, 16 Jul 2023 18:18:02 +0300
|
||||
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
||||
+ instructions within inline assembly
|
||||
+
|
||||
+Fixes assembling with binutil as >= 2.41
|
||||
+
|
||||
+Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
+---
|
||||
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
|
||||
+ 1 file changed, 23 insertions(+), 3 deletions(-)
|
||||
+
|
||||
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
|
||||
+index 6298f5ed19..ca7e2dffc1 100644
|
||||
+--- a/libavcodec/x86/mathops.h
|
||||
++++ b/libavcodec/x86/mathops.h
|
||||
+@@ -35,12 +35,20 @@
|
||||
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
+ {
|
||||
+ int rt, dummy;
|
||||
++ if (__builtin_constant_p(shift))
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ (
|
||||
++ "imull %3 \n\t"
|
||||
++ "shrdl %4, %%edx, %%eax \n\t"
|
||||
++ :"=a"(rt), "=d"(dummy)
|
||||
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
++ );
|
||||
+ return rt;
|
||||
+ }
|
||||
+
|
||||
+@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
+ // avoid +32 for shift optimization (gcc should do that ...)
|
||||
+ #define NEG_SSR32 NEG_SSR32
|
||||
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("sarl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+ #define NEG_USR32 NEG_USR32
|
||||
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("shrl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+--
|
||||
+2.30.2
|
||||
+
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -21,6 +21,7 @@ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$
|
||||
https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz
|
||||
https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz
|
||||
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz
|
||||
0001-ffmpeg-fix-build-with-binutils-update.patch
|
||||
23453.patch)
|
||||
# }}}
|
||||
# unpack_source() {{{
|
||||
@ -73,6 +74,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/0001-ffmpeg-fix-build-with-binutils-update.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