Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ jobs:
echo "MCPP_VENDORED_XLINGS=$root/registry/bin/xlings" >> "$GITHUB_ENV"
echo "$root/bin" >> "$GITHUB_PATH"
- name: Run compat smoke tests
env:
MCPP_INDEX_SMOKE_MCPP_HOME: ${{ runner.temp }}/mcpp-smoke-home
run: |
mkdir -p "$MCPP_INDEX_SMOKE_MCPP_HOME"
"$MCPP" --version
timeout 1800 bash tests/smoke_compat_core.sh
timeout 1800 bash tests/smoke_compat_imgui.sh
Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.khrplatform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.khrplatform",
description = "Khronos KHR platform header for OpenGL/EGL compat packages",
licenses = {"MIT"},
licenses = {"Khronos"},
repo = "https://github.com/KhronosGroup/EGL-Registry",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.libarchive.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.libarchive",
description = "Multi-format archive and compression library",
licenses = {"BSD-2-Clause"},
licenses = {"BSD-2-Clause", "BSD-3-Clause", "BSD-2-Clause-NetBSD", "CC0-1.0", "OpenSSL", "Apache-2.0", "public-domain"},
repo = "https://libarchive.org/",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.x11.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.x11",
description = "Xlib runtime library and public headers built from upstream sources",
licenses = {"MIT"},
licenses = {"BSD-1-Clause", "HPND-sell-variant", "ISC", "MIT", "MIT-Open-Group", "X11"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libx11",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xau.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xau",
description = "X authorization file management library",
licenses = {"MIT"},
licenses = {"MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxau",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xcursor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xcursor",
description = "X cursor management runtime library and public headers",
licenses = {"MIT"},
licenses = {"HPND-sell-variant"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxcursor",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xdmcp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xdmcp",
description = "X Display Manager Control Protocol library",
licenses = {"MIT"},
licenses = {"MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xext.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xext",
description = "X11 miscellaneous extensions runtime library and public headers",
licenses = {"MIT"},
licenses = {"HPND-sell-variant", "ISC", "MIT", "MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxext",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xfixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xfixes",
description = "X Fixes extension runtime library and public headers",
licenses = {"MIT"},
licenses = {"HPND-sell-variant"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxfixes",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xi.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xi",
description = "X Input extension runtime library and public headers",
licenses = {"MIT"},
licenses = {"MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxi",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xinerama.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xinerama",
description = "Xinerama extension runtime library and public headers",
licenses = {"MIT"},
licenses = {"MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxinerama",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xorgproto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xorgproto",
description = "X.Org protocol headers for X11-based compat packages",
licenses = {"MIT"},
licenses = {},
repo = "https://gitlab.freedesktop.org/xorg/proto/xorgproto",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xrandr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xrandr",
description = "X Resize, Rotate and Reflect extension runtime library and public headers",
licenses = {"MIT"},
licenses = {"HPND-sell-variant"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxrandr",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xrender.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xrender",
description = "X Rendering extension runtime library and public headers",
licenses = {"MIT"},
licenses = {"HPND-sell-variant"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxrender",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xtrans.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xtrans",
description = "X.Org transport layer support headers used by Xlib",
licenses = {"MIT"},
licenses = {"HPND-sell-variant", "MIT", "MIT-Open-Group"},
repo = "https://gitlab.freedesktop.org/xorg/lib/libxtrans",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.xz.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.xz",
description = "XZ Utils liblzma compression library",
licenses = {"0BSD", "LGPL-2.1-or-later"},
licenses = {"0BSD"},
repo = "https://github.com/tukaani-project/xz",
type = "package",

Expand Down
2 changes: 1 addition & 1 deletion pkgs/c/compat.zstd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package = {
namespace = "compat",
name = "compat.zstd",
description = "Zstandard real-time compression algorithm",
licenses = {"BSD-3-Clause"},
licenses = {"BSD-3-Clause", "GPL-2.0-only"},
repo = "https://github.com/facebook/zstd",
type = "package",

Expand Down
6 changes: 5 additions & 1 deletion tests/smoke_compat_archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ fi
SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}"
SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}"

export MCPP_HOME="$TMP/mcpp-home"
if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then
export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME"
else
export MCPP_HOME="$TMP/mcpp-home"
fi
mkdir -p "$MCPP_HOME"

USER_MCPP="${HOME}/.mcpp"
Expand Down
6 changes: 5 additions & 1 deletion tests/smoke_compat_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ trap 'rm -rf "$TMP"' EXIT
SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}"
SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}"

export MCPP_HOME="$TMP/mcpp-home"
if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then
export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME"
else
export MCPP_HOME="$TMP/mcpp-home"
fi
mkdir -p "$MCPP_HOME/registry/data/xpkgs"

USER_MCPP="${HOME}/.mcpp"
Expand Down
6 changes: 5 additions & 1 deletion tests/smoke_compat_imgui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ fi
SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}"
SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}"

export MCPP_HOME="$TMP/mcpp-home"
if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then
export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME"
else
export MCPP_HOME="$TMP/mcpp-home"
fi
mkdir -p "$MCPP_HOME"

USER_MCPP="${HOME}/.mcpp"
Expand Down
6 changes: 5 additions & 1 deletion tests/smoke_compat_imgui_window.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ fi
SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}"
SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}"

export MCPP_HOME="$TMP/mcpp-home"
if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then
export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME"
else
export MCPP_HOME="$TMP/mcpp-home"
fi
mkdir -p "$MCPP_HOME/registry/data/xpkgs"

USER_MCPP="${HOME}/.mcpp"
Expand Down
Loading