* [PR PATCH] CI fetch pkgs once
@ 2024-05-28 19:15 zlice
2024-05-28 19:18 ` [PR PATCH] [Closed]: " zlice
0 siblings, 1 reply; 2+ messages in thread
From: zlice @ 2024-05-28 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages ci-fetch-once
https://github.com/void-linux/void-packages/pull/50571
CI fetch pkgs once
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### Comments
Fetch packages a single time in the contianer prep stage so it isn't done for every arch+libc.
A patch file from https://github.com/void-linux/void-packages/pull/50571.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci-fetch-once-50571.patch --]
[-- Type: text/x-diff, Size: 3684 bytes --]
From ad4ba0e8072a887e303e137875b46827502c3641 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 28 May 2024 15:13:57 -0400
Subject: [PATCH 1/2] ci: fetch pkgs while prepping container
---
.github/workflows/build.yaml | 1 +
common/travis/fetch-pkgs.sh | 12 ++++++++++++
2 files changed, 13 insertions(+)
create mode 100755 common/travis/fetch-pkgs.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..7ce8b9c21bb9f6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -47,6 +47,7 @@ jobs:
common/travis/prepare.sh &&
common/travis/fetch-xtools.sh
- run: common/travis/changed_templates.sh
+ - run: common/travis/fetch-pkgs.sh
- name: Run lints
run: |
rv=0
diff --git a/common/travis/fetch-pkgs.sh b/common/travis/fetch-pkgs.sh
new file mode 100755
index 00000000000000..efd9a5ed7cc468
--- /dev/null
+++ b/common/travis/fetch-pkgs.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# fetch.sh
+
+PKGS=$(/hostrepo/xbps-src $test sort-dependencies $(cat /tmp/templates))
+
+for pkg in ${PKGS}; do
+ /hostrepo/xbps-src -H "$HOME"/hostdir fetch "$pkg"
+ [ $? -eq 1 ] && exit 1
+done
+
+exit 0
From e063e192b9953e0102b98ae9ed256bbf489831d2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 28 May 2024 15:14:07 -0400
Subject: [PATCH 2/2] RMG: dummy DO NOT MERGE
---
srcpkgs/RMG/patches/musl-types.patch | 22 ++++++++++++++++++++++
srcpkgs/RMG/template | 21 +++++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 srcpkgs/RMG/patches/musl-types.patch
create mode 100644 srcpkgs/RMG/template
diff --git a/srcpkgs/RMG/patches/musl-types.patch b/srcpkgs/RMG/patches/musl-types.patch
new file mode 100644
index 00000000000000..ad7de7d3de2951
--- /dev/null
+++ b/srcpkgs/RMG/patches/musl-types.patch
@@ -0,0 +1,22 @@
+--- a/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c 2023-12-21 08:48:06.566206745 -0500
++++ b/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c 2023-12-21 08:48:23.460597668 -0500
+@@ -25,7 +25,7 @@
+ #include <sys/types.h> // needed for u_int, u_char, etc
+ #include <assert.h>
+
+-#if defined(__APPLE__)
++#ifndef __USE_GNU || defined(__APPLE__)
+ #define MAP_ANONYMOUS MAP_ANON
+ #endif
+
+--- a/Source/3rdParty/mupen64plus-video-parallel/util/aligned_alloc.cpp 2024-01-26 12:45:43.000000000 -0500
++++ b/Source/3rdParty/mupen64plus-video-parallel/util/aligned_alloc.cpp 2024-02-14 21:48:50.257936910 -0500
+@@ -26,6 +26,7 @@
+ #ifdef _WIN32
+ #include <malloc.h>
+ #endif
++#include <cstdint>
+
+ namespace Util
+ {
+
diff --git a/srcpkgs/RMG/template b/srcpkgs/RMG/template
new file mode 100644
index 00000000000000..e20e6e5132dcc0
--- /dev/null
+++ b/srcpkgs/RMG/template
@@ -0,0 +1,21 @@
+# Template file for 'RMG'
+pkgname=RMG
+version=0.5.9
+revision=1
+archs="x86_64* i686*"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DPORTABLE_INSTALL=OFF
+ -DNO_RUST=ON -G Ninja"
+hostmakedepends="pkg-config which nasm git"
+makedepends="qt6-base-devel qt6-svg-devel freetype-devel hidapi-devel
+ minizip-devel libsamplerate-devel speex-devel SDL2-devel zlib-devel xdg-user-dirs"
+short_desc="Mupen64 GUI"
+maintainer="zlice <zlice555@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Rosalie241/RMG"
+distfiles="https://github.com/Rosalie241/RMG/archive/refs/tags/v${version}.tar.gz"
+checksum=aabf9e41fc86d0db461514817a08350dca0dc7d7d3f50f0e0b57d9a9a0db7ac2
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS+=" -mfpmath=sse -msse2" ; CXXFLAGS+=" -mfpmath=sse -msse2" ;;
+esac
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Closed]: CI fetch pkgs once
2024-05-28 19:15 [PR PATCH] CI fetch pkgs once zlice
@ 2024-05-28 19:18 ` zlice
0 siblings, 0 replies; 2+ messages in thread
From: zlice @ 2024-05-28 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
There's a closed pull request on the void-packages repository
CI fetch pkgs once
https://github.com/void-linux/void-packages/pull/50571
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### Comments
Fetch packages a single time in the contianer prep stage so it isn't done for every arch+libc.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-28 19:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-28 19:15 [PR PATCH] CI fetch pkgs once zlice
2024-05-28 19:18 ` [PR PATCH] [Closed]: " zlice
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).