diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-02-28 10:13:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-28 10:13:27 +0100 |
| commit | 756c9f2317605e39d9cb058e650962acd2d81739 (patch) | |
| tree | 0d5f748852723b37d8c946b164d2fa4ef21fc1af /solenv | |
| parent | 6a0686e843204ef657cb3fdbd785f6f8ef206c64 (diff) | |
Merge upstream fixes into solenv/flatpak-manifest.in
* <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
f5d97291e302d98c217c955c52b255795d4d4cad> "Bump runtime-version to
org.gnome.Platform 3.26"
* <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
7d69e505165d4bbf5fa0b34b5fb2cbff9dfaf9bd> "For now, bundle gst-libav to be
able to play mp4 videos in impress"
Change-Id: I1924d84be7fe577e302b0c1b8c7e2971e8583d73
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index ee8d5cff78a6..3b504ee50174 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.gnome.Platform", - "runtime-version": "3.24", + "runtime-version": "3.26", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.gcc7", @@ -33,6 +33,19 @@ ] }, { + "name": "gst-libav", + "buildsystem": "meson", + "builddir": true, + "config-opts": ["-Ddisable_gtkdoc=true"], + "sources": [ + { + "type": "archive", + "url": "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz", + "sha256": "2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62" + } + ] + }, + { "name": "libreoffice", "sources": [ { |