flatpaks
/
WineBarrels-Wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support wine 5.0

master
Marko Semet 2020-02-10 22:39:24 +01:00
parent 2b6a4e7611
commit 61ba7177aa
6 changed files with 99 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Platform-v2.0/Wine/Wine-staging-x86_64.yaml
View File

@ -30,11 +30,11 @@ modules:
- false
skip-arches:
- x86_64
- name: wine
- name: wine-64bit-buildonly
sources:
- type: archive
url: "{{WINE_SOURCE}}"
sha256: "{{WINE_SOURCE_SHA256}}"
url: {{WINE_SOURCE}}
sha256: {{WINE_SOURCE_SHA256}}
- type: archive
url: "{{WINE_SOURCE_STAGING}}"
sha256: "{{WINE_SOURCE_STAGING_SHA256}}"
@ -42,39 +42,53 @@ modules:
- type: shell
commands:
- wine-staging-patches/patches/patchinstall.sh --all
config-opts:
- --disable-tests
- --enable-win64
- --with-x
- CROSSCC=ccache x86_64-w64-mingw32-gcc
builddir: true
build-options:
ldflags-override: true
no-debuginfo: true
no-debuginfo-compression: true
strip: false
no-make-install: true
post-install:
- mkdir -pv /usr/tmp/64bit && cp -rav ../. /usr/tmp/64bit/
cleanup:
- /tmp
- name: wine-32bit
sources:
- type: archive
url: {{WINE_SOURCE}}
sha256: {{WINE_SOURCE_SHA256}}
- type: archive
url: "{{WINE_SOURCE_STAGING}}"
sha256: "{{WINE_SOURCE_STAGING_SHA256}}"
dest: wine-staging-patches
- type: shell
commands:
- wine-staging-patches/patches/patchinstall.sh --all
config-opts:
- --disable-tests
- --disable-win64
- --libdir=/usr/lib32
- --with-wine64=/usr/tmp/64bit/_flatpak_build
- --with-x
- CROSSCC=ccache i686-w64-mingw32-gcc
builddir: true
build-options:
ldflags-override: true
post-install:
- find /usr/lib32/wine -name \*.dll -exec strip --strip-debug '{}' \;
- find /usr/lib32/wine -name \*.exe -exec strip --strip-debug '{}' \;
- name: wine-64bit-install
buildsystem: simple
build-commands:
- mkdir -p build/64
- cd build/64; ../../configure
--prefix=/usr
--libdir=/usr/lib
--with-x
--disable-tests
--enable-win64
CFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CPPFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CC=ccache\ gcc
CPP=ccache\ cpp
- 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
--disable-tests
CFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CPPFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CC=ccache\ gcc
CPP=ccache\ cpp
- make -C build/32 -j$FLATPAK_BUILDER_N_JOBS
- make -C build/32 DESTDIR=/usr/tmp_wine install -j$FLATPAK_BUILDER_N_JOBS
- make -C build/64 DESTDIR=/usr/tmp_wine install -j$FLATPAK_BUILDER_N_JOBS
- rm -rf /usr/tmp_wine/usr/share/man
- cp -arvP --remove-destination /usr/tmp_wine/usr/* /usr
- rm -rf /usr/tmp_wine
- cd /usr/tmp/64bit/_flatpak_build && make install
- find /usr/lib/x86_64-linux-gnu/wine -name \*.dll -exec strip -v --strip-debug '{}' \;
- find /usr/lib/x86_64-linux-gnu/wine -name \*.exe -exec strip -v --strip-debug '{}' \;
cleanup-platform:
- /include

71
Platform-v2.0/Wine/Wine-x86_64.yaml
View File

@ -8,7 +8,6 @@ branch: "{{VERSION}}"
sdk: de.marko10_000.winebarrels.Sdk
runtime: de.marko10_000.winebarrels.Platform
runtime-version: "v2.0"
separate-locales: false
inherit-extensions:
- org.freedesktop.Platform.GL32
@ -30,43 +29,51 @@ modules:
- false
skip-arches:
- x86_64
- name: wine
- name: wine-64bit-buildonly
sources:
- type: archive
url: {{WINE_SOURCE}}
sha256: {{WINE_SOURCE_SHA256}}
config-opts:
- --disable-tests
- --enable-win64
- --with-x
- CROSSCC=ccache x86_64-w64-mingw32-gcc
builddir: true
build-options:
ldflags-override: true
no-debuginfo: true
no-debuginfo-compression: true
strip: false
no-make-install: true
post-install:
- mkdir -pv /usr/tmp/64bit && cp -rav ../. /usr/tmp/64bit/
cleanup:
- /tmp
- name: wine-32bit
sources:
- type: archive
url: {{WINE_SOURCE}}
sha256: {{WINE_SOURCE_SHA256}}
config-opts:
- --disable-tests
- --disable-win64
- --libdir=/usr/lib32
- --with-wine64=/usr/tmp/64bit/_flatpak_build
- --with-x
- CROSSCC=ccache i686-w64-mingw32-gcc
builddir: true
build-options:
ldflags-override: true
post-install:
- find /usr/lib32/wine -name \*.dll -exec strip -v --strip-debug '{}' \;
- find /usr/lib32/wine -name \*.exe -exec strip -v --strip-debug '{}' \;
- name: wine-64bit-install
buildsystem: simple
build-commands:
- mkdir -p build/64
- cd build/64; ../../configure
--prefix=/usr
--libdir=/usr/lib
--with-x
--disable-tests
--enable-win64
CFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CPPFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CC=ccache\ gcc
CPP=ccache\ cpp
- 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
--disable-tests
CFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CPPFLAGS=-O2\ -D_FORTIFY_SOURCE=2
CC=ccache\ gcc
CPP=ccache\ cpp
- make -C build/32 -j$FLATPAK_BUILDER_N_JOBS
- make -C build/32 DESTDIR=/usr/tmp_wine install -j$FLATPAK_BUILDER_N_JOBS
- make -C build/64 DESTDIR=/usr/tmp_wine install -j$FLATPAK_BUILDER_N_JOBS
- cp -arvP --remove-destination /usr/tmp_wine/usr/* /usr
- rm -rf /usr/tmp_wine
- cd /usr/tmp/64bit/_flatpak_build && make install
- find /usr/lib/x86_64-linux-gnu/wine -name \*.dll -exec strip -v --strip-debug '{}' \;
- find /usr/lib/x86_64-linux-gnu/wine -name \*.exe -exec strip -v --strip-debug '{}' \;
cleanup-platform:
- /include

3
Platform-v2.0/Wine/build_amd64.sh
View File

@ -1,5 +1,4 @@
#! /usr/bin/env bash
# Args: <file> <build-args> [<repo>]
"$(dirname "$0")/../tools/hash_modules.py" --require-build "$1" x86_64 &&
exec "$(dirname "$0")/../tools/build.sh" "$1" x86_64 "$2" "$3"
exec "$(dirname "$0")/../../tools/build_when_required.sh" "$1" x86_64 "$2" "$3"

10
Platform-v2.0/Wine/sources.yaml
View File

@ -1,5 +1,5 @@
"5.0-rc5":
"WINE_SOURCE": "https://dl.winehq.org/wine/source/5.0/wine-5.0-rc5.tar.xz"
"WINE_SOURCE_STAGING": "https://github.com/wine-staging/wine-staging/archive/v5.0-rc5.tar.gz"
"WINE_SOURCE_SHA256": "aa1a20a9a98c9193f922c78fd8ad5a1ce1d3df98a5795c79692a52b7e54dd38b"
"WINE_SOURCE_STAGING_SHA256": "f6707bfd291a08cb2c6892f077e01618af40d9db0f293597e5d427946e481b7c"
"5.0":
"WINE_SOURCE": "https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz"
"WINE_SOURCE_STAGING": "https://github.com/wine-staging/wine-staging/archive/v5.0.tar.gz"
"WINE_SOURCE_SHA256": "181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4"
"WINE_SOURCE_STAGING_SHA256": "5c3f282cd595a7114e7f1131044f89f0c84a2499a5fe34f1b2fb38954464edc2"

5
aliases.csv 100644
View File

@ -0,0 +1,5 @@
TARGET,SOURCE
runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5-stable,runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5.0
runtime/de.marko10_000.winebarrels.Wine/x86_64/5-stable,runtime/de.marko10_000.winebarrels.Wine/x86_64/5.0
runtime/de.marko10_000.winebarrels.WineSdk/x86_64/stable,runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5.0
runtime/de.marko10_000.winebarrels.Wine/x86_64/stable,runtime/de.marko10_000.winebarrels.Wine/x86_64/5.0
1 TARGET SOURCE
2 runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5-stable runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5.0
3 runtime/de.marko10_000.winebarrels.Wine/x86_64/5-stable runtime/de.marko10_000.winebarrels.Wine/x86_64/5.0
4 runtime/de.marko10_000.winebarrels.WineSdk/x86_64/stable runtime/de.marko10_000.winebarrels.WineSdk/x86_64/5.0
5 runtime/de.marko10_000.winebarrels.Wine/x86_64/stable runtime/de.marko10_000.winebarrels.Wine/x86_64/5.0

2
tools

@ -1 +1 @@
Subproject commit d05f998c394ffba0a152064fd22940f07cbcfbdf
Subproject commit 6f4999cb54432cf890fcefea3f8dd1cef3f5e176