[gnome-build-meta/tristan/fdsdk-master-again: 3/26] Revert "Revert "flatpak/{sdk, platform}*: sync with freedesktop-sdk""
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/tristan/fdsdk-master-again: 3/26] Revert "Revert "flatpak/{sdk, platform}*: sync with freedesktop-sdk""
- Date: Tue, 25 Jun 2019 10:26:05 +0000 (UTC)
commit a761c07b7a7b46f226261119ca1ff1e5e373418b
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date: Tue Jun 25 19:23:04 2019 +0900
Revert "Revert "flatpak/{sdk,platform}*: sync with freedesktop-sdk""
This reverts commit 7758be7cb2336482600592ddc153028f1071ea8a.
elements/flatpak/platform-image.bst | 4 ++++
elements/flatpak/platform.bst | 15 ++++++++-------
elements/flatpak/sdk-image.bst | 5 +----
elements/flatpak/sdk.bst | 20 ++++++++++++--------
elements/sdk-platform.bst | 4 ++--
5 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/elements/flatpak/platform-image.bst b/elements/flatpak/platform-image.bst
index 40395d65..b9ab4cb1 100644
--- a/elements/flatpak/platform-image.bst
+++ b/elements/flatpak/platform-image.bst
@@ -2,6 +2,9 @@ kind: compose
depends:
- filename: sdk-platform.bst
type: build
+- filename: multiarch-platform.bst
+ junction: freedesktop-sdk.bst
+ type: build
- filename: split-locales.bst
junction: freedesktop-sdk.bst
type: build
@@ -12,6 +15,7 @@ config:
exclude:
- devel
- extra
+ - static
public:
bst:
split-rules:
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 62704708..330d15ed 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -27,25 +27,26 @@ config:
# When syncing, skip the Locale extension, and add the freedesktop-sdk
# version to extensions that don't have a version
Extension org.freedesktop.Platform.GL:
- versions: "18.08;1.4"
+ # 1.4 is for Nvidia drivers
+ versions: "19.08;1.4"
version: "1.4"
directory: "%{lib}/GL"
subdirectories: "true"
no-autodownload: "true"
autodelete: "false"
add-ld-path: "lib"
- merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors"
+ merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri"
download-if: "active-gl-driver"
enable-if: "active-gl-driver"
Extension org.freedesktop.Platform.Timezones:
directory: share/zoneinfo
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Platform.GStreamer:
directory: lib/extensions/gstreamer-1.0
subdirectories: 'true'
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Platform.Icontheme:
directory: share/runtime/share/icons
@@ -66,10 +67,10 @@ config:
autodelete: 'false'
no-autodownload: 'true'
download-if: have-intel-gpu
- version: 18.08
+ version: 19.08
- Extension org.freedesktop.Platform.html5-codecs:
+ Extension org.freedesktop.Platform.ffmpeg-html5:
directory: '%{lib}/ffmpeg'
add-ld-path: lib
autodelete: 'false'
- version: 18.08
+ version: 19.08
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index 80d76c96..d1c5a18d 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -2,7 +2,7 @@ kind: compose
depends:
- filename: sdk.bst
type: build
-- filename: components/man-db-generate.bst
+- filename: multiarch-sdk.bst
junction: freedesktop-sdk.bst
type: build
- filename: split-locales.bst
@@ -14,9 +14,6 @@ depends:
- filename: flatpak-builder-configuration.bst
junction: freedesktop-sdk.bst
type: build
-- filename: multiarch-debugdir.bst
- junction: freedesktop-sdk.bst
- type: build
- filename: debug-app-link.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 05e6f513..973ad52f 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -2,6 +2,9 @@ kind: flatpak_image
depends:
- filename: flatpak/sdk-image.bst
type: build
+- filename: linker-debuginfo.bst
+ junction: freedesktop-sdk.bst
+ type: build
config:
directory: '%{prefix}'
exclude:
@@ -36,25 +39,26 @@ config:
# add the freedesktop-sdk version to extensions that don't have
# a version.
Extension org.freedesktop.Platform.GL:
- versions: "18.08;1.4"
+ # 1.4 is for Nvidia drivers
+ versions: "19.08;1.4"
version: "1.4"
directory: "%{lib}/GL"
subdirectories: "true"
no-autodownload: "true"
autodelete: "false"
add-ld-path: "lib"
- merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors"
+ merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri"
download-if: "active-gl-driver"
enable-if: "active-gl-driver"
Extension org.freedesktop.Platform.Timezones:
directory: share/zoneinfo
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Platform.GStreamer:
directory: lib/extensions/gstreamer-1.0
subdirectories: 'true'
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Platform.Icontheme:
directory: share/runtime/share/icons
@@ -70,21 +74,21 @@ config:
version: '3.22'
download-if: active-gtk-theme
- Extension org.freedesktop.Platform.html5-codecs:
+ Extension org.freedesktop.Platform.ffmpeg-html5:
directory: '%{lib}/ffmpeg'
add-ld-path: lib
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Sdk.Extension:
subdirectories: 'true'
directory: lib/sdk
no-autodownload: 'true'
add-ld-path: lib
- version: 18.08
+ version: 19.08
Extension org.freedesktop.Platform.VAAPI.Intel:
directory: '%{lib}/dri/intel-vaapi-driver'
autodelete: 'false'
no-autodownload: 'true'
download-if: have-intel-gpu
- version: 18.08
+ version: 19.08
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 6d50aa50..5673762a 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -143,6 +143,8 @@ depends:
junction: freedesktop-sdk.bst
- filename: components/libogg.bst
junction: freedesktop-sdk.bst
+- filename: components/libnice.bst
+ junction: freedesktop-sdk.bst
- filename: components/libpng.bst
junction: freedesktop-sdk.bst
- filename: components/libsamplerate.bst
@@ -321,8 +323,6 @@ depends:
junction: freedesktop-sdk.bst
- filename: components/mpg123.bst
junction: freedesktop-sdk.bst
-- filename: components/multiarch-links.bst
- junction: freedesktop-sdk.bst
- filename: components/mythes.bst
junction: freedesktop-sdk.bst
- filename: components/openal.bst
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]