Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
829eccdd69 | ||
|
|
95e44526f8 | ||
|
|
08e9470265 | ||
|
|
366eb89c85 | ||
|
|
72768b597e | ||
|
|
3d9a9ae56b | ||
|
|
10fef85a01 | ||
|
|
50206529be | ||
|
|
beb64f4df9 | ||
|
|
2a99d35797 | ||
|
|
6571672df8 | ||
|
|
20363b498c |
@@ -0,0 +1,11 @@
|
|||||||
|
# Alpine/musl hosts: rustup's *-linux-musl targets default to crt-static, which
|
||||||
|
# tries to statically link system libraries as well. Alpine ships libxkbcommon.so
|
||||||
|
# but no libxkbcommon.a, so the final link fails with:
|
||||||
|
# ld: cannot find -lxkbcommon
|
||||||
|
# ld: have you installed the static version of the xkbcommon library ?
|
||||||
|
# Link dynamically instead, which is what a binary running on the host wants.
|
||||||
|
[target.aarch64-unknown-linux-musl]
|
||||||
|
rustflags = ["-C", "target-feature=-crt-static"]
|
||||||
|
|
||||||
|
[target.x86_64-unknown-linux-musl]
|
||||||
|
rustflags = ["-C", "target-feature=-crt-static"]
|
||||||
@@ -60,7 +60,7 @@ jobs:
|
|||||||
- name: Create release
|
- name: Create release
|
||||||
run: |
|
run: |
|
||||||
curl -sX POST \
|
curl -sX POST \
|
||||||
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases" \
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases" \
|
||||||
-d "{\"tag_name\":\"${{ gitea.ref_name }}\",\"name\":\"${{ gitea.ref_name }}\"}" \
|
-d "{\"tag_name\":\"${{ gitea.ref_name }}\",\"name\":\"${{ gitea.ref_name }}\"}" \
|
||||||
@@ -69,24 +69,24 @@ jobs:
|
|||||||
- name: Upload assets
|
- name: Upload assets
|
||||||
run: |
|
run: |
|
||||||
RELEASE_ID=$(curl -s \
|
RELEASE_ID=$(curl -s \
|
||||||
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/tags/${{ gitea.ref_name }}" \
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/tags/${{ gitea.ref_name }}" \
|
||||||
| jq -r '.id')
|
| jq -r '.id')
|
||||||
|
|
||||||
for FILE in "${{ env.TARBALL }}" "${{ env.TARBALL }}.sha256"; do
|
for FILE in "${{ env.TARBALL }}" "${{ env.TARBALL }}.sha256"; do
|
||||||
# Remove any existing asset with the same name so re-runs stay clean
|
# Remove any existing asset with the same name so re-runs stay clean
|
||||||
EXISTING=$(curl -s \
|
EXISTING=$(curl -s \
|
||||||
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets" \
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets" \
|
||||||
| jq -r ".[] | select(.name == \"${FILE}\") | .id")
|
| jq -r ".[] | select(.name == \"${FILE}\") | .id")
|
||||||
for AID in $EXISTING; do
|
for AID in $EXISTING; do
|
||||||
curl -sX DELETE \
|
curl -sX DELETE \
|
||||||
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets/${AID}"
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets/${AID}"
|
||||||
done
|
done
|
||||||
|
|
||||||
curl -sX POST \
|
curl -sX POST \
|
||||||
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
-H "Content-Type: application/octet-stream" \
|
-H "Content-Type: application/octet-stream" \
|
||||||
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=${FILE}" \
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=${FILE}" \
|
||||||
--data-binary "@${FILE}" --fail-with-body
|
--data-binary "@${FILE}" --fail-with-body
|
||||||
@@ -110,6 +110,32 @@ jobs:
|
|||||||
sed -i "s/sha256sums_x86_64=('.*')/sha256sums_x86_64=('${SUM_X86}')/" aur/PKGBUILD
|
sed -i "s/sha256sums_x86_64=('.*')/sha256sums_x86_64=('${SUM_X86}')/" aur/PKGBUILD
|
||||||
sed -i "s/sha256sums_aarch64=('.*')/sha256sums_aarch64=('${SUM_AARCH}')/" aur/PKGBUILD
|
sed -i "s/sha256sums_aarch64=('.*')/sha256sums_aarch64=('${SUM_AARCH}')/" aur/PKGBUILD
|
||||||
|
|
||||||
|
# Also publish the built packages to this instance's Arch registry
|
||||||
|
# (docs.gitea.com/usage/packages/arch). The PKGBUILD only repacks the
|
||||||
|
# release tarballs, so CARCH can produce both architectures from this
|
||||||
|
# one host. Consumers: see the infrastructure README.
|
||||||
|
# Best-effort mirror to the instance Arch registry. The ephemeral
|
||||||
|
# GITHUB_TOKEN is not accepted as a package-write credential, so this
|
||||||
|
# uses a dedicated REGISTRY_TOKEN secret (a write:package token for bl);
|
||||||
|
# if it is unset the step is skipped, and continue-on-error keeps a
|
||||||
|
# registry hiccup from failing the release or the AUR push.
|
||||||
|
- name: Publish to the Arch package registry
|
||||||
|
continue-on-error: true
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -z "${{ secrets.REGISTRY_TOKEN }}" ]; then
|
||||||
|
echo "::warning::REGISTRY_TOKEN not set — skipping Arch registry publish"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
cd aur
|
||||||
|
for carch in aarch64 x86_64; do
|
||||||
|
pkgfile=$(CARCH="$carch" makepkg --packagelist | tail -1)
|
||||||
|
CARCH="$carch" makepkg -f --nodeps --noconfirm --skipinteg
|
||||||
|
curl --fail-with-body --user "bl:${{ secrets.REGISTRY_TOKEN }}" \
|
||||||
|
--upload-file "$pkgfile" \
|
||||||
|
"${{ gitea.server_url }}/api/packages/${{ gitea.repository_owner }}/arch/uhhm"
|
||||||
|
done
|
||||||
|
|
||||||
- name: Push to AUR
|
- name: Push to AUR
|
||||||
env:
|
env:
|
||||||
AUR_SSH_KEY: ${{ secrets.AUR_SSH_KEY }}
|
AUR_SSH_KEY: ${{ secrets.AUR_SSH_KEY }}
|
||||||
@@ -122,6 +148,7 @@ jobs:
|
|||||||
echo " User aur" >> ~/.ssh/config
|
echo " User aur" >> ~/.ssh/config
|
||||||
ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
|
rm -rf /tmp/aur-gpupaper
|
||||||
git clone ssh://aur@aur.archlinux.org/gpupaper.git /tmp/aur-gpupaper
|
git clone ssh://aur@aur.archlinux.org/gpupaper.git /tmp/aur-gpupaper
|
||||||
cp aur/PKGBUILD /tmp/aur-gpupaper/
|
cp aur/PKGBUILD /tmp/aur-gpupaper/
|
||||||
cd /tmp/aur-gpupaper
|
cd /tmp/aur-gpupaper
|
||||||
|
|||||||
Generated
+1
-1
@@ -473,7 +473,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpupaper"
|
name = "gpupaper"
|
||||||
version = "0.1.1"
|
version = "0.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "gpupaper"
|
name = "gpupaper"
|
||||||
version = "0.1.1"
|
version = "0.1.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
|
|||||||
+5
-4
@@ -1,10 +1,11 @@
|
|||||||
# Maintainer: Bendik Aagaard Lynghaug <bendik.lynghaug@gmail.com>
|
# Maintainer: Bendik Aagaard Lynghaug <bendik.lynghaug@gmail.com>
|
||||||
pkgname=gpupaper
|
pkgname=gpupaper
|
||||||
pkgver=0.1.1
|
pkgver=0.1.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Wayland layer-surface wallpaper runner powered by GLSL/WGSL fragment shaders (wgpu)"
|
pkgdesc="Wayland layer-surface wallpaper runner powered by GLSL/WGSL fragment shaders (wgpu)"
|
||||||
arch=('x86_64' 'aarch64')
|
arch=('x86_64' 'aarch64')
|
||||||
url="https://prosjekt.klingenbergbygg.no/bl/gpupaper"
|
options=('!strip')
|
||||||
|
url="https://project.uhhm.no/bl/gpupaper"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
depends=('wayland' 'libglvnd')
|
depends=('wayland' 'libglvnd')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
@@ -14,8 +15,8 @@ optdepends=(
|
|||||||
)
|
)
|
||||||
provides=('gpupaper')
|
provides=('gpupaper')
|
||||||
conflicts=('gpupaper-git' 'gpupaper-bin')
|
conflicts=('gpupaper-git' 'gpupaper-bin')
|
||||||
source_x86_64=("gpupaper-v${pkgver}-x86_64.tar.gz::https://prosjekt.klingenbergbygg.no/bl/gpupaper/releases/download/v${pkgver}/gpupaper-v${pkgver}-x86_64.tar.gz")
|
source_x86_64=("gpupaper-v${pkgver}-x86_64.tar.gz::https://project.uhhm.no/bl/gpupaper/releases/download/v${pkgver}/gpupaper-v${pkgver}-x86_64.tar.gz")
|
||||||
source_aarch64=("gpupaper-v${pkgver}-aarch64.tar.gz::https://prosjekt.klingenbergbygg.no/bl/gpupaper/releases/download/v${pkgver}/gpupaper-v${pkgver}-aarch64.tar.gz")
|
source_aarch64=("gpupaper-v${pkgver}-aarch64.tar.gz::https://project.uhhm.no/bl/gpupaper/releases/download/v${pkgver}/gpupaper-v${pkgver}-aarch64.tar.gz")
|
||||||
sha256sums_x86_64=('SKIP')
|
sha256sums_x86_64=('SKIP')
|
||||||
sha256sums_aarch64=('SKIP')
|
sha256sums_aarch64=('SKIP')
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
// i don't remember what i based this off of or if it was just fiddling,
|
||||||
|
// found it in my shader list and thought the clouds were pretty good,
|
||||||
|
// for what it is
|
||||||
|
uniform float time;
|
||||||
|
uniform vec2 resolution;
|
||||||
|
|
||||||
|
float noise(vec3 p) {
|
||||||
|
float v = 0.0, a;
|
||||||
|
for (a = .85; a > .15; a *=.75) {
|
||||||
|
v += a * abs(dot( sin( .1*time + .1*p.z + .1*p/a) , vec3(a*3.)) );
|
||||||
|
p += p;
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
void mainImage(out vec4 o, vec2 u) {
|
||||||
|
float i = 0.0, s = 0.0;
|
||||||
|
o = vec4(0.0);
|
||||||
|
vec3 p = vec3(0.0);
|
||||||
|
vec2 r = resolution;
|
||||||
|
u = ( u+u - r.xy ) / r.y;
|
||||||
|
for( ; i++ < 1e2; ) {
|
||||||
|
p += vec3(u * s, s);
|
||||||
|
s = .1 + .2* abs( 12.-abs(p.y) - noise(p) );
|
||||||
|
o += 1./s;
|
||||||
|
}
|
||||||
|
o = tanh(vec4(5,2,1,0)*o /3e3/ length(u));
|
||||||
|
}
|
||||||
|
|
||||||
+11
-1
@@ -243,11 +243,21 @@ impl SurfaceRenderer {
|
|||||||
fps: u32,
|
fps: u32,
|
||||||
) -> Result<Self> {
|
) -> Result<Self> {
|
||||||
let caps = surface.get_capabilities(&gpu.adapter);
|
let caps = surface.get_capabilities(&gpu.adapter);
|
||||||
|
|
||||||
|
// A surface may advertise formats that need features we never requested when
|
||||||
|
// creating the device (see `required_features` above). Picking one of those
|
||||||
|
// fails validation at `create_render_pipeline`. Turnip/Adreno enumerates
|
||||||
|
// 16-bit-norm formats (needing TEXTURE_FORMAT_16BIT_NORM) before the plain
|
||||||
|
// 8-bit ones, so filter by what the device actually supports rather than
|
||||||
|
// relying on enumeration order.
|
||||||
|
let supported = gpu.device.features();
|
||||||
|
let usable = |f: &wgpu::TextureFormat| supported.contains(f.required_features());
|
||||||
let format = caps
|
let format = caps
|
||||||
.formats
|
.formats
|
||||||
.iter()
|
.iter()
|
||||||
.copied()
|
.copied()
|
||||||
.find(|f| !f.is_srgb())
|
.find(|f| !f.is_srgb() && usable(f))
|
||||||
|
.or_else(|| caps.formats.iter().copied().find(usable))
|
||||||
.unwrap_or(caps.formats[0]);
|
.unwrap_or(caps.formats[0]);
|
||||||
|
|
||||||
let present_mode =
|
let present_mode =
|
||||||
|
|||||||
+11
-8
@@ -118,7 +118,7 @@ pub fn parse_layer(s: &str) -> Result<Layer> {
|
|||||||
"bottom" => Ok(Layer::Bottom),
|
"bottom" => Ok(Layer::Bottom),
|
||||||
"top" => Ok(Layer::Top),
|
"top" => Ok(Layer::Top),
|
||||||
"overlay" => Ok(Layer::Overlay),
|
"overlay" => Ok(Layer::Overlay),
|
||||||
other => bail!("unknown layer: {}", other),
|
other => bail!("unknown layer '{}' (valid: background, bottom, top, overlay)", other),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,14 +168,11 @@ pub fn run(
|
|||||||
let is_all = target_output == "all" || target_output == "*";
|
let is_all = target_output == "all" || target_output == "*";
|
||||||
|
|
||||||
if is_all {
|
if is_all {
|
||||||
let wl_outputs: Vec<_> = state.output_state.outputs().collect();
|
// OutputHandler::new_output already attached one layer per existing
|
||||||
if wl_outputs.is_empty() {
|
// output during the roundtrip above. Only fall back to a compositor-
|
||||||
// No outputs reported yet; let the compositor assign.
|
// assigned surface if none arrived.
|
||||||
|
if state.outputs.is_empty() {
|
||||||
state.attach_output(&qh, None);
|
state.attach_output(&qh, None);
|
||||||
} else {
|
|
||||||
for wl_out in &wl_outputs {
|
|
||||||
state.attach_output(&qh, Some(wl_out));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let wl_out = find_output(&state.output_state, &target_output);
|
let wl_out = find_output(&state.output_state, &target_output);
|
||||||
@@ -343,6 +340,12 @@ impl OutputHandler for AppState {
|
|||||||
output: wl_output::WlOutput,
|
output: wl_output::WlOutput,
|
||||||
) {
|
) {
|
||||||
if self.target_output == "all" || self.target_output == "*" {
|
if self.target_output == "all" || self.target_output == "*" {
|
||||||
|
let name = self
|
||||||
|
.output_state
|
||||||
|
.info(&output)
|
||||||
|
.and_then(|i| i.name)
|
||||||
|
.unwrap_or_else(|| "<unnamed>".into());
|
||||||
|
log::info!("attaching output: {}", name);
|
||||||
self.attach_output(qh, Some(&output));
|
self.attach_output(qh, Some(&output));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user