build: remove cmake and python dependency

This commit is contained in:
chyyran 2024-02-07 23:06:38 -05:00 committed by Ronny Chan
parent 2b208f1848
commit 91794dd353
9 changed files with 16 additions and 34 deletions

View file

@ -26,10 +26,6 @@ jobs:
toolchain: nightly toolchain: nightly
override: true override: true
target: aarch64-unknown-linux-gnu target: aarch64-unknown-linux-gnu
- uses: actions/setup-python@v1
name: Setup Python 3.11
with:
python-version: '3.11'
- name: Install ARM64 cross-compilation dependencies - name: Install ARM64 cross-compilation dependencies
continue-on-error: true continue-on-error: true
run: | run: |

View file

@ -26,10 +26,6 @@ jobs:
with: with:
toolchain: nightly toolchain: nightly
override: true override: true
- uses: actions/setup-python@v1
name: Setup Python 3.11
with:
python-version: '3.11'
- name: Install Vulkan SDK - name: Install Vulkan SDK
uses: humbletim/install-vulkan-sdk@v1.1.1 uses: humbletim/install-vulkan-sdk@v1.1.1
with: with:

7
Cargo.lock generated
View file

@ -1355,11 +1355,12 @@ dependencies = [
[[package]] [[package]]
name = "glslang-sys" name = "glslang-sys"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d82a4e43102eb601efd17b0c3d10596132405c5eb3268a91a6f2ccc9a04c0ce" checksum = "a3c81cefc876b4fd65354162037a464768bc5bada8b02d93b64e18186ae5cb7e"
dependencies = [ dependencies = [
"cmake", "cc",
"glob",
] ]
[[package]] [[package]]

View file

@ -19,14 +19,14 @@ are not currently supported (but pull-requests are welcome). librashader does no
APIs such as older versions of OpenGL, or legacy versions of Direct3D. APIs such as older versions of OpenGL, or legacy versions of Direct3D.
| **API** | **Status** | **`librashader` feature** | | **API** | **Status** | **`librashader` feature** |
|-------------|------------|--------------------------| |-------------|------------|---------------------------|
| OpenGL 3.3+ | ✔ | `gl` | | OpenGL 3.3+ | ✔ | `gl` |
| OpenGL 4.6 | ✔ | `gl` | | OpenGL 4.6 | ✔ | `gl` |
| Vulkan | ✔ | `vk` | | Vulkan | ✔ | `vk` |
| Direct3D 11 | ✔ | `d3d11` | | Direct3D 11 | ✔ | `d3d11` |
| Direct3D 12 | ✔ | `d3d12` | | Direct3D 12 | ✔ | `d3d12` |
| wgpu | ✔ | `wgpu` |
| Metal | ❌ | | | Metal | ❌ | |
| WebGPU | ❌ | |
✔ = Render API is supported — ❌ Render API is not supported ✔ = Render API is supported — ❌ Render API is not supported
@ -91,18 +91,11 @@ static GL_DEFAULT_MVP: &[f32; 16] = &[
### Building ### Building
librashader requires the following build time dependencies librashader requires the [Vulkan SDK](https://www.lunarg.com/vulkan-sdk/).
* The [Vulkan SDK](https://www.lunarg.com/vulkan-sdk/)
* [CMake 3.8 or later](https://cmake.org/)
For DXIL support on Windows, the following is also needed
* [Meson](https://mesonbuild.com/)
* [Python 3.6 or later](https://www.python.org/)
--- ---
For Rust projects, simply add the crate tofil your `Cargo.toml`. For Rust projects, simply add the crate to your `Cargo.toml`.
``` ```
cargo add librashader cargo add librashader

View file

@ -23,6 +23,5 @@ mod util;
pub use filter_chain::FilterChainWgpu; pub use filter_chain::FilterChainWgpu;
pub use framebuffer::WgpuOutputView; pub use framebuffer::WgpuOutputView;
pub mod error; pub mod error;
pub mod options; pub mod options;

View file

@ -12,7 +12,6 @@ URL: https://github.com/SnowflakePowered/%{name}
%undefine _disable_source_fetch %undefine _disable_source_fetch
Source: {{{ git_dir_pack }}} Source: {{{ git_dir_pack }}}
BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(vulkan)
BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git BuildRequires: git
BuildRequires: g++ BuildRequires: g++

View file

@ -12,7 +12,6 @@ URL: https://github.com/SnowflakePowered/%{name}
%undefine _disable_source_fetch %undefine _disable_source_fetch
Source: https://github.com/SnowflakePowered/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source: https://github.com/SnowflakePowered/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(vulkan)
BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: g++ BuildRequires: g++
BuildRequires: ninja-build BuildRequires: ninja-build

View file

@ -6,7 +6,7 @@ arch=('x86_64' 'aarch64')
url="https://github.com/SnowflakePowered/librashader" url="https://github.com/SnowflakePowered/librashader"
license=('MPL-2.0') license=('MPL-2.0')
groups=('') groups=('')
depends=('vulkan-icd-loader' 'cmake' 'gcc' 'rust' 'patchelf' 'ninja') depends=('vulkan-icd-loader' 'gcc' 'rust' 'patchelf' 'ninja')
provides=("$pkgname=$pkgver" 'librashader.so') provides=("$pkgname=$pkgver" 'librashader.so')
backup=('') backup=('')
source=("$pkgname-$pkgver.tar.xz" 'vendor.tar.xz' 'cargo_config') source=("$pkgname-$pkgver.tar.xz" 'vendor.tar.xz' 'cargo_config')

View file

@ -12,7 +12,6 @@ Source2: cargo_config
BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(vulkan)
BuildRequires: ninja-build BuildRequires: ninja-build
BuildRequires: patchelf BuildRequires: patchelf
BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cargo BuildRequires: cargo