Changeset 292688 in webkit


Ignore:
Timestamp:
Apr 10, 2022 9:50:36 AM (2 years ago)
Author:
commit-queue@webkit.org
Message:

[Flatpak SDK] Pre-easter eggs update
​https://bugs.webkit.org/show_bug.cgi?id=239007

Patch by Philippe Normand <​pnormand@igalia.com> on 2022-04-10
Reviewed by Adrian Perez de Castro.

  • elements/freedesktop-sdk.bst: Bump junction.
  • elements/qt5/qtbase.bst: Remove reference to removed gtk3 recipe.
  • elements/sdk-platform.bst: Replace duplicate recipes with their upstream version.
  • elements/sdk/adwaita-icon-theme.bst: Remove reference to removed gtk3 recipe.
  • elements/sdk/bubblewrap.bst: Removed.
  • elements/sdk/ffmpeg.bst: Bump to version 5, inspired from upstream version of the recipe.
  • elements/sdk/gst-plugins-base.bst: Remove reference to removed gtk3 recipe.
  • elements/sdk/gst-plugins-good.bst: Remove reference to removed gtk3 recipe.
  • elements/sdk/gtk+-3.bst: Removed.
  • patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch: Removed.
  • patches/gtk-gcc11-build-fix.patch: Removed.
