aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2024-01-24 21:27:59 +0000
committerptrcnull <git@ptrcnull.me>2024-02-18 22:24:31 +0100
commit736f7d7d1249afa2b3fb87a6a6330e635dd91cc0 (patch)
treede86de20ef91aff76db0eb09601b160860f442b9
parentb5b069d8c13341591d5072c2516190da23d410dc (diff)
community/kodi: fix build with swig 4.2.0
-rw-r--r--community/kodi/APKBUILD2
-rw-r--r--community/kodi/fix-building-with-swig-4.2.0.patch35
-rw-r--r--testing/autorandr/APKBUILD2
3 files changed, 38 insertions, 1 deletions
diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD
index eb6bcd75aaa..505ceb1306a 100644
--- a/community/kodi/APKBUILD
+++ b/community/kodi/APKBUILD
@@ -133,6 +133,7 @@ source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz
$pkgname-$pkgver-fmt10-2.patch::https://github.com/xbmc/xbmc/commit/93c5212b135f398fae56ece55a3b29a21315c3ea.patch
$pkgname-$pkgver-fmt10-3.patch::https://github.com/xbmc/xbmc/commit/cb7caa030b3df0b411df879cdf59c789e7eb8cfe.patch
$pkgname-$pkgver-fmt10-4.patch::https://github.com/xbmc/xbmc/commit/894c8bf2a3fca8cdd1de92e2730e2418b6f6d965.patch
+ fix-building-with-swig-4.2.0.patch
kodi.initd
60-kodi.rules
"
@@ -291,6 +292,7 @@ ec0a65d45cbd1e60798a756867adeb0c30ef972e6bd4e434d666525bde4ad74aa0b78fae164f18c0
0105db1111bf2b38af67076c61e65d6abd44e08b4034774e04735e9a3f08c9f33f15680ac17229c810114043080729c35d40660c5a3eace57f87e94e13ab84d2 kodi-20.2-fmt10-2.patch
0355ffcbaa955999a9cd5992c228bc2f56ba22bfdd0b64f5f68c3a7c33b44c7b08efa6ccb6de5127d11a90d5e0d5b801615d6d321828c2a6c5998a992ba52b18 kodi-20.2-fmt10-3.patch
bb880bcbf6e3cd1454eacc20ce47af09919134df3a491f9a9a89f517d55ff8865dd7e54cc4372ca1dcd3893f5c5526f6b6931b81910d01563744cc1b818d962f kodi-20.2-fmt10-4.patch
+6fb1bdd249590977587f59c5a57d3824380233b30edb04932c8291d8f0da0fd52d9709543e033d502fd053b1d15e0ed8a2638694b16352432c7a75781fc0f102 fix-building-with-swig-4.2.0.patch
c47e90b6bb011092c033705195c8f1e4fcb56be412f12133514f46f5cb52acda7075c8350d78c98b86e0808f3d373ac3735f0fae10e907610b5405ba623cebac kodi.initd
465a2079d598bf909a458d8e9d0ddd2b2a41dff83ba736542cffec7811c044295d5af092928f20aaa6cd3bc8b13bb03ede5c7ded1783680f890464e103392787 60-kodi.rules
"
diff --git a/community/kodi/fix-building-with-swig-4.2.0.patch b/community/kodi/fix-building-with-swig-4.2.0.patch
new file mode 100644
index 00000000000..88ff32d2be7
--- /dev/null
+++ b/community/kodi/fix-building-with-swig-4.2.0.patch
@@ -0,0 +1,35 @@
+From e2f165fe1586f19114a2084a27559dcc75421939 Mon Sep 17 00:00:00 2001
+From: fuzzard <fuzzard@kodi.tv>
+Date: Mon, 1 Jan 2024 19:57:30 +1000
+Subject: [PATCH] [swig] Fix building with Swig 4.2.0
+
+swig 4.2.0 introduced a change that adds a constructor to the generated AddonModuleXbmcaddon.i.cpp
+file. This causes failures such as
+
+build/swig/AddonModuleXbmcaddon.i.cpp: In function 'PyObject* PythonBindings::xbmcaddon_XBMCAddon_xbmcaddon_Settings_New(PyTypeObject*, PyObject*, PyObject*)':
+build/swig/AddonModuleXbmcaddon.i.cpp:1751:52: error: no matching function for call to 'XBMCAddon::xbmcaddon::Settings::Settings()'
+ 1751 | apiResult = new XBMCAddon::xbmcaddon::Settings();
+ | ^
+In file included from ../xbmc/interfaces/legacy/Addon.h:14,
+ from build/swig/AddonModuleXbmcaddon.i.cpp:30:
+../xbmc/interfaces/legacy/Settings.h:58:3: note: candidate: 'XBMCAddon::xbmcaddon::Settings::Settings(std::shared_ptr<CSettingsBase>)'
+ 58 | Settings(std::shared_ptr<CSettingsBase> settings);
+ | ^~~~~~~~
+../xbmc/interfaces/legacy/Settings.h:58:3: note: candidate expects 1 argument, 0 provided
+
+If we disable the contructor for Settings, we get the same generated output as swig <=4.1.1
+---
+ xbmc/interfaces/swig/AddonModuleXbmcaddon.i | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xbmc/interfaces/swig/AddonModuleXbmcaddon.i b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
+index 6c00a1caa2f5a..d38794c043377 100644
+--- a/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
++++ b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
+@@ -33,5 +33,6 @@ using namespace xbmcaddon;
+ %include "interfaces/legacy/AddonString.h"
+
+ %include "interfaces/legacy/Addon.h"
++%nodefaultctor Settings;
+ %include "interfaces/legacy/Settings.h"
+
diff --git a/testing/autorandr/APKBUILD b/testing/autorandr/APKBUILD
index b01ff1e535f..f56bd9c49c3 100644
--- a/testing/autorandr/APKBUILD
+++ b/testing/autorandr/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=autorandr
pkgver=1.14
-pkgrel=1
+pkgrel=2
pkgdesc="Auto-detect the connected display hardware and load the appropriate X11 setup using xrandr"
url="https://github.com/phillipberndt/autorandr"
arch="noarch"