Compare commits

..

4 Commits

Author SHA1 Message Date
Ward Nakchbandi (Cosmic Fusion)
da167de937
Update changelog 2023-05-02 18:10:53 +03:00
Ward Nakchbandi (Cosmic Fusion)
648033e36d
Update control 2023-05-02 18:10:43 +03:00
Ward Nakchbandi (Cosmic Fusion)
8bc6ad36fe
2023-05-02 12:14:21 +03:00
Ward Nakchbandi (Cosmic Fusion)
ba5a3325bf
2023-05-02 12:11:35 +03:00
36 changed files with 182 additions and 432 deletions

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
2

View File

@ -1 +0,0 @@
2

View File

@ -1 +0,0 @@
2

View File

@ -1 +0,0 @@
2

View File

@ -1,37 +0,0 @@
name: PikaOS Package Build Only (Canary) (i386)
on:
push:
branches:
- main
paths:
- '.github/build-canary-i386'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh

View File

@ -1,37 +0,0 @@
name: PikaOS Package Build Only (Canary) (amd64-v3)
on:
push:
branches:
- main
paths:
- '.github/build-canary-v3'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh

View File

@ -1,37 +0,0 @@
name: PikaOS Package Build Only (i386)
on:
push:
branches:
- main
paths:
- '.github/build-nest-i386'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh

View File

@ -1,37 +0,0 @@
name: PikaOS Package Build Only (amd64-v3)
on:
push:
branches:
- main
paths:
- '.github/build-nest-v3'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh

View File

@ -1,40 +0,0 @@
name: PikaOS Package Build & Release (Canary) (i386)
on:
push:
branches:
- main
paths:
- '.github/release-canary-i386'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh
- name: Release Package
run: ./release.sh

View File

@ -1,40 +0,0 @@
name: PikaOS Package Build & Release (Canary) (amd64-v3)
on:
push:
branches:
- main
paths:
- '.github/release-canary-v3'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh
- name: Release Package
run: ./release.sh

View File

@ -1,40 +0,0 @@
name: PikaOS Package Build & Release (i386)
on:
push:
branches:
- main
paths:
- '.github/release-nest-i386'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh
- name: Release Package
run: ./release.sh

View File

@ -1,40 +0,0 @@
name: PikaOS Package Build & Release (amd64-v3)
on:
push:
branches:
- main
paths:
- '.github/release-nest-v3'
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Update APT Cache
run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package
run: ./main.sh
- name: Release Package
run: ./release.sh

40
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,40 @@
name: PikaOS Package Release
on:
workflow_dispatch
jobs:
build:
runs-on: self-hosted
container:
image: debian:sid
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install needed packages
run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Build Package
run: ./main.sh
- name: Release Package
run: ./release.sh

40
.github/workflows/release_i386.yml vendored Normal file
View File

@ -0,0 +1,40 @@
name: PikaOS Package Release (i386)
on:
workflow_dispatch
jobs:
build:
runs-on: self-hosted
container:
image: debian:sid
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install needed packages
run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
if_key_exists: replace
- name: Build Package
run: ./main32.sh
- name: Release Package
run: ./release.sh

View File

@ -1,24 +0,0 @@
MIT License (With DPKG packaging compatibility)
Copyright (c) 2024 PikaOS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Notes:
The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

11
debian/README.debian vendored Normal file
View File

@ -0,0 +1,11 @@
mangohud for Debian
----------------
Upstream includes a file include/nvml.h, which is probably non-free. However,
upstream offers two tarballs, one with this file, and one without it. In
Debian, we use the DFSG variant of the upstream tarballs. If one wants to use
Nvidia's ML library, it's a simple as adding libnvidia-ml-dev to the build
dependencies and change -Dwith_nvml=disabled to -Dwith_nvml=system in the
rules file.
-- Stephan Lachnit <stephanlachnit@protonmail.com> Fri, 30 Oct 2020 13:28:02 +0100

9
debian/changelog vendored
View File

@ -1,11 +1,12 @@
mangohud (0.7.2-git1-101pika1) pika; urgency=medium
mangohud (1:0.6.8-99pika7) kinetic; urgency=medium
* Upstream fixes
* Initial Push to PPA
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 15 Oct 2022 18:58:00 +0300
mangohud (0.7.2-101pika1) pika; urgency=medium
* Initial Push to PikaOS 4
mangohud (1:0.6.8-99pika1) kinetic; urgency=medium
* Initial Push to PPA
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 15 Oct 2022 18:58:00 +0300

1
debian/clean vendored Normal file
View File

@ -0,0 +1 @@
imgui.ini

37
debian/control vendored
View File

