diff --git a/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml b/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml deleted file mode 100644 index dd36883..0000000 --- a/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml +++ /dev/null @@ -1,67 +0,0 @@ -build-runtime: true -writable-sdk: true - -id: de.marko10_000.winebarrels.Sdk -id-platform: de.marko10_000.winebarrels.Platform -branch: "v2.0-latest-vkd3d" - -sdk: de.marko10_000.winebarrels.BaseSdk -runtime: de.marko10_000.winebarrels.BasePlatform -runtime-version: "v2" -separate-locales: false - -inherit-extensions: - - org.freedesktop.Platform.GL32 - - org.freedesktop.Platform.GL - - org.freedesktop.Platform.Timezones - - org.freedesktop.Platform.GStreamer - - org.freedesktop.Platform.Icontheme - - org.gtk.Gtk3theme - - org.freedesktop.Platform.VAAPI.Intel - - org.freedesktop.Platform.openh264 - -add-extensions: - de.marko10_000.winebarrels.Platform.ExtensionsV2: - directory: wine_extensions/v2 - version: "v2.0" - versions: "v2.0" - subdirectories: true - autodelete: true - no-autodownload: true - de.marko10_000.winebarrels.Platform.Gecko: - directory: share/wine/gecko - version: "v2.0" - versions: "v2.0" - de.marko10_000.winebarrels.Platform.Mono: - directory: share/wine/mono - version: "v2.0" - versions: "v2.0" - -modules: - - name: test-arch - buildsystem: simple - build-commands: - - false - skip-arches: - - x86_64 - - platform/platform.yaml - - vkd3d/latest.yaml - - name: finalize - buildsystem: simple - build-commands: - - libtool --finish /usr/lib/x86_64-linux-gnu - - libtool --finish /usr/lib32 - -cleanup-platform: - - "*.a" - - "*.la" - - /include - - /lib/pkgconfig - - /lib/cmake - - /lib32/pkgconfig - - /lib32/cmake - - /lib/x86_64-linux-gnu/pkgconfig - - /lib/x86_64-linux-gnu/cmake - - /share/info - - /share/doc - - /share/man \ No newline at end of file diff --git a/Platform/v2.0/Sdk-x86_64.yaml b/Platform/v2.0/Sdk-x86_64.yaml index 62febe5..6fa07c1 100644 --- a/Platform/v2.0/Sdk-x86_64.yaml +++ b/Platform/v2.0/Sdk-x86_64.yaml @@ -51,6 +51,7 @@ modules: build-commands: - libtool --finish /usr/lib/x86_64-linux-gnu - libtool --finish /usr/lib32 + - platform/cleanup.yaml cleanup-platform: - "*.a" diff --git a/Platform/v2.0/build.latest_vkd3d.sh b/Platform/v2.0/build.latest_vkd3d.sh deleted file mode 100755 index 3c96b7a..0000000 --- a/Platform/v2.0/build.latest_vkd3d.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/env bash -# Args: [] - -CONF_PATH="$(dirname "$0")" && -exec "$CONF_PATH/../../tools/build_when_required.sh" "$CONF_PATH/Sdk-latest-vkd3d-x86_64.yaml" "x86_64" "$1" "$2" \ No newline at end of file diff --git a/Platform/v2.0/platform/cleanup.yaml b/Platform/v2.0/platform/cleanup.yaml new file mode 100644 index 0000000..83eb22f --- /dev/null +++ b/Platform/v2.0/platform/cleanup.yaml @@ -0,0 +1,5 @@ +name: cleanup-python +buildsystem: simple +build-commands: + - find /usr/ -type f \( -iname '*.pyc' -or -iname '*.pyo' \) -delete + - find /usr/ -type d -name __pycache__ -delete \ No newline at end of file diff --git a/Platform/v2.0/platform/libfaudio.yaml b/Platform/v2.0/platform/libfaudio.yaml index 4b55e26..ae60895 100644 --- a/Platform/v2.0/platform/libfaudio.yaml +++ b/Platform/v2.0/platform/libfaudio.yaml @@ -55,8 +55,8 @@ modules: sources: - &FAUDIO_SOURCE type: archive - url: https://github.com/FNA-XNA/FAudio/archive/20.04.tar.gz - sha256: ff18365b401b66944159aac20065bcc343f20f8f19d2341e7718b2ae43f0dec8 + url: https://github.com/FNA-XNA/FAudio/archive/20.10.tar.gz + sha256: 5db56e58ca3f8eb6d10f01970f122798ebb366dd1b4d7561f65d05f815cef3b3 buildsystem: cmake-ninja builddir: true build-options: diff --git a/Platform/v2.0/platform/libldap.yaml b/Platform/v2.0/platform/libldap.yaml index 40f56c9..400ae72 100644 --- a/Platform/v2.0/platform/libldap.yaml +++ b/Platform/v2.0/platform/libldap.yaml @@ -3,8 +3,8 @@ modules: - name: libopenldap-platform sources: &OPENLDAP_SOURCES - type: archive - url: http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.49.tgz - sha256: e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e + url: https://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.53.tgz + sha256: 035860e2fb812f2e294ea3e9914944691e4e4f52521b8945a5aacdcd088d8ae8 builddir: true config-opts: - --disable-bdb diff --git a/Platform/v2.0/platform/libxslt-32bit.yaml b/Platform/v2.0/platform/libxslt-32bit.yaml index 0d133ae..96b6529 100644 --- a/Platform/v2.0/platform/libxslt-32bit.yaml +++ b/Platform/v2.0/platform/libxslt-32bit.yaml @@ -1,12 +1,19 @@ - -name: libxslt-32bit -sources: - - type: archive - url: https://gitlab.gnome.org/GNOME/libxslt/-/archive/v1.1.34/libxslt-v1.1.34.tar.gz - sha256: c61af4c898a93c2862f3f06bba8e5de5e352463febc94a2642d732f21e5d5641 -builddir: true -build-options: - cflags: -flto -m32 - cxxflags: -flto -m32 -only-arches: - - x86_64 \ No newline at end of file +name: libxslt-meta +modules: + - name: libxslt + sources: &LIBXSLT_SOURCE + - type: archive + url: https://gitlab.gnome.org/GNOME/libxslt/-/archive/v1.1.34/libxslt-v1.1.34.tar.gz + sha256: c61af4c898a93c2862f3f06bba8e5de5e352463febc94a2642d732f21e5d5641 + builddir: true + build-options: + cflags: -flto -m32 + cxxflags: -flto -m32 + - name: libxslt-32bit + sources: *LIBXSLT_SOURCE + builddir: true + build-options: + cflags: -flto -m32 + cxxflags: -flto -m32 + only-arches: + - x86_64 \ No newline at end of file diff --git a/Platform/v2.0/vkd3d/latest.yaml b/Platform/v2.0/vkd3d/latest.yaml deleted file mode 100644 index 889af79..0000000 --- a/Platform/v2.0/vkd3d/latest.yaml +++ /dev/null @@ -1,75 +0,0 @@ -name: vkd3d-meta -modules: - - name: spirv-headers - sources: - - type: archive - url: https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.1.corrected.tar.gz - sha256: 2b6a0ce1c02b9fe7b9ef727369168fe579e5256f1ea013993acdb8d8f06b7e89 - builddir: true - buildsystem: cmake - build-options: - make-install-args: - - DESTDIR=/usr/tmp_spirv - - install - post-install: - - rm -rfv /usr/tmp_spirv/usr/share - - cp -ravP --remove-destination /usr/tmp_spirv/usr / - - rm -rfv /usr/tmp_spirv - cleanup-platform: - - "/include" - - name: vkd3d-tmp-wine - sources: - - type: archive - url: https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz - sha256: 181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4 - build-options: - make-install-args: - - DESTDIR=/usr/tmp_wine - - install - cleanup: - - "*" - - name: vkd3d-platform - sources: &VKD3D_SOURCES - - type: git - url: git://source.winehq.org/git/vkd3d.git - commit: "5ad16f14588fb94582c11aa111a7e49456e7c943" - builddir: true - build-options: - make-install-args: - - DESTDIR=/usr/tmp_vkd3d - - install - env: - PATH: "/usr/bin:/usr/tmp_wine/usr/bin" - post-install: - - rm -rfv /usr/tmp_vkd3d/usr/share - - cp -ravP --remove-destination /usr/tmp_vkd3d/usr / - - rm -rfv /usr/tmp_vkd3d - cleanup-platform: - - "*.la" - - "*.a" - - "/include" - - name: vkd3d-32bit - sources: *VKD3D_SOURCES - builddir: true - config-opts: - - --build=i686-unknown-linux - - --libdir=/usr/lib32 - - CFLAGS=-m32 - - CXXFLAGS=-m32 - - LDFLAGS=-m32 - build-options: - make-install-args: - - DESTDIR=/usr/tmp_vkd3d - - install - env: - PATH: "/usr/bin:/usr/tmp_wine/usr/bin" - post-install: - - rm -rfv /usr/tmp_vkd3d/usr/share - - cp -ravP --remove-destination /usr/tmp_vkd3d/usr / - - rm -rfv /usr/tmp_vkd3d - cleanup-platform: - - "*.la" - - "*.a" - - "/include" - only-arches: - - x86_64 diff --git a/Platform/v2.0/vkd3d/release.yaml b/Platform/v2.0/vkd3d/release.yaml index c8c34dc..8344545 100644 --- a/Platform/v2.0/vkd3d/release.yaml +++ b/Platform/v2.0/vkd3d/release.yaml @@ -3,8 +3,8 @@ modules: - name: spirv-headers sources: - type: archive - url: https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.1.corrected.tar.gz - sha256: 2b6a0ce1c02b9fe7b9ef727369168fe579e5256f1ea013993acdb8d8f06b7e89 + url: https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.3.reservations1.tar.gz + sha256: aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd builddir: true buildsystem: cmake build-options: @@ -20,8 +20,8 @@ modules: - name: vkd3d-platform sources: &VKD3D_SOURCES - type: archive - url: https://dl.winehq.org/vkd3d/source/vkd3d-1.1.tar.xz - sha256: 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6 + url: https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz + sha256: b04b030fcbf0f2dacc933c76c74b449bffef1fc1a18d50254ef1ad3e380df96b builddir: true build-options: make-install-args: