From 3d7b5bdbe59c55fa8677b2b5b775650209d1bb47 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Sat, 11 Jan 2020 21:47:35 +0100 Subject: [PATCH] Add: Platform v2.0 --- .gitmodules | 3 + Platform/v2.0/Sdk-x86_64.yaml | 66 ++++++++++++++ Platform/v2.0/build.stable.sh | 8 ++ Platform/v2.0/platform/libfaudio.yaml | 86 +++++++++++++++++++ Platform/v2.0/platform/libglu.yaml | 43 ++++++++++ Platform/v2.0/platform/libldap.yaml | 50 +++++++++++ Platform/v2.0/platform/libpcap.yaml | 43 ++++++++++ Platform/v2.0/platform/platform.yaml | 13 +++ Platform/v2.0/platform/python3-pygobject.yaml | 19 ++++ Platform/v2.0/platform/winetricks.yaml | 29 +++++++ Platform/v2.0/vkd3d/release.yaml | 60 +++++++++++++ tools | 1 + 12 files changed, 421 insertions(+) create mode 100644 .gitmodules create mode 100644 Platform/v2.0/Sdk-x86_64.yaml create mode 100755 Platform/v2.0/build.stable.sh create mode 100644 Platform/v2.0/platform/libfaudio.yaml create mode 100644 Platform/v2.0/platform/libglu.yaml create mode 100644 Platform/v2.0/platform/libldap.yaml create mode 100644 Platform/v2.0/platform/libpcap.yaml create mode 100644 Platform/v2.0/platform/platform.yaml create mode 100644 Platform/v2.0/platform/python3-pygobject.yaml create mode 100644 Platform/v2.0/platform/winetricks.yaml create mode 100644 Platform/v2.0/vkd3d/release.yaml create mode 160000 tools diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..296d0a6 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tools"] + path = tools + url = https://git.marko10-000.de/flatpaks/tools.git diff --git a/Platform/v2.0/Sdk-x86_64.yaml b/Platform/v2.0/Sdk-x86_64.yaml new file mode 100644 index 0000000..8c34816 --- /dev/null +++ b/Platform/v2.0/Sdk-x86_64.yaml @@ -0,0 +1,66 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.Sdk +id-platform: de.marko10_000.winebarrels.Platform +branch: "v2.0" + +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/release.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/man \ No newline at end of file diff --git a/Platform/v2.0/build.stable.sh b/Platform/v2.0/build.stable.sh new file mode 100755 index 0000000..2bf792d --- /dev/null +++ b/Platform/v2.0/build.stable.sh @@ -0,0 +1,8 @@ +#! /usr/bin/env bash +# Args: [] + +CONF_PATH="$(dirname "$0")" && +"$CONF_PATH/../../tools/hash_modules.py" --require-build "$CONF_PATH/Sdk-x86_64.yaml" "x86_64" && +exec "$CONF_PATH/../../tools/build.sh" "$CONF_PATH/Sdk-x86_64.yaml" "x86_64" "$1" "$2" + +echo 'No build required.' \ No newline at end of file diff --git a/Platform/v2.0/platform/libfaudio.yaml b/Platform/v2.0/platform/libfaudio.yaml new file mode 100644 index 0000000..a9edea4 --- /dev/null +++ b/Platform/v2.0/platform/libfaudio.yaml @@ -0,0 +1,86 @@ +name: libfaudio-meta +modules: + - name: sdl2-32bit + sources: + - &SDL2_SOURCE + type: archive + url: https://www.libsdl.org/release/SDL2-2.0.10.tar.gz + sha256: b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 + - type: shell + commands: + - sed -i 's|lib/cmake|lib32/cmake|' CMakeLists.txt + - sed -i '/pkg_search_module.*ibus-1.0/d' CMakeLists.txt + buildsystem: cmake-ninja + config-opts: + - -DALSA=ON + - -DSDL_DLOPEN=ON + - -DJACK=ON + - -DJACK_SHARED=ON + - -DPULSEAUDIO_SHARED=ON + - -DVIDEO_WAYLAND=ON + - -DLIB_SUFFIX=32 + builddir: true + build-options: + env: + - CC=gcc -m32 + - CXX=g++ -m32 + - PKG_CONFIG_PATH=/usr/lib32/pkgconfig + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + only-arches: + - x86_64 + - name: sdl2 + sources: + - *SDL2_SOURCE + buildsystem: cmake-ninja + config-opts: + - -DALSA=ON + - -DSDL_DLOPEN=ON + - -DJACK_SHARED=ON + - -DPULSEAUDIO_SHARED=ON + - -DVIDEO_WAYLAND=ON + builddir: true + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + - name: libfaudio-platform + sources: + - &FAUDIO_SOURCE + type: archive + url: https://github.com/FNA-XNA/FAudio/archive/20.01.tar.gz + sha256: c015f7d395cf24b9050135238de38683e5a90378215bc6d5bb89777a9623f0e6 + builddir: true + buildsystem: cmake-ninja + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + - name: libfaudio-32bit + sources: + - *FAUDIO_SOURCE + - type: shell + commands: + - mv /usr/lib/lib32 /usr/lib/lib32_ + - ln -s /usr/lib32 /usr/lib/lib32 + - ln -s /usr/include /usr/lib/include + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_C_FLAGS=-m32 + - -DCMAKE_CXX_FLAGS=-m32 + - -DCMAKE_INSTALL_LIBDIR=lib32 + builddir: true + build-options: + env: + - PKG_CONFIG_PATH=/usr/lib32/pkgconfig + post-install: + - rm -v /usr/lib/lib32 /usr/lib/include + - mv /usr/lib/lib32_ /usr/lib/lib32 + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + only-arches: + - x86_64 diff --git a/Platform/v2.0/platform/libglu.yaml b/Platform/v2.0/platform/libglu.yaml new file mode 100644 index 0000000..19f0583 --- /dev/null +++ b/Platform/v2.0/platform/libglu.yaml @@ -0,0 +1,43 @@ +name: libglu-meta +modules: + - name: libglu-platform + sources: &GLU_SOURCES + - type: archive + url: https://mesa.freedesktop.org/archive/glu/glu-9.0.1.tar.xz + sha256: fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc + builddir: true + build-options: + make-install-args: + - DESTDIR=/usr/tmp_glu + - install + post-install: + - rm -rfv /usr/tmp_glu/usr/share + - cp -ravP --remove-destination /usr/tmp_glu/usr / + - rm -rfv /usr/tmp_glu + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + - name: libglu-32bit + sources: *GLU_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_glu + - install + post-install: + - rm -rfv /usr/tmp_glu/usr/share + - cp -ravP --remove-destination /usr/tmp_glu/usr / + - rm -rfv /usr/tmp_glu + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + only-arches: + - x86_64 diff --git a/Platform/v2.0/platform/libldap.yaml b/Platform/v2.0/platform/libldap.yaml new file mode 100644 index 0000000..67c1cb7 --- /dev/null +++ b/Platform/v2.0/platform/libldap.yaml @@ -0,0 +1,50 @@ +name: libopenldap-meta +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 + builddir: true + config-opts: + - --disable-bdb + - --disable-hdb + build-options: + make-install-args: + - DESTDIR=/usr/tmp_ldap + - install + post-install: + - rm -rfv /usr/tmp_ldap/usr/share + - mv -v /usr/tmp_ldap/usr/sbin/* /usr/tmp_ldap/usr/bin + - rm -rfv /usr/tmp_ldap/usr/sbin + - cp -ravP --remove-destination /usr/tmp_ldap/usr / + - rm -rfv /usr/tmp_ldap + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + - name: libopenldap-32bit + sources: *OPENLDAP_SOURCES + builddir: true + config-opts: + - --build=i686-unknown-linux + - --libdir=/usr/lib32 + - --disable-bdb + - --disable-hdb + - CFLAGS=-m32 + - CXXFLAGS=-m32 + - LDFLAGS=-m32 + build-options: + make-install-args: + - DESTDIR=/usr/tmp_ldap + - install + post-install: + - rm -rfv /usr/tmp_ldap/usr/share /usr/tmp_ldap/usr/sbin /usr/tmp_ldap/usr/bin /usr/tmp_ldap/usr/include + - cp -ravP --remove-destination /usr/tmp_ldap/usr / + - rm -rfv /usr/tmp_ldap + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + only-arches: + - x86_64 diff --git a/Platform/v2.0/platform/libpcap.yaml b/Platform/v2.0/platform/libpcap.yaml new file mode 100644 index 0000000..1577880 --- /dev/null +++ b/Platform/v2.0/platform/libpcap.yaml @@ -0,0 +1,43 @@ +name: libpcap-meta +modules: + - name: libpcap-platform + sources: &PCAP_SOURCES + - type: archive + url: https://www.tcpdump.org/release/libpcap-1.9.1.tar.gz + sha256: 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 + builddir: true + build-options: + make-install-args: + - DESTDIR=/usr/tmp_pcap + - install + post-install: + - rm -rfv /usr/tmp_pcap/usr/share + - cp -ravP --remove-destination /usr/tmp_pcap/usr / + - rm -rfv /usr/tmp_pcap + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + - name: libpcap-32bit + sources: *PCAP_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_pcap + - install + post-install: + - rm -rfv /usr/tmp_pcap/usr/share + - cp -ravP --remove-destination /usr/tmp_pcap/usr / + - rm -rfv /usr/tmp_pcap + cleanup-platform: + - "*.la" + - "*.a" + - "/include" + only-arches: + - x86_64 diff --git a/Platform/v2.0/platform/platform.yaml b/Platform/v2.0/platform/platform.yaml new file mode 100644 index 0000000..c8b2346 --- /dev/null +++ b/Platform/v2.0/platform/platform.yaml @@ -0,0 +1,13 @@ +name: platform-meta +buildsystem: simple +build-commands: + - mkdir -vp /usr/share/wine/gecko + - mkdir -vp /usr/share/wine/mono + - mkdir -vp /usr/wine_extensions/v2 +modules: + - winetricks.yaml + - libglu.yaml + - libpcap.yaml + - libfaudio.yaml + - libldap.yaml + - python3-pygobject.yaml diff --git a/Platform/v2.0/platform/python3-pygobject.yaml b/Platform/v2.0/platform/python3-pygobject.yaml new file mode 100644 index 0000000..041b2a8 --- /dev/null +++ b/Platform/v2.0/platform/python3-pygobject.yaml @@ -0,0 +1,19 @@ +name: python3-pygobject +sources: + - type: archive + url: https://ftp.acc.umu.se/pub/GNOME/sources/pygobject/3.34/pygobject-3.34.0.tar.xz + sha256: 87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a +buildsystem: simple +build-commands: + - python3 setup.py build + - python3 setup.py install + - python3 -c 'import gi.repository.Gtk' +modules: + - name: pycairo + sources: + - type: archive + url: https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb/pycairo-1.18.2.tar.gz + sha256: dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531 + buildsystem: simple + build-commands: + - pip3 install . \ No newline at end of file diff --git a/Platform/v2.0/platform/winetricks.yaml b/Platform/v2.0/platform/winetricks.yaml new file mode 100644 index 0000000..0347358 --- /dev/null +++ b/Platform/v2.0/platform/winetricks.yaml @@ -0,0 +1,29 @@ +name: winetricks +sources: + - type: archive + url: https://github.com/Winetricks/winetricks/archive/20191224.tar.gz + sha256: c1223bb90e76c468f15784a701696a184aaee802bc9c236797166dea33d0d0a2 +no-autogen: true +build-options: + make-install-args: + - DESTDIR=/usr/tmp_winetricks + - install +post-install: + - rm -rfv /usr/tmp_winetricks/usr/share + - cp -ravP --remove-destination /usr/tmp_winetricks/usr/* /usr + - rm -rf /usr/tmp_winetricks + +modules: + - name: cabextract + sources: + - type: archive + url: https://cabextract.org.uk/cabextract-1.9.1.tar.gz + sha256: afc253673c8ef316b4d5c29cc4aa8445844bee14afffbe092ee9469405851ca7 + build-options: + make-install-args: + - DESTDIR=/usr/tmp_cabextract + - install + post-install: + - rm -rfv /usr/tmp_cabextract/usr/share + - cp -ravP --remove-destination /usr/tmp_cabextract/usr/* /usr + - rm -rf /usr/tmp_cabextract diff --git a/Platform/v2.0/vkd3d/release.yaml b/Platform/v2.0/vkd3d/release.yaml new file mode 100644 index 0000000..491c7b8 --- /dev/null +++ b/Platform/v2.0/vkd3d/release.yaml @@ -0,0 +1,60 @@ +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-platform + sources: &VKD3D_SOURCES + - type: archive + url: https://dl.winehq.org/vkd3d/source/vkd3d-1.1.tar.xz + sha256: 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6 + builddir: true + build-options: + make-install-args: + - DESTDIR=/usr/tmp_vkd3d + - install + 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 + 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/tools b/tools new file mode 160000 index 0000000..2adf338 --- /dev/null +++ b/tools @@ -0,0 +1 @@ +Subproject commit 2adf3381d7d891d0afb8826b148a96f7536902bd