@ -1,21 +1,11 @@
Source: mangohud
Section: games
Priority: optional
Maintainer: Debian Games Team <team+pkg-games@tracker.debian.org>
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Games Team <team+pkg-games@tracker.debian.org>
Uploaders: Stephan Lachnit <stephanlachnit@debian.org>
Build-Depends: debhelper-compat (= 13),
meson,
gcc,
g++,
gcc-multilib,
g++-multilib,
ninja-build,
python3-pip,
python3-mako,
python3-setuptools,
python3-wheel,
python3-numpy [!i386],
python3-matplotlib [!i386],
pkg-config,
glslang-tools,
mesa-common-dev,
@ -25,14 +15,14 @@ Build-Depends: debhelper-compat (= 13),
libglew-dev,
libopengl-dev,
nlohmann-json3-dev,
libnvidia-ml-dev [!i386],
libglfw3-dev,
libspdlog-dev,
libx11-dev,
libwayland-dev,
libxkbcommon-dev,
libxnvctrl-dev,
libxrandr-dev,
python3-mako [!i386],
python3-setuptools,
Rules-Requires-Root: no
Standards-Version: 4.6.1
Homepage: https://github.com/flightlessmango/MangoHud
@ -41,10 +31,9 @@ Vcs-Git: https://salsa.debian.org/games-team/mangohud.git
Package: mangohud
Section: misc
Architecture: linux-any
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
Depends: libc6, libfmt9, libgcc-s1, libspdlog1.10-fmt9, libstdc++6
Recommends: mangoctl,
Suggests: libxnvctrl0,
goverlay,
@ -58,11 +47,9 @@ Description: Vulkan/OpenGL overlay for monitoring FPS, temperatures, CPU/GPU loa
Package: mangoapp
Section: misc
Architecture: linux-any
Architecture: amd64 arm64
Multi-Arch: no
Depends: mangohud (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Depends: mangohud, libc6, libfmt9, libgcc-s1, libgl1, libglew2.2, libglfw3, libspdlog1.10-fmt9, libstdc++6, libx11-6
Suggests: gamescope,
Description: Application to render MangoHud with gamescope
MangoHud is a highly customizable overlay for Vulkan and OpenGL application to
@ -73,15 +60,11 @@ Description: Application to render MangoHud with gamescope
Package: mangohudctl
Section: misc
Architecture: linux-any
Architecture: amd64 arm64
Multi-Arch: no
Depends: mangohud (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Depends: mangohud, libc6
Description: Application to control MangoHud
MangoHud is a highly customizable overlay for Vulkan and OpenGL application to
monitoring FPS, temperatures, CPU/GPU load and more.
.
This package contains an optional CLI application to control MangoHud.

3
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,3 @@
[DEFAULT]
upstream-branch = upstream/latest
debian-branch = debian/latest

View File

@ -1,3 +1,4 @@
usr/bin/mangoapp
usr/lib/*/mangohud/libMangoApp.so
usr/share/vulkan/implicit_layer.d/libMangoApp.json
usr/share/man/man1/mangoapp.1

View File

@ -1,11 +1,8 @@
usr/lib/*/mangohud/libMangoHud.so
usr/lib/*/mangohud/libMangoHud_opengl.so
usr/lib/*/mangohud/libMangoHud_dlsym.so
usr/share/vulkan/implicit_layer.d/*
usr/share/vulkan/implicit_layer.d/MangoHud.json
usr/share/doc/mangohud/MangoHud.conf.example
usr/bin/mangohud
usr/bin/mangoplot
usr/share/man/man1/mangohud.1
usr/share/metainfo/io.github.flightlessmango.mangohud.metainfo.xml
usr/share/icons/hicolor/scalable/apps/io.github.flightlessmango.mangohud.svg
usr/share/doc/mangohud/presets.conf.example

38
debian/rules vendored
View File

@ -4,30 +4,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@
ifeq (i386,$(DEB_HOST_ARCH))
override_dh_auto_configure:
dh_auto_configure -- \
--wrap-mode=default \
-Dwith_nvml=disabled \
-Dinclude_doc=true \
-Dwith_xnvctrl=enabled \
-Dwith_x11=enabled \
-Dwith_wayland=enabled \
-Dwith_dbus=enabled \
-Dmangoapp=true \
-Dmangohudctl=true \
-Dmangoapp_layer=true
else
override_dh_auto_configure:
dh_auto_configure -- \
--wrap-mode=default \
-Dwith_nvml=enabled \
-Dinclude_doc=true \
-Dwith_xnvctrl=enabled \
-Dwith_x11=enabled \
-Dwith_wayland=enabled \
-Dwith_dbus=enabled \
-Dmangoapp=true \
-Dmangohudctl=true \
-Dmangoapp_layer=true
endif
override_dh_auto_configure:
dh_auto_configure -- \
-Duse_system_vulkan=enabled \
-Duse_system_spdlog=enabled \
-Dwith_nvml=disabled \
-Dwith_xnvctrl=enabled \
-Dwith_wayland=enabled \
-Dmangoapp=true \
-Dmangohudctl=true \
-Dmangoapp_layer=true

3
debian/salsa-ci.yml vendored Normal file
View File

@ -0,0 +1,3 @@
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml

4
debian/upstream/metadata vendored Normal file
View File

@ -0,0 +1,4 @@
Bug-Database: https://github.com/flightlessmango/MangoHud/issues
Bug-Submit: https://github.com/flightlessmango/MangoHud/issues/new
Repository: https://github.com/flightlessmango/MangoHud.git
Repository-Browse: https://github.com/flightlessmango/MangoHud

3
debian/watch vendored Normal file
View File

@ -0,0 +1,3 @@
version=4
opts="filenamemangle=s%(?:.*?)?MangoHud-v@ANY_VERSION@-Source-DFSG\.tar\.xz%mangohud-$1.tar.xz%,uversionmangle=s%-(\d)%\.$1%" \
https://github.com/flightlessmango/MangoHud/releases (?:.*?/)?MangoHud-v@ANY_VERSION@-Source-DFSG\.tar\.xz

24
main.sh
View File

@ -1,23 +1,21 @@
#! /bin/bash
set -e
. ./pika-build-config.sh
echo "$PIKA_BUILD_ARCH" > pika-build-arch
VERSION="0.7.2-git1"
# Add dependent repositories
wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
touch /etc/apt/sources.list.d/pika.list
echo 'deb https://ppa.pika-os.com/ lunar main' > /etc/apt/sources.list.d/pika.list
echo 'deb http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware' > /etc/apt/sources.list
echo 'deb-src http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware' >> /etc/apt/sources.list
apt update
# Clone Upstream
git clone https://github.com/flightlessmango/MangoHud mangohud
tar -xf mangohud_0.6.8.orig.tar.xz -C ./
mv ./MangoHud-v0.6.8 ./mangohud
cp -rvf ./debian ./mangohud/
cd ./mangohud
# Get build deps
LOGNAME=root dh_make --createorig -y -l -p mangohud_"$VERSION" || echo "dh-make: Ignoring Last Error"
apt-get build-dep ./ -y
# Build package
dpkg-buildpackage --no-sign
dpkg-buildpackage
# Move the debs to output
cd ../

28
main32.sh Executable file
View File

@ -0,0 +1,28 @@
# Add dependent repositories
sudo dpkg --add-architecture i386
wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
touch /etc/apt/sources.list.d/pika.list
echo 'deb https://ppa.pika-os.com/ lunar main' > /etc/apt/sources.list.d/pika.list
echo 'deb http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware' > /etc/apt/sources.list
echo 'deb-src http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware' >> /etc/apt/sources.list
apt update
# Clone Upstream
tar -xf mangohud_0.6.8.orig.tar.xz -C ./
mv ./MangoHud-v0.6.8 ./mangohud
cp -rvf ./debian ./mangohud/
cd ./mangohud
# Get build deps
apt-get install build-essential -y
apt-get install crossbuild-essential-i386 lib32gcc-11-dev -y
apt-get build-dep ./ -y -a i386
apt-get install python3-mako -y
# Build package
dpkg-buildpackage -a i386
# Move the debs to output
cd ../
mkdir -p ./output
mv ./*.deb ./output/

BIN
mangohud_0.6.8.orig.tar.xz Normal file

Binary file not shown.

View File

@ -1,10 +0,0 @@
#! /bin/bash
export PIKA_BUILD_ARCH="amd64-v3"
export DEBIAN_FRONTEND="noninteractive"
export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_BUILD_OPTIONS="nocheck notest terse"
export DPKG_GENSYMBOLS_CHECK_LEVEL=0

View File

@ -1,5 +0,0 @@
#! /bin/bash
export PIKA_BUILD_ARCH="i386"
export DEBIAN_FRONTEND="noninteractive"
export DEB_BUILD_OPTIONS="nocheck notest terse"
export DPKG_GENSYMBOLS_CHECK_LEVEL=0

View File

@ -1,3 +1,11 @@
# send debs to server
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
# Sign the packages
dpkg-sig --sign builder ./output/*.deb
# Pull down existing ppa repo db files etc
rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
# Add the new package to the repo
reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb
# Push the updated ppa repo to the server
rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/