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

Update base platform to gnome 3.36.

master
Marko Semet 2020-04-25 01:51:48 +02:00
parent 84c5569e0c
commit 15934f8b86
13 changed files with 82 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BasePlatform/v2/Base-x86_64.yaml
View File

@ -39,3 +39,6 @@ cleanup-platform:
- /lib/pkgconfig
- /lib/x86_64-linux-gnu/pkgconfig
- /lib32/pkgconfig
- /share/doc
- /share/info
- /share/man

10
BasePlatform/v2/RawPlatform-x86_64.yaml
View File

@ -6,19 +6,19 @@ branch: "v2"
sdk: org.gnome.Platform
runtime: org.gnome.Platform
runtime-version: "3.34"
runtime-version: "3.36"
separate-locales: false
add-extensions:
org.freedesktop.Platform.GL32:
directory: lib32/GL
version: '1.4'
versions: 19.08;1.4
directory: lib32/GL
subdirectories: true
no-autodownload: true
autodelete: false
add-ld-path: lib
merge-dirs: vulkan/icd.d;glvnd/egl_vendor.d
merge-dirs: vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d
download-if: active-gl-driver
enable-if: active-gl-driver
org.freedesktop.Platform.GL:
@ -65,8 +65,8 @@ add-extensions:
add-ld-path: lib
download-if: have-intel-gpu
org.freedesktop.Platform.openh264:
versions: "19.08"
version: "19.08"
versions: "2.0"
version: "2.0"
directory: lib/x86_64-linux-gnu/openh264
add-ld-path: extra
autodelete: false

10
BasePlatform/v2/RawSdk-x86_64.yaml
View File

@ -6,19 +6,19 @@ branch: "v2"
sdk: org.gnome.Sdk
runtime: org.gnome.Sdk
runtime-version: "3.34"
runtime-version: "3.36"
separate-locales: false
add-extensions:
org.freedesktop.Platform.GL32:
directory: lib32/GL
version: '1.4'
versions: 19.08;1.4
directory: lib32/GL
subdirectories: true
no-autodownload: true
autodelete: false
add-ld-path: lib
merge-dirs: vulkan/icd.d;glvnd/egl_vendor.d
merge-dirs: vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d
download-if: active-gl-driver
enable-if: active-gl-driver
org.freedesktop.Platform.GL:
@ -65,8 +65,8 @@ add-extensions:
add-ld-path: lib
download-if: have-intel-gpu
org.freedesktop.Platform.openh264:
versions: "19.08"
version: "19.08"
versions: "2.0"
version: "2.0"
directory: lib/x86_64-linux-gnu/openh264
add-ld-path: extra
autodelete: false

14
BasePlatform/v2/build.base.sh
View File

@ -1,13 +1,5 @@
#! /usr/bin/env bash
# <build-args> [<repo>]
CONF_PATH=`dirname $0`
if [ -z "$BUILD_DIR_64BIT" ]; then
BUILD_DIR_64BIT=build64
fi
if [ -z "$2" ]; then
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/Base-x86_64.yaml" || exit 1
else
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/Base-x86_64.yaml" || exit 1
fi
CONF_PATH="$(dirname "$0")" &&
exec "$CONF_PATH/../../tools/build_when_required.sh" "$CONF_PATH/Base-x86_64.yaml" "x86_64" "$1" "$2"

37
BasePlatform/v2/build.raw.sh
View File

