diff --git a/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml b/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml new file mode 100644 index 0000000..dd36883 --- /dev/null +++ b/Platform/v2.0/Sdk-latest-vkd3d-x86_64.yaml @@ -0,0 +1,67 @@ +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 8c34816..62febe5 100644 --- a/Platform/v2.0/Sdk-x86_64.yaml +++ b/Platform/v2.0/Sdk-x86_64.yaml @@ -63,4 +63,5 @@ cleanup-platform: - /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/build.latest_vkd3d.sh b/Platform/v2.0/build.latest_vkd3d.sh new file mode 100755 index 0000000..3c96b7a --- /dev/null +++ b/Platform/v2.0/build.latest_vkd3d.sh @@ -0,0 +1,5 @@ +#! /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/libfaudio.yaml b/Platform/v2.0/platform/libfaudio.yaml index 5a40302..4b55e26 100644 --- a/Platform/v2.0/platform/libfaudio.yaml +++ b/Platform/v2.0/platform/libfaudio.yaml @@ -4,8 +4,8 @@ modules: sources: - &SDL2_SOURCE type: archive - url: https://www.libsdl.org/release/SDL2-2.0.10.tar.gz - sha256: b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 + url: https://www.libsdl.org/release/SDL2-2.0.12.tar.gz + sha256: 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 - type: shell commands: - sed -i 's|lib/cmake|lib32/cmake|' CMakeLists.txt @@ -55,8 +55,8 @@ modules: sources: - &FAUDIO_SOURCE type: archive - url: https://github.com/FNA-XNA/FAudio/archive/20.01.tar.gz - sha256: c015f7d395cf24b9050135238de38683e5a90378215bc6d5bb89777a9623f0e6 + url: https://github.com/FNA-XNA/FAudio/archive/20.04.tar.gz + sha256: ff18365b401b66944159aac20065bcc343f20f8f19d2341e7718b2ae43f0dec8 buildsystem: cmake-ninja builddir: true build-options: diff --git a/Platform/v2.0/platform/libldap.yaml b/Platform/v2.0/platform/libldap.yaml index 54ba7a1..40f56c9 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.48.tgz - sha256: d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d + url: http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.49.tgz + sha256: e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e builddir: true config-opts: - --disable-bdb diff --git a/Platform/v2.0/platform/winetricks.yaml b/Platform/v2.0/platform/winetricks.yaml index 0347358..c7fe797 100644 --- a/Platform/v2.0/platform/winetricks.yaml +++ b/Platform/v2.0/platform/winetricks.yaml @@ -1,8 +1,8 @@ name: winetricks sources: - type: archive - url: https://github.com/Winetricks/winetricks/archive/20191224.tar.gz - sha256: c1223bb90e76c468f15784a701696a184aaee802bc9c236797166dea33d0d0a2 + url: https://github.com/Winetricks/winetricks/archive/20200412.tar.gz + sha256: 4b0aa4f11dbc30d10a8edd2bb83fcc34f9b143ab58ccce7b99cd54ebff7ec260 no-autogen: true build-options: make-install-args: diff --git a/Platform/v2.0/vkd3d/latest.yaml b/Platform/v2.0/vkd3d/latest.yaml new file mode 100644 index 0000000..889af79 --- /dev/null +++ b/Platform/v2.0/vkd3d/latest.yaml @@ -0,0 +1,75 @@ +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