34 changed files with 160 additions and 377 deletions
--- a/.github/build-canary-i386
+++ b/.github/build-canary-i386
@ -1 +0,0 @@
-1
--- a/.github/build-canary-v3
+++ b/.github/build-canary-v3
@ -1 +0,0 @@
-1
--- a/.github/build-nest-i386
+++ b/.github/build-nest-i386
@ -1 +0,0 @@
-1
--- a/.github/build-nest-v3
+++ b/.github/build-nest-v3
@ -1 +0,0 @@
-1
--- a/.github/release-canary-i386
+++ b/.github/release-canary-i386
@ -1 +0,0 @@
-2
--- a/.github/release-canary-v3
+++ b/.github/release-canary-v3
@ -1 +0,0 @@
-2
--- a/.github/release-nest-i386
+++ b/.github/release-nest-i386
@ -1 +0,0 @@
-2
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@ -1 +0,0 @@
-2
--- a/.github/workflows/build-canaryi386.yml
+++ b/.github/workflows/build-canaryi386.yml
@ -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
--- a/.github/workflows/build-canaryv3.yml
+++ b/.github/workflows/build-canaryv3.yml
@ -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
--- a/.github/workflows/build-nesti386.yml
+++ b/.github/workflows/build-nesti386.yml
@ -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
--- a/.github/workflows/build-nestv3.yml
+++ b/.github/workflows/build-nestv3.yml
@ -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
--- a/.github/workflows/release-canaryi386.yml
+++ b/.github/workflows/release-canaryi386.yml
@ -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
--- a/.github/workflows/release-canaryv3.yml
+++ b/.github/workflows/release-canaryv3.yml
@ -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
--- a/.github/workflows/release-nesti386.yml
+++ b/.github/workflows/release-nesti386.yml
@ -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
--- a/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/release-nestv3.yml
@ -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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,46 @@
+name: PikaOS Package Release
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pika-package-container:latest
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - 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
+
+    - name: Purge cache
+      uses: strrife/cloudflare-chunked-purge-action@master
+      env:
+        # Zone is required by both authentication methods
+        CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
+
+        CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
+        PURGE_URLS: ${{ vars.PURGE_URLS }}
--- a/.github/workflows/release_i386.yml
+++ b/.github/workflows/release_i386.yml
@ -0,0 +1,46 @@
+name: PikaOS Package Release (i386)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pika-i386-package-container:latest
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - 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
+
+    - name: Purge cache
+      uses: strrife/cloudflare-chunked-purge-action@master
+      env:
+        # Zone is required by both authentication methods
+        CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
+
+        CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
+        PURGE_URLS: ${{ vars.PURGE_URLS }}
--- a/LICENSE.md
+++ b/LICENSE.md
@ -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.
--- a/debian/README.debian
+++ b/debian/README.debian
@ -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
--- a/debian/changelog
+++ b/debian/changelog
@ -1,11 +1,18 @@
-mangohud (0.7.2-git1-101pika1) pika; urgency=medium
+mangohud (1:0.6.9.1-99pika1.lunar) lunar; 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
+mangohud (1:0.6.8-99pika5) kinetic; urgency=medium

-  * Initial Push to PikaOS 4
+  * Initial Push to PPA
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
+
+
+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
--- a/debian/clean
+++ b/debian/clean
@ -0,0 +1 @@
+imgui.ini
--- a/debian/control
+++ b/debian/control
@ -30,7 +30,6 @@ Build-Depends: debhelper-compat (= 13),
               libspdlog-dev,
               libx11-dev,
               libwayland-dev,
-               libxkbcommon-dev,
               libxnvctrl-dev,
               libxrandr-dev,
 Rules-Requires-Root: no
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch = upstream/latest
+debian-branch = debian/latest
--- a/debian/mangohud.install
+++ b/debian/mangohud.install
@ -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/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
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -0,0 +1,3 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
--- a/debian/source/format
+++ b/debian/source/format
@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -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
--- a/debian/watch
+++ b/debian/watch
@ -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
--- a/main.sh
+++ b/main.sh
@ -1,22 +1,16 @@
-#! /bin/bash
-
-set -e
-
-. ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
-
-VERSION="0.7.2-git1"
-
 # Clone Upstream
-git clone https://github.com/flightlessmango/MangoHud mangohud
+git clone https://github.com/flightlessmango/MangoHud -b v0.6.9-1
+mv ./MangoHud ./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
+
+LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
+
 dpkg-buildpackage --no-sign

 # Move the debs to output
--- a/main32.sh
+++ b/main32.sh
@ -0,0 +1,19 @@
+# Clone Upstream
+git clone https://github.com/flightlessmango/MangoHud -b v0.6.9-1
+mv ./MangoHud ./mangohud
+cp -rvf ./debian ./mangohud/
+cd ./mangohud
+
+# Get build deps
+apt-get build-dep ./ -y
+
+# Build package
+
+LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
+
+dpkg-buildpackage --no-sign
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/
--- a/pika-build-config/amd64-v3.sh
+++ b/pika-build-config/amd64-v3.sh
@ -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
--- a/pika-build-config/i386.sh
+++ b/pika-build-config/i386.sh
@ -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
--- a/release.sh
+++ b/release.sh
@ -1,3 +1,8 @@
 # send debs to server
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/

+# add debs to repo
+ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/'
+
+# publish the repo
+ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:'