@ -6,25 +6,26 @@ if [ -z "$BUILD_DIR_64BIT" ]; then
BUILD_DIR_64BIT=build64
fi
if [ -z "$NO_REBUILD_I386" ]; then
echo EXPORT: runtime/org.gnome.Platform.Compat.i386/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Compat.i386/x86_64/3.34 > "$CONF_PATH/i386.tar" || exit 1
fi
source "$(dirname "$0")/versions.sh" &&
if [ -z "$2" ]; then
if [ -z "$NO_PLATFORM" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/3.34 > "$CONF_PATH/docs.tar" || exit 5
echo EXPORT: runtime/org.gnome.Platform.Compat.i386/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Compat.i386/x86_64/$GNOME_VERSION > "$CONF_PATH/i386.tar" || exit 1
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/$GNOME_VERSION > "$CONF_PATH/locale.tar" || exit 2
fi
echo BUILD: Runtime
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
fi
if [ -z "$NO_SDK" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Compat.i386/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Compat.i386/x86_64/$GNOME_VERSION > "$CONF_PATH/i386.tar" || exit 1
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/$GNOME_VERSION > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/$GNOME_VERSION > "$CONF_PATH/docs.tar" || exit 5
fi
echo BUILD: Sdk
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6
@ -32,18 +33,22 @@ if [ -z "$2" ]; then
else
if [ -z "$NO_PLATFORM" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/3.34 > "$CONF_PATH/docs.tar" || exit 5
echo EXPORT: runtime/org.gnome.Platform.Compat.i386/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Compat.i386/x86_64/$GNOME_VERSION > "$CONF_PATH/i386.tar" || exit 1
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/$GNOME_VERSION > "$CONF_PATH/locale.tar" || exit 2
fi
echo BUILD: Runtime
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
fi
if [ -z "$NO_SDK" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Compat.i386/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Compat.i386/x86_64/$GNOME_VERSION > "$CONF_PATH/i386.tar" || exit 1
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/$GNOME_VERSION > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/$GNOME_VERSION
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/$GNOME_VERSION > "$CONF_PATH/docs.tar" || exit 5
fi
echo BUILD: Sdk
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6

15
BasePlatform/v2/install.raw.sh
View File

@ -1,10 +1,13 @@
#! /usr/bin/env bash
source "$(dirname "$0")/versions.sh" &&
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Compat.i386/x86_64/3.34
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Locale/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Docs/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Locale/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Compat.i386/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Locale/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Compat.i386/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Docs/x86_64/$GNOME_VERSION &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Locale/x86_64/$GNOME_VERSION &&
flatpak update -y --noninteractive --user

22
BasePlatform/v2/platform/gcc-base.yaml
View File

@ -4,8 +4,8 @@ modules:
- name: cross-gmp
sources:
- type: archive
url: https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
sha256: 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
url: https://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.lz
sha256: 3f33f127bcb6b2c3601676cd3281df45824b148cbf688b73c0fc8248793667d9
config-opts:
- --disable-static
- --enable-assert
@ -69,8 +69,8 @@ modules:
- name: mingw-binutils-32bit
sources: &BINUTILS_SOURCES
- type: archive
url: https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.xz
sha256: ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
url: https://ftp.gnu.org/gnu/binutils/binutils-2.34.tar.lz
sha256: 5cec79823ef596817aa57a3f470a1afa9827bf14e3583a4e445dc046cc38d29c
config-opts:
- --target=i686-w64-mingw32
- --disable-werror
@ -135,17 +135,25 @@ modules:
- x86_64
# Glibc base headers
- name: cross-prepare-rsync
sources:
- type: archive
url: https://download.samba.org/pub/rsync/src/rsync-3.1.3.tar.gz
sha256: 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
no-autogen: true
cleanup-platform:
- "*"
- name: cross-prepare-glibc
sources:
- type: archive
url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.1.tar.xz
sha256: 3581e84e9d63298a14c147f925cd496ebb25c5a08cf065ba63c54cdee6d86506
url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.34.tar.xz
sha256: 903ec1334daba6a626688f799cc947b420cf6fc8ce83055313dc4e9978d64cd2
dest: kernel_headers
buildsystem: simple
build-commands:
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS mrproper
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS headers_check
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS INSTALL_HDR_PATH=/usr/tmp ARCH=x86_64 headers_install
- cd kernel_headers; PATH=$PATH:/usr/tmp/usr/bin make -j$FLATPAK_BUILDER_N_JOBS INSTALL_HDR_PATH=/usr/tmp ARCH=x86_64 headers_install
- cp -raPv /usr/tmp/include /usr && rm -rf /usr/tmp
only-arches:
- x86_64

3
BasePlatform/v2/raw/platform.yaml
View File

@ -1,5 +1,4 @@
name: meta-platform
modules:
- libs.yaml
- locale.yaml
- docs.yaml
- locale.yaml

1
BasePlatform/v2/raw/sdk.yaml
View File

@ -1,4 +1,5 @@
name: meta-sdk
modules:
- docs.yaml
- fix-libs.yaml
- docs-sdk.yaml

22
BasePlatform/v2/sdk/cross.yaml
View File

@ -6,8 +6,8 @@ modules:
sources: &GCC_SOURCES
- &GCC_SOURCE
type: archive
url: https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
sha256: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
url: https://ftp.gnu.org/gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz
sha256: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- type: patch
path: ./gcc.patch
- type: shell
@ -51,9 +51,15 @@ modules:
- /bin
- /libexec/gcc
- /share
- name: cross-delete-old-gcc
buildsystem: simple
build-commands:
- rm -rf /usr/lib/gcc/x86_64-unknown-linux-gnu
- rm -rf /usr/x86_64-unknown-linux-gnu
- name: cross-glibc-32bit-pass1
sources: &GLIBC_SOURCE_32BIT
- type: archive
- &GLBIC_SOURCE
type: archive
url: https://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.xz
sha256: e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- type: shell
@ -95,9 +101,7 @@ modules:
builddir: true
- name: cross-glibc-64bit-pass1
sources: &GLIBC_SOURCE_64BIT
- type: archive
url: https://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.xz
sha256: e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
- *GLBIC_SOURCE
- type: shell
commands:
- echo slibdir=/usr/lib/x86_64-linux-gnu >> configparms
@ -129,7 +133,7 @@ modules:
cxxflags-override: true
post-install: &GLIBC_POST_INSTALL_64BIT
- mv -v /usr/tmp/usr/sbin/* /usr/tmp/usr/bin && rm -rf /usr/tmp/usr/sbin
- cp -raPv /usr/tmp/usr/* /usr && cp -rav /usr/tmp/etc/* /etc && rm -rf /usr/tmp
- cp -rav /usr/tmp/usr/. /usr/ && cp -rav /usr/tmp/etc/. /etc/ && rm -rfv /usr/tmp
builddir: true
- name: cross-test
buildsystem: simple
@ -150,8 +154,6 @@ modules:
- type: shell
commands:
- sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
- echo "exec \"\$(dirname \$0)/libstdc++-v3/configure\" \"\$@\"" > configure && chmod +x configure
- ln -s /usr/bin/cpp /lib/cpp
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
@ -161,10 +163,10 @@ modules:
- --enable-multilib
- --enable-shared
- --enable-static
subdir: libstdc++-v3
builddir: true
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check
- rm -v /lib/cpp
- name: cross-gcc-pass2
sources: *GCC_SOURCES
config-opts: &GCC_CONFIG

8
BasePlatform/v2/sdk/mingw.yaml
View File

@ -4,8 +4,8 @@ modules:
- name: mingw-headers-32bit
sources: &MINGW_SOURCES
- type: archive
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2
sha256: 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v7.0.0.tar.bz2
sha256: aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628
subdir: mingw-w64-headers
config-opts:
- --target=i686-w64-mingw32
@ -36,8 +36,8 @@ modules:
- name: mingw-gcc-pass1-32bit
sources: &GCC_SOURCES
- type: archive
url: https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
sha256: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
url: https://ftp.gnu.org/gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz
sha256: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
config-opts: &GCC_CONF_32BIT
- --target=i686-w64-mingw32
- --disable-multilib

4
BasePlatform/v2/sdk/sdk.yaml
View File

@ -1,4 +1,4 @@
name: meta-sdk
modules:
- mingw.yaml
- cross.yaml
- cross.yaml
- mingw.yaml

1
BasePlatform/v2/versions.sh 100644
View File

@ -0,0 +1 @@
export GNOME_VERSION=3.36