From c075045a6510eb81fd915e791d0effcbf8900eaf Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 6 Aug 2019 16:52:23 +0200 Subject: [PATCH] Support Wine 4.13 --- .gitignore | 2 ++ Platform-v1.0/Wine-i386.yaml | 38 ++++++++++++++++++++++ Platform-v1.0/Wine-x86_64.yaml | 39 +++++++++++++++++++++++ Platform-v1.0/build.sh | 32 +++++++++++++++++++ Platform-v1.0/wine/4.13.yaml | 58 ++++++++++++++++++++++++++++++++++ 5 files changed, 169 insertions(+) create mode 100644 .gitignore create mode 100644 Platform-v1.0/Wine-i386.yaml create mode 100644 Platform-v1.0/Wine-x86_64.yaml create mode 100755 Platform-v1.0/build.sh create mode 100644 Platform-v1.0/wine/4.13.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e9ff8b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +tmp-i386.yaml +tmp-x86_64.yaml diff --git a/Platform-v1.0/Wine-i386.yaml b/Platform-v1.0/Wine-i386.yaml new file mode 100644 index 0000000..0f53a4a --- /dev/null +++ b/Platform-v1.0/Wine-i386.yaml @@ -0,0 +1,38 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.WineSdk +id-platform: de.marko10_000.winebarrels.Wine +branch: "WINE_BRANCH" + +sdk: de.marko10_000.winebarrels.Sdk +runtime: de.marko10_000.winebarrels.Platform +runtime-version: "v1.0" +separate-locales: false + +inherit-extensions: + - 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.html5-codecs + - de.marko10_000.winebarrels.Platform.ExtensionsV1_0 + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - "i386" + - wine/WINE_VERSION.yaml + +cleanup: + - /share/man + +cleanup-platform: + - /include + - "*.a" + - "*.la" diff --git a/Platform-v1.0/Wine-x86_64.yaml b/Platform-v1.0/Wine-x86_64.yaml new file mode 100644 index 0000000..0be8d79 --- /dev/null +++ b/Platform-v1.0/Wine-x86_64.yaml @@ -0,0 +1,39 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.WineSdk +id-platform: de.marko10_000.winebarrels.Wine +branch: "WINE_BRANCH" + +sdk: de.marko10_000.winebarrels.Sdk +runtime: de.marko10_000.winebarrels.Platform +runtime-version: "v1.0" +separate-locales: false + +inherit-extensions: + - 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.html5-codecs + - org.freedesktop.Platform.GL32 + - de.marko10_000.winebarrels.Platform.ExtensionsV1_0 + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - x86_64 + - wine/WINE_VERSION.yaml + +cleanup: + - /share/man + +cleanup-platform: + - /include + - "*.a" + - "*.la" diff --git a/Platform-v1.0/build.sh b/Platform-v1.0/build.sh new file mode 100755 index 0000000..f1b4add --- /dev/null +++ b/Platform-v1.0/build.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +CONFIG_PATH="`dirname $0`" || exit 1 +if [ ! -z "$4" ]; then + BRANCH="$4" +else + BRANCH="$1" +fi + +if [ -z "$NO_32BIT" ]; then + cp -f "$CONFIG_PATH/Wine-i386.yaml" "$CONFIG_PATH/tmp-i386.yaml" && + sed -i -e "s/WINE_VERSION/$1/" "$CONFIG_PATH/tmp-i386.yaml" && + sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-i386.yaml" || exit 2 + + if [ -z $3 ]; then + flatpak-builder $2 --arch=i386 build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2 + else + flatpak-builder $2 --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2 + fi +fi + +if [ -z "$NO_64BIT" ]; then + cp -f "$CONFIG_PATH/Wine-x86_64.yaml" "$CONFIG_PATH/tmp-x86_64.yaml" && + sed -i -e "s/WINE_VERSION/$1/" "$CONFIG_PATH/tmp-x86_64.yaml" && + sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3 + + if [ -z $3 ]; then + flatpak-builder $2 --arch=x86_64 build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3 + else + flatpak-builder $2 --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3 + fi +fi diff --git a/Platform-v1.0/wine/4.13.yaml b/Platform-v1.0/wine/4.13.yaml new file mode 100644 index 0000000..ce4584b --- /dev/null +++ b/Platform-v1.0/wine/4.13.yaml @@ -0,0 +1,58 @@ +name: wine-meta +modules: + - name: wine-64bit + sources: + - type: archive + url: https://dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz + sha256: 79174151cbc403250d4727dc9c55df8d6a60a2fe28343642c2452a92c6431d67 + buildsystem: simple + only-arches: + - x86_64 + build-commands: + - mkdir -p build/64 + - cd build/64; ../../configure + --prefix=/usr + --libdir=/usr/lib + --with-x + --enable-win64 + CFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + CPPFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + - make -C build/64 -j$FLATPAK_BUILDER_N_JOBS + + - mkdir -p build/32 + - cd build/32; ../../configure + --prefix=/usr + --libdir=/usr/lib32 + --with-x + --with-wine64=../64 + CFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + CPPFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + - make -C build/32 -j$FLATPAK_BUILDER_N_JOBS + + - make -C build/32 DESTDIR=/usr/tmp_wine install + - make -C build/64 DESTDIR=/usr/tmp_wine install + - rm -rf /usr/tmp_wine/usr/share/man + - cp -arfv /usr/tmp_wine/usr/* /usr + - rm -rf /usr/tmp_wine + - name: wine-32bit + sources: + - type: archive + url: https://dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz + sha256: 79174151cbc403250d4727dc9c55df8d6a60a2fe28343642c2452a92c6431d67 + buildsystem: simple + only-arches: + - i386 + build-commands: + - mkdir -p build/32 + - cd build/32; ../../configure + --prefix=/usr + --libdir=/usr/lib + --with-x + CFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + CPPFLAGS=-O2\ -fstack-protector-strong\ -D_FORTIFY_SOURCE=2 + - make -C build/32 -j$FLATPAK_BUILDER_N_JOBS + + - make -C build/32 DESTDIR=/usr/tmp_wine install + - rm -rf /usr/tmp_wine/usr/share/man + - cp -arfv /usr/tmp_wine/usr/* /usr + - rm -rf /usr/tmp_wine