Diff
Modified: trunk/Tools/ChangeLog (263026 => 263027)
--- trunk/Tools/ChangeLog 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/ChangeLog 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,5 +1,35 @@
2020-06-15 Philippe Normand <pnorm...@igalia.com>
+ [Flatpak SDK] Add libavif
+ https://bugs.webkit.org/show_bug.cgi?id=212964
+ <rdar://problem/64291035>
+
+ Reviewed by Žan Doberšek.
+
+ Because of the ABI bump of dav1d, which ffmpeg depends on, ffmpeg needs to be rebuilt. So
+ this is a good opportunity to include it in the SDK and not rely on the ffmpeg-full
+ extension anymore, because it doesn't provide debug symbols.
+
+ * buildstream/elements/flatpak/platform.bst:
+ * buildstream/elements/flatpak/sdk.bst:
+ * buildstream/elements/freedesktop-sdk.bst:
+ * buildstream/elements/sdk-platform.bst:
+ * buildstream/elements/sdk/ffmpeg.bst: Added.
+ * buildstream/elements/sdk/gst-libav.bst:
+ * buildstream/elements/sdk/libavif.bst: Added.
+ * buildstream/elements/sdk/ruby-highline.bst: Remove the spec source, un-needed.
+ * buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch: Added.
+ * buildstream/patches/fdo/0001-ffmpeg-Add-MS-MPEG-DivX-variants.patch: Removed.
+ * buildstream/patches/fdo/0002-ffmpeg-Add-VP6-and-Sorenson-Spark-video-codecs.patch: Removed.
+ * buildstream/patches/fdo/0003-ffmpeg-Add-Intel-Indeo-and-Cinepak-video-support.patch: Removed.
+ * buildstream/patches/fdo/0004-ffmpeg-Add-MPEG-2-video-decoder.patch: Removed.
+ * buildstream/patches/fdo/0005-ffmpeg-Add-msmpeg4v3-support.patch: Removed.
+ * buildstream/project.conf:
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak._get_packages):
+
+2020-06-15 Philippe Normand <pnorm...@igalia.com>
+
[Flatpak SDK] Remove webkit-build-directory dependency from flatpakutils
https://bugs.webkit.org/show_bug.cgi?id=213179
Modified: trunk/Tools/buildstream/elements/flatpak/platform.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/flatpak/platform.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/flatpak/platform.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -82,9 +82,3 @@
add-ld-path: extra
autodelete: 'false'
version: '%{freedesktop-sdk-flatpak-branch}'
-
- Extension org.freedesktop.Platform.ffmpeg-full:
- directory: '%{lib}/ffmpeg'
- add-ld-path: '.'
- autodelete: 'false'
- version: '%{freedesktop-sdk-flatpak-branch}'
Modified: trunk/Tools/buildstream/elements/flatpak/sdk.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/flatpak/sdk.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/flatpak/sdk.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -97,12 +97,6 @@
download-if: have-intel-gpu
version: '%{freedesktop-sdk-flatpak-branch}'
- Extension org.freedesktop.Platform.ffmpeg-full:
- directory: '%{lib}/ffmpeg'
- add-ld-path: '.'
- autodelete: 'false'
- version: '%{freedesktop-sdk-flatpak-branch}'
-
(?):
- arch in ["x86_64", "aarch64"]:
Extension org.webkit.Sdk.Compat.arm:
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -12,17 +12,9 @@
- kind: patch
path: patches/fdo-0001-Update-gcc-to-9.3.0.patch
- kind: patch
- path: patches/fdo/0001-ffmpeg-Add-MS-MPEG-DivX-variants.patch
+ path: patches/fdo/0001-Pango-Bump-to-1.45-master.patch
- kind: patch
- path: patches/fdo/0002-ffmpeg-Add-VP6-and-Sorenson-Spark-video-codecs.patch
-- kind: patch
- path: patches/fdo/0003-ffmpeg-Add-Intel-Indeo-and-Cinepak-video-support.patch
-- kind: patch
- path: patches/fdo/0004-ffmpeg-Add-MPEG-2-video-decoder.patch
-- kind: patch
- path: patches/fdo/0005-ffmpeg-Add-msmpeg4v3-support.patch
-- kind: patch
- path: patches/fdo/0001-Pango-Bump-to-1.45-master.patch
+ path: patches/fdo/0001-dav1d-Bump-to-0.7.0.patch
config:
options:
target_arch: '%{arch}'
Added: trunk/Tools/buildstream/elements/sdk/ffmpeg.bst (0 => 263027)
--- trunk/Tools/buildstream/elements/sdk/ffmpeg.bst (rev 0)
+++ trunk/Tools/buildstream/elements/sdk/ffmpeg.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -0,0 +1,155 @@
+kind: manual
+
+depends:
+- filename: freedesktop-sdk.bst:bootstrap-import.bst
+- filename: freedesktop-sdk.bst:components/dav1d.bst
+- filename: freedesktop-sdk.bst:components/fontconfig.bst
+- filename: freedesktop-sdk.bst:components/freetype.bst
+- filename: freedesktop-sdk.bst:components/libfdk-aac.bst
+- filename: freedesktop-sdk.bst:components/lame.bst
+- filename: freedesktop-sdk.bst:components/libva.bst
+- filename: freedesktop-sdk.bst:components/libvdpau.bst
+- filename: freedesktop-sdk.bst:components/mpg123.bst
+- filename: freedesktop-sdk.bst:components/openal.bst
+- filename: freedesktop-sdk.bst:components/libpulse.bst
+- filename: freedesktop-sdk.bst:components/sdl2.bst
+- filename: freedesktop-sdk.bst:components/aom.bst
+- filename: freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+ type: build
+- filename: freedesktop-sdk.bst:components/gnutls.bst
+- filename: freedesktop-sdk.bst:components/speex.bst
+- filename: freedesktop-sdk.bst:components/libtheora.bst
+- filename: freedesktop-sdk.bst:components/libvorbis.bst
+- filename: freedesktop-sdk.bst:components/libvpx.bst
+- filename: freedesktop-sdk.bst:components/opus.bst
+- filename: freedesktop-sdk.bst:components/nasm.bst
+ type: build
+- filename: freedesktop-sdk.bst:components/noopenh264.bst
+
+variables:
+ ffmpeg-prefix: '%{prefix}'
+ ffmpeg-libdir: '%{libdir}'
+ ffmpeg-arch: '%{arch}'
+
+ audio-encoders: |
+ ac3,alac,flac,libfdk_aac,g723_1,mp2,libmp3lame,libopus,pcm_alaw,pcm_mulaw,\
+ pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
+ pcm_u8,tta,libvorbis,wavpack,%{extra-aud-enc}
+
+ audio-decoders: |
+ ac3,alac,flac,g723_1,g729,libfdk_aac,libopus,mp2,mp3,m4a,pcm_alaw,pcm_mulaw,\
+ pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
+ pcm_u8,tta,vorbis,wavpack,%{extra-aud-dec}
+
+ video-encoders: |
+ ass,ffv1,libaom_av1,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,%{extra-vid-enc}
+
+ video-decoders: |
+ ass,ffv1,libaom_av1,libdav1d,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,vp8,vp9,%{extra-vid-dec}
+
+ image-formats: |
+ gif,png,tiff,webp,%{extra-image-formats}
+
+ hwaccels: '%{extra-hwaccels}'
+
+ muxers: |
+ ac3,ass,flac,gif,matroska,mp3,mpegvideo,ogg,opus,wav,%{extra-muxers}
+
+ demuxers: |
+ aac,ac3,ass,flac,gif,matroska,mov,mp3,mpegvideo,ogg,wav,%{extra-demuxers}
+
+ parsers: |
+ aac,ac3,flac,mpegaudio,mpeg4video,opus,vp3,vp8,vorbis,%{extra-parsers}
+
+ filters: |
+ crop,scale,%{extra-filters}
+
+ conf-local: |
+ --prefix="%{ffmpeg-prefix}" \
+ --libdir="%{ffmpeg-libdir}" \
+ --disable-doc \
+ --disable-static \
+ --enable-optimizations \
+ --enable-shared \
+ --disable-everything \
+ --enable-ffplay \
+ --enable-ffprobe \
+ --enable-gnutls \
+ --enable-libaom \
+ --enable-libdav1d \
+ --enable-libfdk-aac \
+ --enable-libmp3lame \
+ --enable-libfontconfig \
+ --enable-libfreetype \
+ --enable-libopenh264 \
+ --enable-libopus \
+ --enable-libpulse \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libwebp \
+ --enable-openal \
+ --enable-opengl \
+ --enable-sdl2 \
+ --enable-encoder=%{audio-encoders} \
+ --enable-encoder=%{video-encoders} \
+ --enable-decoder=%{audio-decoders} \
+ --enable-decoder=%{video-decoders} \
+ --enable-encoder=%{image-formats} \
+ --enable-decoder=%{image-formats} \
+ --enable-hwaccel=%{hwaccels} \
+ --enable-parser=%{parsers} \
+ --enable-muxer=%{muxers} \
+ --enable-demuxer=%{demuxers} \
+ --enable-filter=%{filters} \
+ --enable-protocol=file \
+ --arch="%{ffmpeg-arch}"
+
+ conf-extra: ''
+
+ extra-aud-enc: ''
+ extra-aud-dec: ''
+ extra-vid-enc: 'h263,h264'
+ extra-vid-dec: 'flv,hevc,h263,h264,mpeg2video,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,msmpeg4v3,vp6,vp6a,vp6f'
+ extra-image-formats: ''
+ extra-hwaccels: ''
+ extra-muxers: ''
+ extra-demuxers: 'avi,h264,m4v'
+ extra-parsers: 'hevc,h264'
+ extra-filters: ''
+
+public:
+ bst:
+ overlap-whitelist:
+ - '**'
+ split-rules:
+ devel:
+ (>):
+ - '%{libdir}/libavdevice.so'
+ - '%{libdir}/libavcodec.so'
+ - '%{libdir}/libswscale.so'
+ - '%{libdir}/libpostproc.so'
+ - '%{libdir}/libavutil.so'
+ - '%{libdir}/libavfilter.so'
+ - '%{libdir}/libavformat.so'
+ - '%{libdir}/libswresample.so'
+ - '%{datadir}/ffmpeg/examples'
+ - '%{datadir}/ffmpeg/examples/**'
+
+# ffmpeg is not using autotools, but a configure and Makefile files
+config:
+ configure-commands:
+ - ./configure %{conf-local} %{conf-extra}
+
+ build-commands:
+ - make
+
+ install-commands:
+ - make -j1 DESTDIR="%{install-root}" install
+
+sources:
+- kind: git_tag
+ url: ffmpeg:ffmpeg.git
+ track: release/4.2
+ ref: n4.2.3-5-g221e490d42bc1c20c61aee385d5bfe003a1a8c87
Modified: trunk/Tools/buildstream/elements/sdk/gst-libav.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/sdk/gst-libav.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/sdk/gst-libav.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -11,15 +11,12 @@
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
- freedesktop-sdk.bst:components/nasm.bst
-- freedesktop-sdk.bst:extensions/ffmpeg-full/ffmpeg.bst
depends:
+- sdk/ffmpeg.bst
- sdk/gst-plugins-base.bst
- freedesktop-sdk.bst:components/orc.bst
- freedesktop-sdk.bst:bootstrap-import.bst
-environment:
- PKG_CONFIG_PATH: /usr/lib/%{gcc_triplet}/ffmpeg/lib/pkgconfig/:/usr/lib/%{gcc_triplet}/pkgconfig
-
variables:
meson-local: |
'-Dc_args=-DTRIPLET=\"%{gcc_triplet}\"'
@@ -28,3 +25,7 @@
bst:
overlap-whitelist:
- '**'
+
+ integration-commands:
+ - |
+ gst-inspect-1.0 libav
Added: trunk/Tools/buildstream/elements/sdk/libavif.bst (0 => 263027)
--- trunk/Tools/buildstream/elements/sdk/libavif.bst (rev 0)
+++ trunk/Tools/buildstream/elements/sdk/libavif.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -0,0 +1,17 @@
+kind: cmake
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
+
+depends:
+- freedesktop-sdk.bst:bootstrap-import.bst
+- freedesktop-sdk.bst:components/dav1d.bst
+
+sources:
+- kind: git_tag
+ url: github_com:AOMediaCodec/libavif
+ track: v0.7.3
+ ref: v0.7.3-0-g70f4122a7e26411e9527574a0dae75c4bac68e89
+variables:
+ cmake-local: >-
+ -DAVIF_CODEC_DAV1D=ON
Modified: trunk/Tools/buildstream/elements/sdk/ruby-highline.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/sdk/ruby-highline.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/sdk/ruby-highline.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -3,9 +3,6 @@
- kind: remote
url: ruby_gems:highline-2.0.3.gem
ref: 2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479
-- kind: remote
- url: https://rubygems.org/specs.4.8.gz
- ref: deb2c5221061354fe8c2de0bf51c7af4bf68ba92f6dbb2606c4d64b9cce5a22b
build-depends:
- freedesktop-sdk.bst:components/ruby.bst
depends:
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (263026 => 263027)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2020-06-15 09:20:01 UTC (rev 263027)
@@ -16,6 +16,7 @@
- sdk/capnp.bst
- sdk/ccls.bst
- sdk/enchant-2.bst
+- sdk/ffmpeg.bst
- sdk/glib-networking.bst
- sdk/glib.bst
- sdk/graphviz.bst
@@ -30,6 +31,7 @@
- sdk/icecc.bst
- sdk/intltool.bst
- sdk/krb5.bst
+- sdk/libavif.bst
- sdk/libcap-ng.bst
- sdk/libevent.bst
- sdk/libgcrypt.bst
@@ -76,6 +78,7 @@
- freedesktop-sdk.bst:components/cups.bst
- freedesktop-sdk.bst:components/curl.bst
- freedesktop-sdk.bst:components/cyrus-sasl.bst
+- freedesktop-sdk.bst:components/dav1d.bst
- freedesktop-sdk.bst:components/dbus.bst
- freedesktop-sdk.bst:components/dejavu-fonts.bst
- freedesktop-sdk.bst:components/dictionaries.bst
@@ -83,7 +86,6 @@
- freedesktop-sdk.bst:components/e2fsprogs.bst
- freedesktop-sdk.bst:components/emoji-one-font.bst
- freedesktop-sdk.bst:components/expat.bst
-- freedesktop-sdk.bst:components/ffmpeg.bst
- freedesktop-sdk.bst:components/fftw.bst
- freedesktop-sdk.bst:components/flatpak-xdg-utils.bst
- freedesktop-sdk.bst:components/flex.bst
Added: trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch (0 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -0,0 +1,22 @@
+From a4dc4cae545532cfbd98724573488036a0842324 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <ph...@igalia.com>
+Date: Sat, 6 Jun 2020 13:00:47 +0100
+Subject: [PATCH] dav1d: Bump to 0.7.0
+
+---
+ elements/components/dav1d.bst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elements/components/dav1d.bst b/elements/components/dav1d.bst
+index e1ea10fdd..d0150deec 100644
+--- a/elements/components/dav1d.bst
++++ b/elements/components/dav1d.bst
+@@ -22,4 +22,4 @@ sources:
+ - kind: git_tag
+ url: videolan:dav1d.git
+ track: master
+- ref: 0.4.0-0-g5f63e531b9d10a09afe0a6b4875ca4852a7e58c1
++ ref: 0.7.0-0-gdf40d36d84fbdd3aae827b36d1a15739efb9225b
+--
+2.26.2
+
Deleted: trunk/Tools/buildstream/patches/fdo/0001-ffmpeg-Add-MS-MPEG-DivX-variants.patch (263026 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0001-ffmpeg-Add-MS-MPEG-DivX-variants.patch 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/patches/fdo/0001-ffmpeg-Add-MS-MPEG-DivX-variants.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,26 +0,0 @@
-From 6b2584311361e3ffdf3f9fd5753e3aa81dee77e2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <had...@hadess.net>
-Date: Fri, 20 Dec 2019 10:27:00 +0100
-Subject: [PATCH 1/5] ffmpeg: Add MS-MPEG DivX;) variants
-
-Add support for early 2000s' MS-MPEG4 DivX;) variant.
----
- elements/extensions/ffmpeg-full/ffmpeg.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/extensions/ffmpeg-full/ffmpeg.bst b/elements/extensions/ffmpeg-full/ffmpeg.bst
-index 3f6aafba..85788ed2 100644
---- a/elements/extensions/ffmpeg-full/ffmpeg.bst
-+++ b/elements/extensions/ffmpeg-full/ffmpeg.bst
-@@ -8,7 +8,7 @@ variables:
- extra-aud-enc: wmav1,wmav2
- extra-aud-dec: ape,dca,eac3,mlp,tak,truehd,wmav1,wmav2,wmapro
- extra-vid-enc: h263,h264,wmv1,wmv2
-- extra-vid-dec: hevc,h263,h264,mpeg4,wmv1,wmv2,wmv3,wmv3image
-+ extra-vid-dec: hevc,h263,h264,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,wmv1,wmv2,wmv3,wmv3image
- extra-hwaccels: h264_vaapi,h264_vdpau,hevc_vaapi,hevc_vdpau
- extra-parsers: hevc,h264,dca
- extra-demuxers: avi,h264,m4v
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo/0002-ffmpeg-Add-VP6-and-Sorenson-Spark-video-codecs.patch (263026 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0002-ffmpeg-Add-VP6-and-Sorenson-Spark-video-codecs.patch 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/patches/fdo/0002-ffmpeg-Add-VP6-and-Sorenson-Spark-video-codecs.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,26 +0,0 @@
-From a54e8f158f74894f4ec7dd6935a08d72b73935fb Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <had...@hadess.net>
-Date: Fri, 20 Dec 2019 10:39:26 +0100
-Subject: [PATCH 2/5] ffmpeg: Add VP6 and Sorenson Spark video codecs
-
-As used in FLV Flash videos.
----
- elements/extensions/ffmpeg-full/ffmpeg.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/extensions/ffmpeg-full/ffmpeg.bst b/elements/extensions/ffmpeg-full/ffmpeg.bst
-index 85788ed2..30016a9e 100644
---- a/elements/extensions/ffmpeg-full/ffmpeg.bst
-+++ b/elements/extensions/ffmpeg-full/ffmpeg.bst
-@@ -8,7 +8,7 @@ variables:
- extra-aud-enc: wmav1,wmav2
- extra-aud-dec: ape,dca,eac3,mlp,tak,truehd,wmav1,wmav2,wmapro
- extra-vid-enc: h263,h264,wmv1,wmv2
-- extra-vid-dec: hevc,h263,h264,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,wmv1,wmv2,wmv3,wmv3image
-+ extra-vid-dec: flv,hevc,h263,h264,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
- extra-hwaccels: h264_vaapi,h264_vdpau,hevc_vaapi,hevc_vdpau
- extra-parsers: hevc,h264,dca
- extra-demuxers: avi,h264,m4v
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo/0003-ffmpeg-Add-Intel-Indeo-and-Cinepak-video-support.patch (263026 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0003-ffmpeg-Add-Intel-Indeo-and-Cinepak-video-support.patch 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/patches/fdo/0003-ffmpeg-Add-Intel-Indeo-and-Cinepak-video-support.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,26 +0,0 @@
-From f784ef4dc80cc8abfabab9ee5abe8c220c289fd0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <had...@hadess.net>
-Date: Fri, 20 Dec 2019 10:40:27 +0100
-Subject: [PATCH 3/5] ffmpeg: Add Intel Indeo and Cinepak video support
-
-As used in older commercial videos.
----
- elements/extensions/ffmpeg-full/ffmpeg.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/extensions/ffmpeg-full/ffmpeg.bst b/elements/extensions/ffmpeg-full/ffmpeg.bst
-index 30016a9e..61c8cacb 100644
---- a/elements/extensions/ffmpeg-full/ffmpeg.bst
-+++ b/elements/extensions/ffmpeg-full/ffmpeg.bst
-@@ -8,7 +8,7 @@ variables:
- extra-aud-enc: wmav1,wmav2
- extra-aud-dec: ape,dca,eac3,mlp,tak,truehd,wmav1,wmav2,wmapro
- extra-vid-enc: h263,h264,wmv1,wmv2
-- extra-vid-dec: flv,hevc,h263,h264,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
-+ extra-vid-dec: cinepak,flv,hevc,h263,h264,indeo2,indeo3,indeo4,indeo5,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
- extra-hwaccels: h264_vaapi,h264_vdpau,hevc_vaapi,hevc_vdpau
- extra-parsers: hevc,h264,dca
- extra-demuxers: avi,h264,m4v
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo/0004-ffmpeg-Add-MPEG-2-video-decoder.patch (263026 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0004-ffmpeg-Add-MPEG-2-video-decoder.patch 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/patches/fdo/0004-ffmpeg-Add-MPEG-2-video-decoder.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,29 +0,0 @@
-From 329c2f6b2075713fe7dd2c626175745b9209ad0b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <had...@hadess.net>
-Date: Fri, 20 Dec 2019 10:54:42 +0100
-Subject: [PATCH 4/5] ffmpeg: Add MPEG-2 video decoder
-
-As should be used for DVD playback, rather than the older libmpeg2-based
-one fro gst-plugins-ugly.
-
-This video decoder also supports MPEG-1 video playback.
----
- elements/extensions/ffmpeg-full/ffmpeg.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/extensions/ffmpeg-full/ffmpeg.bst b/elements/extensions/ffmpeg-full/ffmpeg.bst
-index 61c8cacb..bd1275f0 100644
---- a/elements/extensions/ffmpeg-full/ffmpeg.bst
-+++ b/elements/extensions/ffmpeg-full/ffmpeg.bst
-@@ -8,7 +8,7 @@ variables:
- extra-aud-enc: wmav1,wmav2
- extra-aud-dec: ape,dca,eac3,mlp,tak,truehd,wmav1,wmav2,wmapro
- extra-vid-enc: h263,h264,wmv1,wmv2
-- extra-vid-dec: cinepak,flv,hevc,h263,h264,indeo2,indeo3,indeo4,indeo5,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
-+ extra-vid-dec: cinepak,flv,hevc,h263,h264,indeo2,indeo3,indeo4,indeo5,mpeg2video,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
- extra-hwaccels: h264_vaapi,h264_vdpau,hevc_vaapi,hevc_vdpau
- extra-parsers: hevc,h264,dca
- extra-demuxers: avi,h264,m4v
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo/0005-ffmpeg-Add-msmpeg4v3-support.patch (263026 => 263027)
--- trunk/Tools/buildstream/patches/fdo/0005-ffmpeg-Add-msmpeg4v3-support.patch 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/patches/fdo/0005-ffmpeg-Add-msmpeg4v3-support.patch 2020-06-15 09:20:01 UTC (rev 263027)
@@ -1,25 +0,0 @@
-From 438145071e4370cc4a767ff37b28c82613c2f6cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjar...@gnome.org>
-Date: Sun, 5 Apr 2020 15:05:58 +0100
-Subject: [PATCH 5/5] ffmpeg: Add msmpeg4v3 support
-
----
- elements/extensions/ffmpeg-full/ffmpeg.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/extensions/ffmpeg-full/ffmpeg.bst b/elements/extensions/ffmpeg-full/ffmpeg.bst
-index bd1275f0..0d61311e 100644
---- a/elements/extensions/ffmpeg-full/ffmpeg.bst
-+++ b/elements/extensions/ffmpeg-full/ffmpeg.bst
-@@ -8,7 +8,7 @@ variables:
- extra-aud-enc: wmav1,wmav2
- extra-aud-dec: ape,dca,eac3,mlp,tak,truehd,wmav1,wmav2,wmapro
- extra-vid-enc: h263,h264,wmv1,wmv2
-- extra-vid-dec: cinepak,flv,hevc,h263,h264,indeo2,indeo3,indeo4,indeo5,mpeg2video,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
-+ extra-vid-dec: cinepak,flv,hevc,h263,h264,indeo2,indeo3,indeo4,indeo5,mpeg2video,mpeg4,msmpeg4,msmpeg4v1,msmpeg4v2,msmpeg4v3,vp6,vp6a,vp6f,wmv1,wmv2,wmv3,wmv3image
- extra-hwaccels: h264_vaapi,h264_vdpau,hevc_vaapi,hevc_vdpau
- extra-parsers: hevc,h264,dca
- extra-demuxers: avi,h264,m4v
---
-2.26.2
-
Modified: trunk/Tools/buildstream/project.conf (263026 => 263027)
--- trunk/Tools/buildstream/project.conf 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/buildstream/project.conf 2020-06-15 09:20:01 UTC (rev 263027)
@@ -40,6 +40,7 @@
# be changed without triggering a rebuild.
#
aliases:
+ ffmpeg: https://git.ffmpeg.org/
gitlab_freedesktop_org: https://gitlab.freedesktop.org/
github_com: https://github.com/
gitlab_com: https://gitlab.com/
Modified: trunk/Tools/flatpak/flatpakutils.py (263026 => 263027)
--- trunk/Tools/flatpak/flatpakutils.py 2020-06-15 09:19:31 UTC (rev 263026)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-06-15 09:20:01 UTC (rev 263027)
@@ -936,8 +936,6 @@
packages.append(FlatpakPackage("org.freedesktop.Platform.GL.default", "19.08",
self.flathub_repo, arch))
- packages.append(FlatpakPackage("org.freedesktop.Platform.ffmpeg-full", "19.08",
- self.flathub_repo, arch))
return packages
def install_all(self):
