Add 4.13 staging and ccache support
parent
c075045a65
commit
fbbe4b2bf7
|
@ -13,9 +13,9 @@ if [ -z "$NO_32BIT" ]; then
|
||||||
sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
||||||
|
|
||||||
if [ -z $3 ]; then
|
if [ -z $3 ]; then
|
||||||
flatpak-builder $2 --arch=i386 build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
flatpak-builder $2 --ccache --arch=i386 build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
||||||
else
|
else
|
||||||
flatpak-builder $2 --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
flatpak-builder $2 --ccache --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONFIG_PATH/tmp-i386.yaml" || exit 2
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -25,8 +25,8 @@ if [ -z "$NO_64BIT" ]; then
|
||||||
sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
sed -i -e "s/WINE_BRANCH/$BRANCH/" "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
||||||
|
|
||||||
if [ -z $3 ]; then
|
if [ -z $3 ]; then
|
||||||
flatpak-builder $2 --arch=x86_64 build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
flatpak-builder $2 --ccache --arch=x86_64 build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
||||||
else
|
else
|
||||||
flatpak-builder $2 --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
flatpak-builder $2 --ccache --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONFIG_PATH/tmp-x86_64.yaml" || exit 3
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
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
|
||||||
|
- type: archive
|
||||||
|
url: https://github.com/wine-staging/wine-staging/archive/v4.13.tar.gz
|
||||||
|
sha256: e9b01570092c2e7659119e0ff5d71e7733209b47b065495c073332c0bbe906a3
|
||||||
|
dest: wine-staging-patches
|
||||||
|
- type: shell
|
||||||
|
commands:
|
||||||
|
- wine-staging-patches/patches/patchinstall.sh --all
|
||||||
|
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
|
||||||
|
- type: archive
|
||||||
|
url: https://github.com/wine-staging/wine-staging/archive/v4.13.tar.gz
|
||||||
|
sha256: e9b01570092c2e7659119e0ff5d71e7733209b47b065495c073332c0bbe906a3
|
||||||
|
dest: wine-staging-patches
|
||||||
|
- type: shell
|
||||||
|
commands:
|
||||||
|
- wine-staging-patches/patches/patchinstall.sh --all
|
||||||
|
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
|
Loading…
Reference in New Issue