Ignore:
Timestamp:
09/24/2021 07:32:33 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
lazarus
Children:
85d9842
Parents:
00cbc797 (diff), 3619a7bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into lazarus

File:
1 edited

Legend:

Unmodified
Added
Removed
  • multimedia/libdriv/gst10-plugins-base.xml

    r00cbc797 rd09f950  
    88           "&gstreamer-dl;/gst-plugins-base/gst-plugins-base-&gst10-plugins-base-version;.tar.xz">
    99  <!ENTITY gst10-plugins-base-download-ftp  " ">
    10   <!ENTITY gst10-plugins-base-md5sum        "523336ed6938b8b1004847cbbd5e31cb">
     10  <!ENTITY gst10-plugins-base-md5sum        "69b23213a6bb79d6d1b8371a9dd3e82e">
    1111  <!ENTITY gst10-plugins-base-size          "3.0 MB">
    12   <!ENTITY gst10-plugins-base-buildsize     "99 MB (with tests)">
    13   <!ENTITY gst10-plugins-base-time          "1.0 SBU (Using parallelism=4; with tests)">
     12  <!ENTITY gst10-plugins-base-buildsize     "100 MB (with tests)">
     13  <!ENTITY gst10-plugins-base-time          "0.9 SBU (Using parallelism=4; with tests)">
    1414]>
    1515
     
    9292      <xref linkend="iso-codes"/>,
    9393      <xref linkend="libgudev"/>,
     94      <xref linkend="libjpeg"/>,
    9495      <xref linkend="libogg"/>,
     96      <xref linkend="libpng"/>,
    9597      <xref linkend="libtheora"/>,
    9698      <xref linkend="libvorbis"/>,
    9799      <xref linkend="mesa"/>,
     100      <xref linkend="pango"/>,
    98101      <xref linkend="wayland-protocols"/>, and
    99102      <xref linkend="xorg7-lib"/>
     
    128131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    129132      href="../../xincludes/gst10-plugins.xml"/>
    130 
    131     <para> <!-- upstream has a different fix for 0.18.5, see
    132       https://www.linuxquestions.org/questions/slackware-14/regression-on-current-with-gst-plugins-base-4175694901/-->
    133       First fix a build failure caused by a change in
    134       <application>meson-0.58.0</application>:
    135     </para>
    136 
    137 <screen><userinput>sed -i 's|implicit_include_directories : false||' gst-libs/gst/gl/meson.build</userinput></screen>
    138133
    139134    <para>
Note: See TracChangeset for help on using the changeset viewer.