Bug 1639531 - make flatpak aware of optional ffmpeg-full extension r=mtabara
authorBartłomiej Piotrowski <bpiotrowski@gnome.org>
Wed, 20 May 2020 12:01:58 +0000
changeset 531208 e2595b61fb3807292de43bbf4a011bc60c83f730
parent 531207 c2f3011258b10a0b78f4f9618052a3073ea4c6c2
child 531209 141fda86ce584056961fbff02b1f6abb028a4d76
push id37435
push userapavel@mozilla.com
push dateWed, 20 May 2020 15:28:23 +0000
treeherdermozilla-central@5415da14ec9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1639531
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1639531 - make flatpak aware of optional ffmpeg-full extension r=mtabara Differential Revision: https://phabricator.services.mozilla.com/D76129
taskcluster/docker/firefox-flatpak/runme.sh
--- a/taskcluster/docker/firefox-flatpak/runme.sh
+++ b/taskcluster/docker/firefox-flatpak/runme.sh
@@ -84,20 +84,27 @@ cp -r ~/.local/share/flatpak/app/org.moz
 
 ARCH=$(flatpak --default-arch)
 cat <<EOF > build/metadata
 [Application]
 name=org.mozilla.firefox
 runtime=org.freedesktop.Platform/${ARCH}/${FREEDESKTOP_VERSION}
 sdk=org.freedesktop.Sdk/${ARCH}/${FREEDESKTOP_VERSION}
 base=app/org.mozilla.Firefox.BaseApp/${ARCH}/${FIREFOX_BASEAPP_CHANNEL}
+
 [Extension org.mozilla.firefox.Locale]
 directory=share/runtime/langpack
 autodelete=true
 locale-subset=true
+
+[Extension org.freedesktop.Platform.ffmpeg-full]
+directory=lib/ffmpeg
+add-ld-path=.
+no-autodownload=true
+version=${FREEDESKTOP_VERSION}
 EOF
 
 cat <<EOF > build/metadata.locale
 [Runtime]
 name=org.mozilla.firefox.Locale
 
 [ExtensionOf]
 ref=app/org.mozilla.firefox/${ARCH}/${FLATPAK_BRANCH}
@@ -106,16 +113,17 @@ EOF
 appdir=build/files
 install -d "${appdir}/lib/"
 (cd "${appdir}/lib/" && tar jxf "${WORKSPACE}/firefox.tar.bz2")
 install -D -m644 -t "${appdir}/share/appdata" org.mozilla.firefox.appdata.xml
 install -D -m644 -t "${appdir}/share/applications" org.mozilla.firefox.desktop
 for size in 16 32 48 64 128; do
     install -D -m644 "${appdir}/lib/firefox/browser/chrome/icons/default/default${size}.png" "${appdir}/share/icons/hicolor/${size}x${size}/apps/org.mozilla.firefox.png"
 done
+mkdir -p "${appdir}/lib/ffmpeg"
 
 appstream-compose --prefix="${appdir}" --origin=flatpak --basename=org.mozilla.firefox org.mozilla.firefox
 appstream-util mirror-screenshots "${appdir}"/share/app-info/xmls/org.mozilla.firefox.xml.gz "https://dl.flathub.org/repo/screenshots/org.mozilla.firefox-${FLATPAK_BRANCH}" build/screenshots "build/screenshots/org.mozilla.firefox-${FLATPAK_BRANCH}"
 
 # XXX: we used to `install -D` before which automatically created the components
 # of target, now we need to manually do this since we're symlinking
 mkdir -p "${appdir}/lib/firefox/distribution/extensions"
 # XXX: we put the langpacks in /app/share/locale/$LANG_CODE and symlink that