Location:
trunk/Tools/buildstream
Files:
4 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/buildstream/ChangeLog

    r292601 r292688  
     12022-04-10  Philippe Normand  <pnormand@igalia.com>
     2
     3        [Flatpak SDK] Pre-easter eggs update
     4        https://bugs.webkit.org/show_bug.cgi?id=239007
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * elements/freedesktop-sdk.bst: Bump junction.
     9        * elements/qt5/qtbase.bst: Remove reference to removed gtk3 recipe.
     10        * elements/sdk-platform.bst: Replace duplicate recipes with their upstream version.
     11        * elements/sdk/adwaita-icon-theme.bst: Remove reference to removed gtk3 recipe.
     12        * elements/sdk/bubblewrap.bst: Removed.
     13        * elements/sdk/ffmpeg.bst: Bump to version 5, inspired from upstream version of the recipe.
     14        * elements/sdk/gst-plugins-base.bst: Remove reference to removed gtk3 recipe.
     15        * elements/sdk/gst-plugins-good.bst: Remove reference to removed gtk3 recipe.
     16        * elements/sdk/gtk+-3.bst: Removed.
     17        * patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch: Removed.
     18        * patches/gtk-gcc11-build-fix.patch: Removed.
     19
    1202022-04-08  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    221

  • trunk/Tools/buildstream/elements/freedesktop-sdk.bst

    r292103 r292688  
    44  url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
    55  track: 'release/21.08'
    6   ref: freedesktop-sdk-21.08.11-68-gc5c9e4d4b64f099843657fabbab295b3b77403c6
     6  ref: freedesktop-sdk-21.08.12-73-g6f02787ff2f4506731cf6aac153728e3251bdda1
    77- kind: patch
    88  path: patches/fdo-0001-Bump-libnice-to-current-git-master-HEAD.patch
    99- kind: patch
    1010  path: patches/fdo-0001-pango-Bump-to-1.50.4.patch
    11 - kind: patch
    12   path: patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch
    1311- kind: patch
    1412  path: patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch

  • trunk/Tools/buildstream/elements/qt5/qtbase.bst

    r282308 r292688  
    22
    33depends:
    4 - sdk/gtk+-3.bst
     4- freedesktop-sdk.bst:components/gtk3.bst
    55- freedesktop-sdk.bst:components/perl.bst
    66      # gtk3 seems to have all the so files that qtbase needs access to

  • trunk/Tools/buildstream/elements/sdk-platform.bst

    r291547 r292688  
    1111- sdk/adwaita-icon-theme.bst
    1212- sdk/apitrace.bst
    13 - sdk/bubblewrap.bst
    1413- sdk/capnp.bst
    1514- sdk/cargo-c.bst
    … …  
    3231- sdk/gst-plugins-ugly.bst
    3332- sdk/gstreamer.bst
    34 - sdk/gtk+-3.bst
    3533- sdk/gtk.bst
    3634- sdk/icecc.bst
    … …  
    7674- freedesktop-sdk.bst:components/atk.bst
    7775- freedesktop-sdk.bst:components/brotli.bst
     76- freedesktop-sdk.bst:components/bubblewrap.bst
    7877- freedesktop-sdk.bst:components/ca-certificates.bst
    7978- freedesktop-sdk.bst:components/cairo.bst
    … …  
    109108- freedesktop-sdk.bst:components/gpgme.bst
    110109- freedesktop-sdk.bst:components/graphite2.bst
     110- freedesktop-sdk.bst:components/gtk3.bst
    111111- freedesktop-sdk.bst:components/gtk-doc.bst
    112112- freedesktop-sdk.bst:components/gzip.bst

  • trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst

    r280380 r292688  
    77- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
    88depends:
    9 - sdk/gtk+-3.bst
     9- freedesktop-sdk.bst:components/gtk3.bst
    1010- freedesktop-sdk.bst:components/librsvg.bst
    1111- freedesktop-sdk.bst:bootstrap-import.bst

  • trunk/Tools/buildstream/elements/sdk/ffmpeg.bst

    r280380 r292688  
    2323- filename: freedesktop-sdk.bst:components/libvpx.bst
    2424- filename: freedesktop-sdk.bst:components/opus.bst
     25- filename: freedesktop-sdk.bst:components/vulkan-icd-loader.bst
     26- filename: freedesktop-sdk.bst:components/v4l-utils.bst
     27- filename: freedesktop-sdk.bst:components/xorg-lib-xcb.bst
    2528- filename: freedesktop-sdk.bst:components/nasm.bst
     29  type: build
     30- filename: freedesktop-sdk.bst:components/vulkan-headers.bst
    2631  type: build
    2732- filename: freedesktop-sdk.bst:components/noopenh264.bst
    … …  
    3338
    3439  audio-encoders: |
    35     ac3,alac,flac,libfdk_aac,g723_1,mp2,libmp3lame,libopus,pcm_alaw,pcm_mulaw,\
     40    ac3,alac,flac,libfdk_aac,g723_1,mp2,libmp3lame,libopus,libspeex,pcm_alaw,pcm_mulaw,\
    3641    pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
    3742    pcm_u8,tta,libvorbis,wavpack,%{extra-aud-enc}
    3843
    3944  audio-decoders: |
    40     ac3,alac,flac,g723_1,g729,libfdk_aac,libopus,mp2,mp3,m4a,pcm_alaw,pcm_mulaw,\
    41     pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
    42     pcm_u8,tta,vorbis,wavpack,%{extra-aud-dec}
     45    ac3,adpcm_g722,alac,flac,g723_1,g729,libfdk_aac,libopus,libspeex,\
     46    mp2,mp3,m4a,pcm_alaw,pcm_mulaw,pcm_f16le,pcm_f24le,pcm_f32be,\
     47    pcm_f32le,pcm_f64be,pcm_f64le,pcm_s16be,pcm_s16be_planar,pcm_s24be,\
     48    pcm_s16le,pcm_s16le_planar,pcm_s24le,pcm_s24le_planar,pcm_s32le,\
     49    pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_s8,pcm_s8_planar,\
     50    pcm_u8,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,tta,vorbis,wavpack,%{extra-aud-dec}
    4351
    4452  video-encoders: |
    45     ass,ffv1,libaom_av1,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,%{extra-vid-enc}
     53    ass,ffv1,libaom_av1,libopenh264,libvpx_vp8,libvpx_vp9,mjpeg_vaapi,rawvideo,\
     54    theora,vp8_vaapi,%{extra-vid-enc}
    4655
    4756  video-decoders: |
    48     ass,ffv1,libaom_av1,libdav1d,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,vp8,vp9,%{extra-vid-dec}
     57    ass,ffv1,libaom_av1,libdav1d,libopenh264,libvpx_vp8,libvpx_vp9,\
     58    rawvideo,theora,vp8,vp9,%{extra-vid-dec}
    4959
    5060  image-formats: |
    51     gif,png,tiff,webp,%{extra-image-formats}
     61    bmp,gif,jpegls,tiff,webp,%{extra-image-formats}
    5262
    53   hwaccels: '%{extra-hwaccels}'
     63  hwaccels: |
     64    vp8_vaapi,mjpeg_vaapi,%{extra-hwaccels}
    5465
    5566  muxers: |
    56     ac3,ass,flac,gif,matroska,mp3,mpegvideo,ogg,opus,wav,%{extra-muxers}
     67    ac3,ass,flac,g722,gif,matroska,mp3,mpegvideo,rtp,ogg,opus,\
     68    pcm_s16be,pcm_s16le,wav,webm,%{extra-muxers}
    5769
    5870  demuxers: |
    59     aac,ac3,ass,flac,gif,matroska,mov,mp3,mpegvideo,ogg,wav,%{extra-demuxers}
     71    aac,ac3,ass,flac,g722,gif,image_jpeg_pipe,image_png_pipe,\
     72    image_webp_pipe,matroska,mjpeg,mov,mp3,mpegvideo,ogg,pcm_mulaw,\
     73    pcm_alaw,pcm_s16be,pcm_s16le,rtp,wav,%{extra-demuxers}
    6074
    6175  parsers: |
    62     aac,ac3,flac,mpegaudio,mpeg4video,opus,vp3,vp8,vorbis,%{extra-parsers}
     76    aac,ac3,flac,mjpeg,mpegaudio,mpeg4video,opus,vp3,vp8,vp9,vorbis,%{extra-parsers}
    6377
    6478  filters: |
    65     crop,scale,%{extra-filters}
     79    crop,scale,overlay,amix,amerge,aresample,format,aformat,fps,transpose,pad,%{extra-filters}
    6680
    67   conf-local: |
    68     --prefix="%{ffmpeg-prefix}" \
    69     --libdir="%{ffmpeg-libdir}" \
    70     --disable-doc \
    71     --disable-static \
    72     --enable-optimizations \
    73     --enable-shared \
    74     --disable-everything \
    75     --enable-ffplay \
    76     --enable-ffprobe \
    77     --enable-gnutls \
    78     --enable-libaom \
    79     --enable-libdav1d \
    80     --enable-libfdk-aac \
    81     --enable-libmp3lame \
    82     --enable-libfontconfig \
    83     --enable-libfreetype \
    84     --enable-libopenh264 \
    85     --enable-libopus \
    86     --enable-libpulse \
    87     --enable-libspeex \
    88     --enable-libtheora \
    89     --enable-libvorbis \
    90     --enable-libvpx \
    91     --enable-libwebp \
    92     --enable-openal \
    93     --enable-opengl \
    94     --enable-sdl2 \
    95     --enable-encoder=%{audio-encoders} \
    96     --enable-encoder=%{video-encoders} \
    97     --enable-decoder=%{audio-decoders} \
    98     --enable-decoder=%{video-decoders} \
    99     --enable-encoder=%{image-formats} \
    100     --enable-decoder=%{image-formats} \
    101     --enable-hwaccel=%{hwaccels} \
    102     --enable-parser=%{parsers} \
    103     --enable-muxer=%{muxers} \
    104     --enable-demuxer=%{demuxers} \
    105     --enable-filter=%{filters} \
    106     --enable-protocol=file \
     81  protocols: |
     82    crypto,file,pipe,rtp,srtp,rtsp,tcp,udp,unix,%{extra-protocols}
     83
     84  conf-local: >-
     85    --prefix="%{ffmpeg-prefix}"
     86    --libdir="%{ffmpeg-libdir}"
     87    --disable-debug
     88    --disable-doc
     89    --disable-static
     90    --enable-optimizations
     91    --enable-shared
     92    --disable-everything
     93    --enable-ffplay
     94    --enable-ffprobe
     95    --enable-gnutls
     96    --enable-libaom
     97    --enable-libdav1d
     98    --enable-libfdk-aac
     99    --enable-libmp3lame
     100    --enable-libfontconfig
     101    --enable-libfreetype
     102    --enable-libopus
     103    --enable-libpulse
     104    --enable-libspeex
     105    --enable-libtheora
     106    --enable-libvorbis
     107    --enable-libvpx
     108    --enable-libwebp
     109    --enable-openal
     110    --enable-opengl
     111    --enable-sdl2
     112    --enable-vulkan
     113    --enable-zlib
     114    --enable-libv4l2
     115    --enable-libxcb
     116    --enable-vdpau
     117    --enable-vaapi
     118    --enable-encoder=%{audio-encoders}
     119    --enable-encoder=%{video-encoders}
     120    --enable-decoder=%{audio-decoders}
     121    --enable-decoder=%{video-decoders}
     122    --enable-encoder=%{image-formats}
     123    --enable-decoder=%{image-formats}
     124    --enable-hwaccel=%{hwaccels}
     125    --enable-parser=%{parsers}
     126    --enable-muxer=%{muxers}
     127    --enable-demuxer=%{demuxers}
     128    --enable-filter=%{filters}
     129    --enable-protocol=%{protocols}
    107130    --arch="%{ffmpeg-arch}"
    108131
    … …  
    119142  extra-parsers: 'hevc,h264'
    120143  extra-filters: ''
     144  extra-protocols: ''
    121145
    122146public:
    … …  
    152176- kind: git_tag
    153177  url: ffmpeg:ffmpeg.git
    154   track: release/4.4
    155   ref: n4.4-79-gde1132a89113b131831d8edde75214372c983f32
     178  track: release/5.0
     179  ref: n5.0-0-g390d6853d0ef408007feb39c0040682c81c02751

  • trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst

    r291547 r292688  
    1010- sdk/gstreamer.bst
    1111- sdk/graphene.bst
    12 - sdk/gtk+-3.bst
     12- freedesktop-sdk.bst:components/gtk3.bst
    1313- freedesktop-sdk.bst:components/pango.bst
    1414- freedesktop-sdk.bst:components/libdrm.bst

  • trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst

    r291345 r292688  
    1010- sdk/gstreamer.bst
    1111- sdk/gst-plugins-base.bst
    12 - sdk/gtk+-3.bst
     12- freedesktop-sdk.bst:components/gtk3.bst
    1313- freedesktop-sdk.bst:components/libsoup.bst
    1414- freedesktop-sdk.bst:components/v4l-utils.bst
Note: See TracChangeset for help on using the changeset viewer.