From 3048369d20131dd83230fab28bcf6649ad30a39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 23 Apr 2022 16:32:30 +0200 Subject: [PATCH 1/3] pipewire: patch warnings in headers --- .../patches/spa-fix-c90-header-include.patch | 45 +++++++++++++++++++ srcpkgs/pipewire/template | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pipewire/patches/spa-fix-c90-header-include.patch diff --git a/srcpkgs/pipewire/patches/spa-fix-c90-header-include.patch b/srcpkgs/pipewire/patches/spa-fix-c90-header-include.patch new file mode 100644 index 000000000000..532827901656 --- /dev/null +++ b/srcpkgs/pipewire/patches/spa-fix-c90-header-include.patch @@ -0,0 +1,45 @@ +From d3ea3142e1a4de206e616bc18f63a529e6b4986a Mon Sep 17 00:00:00 2001 +From: psykose +Date: Wed, 13 Apr 2022 21:57:49 +0000 +Subject: [PATCH] spa: fix c90 header include + +placing declarations after code is invalid under ISO c90 + +Fixes !1211 +--- + spa/include/spa/utils/string.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/spa/include/spa/utils/string.h b/spa/include/spa/utils/string.h +index e80434537..43d19616c 100644 +--- a/spa/include/spa/utils/string.h ++++ b/spa/include/spa/utils/string.h +@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, . + static inline float spa_strtof(const char *str, char **endptr) + { + static locale_t locale = NULL; ++ locale_t prev; + float v; + if (SPA_UNLIKELY(locale == NULL)) + locale = newlocale(LC_ALL_MASK, "C", NULL); +- locale_t prev = uselocale(locale); ++ prev = uselocale(locale); + v = strtof(str, endptr); + uselocale(prev); + return v; +@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val) + static inline double spa_strtod(const char *str, char **endptr) + { + static locale_t locale = NULL; ++ locale_t prev; + double v; + if (SPA_UNLIKELY(locale == NULL)) + locale = newlocale(LC_ALL_MASK, "C", NULL); +- locale_t prev = uselocale(locale); ++ prev = uselocale(locale); + v = strtod(str, endptr); + uselocale(prev); + return v; +-- +GitLab + diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 6427e0b66e77..51a61d738446 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire version=0.3.50 -revision=1 +revision=2 _pms_version=0.4.1 build_style=meson configure_args=" From a2b6f91a6c2fbf1cc597504cd5878a1a5c93ad1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 23 Apr 2022 16:50:07 +0200 Subject: [PATCH 2/3] SDL2: make cmake prefix relative fixes cross build of dependants --- srcpkgs/SDL2/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index db3afefab3ce..551ee71aec43 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared @@ -121,6 +121,10 @@ else configure_args+=" --disable-video-vulkan" fi +post_configure() { + vsed -i sdl2-config.cmake -e 's:set(prefix "/usr"):get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE):' +} + SDL2-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From a0a04333abaca806ef483142dd075db9fba731fe Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sat, 16 Apr 2022 23:32:12 +0200 Subject: [PATCH 3/3] openttd: update to 12.2 gfx to 7.1, sfx to 1.0.3, msx to 0.4.2. --- srcpkgs/openttd/template | 92 +++++++++++++++++++++++++--------------- srcpkgs/openttd/update | 2 - 2 files changed, 58 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/openttd/update diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index f19e683080dd..fb41b0ccf418 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -1,57 +1,81 @@ # Template file for 'openttd' pkgname=openttd -version=1.10.3 -revision=4 -_gfxver=0.6.0 -_sfxver=0.2.3 +version=12.2 +revision=1 +_gfxver=7.1 +_sfxver=1.0.3 +_msxver=0.4.2 create_wrksrc=yes -build_wrksrc=openttd-$version -build_style=gnu-configure -hostmakedepends="pkg-config unzip tar" -makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel - libxdg-basedir-devel" +build_wrksrc=${pkgname}-$version +build_style=cmake +configure_args="-DCMAKE_INSTALL_DATADIR=share -DCMAKE_INSTALL_BINDIR=bin" +hostmakedepends="pkg-config" +makedepends="$(vopt_if sdl2 SDL2-devel sdl-devel) icu-devel fontconfig-devel +libpng-devel lzo-devel liblzma-devel libxdg-basedir-devel zlib-devel +freetype-devel fluidsynth-devel" depends="hicolor-icon-theme" short_desc="Open Source version of Transport Tycoon Deluxe" -maintainer="Orphaned " +maintainer="Enrico Belleri " license="GPL-2.0-only, Zlib" -homepage="https://www.openttd.org/" -distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz +homepage="https://www.openttd.org" +changelog="https://raw.githubusercontent.com/OpenTTD/OpenTTD/release/12/changelog.txt" +distfiles="https://cdn.openttd.org/openttd-releases/${version}/${pkgname}-${version}-source.tar.xz https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip - https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip" -checksum="c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b - d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774 - 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02" + https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip + https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip" +checksum="81508f0de93a0c264b216ef56a05f8381fff7bffa6d010121a21490b4dace95c + 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846 + e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759 + 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762" +build_options="sdl2" +desc_option_sdl2="Use Simple DirectMedia Layer 2.0" +build_options_default="sdl2" +if [ "$CROSS_BUILD" ]; then + pre_configure() { + mkdir -p native + cd native + env -i PATH=$PATH cmake .. -DOPTION_TOOLS_ONLY=ON + make ${makejobs} + } -CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1' + configure_args+=" -DHOST_BINARY_DIR=/builddir/openttd-12.2/${wrksrc}/${build_wrksrc}/native" +fi post_extract() { cd $wrksrc bsdtar xf opengfx-${_gfxver}.tar - rm opengfx-${_gfxver}.tar + rm -f opengfx-${_gfxver}.tar + bsdtar xf opensfx-${_sfxver}.tar + rm -f opensfx-${_sfxver}.tar + bsdtar xf openmsx-${_msxver}.tar + rm -f openmsx-${_msxver}.tar } -do_configure() { - ./configure --prefix-dir=/usr \ - --cc-build=gcc \ - --cxx-build=g++ \ - --binary-dir=bin \ - --data-dir=share/openttd \ - --doc-dir=share/doc/openttd \ - --with-lzo2=${XBPS_CROSS_BASE}/usr/lib \ - --binary-name=openttd \ - --install-dir=${DESTDIR} \ - --menu-name=OpenTTD \ - --with-xdg-basedir +# test requires opengfx +pre_check() { + mkdir build/data + cp ../opengfx-${_gfxver}/*.grf build/data + cp ../opengfx-${_gfxver}/*.obg build/data + if [ "$XBPS_TARGET_LIBC" = musl ]; then + vsed -i build/ai/regression/result.txt -e 's/(null : 0x00000000)/(null : 0x0)/' + fi } post_install() { - vmkdir usr/share/openttd/data - vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data - vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data - vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data + vmkdir usr/share/openttd/data/opengfx + vmkdir usr/share/openttd/data/opensfx + vmkdir usr/share/openttd/data/openmsx + vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data/opengfx + vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data/opengfx + vcopy ../opensfx-${_sfxver}/*.cat usr/share/openttd/data/opensfx + vcopy ../opensfx-${_sfxver}/*.obs usr/share/openttd/data/opensfx + vcopy ../openmsx-${_msxver}/*.mid usr/share/openttd/data/openmsx + vcopy ../openmsx-${_msxver}/*.obm usr/share/openttd/data/openmsx vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx + vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx vdoc ../opengfx-${_gfxver}/readme.txt README-gfx vdoc ../opensfx-${_sfxver}/readme.txt README-sfx + vdoc ../openmsx-${_msxver}/readme.txt README-msx } diff --git a/srcpkgs/openttd/update b/srcpkgs/openttd/update deleted file mode 100644 index 4303c0c21d17..000000000000 --- a/srcpkgs/openttd/update +++ /dev/null @@ -1,2 +0,0 @@ -site=http://binaries.openttd.org/releases/ -pattern='href="\K[\d]+\.[\d]+\.[\d]+(?=[^-])'