From f1bb15735efee178a9cbbc7600973921174b7ff0 Mon Sep 17 00:00:00 2001 From: no92 Date: Mon, 30 Oct 2023 22:05:22 +0100 Subject: [PATCH 1/5] lua: move to the proper bootstrap.d file --- bootstrap.d/dev-lang.yml | 31 +++++++++++++++++++++++++++++++ bootstrap.yml | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bootstrap.d/dev-lang.yml b/bootstrap.d/dev-lang.yml index 9e82132ee..9f6e2b87a 100644 --- a/bootstrap.d/dev-lang.yml +++ b/bootstrap.d/dev-lang.yml @@ -121,6 +121,37 @@ tools: - '@PREFIX@' packages: + - name: lua + source: + subdir: ports + url: 'https://www.lua.org/ftp/lua-5.3.5.tar.gz' + format: 'tar.gz' + checksum: blake2b:8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b + extract_path: 'lua-5.3.5' + version: '5.3.5' + tools_required: + - system-gcc + pkgs_required: + - mlibc + revision: 5 + configure: + - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@'] + - args: + - 'sed' + - '-i' + - 's|^#define LUA_ROOT "/usr/local/"$|#define LUA_ROOT "/usr/"|' + - 'src/luaconf.h' + build: + - args: + - 'make' + - 'generic' + - 'CC=@OPTION:arch-triple@-gcc' + - 'AR=@OPTION:arch-triple@-ar rcu' + - 'RANLIB=@OPTION:arch-triple@-ranlib' + - '-j@PARALLELISM@' + - args: ['make', 'install', 'INSTALL_TOP=@THIS_COLLECT_DIR@/usr'] + quiet: true + - name: nasm architecture: '@OPTION:arch@' source: diff --git a/bootstrap.yml b/bootstrap.yml index 9d29d3234..97e56280a 100644 --- a/bootstrap.yml +++ b/bootstrap.yml @@ -1643,37 +1643,6 @@ packages: - args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/etc/kmscon'] - args: ['cp', '@SOURCE_ROOT@/extrafiles/kmscon.conf', '@THIS_COLLECT_DIR@/etc/kmscon/'] - - name: lua - source: - subdir: ports - url: 'https://www.lua.org/ftp/lua-5.3.5.tar.gz' - format: 'tar.gz' - checksum: blake2b:8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b - extract_path: 'lua-5.3.5' - version: '5.3.5' - tools_required: - - system-gcc - pkgs_required: - - mlibc - revision: 5 - configure: - - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@'] - - args: - - 'sed' - - '-i' - - 's|^#define LUA_ROOT "/usr/local/"$|#define LUA_ROOT "/usr/"|' - - 'src/luaconf.h' - build: - - args: - - 'make' - - 'generic' - - 'CC=@OPTION:arch-triple@-gcc' - - 'AR=@OPTION:arch-triple@-ar rcu' - - 'RANLIB=@OPTION:arch-triple@-ranlib' - - '-j@PARALLELISM@' - - args: ['make', 'install', 'INSTALL_TOP=@THIS_COLLECT_DIR@/usr'] - quiet: true - - name: mednafen source: subdir: 'ports' From f758c096df3d24a3e5fc9175c12379dd7facad3e Mon Sep 17 00:00:00 2001 From: no92 Date: Mon, 30 Oct 2023 22:34:06 +0100 Subject: [PATCH 2/5] lua: bump to 5.4.6 and add metadata --- bootstrap.d/dev-lang.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bootstrap.d/dev-lang.yml b/bootstrap.d/dev-lang.yml index 9f6e2b87a..cb067348b 100644 --- a/bootstrap.d/dev-lang.yml +++ b/bootstrap.d/dev-lang.yml @@ -122,18 +122,24 @@ tools: packages: - name: lua + metadata: + summary: Lua is a scripting language. + description: Lua is a powerful, efficient, lightweight, embeddable scripting language. + spdx: 'MIT' + website: 'https://www.lua.org/' + maintainer: "no92 " + categories: ['dev-lang'] source: subdir: ports - url: 'https://www.lua.org/ftp/lua-5.3.5.tar.gz' + url: 'https://www.lua.org/ftp/lua-5.4.6.tar.gz' format: 'tar.gz' - checksum: blake2b:8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b - extract_path: 'lua-5.3.5' - version: '5.3.5' + checksum: blake2b:b5d8dbc4b3ec1708b715be438c1a1f48d4f5f226885992af147c1aa6a8823bed318f77ef7cc92b265dadd26cf6088f0f39784fbfd2f9887c35de8e9def2c0558 + extract_path: 'lua-5.4.6' + version: '5.4.6' tools_required: - system-gcc pkgs_required: - mlibc - revision: 5 configure: - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@'] - args: From 01bae423bf2ac313605e039106854ab0e17b4293 Mon Sep 17 00:00:00 2001 From: no92 Date: Thu, 2 Nov 2023 15:35:23 +0100 Subject: [PATCH 3/5] libarchive: bump to 3.7.2 --- bootstrap.d/app-arch.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap.d/app-arch.yml b/bootstrap.d/app-arch.yml index 44f5075c8..b1b4a866b 100644 --- a/bootstrap.d/app-arch.yml +++ b/bootstrap.d/app-arch.yml @@ -160,8 +160,8 @@ packages: source: subdir: 'ports' git: 'https://github.com/libarchive/libarchive.git' - tag: 'v3.6.2' - version: '3.6.2' + tag: 'v3.7.2' + version: '3.7.2' tools_required: - host-cmake - system-gcc @@ -174,7 +174,6 @@ packages: - libexpat - libxml - zstd - revision: 2 configure: - args: - 'cmake' From 553d1d13a0c2db7564a7968ef3b66db2d30de1a1 Mon Sep 17 00:00:00 2001 From: no92 Date: Thu, 2 Nov 2023 15:36:44 +0100 Subject: [PATCH 4/5] mednafen: move to correct category --- bootstrap.d/games-emulation.yml | 46 ++++++++++++++++++++++++++++++++ bootstrap.yml | 47 +-------------------------------- 2 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 bootstrap.d/games-emulation.yml diff --git a/bootstrap.d/games-emulation.yml b/bootstrap.d/games-emulation.yml new file mode 100644 index 000000000..7c7c7053c --- /dev/null +++ b/bootstrap.d/games-emulation.yml @@ -0,0 +1,46 @@ +packages: + - name: mednafen + source: + subdir: 'ports' + url: 'https://mednafen.github.io/releases/files/mednafen-1.24.0-UNSTABLE.tar.xz' + format: 'tar.xz' + checksum: blake2b:d326d785e96a1360a25aa308c738ee1c613717406512f2ce73a260cb1583adb5149ab6b1cf36be730dace517aa20abf15babb58841e0b294ef18f08996176ce8 + extract_path: 'mednafen' + version: '1.24.0' + tools_required: + - host-autoconf-v2.69 + - host-automake-v1.15 + - host-libtool + - host-pkg-config + regenerate: + - args: ['./autogen.sh'] + tools_required: + - system-gcc + - host-pkg-config + - host-autoconf-v2.69 + - host-automake-v1.15 + pkgs_required: + - mlibc + - sdl2 + - libintl + - libiconv + - zlib + revision: 7 + configure: + - args: + - '@THIS_SOURCE_DIR@/configure' + - '--host=@OPTION:arch-triple@' + - '--prefix=/usr' + - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot. + - '--without-libsndfile' + - '--disable-debugger' + build: + - args: ['make', '-j@PARALLELISM@'] + - args: ['make', 'install'] + environ: + DESTDIR: '@THIS_COLLECT_DIR@' + quiet: true + - args: | + if [ -f @THIS_COLLECT_DIR@/usr/lib/ ]; then + rm -rf @THIS_COLLECT_DIR@/usr/lib/ + fi diff --git a/bootstrap.yml b/bootstrap.yml index 97e56280a..c6490eaaf 100644 --- a/bootstrap.yml +++ b/bootstrap.yml @@ -13,6 +13,7 @@ imports: - file: bootstrap.d/dev-util.yml - file: bootstrap.d/dev-qt.yml - file: bootstrap.d/games-board.yml + - file: bootstrap.d/games-emulation.yml - file: bootstrap.d/games-fps.yml - file: bootstrap.d/games-misc.yml - file: bootstrap.d/games-simulation.yml @@ -1643,52 +1644,6 @@ packages: - args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/etc/kmscon'] - args: ['cp', '@SOURCE_ROOT@/extrafiles/kmscon.conf', '@THIS_COLLECT_DIR@/etc/kmscon/'] - - name: mednafen - source: - subdir: 'ports' - url: 'https://mednafen.github.io/releases/files/mednafen-1.24.0-UNSTABLE.tar.xz' - format: 'tar.xz' - checksum: blake2b:d326d785e96a1360a25aa308c738ee1c613717406512f2ce73a260cb1583adb5149ab6b1cf36be730dace517aa20abf15babb58841e0b294ef18f08996176ce8 - extract_path: 'mednafen' - version: '1.24.0' - tools_required: - - host-autoconf-v2.69 - - host-automake-v1.15 - - host-libtool - - host-pkg-config - regenerate: - - args: ['./autogen.sh'] - tools_required: - - system-gcc - - host-pkg-config - - host-autoconf-v2.69 - - host-automake-v1.15 - pkgs_required: - - mlibc - - sdl2 - - libintl - - libiconv - - zlib - revision: 7 - configure: - - args: - - '@THIS_SOURCE_DIR@/configure' - - '--host=@OPTION:arch-triple@' - - '--prefix=/usr' - - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot. - - '--without-libsndfile' - - '--disable-debugger' - build: - - args: ['make', '-j@PARALLELISM@'] - - args: ['make', 'install'] - environ: - DESTDIR: '@THIS_COLLECT_DIR@' - quiet: true - - args: | - if [ -f @THIS_COLLECT_DIR@/usr/lib/ ]; then - rm -rf @THIS_COLLECT_DIR@/usr/lib/ - fi - - name: runit stability_level: broken source: From d3cfdc84f6a124c14806ea24ff6915282982b99c Mon Sep 17 00:00:00 2001 From: no92 Date: Thu, 2 Nov 2023 15:41:38 +0100 Subject: [PATCH 5/5] weston: bump to 12.0.2 and add metadata --- bootstrap.d/dev-libs.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bootstrap.d/dev-libs.yml b/bootstrap.d/dev-libs.yml index a3d7963cb..6be42fa2a 100644 --- a/bootstrap.d/dev-libs.yml +++ b/bootstrap.d/dev-libs.yml @@ -1606,11 +1606,18 @@ packages: - name: weston labels: [aarch64] architecture: '@OPTION:arch@' + metadata: + summary: 'A lightweight and functional Wayland compositor' + description: 'Weston is a Wayland compositor designed for correctness, reliability, predictability, and performance. Out of the box, Weston provides a very basic desktop, or a full-featured environment for non-desktop uses such as automotive, embedded, in-flight, industrial, kiosks, set-top boxes and TVs.' + spdx: 'MIT' + website: 'https://gitlab.freedesktop.org/wayland/weston' + maintainer: "no92 " + categories: ['dev-libs'] source: subdir: 'ports' git: 'https://gitlab.freedesktop.org/wayland/weston.git' - tag: '12.0.1' - version: '12.0.1' + tag: '12.0.2' + version: '12.0.2' tools_required: - host-pkg-config - system-gcc @@ -1636,7 +1643,6 @@ packages: - seatd - xcb-proto - xcb-util-cursor - revision: 2 configure: - args: - 'meson'