summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2023-08-02 14:56:01 -0400
committergraysky2023-08-02 14:56:01 -0400
commited01fabc96ccf8e1b0656c962cbecdc9b0fe32a1 (patch)
tree1ddba8221aa0e54de16b80316d67948a1d1a2602
parent770b732c966de89fc8f962d8a298962ad12beb4e (diff)
downloadaur-ed01fabc96ccf8e1b0656c962cbecdc9b0fe32a1.tar.gz
Update to r63513.e9718f7ef9e-1
-rw-r--r--.SRCINFO12
-rw-r--r--0001-ffmpeg-fix-build-with-binutils-update.patch112
-rw-r--r--PKGBUILD9
3 files changed, 126 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f8036b9f03c..b058b2e122d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = kodi-git
- pkgver = r63276.31e0f1dfcaf
+ pkgver = r63513.e9718f7ef9e
pkgrel = 1
url = https://kodi.tv
arch = x86_64
@@ -81,6 +81,7 @@ pkgbase = kodi-git
source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-23.3.3.tar.gz
source = https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
source = cheat-sse-build.patch
+ source = 0001-ffmpeg-fix-build-with-binutils-update.patch
b2sums = SKIP
b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -91,6 +92,7 @@ pkgbase = kodi-git
b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
+ b2sums = 7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130
pkgname = kodi-git
pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -138,7 +140,7 @@ pkgname = kodi-git
optdepends = pulseaudio: PulseAudio support
optdepends = pipewire: PipeWire support
optdepends = upower: Display battery level
- provides = kodi=r63276.31e0f1dfcaf
+ provides = kodi=r63513.e9718f7ef9e
provides = kodi-x11
provides = kodi-wayland
provides = kodi-gbm
@@ -151,7 +153,7 @@ pkgname = kodi-git-eventclients
pkgdesc = Kodi Event Clients (master branch)
optdepends = kodi: local machine eventclient use
optdepends = python: most eventclients are implemented in python
- provides = kodi-eventclients=r63276.31e0f1dfcaf
+ provides = kodi-eventclients=r63513.e9718f7ef9e
conflicts = kodi-eventclients
pkgname = kodi-git-tools-texturepacker
@@ -160,11 +162,11 @@ pkgname = kodi-git-tools-texturepacker
depends = giflib
depends = libjpeg-turbo
depends = lzo
- provides = kodi-tools-texturepacker=r63276.31e0f1dfcaf
+ provides = kodi-tools-texturepacker=r63513.e9718f7ef9e
conflicts = kodi-tools-texturepacker
pkgname = kodi-git-dev
pkgdesc = Kodi dev files (master branch)
depends = kodi-git
- provides = kodi-dev=r63276.31e0f1dfcaf
+ provides = kodi-dev=r63513.e9718f7ef9e
conflicts = kodi-dev
diff --git a/0001-ffmpeg-fix-build-with-binutils-update.patch b/0001-ffmpeg-fix-build-with-binutils-update.patch
new file mode 100644
index 000000000000..3852ac24b62d
--- /dev/null
+++ b/0001-ffmpeg-fix-build-with-binutils-update.patch
@@ -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
+
diff --git a/PKGBUILD b/PKGBUILD
index df92938fd7ca..0e74474cbf31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _clangbuild=
pkgbase=kodi-git
pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r63276.31e0f1dfcaf
+pkgver=r63513.e9718f7ef9e
pkgrel=1
arch=('x86_64')
url="https://kodi.tv"
@@ -78,6 +78,7 @@ source=(
"https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
"https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
cheat-sse-build.patch
+ 0001-ffmpeg-fix-build-with-binutils-update.patch
)
noextract=(
"libdvdcss-$_libdvdcss_version.tar.gz"
@@ -98,7 +99,8 @@ b2sums=('SKIP'
'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
'1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
- '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+ '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+ '7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130')
pkgver() {
cd "$_gitname"
@@ -115,6 +117,9 @@ prepare() {
[[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
+ # fix for new binutils, credit to kevku for pointing this out
+ patch -p1 -i ../0001-ffmpeg-fix-build-with-binutils-update.patch
+
if [[ -n "$_clangbuild" ]]; then
msg "Building with clang"
export CC=clang CXX=clang++