Merge pull request xbmc#24552 from fuzzard/depends_swig

[tools/depends] Bump swig 4.2.0

tools/depends/native/Makefile

@@ -10,6 +10,7 @@ NATIVE= \
   autoconf-archive \
   automake \
   cmake \
+  bison \
   gas-preprocessor \
   gettext \
   giflib \
@@ -23,7 +24,7 @@ NATIVE= \
   nasm \
   ninja \
   openssl \
-  pcre \
+  pcre2 \
   perlmodule-parseyapp \
   pkg-config \
   python3 \
@@ -69,6 +70,7 @@ download: $(DOWNLOAD_TARGETS)
 autoconf-archive: autoconf
 autoconf: m4
 automake: autoconf
+bison: gettext
 cargo-c: pkg-config openssl rustup
 dpkg: automake gettext libtool pkg-config tar
 heimdal: libtool
@@ -80,9 +82,10 @@ Mako: MarkupSafe
 meson: python3
 ninja: meson
 openssl: zlib
+pcre2: cmake
 pugixml: cmake
 python3: $(EXPAT) $(LIBFFI) pkg-config zlib openssl autoconf-archive
-swig: pcre
+swig: bison cmake pcre2
 tar: xz automake
 TexturePacker: cmake libpng liblzo2 giflib libjpeg-turbo
 wayland-scanner: expat ninja pkg-config

tools/depends/native/bison/BISON-VERSION

@@ -0,0 +1,4 @@
+LIBNAME=bison
+VERSION=3.8.2
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444

tools/depends/native/bison/Makefile

@@ -0,0 +1,31 @@
+include ../../Makefile.include BISON-VERSION ../../download-files.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS=../../Makefile.include Makefile BISON-VERSION ../../download-files.include
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(PLATFORM)/src/$(LIBNAME)
+
+all: .installed-$(PLATFORM)
+
+
+$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
+	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); $(CONFIGURE)
+
+$(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+	$(MAKE) -C $(PLATFORM) install
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+	rm -f .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)

tools/depends/native/pcre2/Makefile

@@ -0,0 +1,38 @@
+include ../../Makefile.include PCRE2-VERSION ../../download-files.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS = ../../Makefile.include Makefile PCRE2-VERSION ../../download-files.include
+
+CMAKE_OPTIONS := -DPCRE2_BUILD_PCRE2GREP=OFF \
+                 -DPCRE2_BUILD_TESTS=OFF \
+                 -DPCRE2_SUPPORT_LIBBZ2=OFF \
+                 -DPCRE2_SUPPORT_LIBZ=OFF \
+                 -DPCRE2_SUPPORT_LIBEDIT=OFF \
+                 -DPCRE2_SUPPORT_LIBREADLINE=OFF \
+                 -DPCRE2GREP_SUPPORT_JIT=OFF \
+                 -DPCRE2GREP_SUPPORT_CALLOUT=OFF \
+                 -DPCRE2GREP_SUPPORT_CALLOUT_FORK=OFF
+
+LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME)-8.a
+
+all: .installed-$(PLATFORM)
+
+
+$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
+	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM)/build; $(CMAKE_FOR_BUILD) $(CMAKE_OPTIONS) ..
+
+$(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/build
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+	$(MAKE) -C $(PLATFORM)/build install
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM)/build clean
+	rm -f .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)

tools/depends/native/pcre2/PCRE2-VERSION

@@ -0,0 +1,4 @@
+LIBNAME=pcre2
+VERSION=10.42
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.bz2
+SHA512=72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3

tools/depends/native/swig/Makefile

@@ -1,41 +1,31 @@
-include ../../Makefile.include
+include ../../Makefile.include SWIG-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
 
-DEPS = ../../Makefile.include Makefile ../../download-files.include
+DEPS = ../../Makefile.include Makefile SWIG-VERSION ../../download-files.include
 
-# lib name, version
-LIBNAME=swig
-VERSION=4.0.2
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
-include ../../download-files.include
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --without-alllang --without-x --disable-ccache
-
-LIBDYLIB=$(PLATFORM)/swig
+LIBDYLIB=$(PLATFORM)/build/swig
 
 all: .installed-$(PLATFORM)
 
 
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM)/build; $(CMAKE_FOR_BUILD) $(CMAKE_OPTIONS) ..
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/build
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
+	$(MAKE) -C $(PLATFORM)/build install
 	touch $@
 
 clean:
-	$(MAKE) -C $(PLATFORM) clean
+	$(MAKE) -C $(PLATFORM)/build clean
 	rm -f .installed-$(PLATFORM)
 
+
 distclean::
 	rm -rf $(PLATFORM) .installed-$(PLATFORM)
 

tools/depends/native/swig/SWIG-VERSION

@@ -0,0 +1,4 @@
+LIBNAME=swig
+VERSION=4.2.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=b7f508b25bc6e882ed6123f6c7ad12b02a7b74de09ac6e5789968e9c2f51407d1e3dafd5ea495087b4fb0f447ecce17e6070471479c67c4265166d8342a10862

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"