Changeset 9f4becea for multimedia

Timestamp:

06/05/2024 11:15:02 AM (6 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

gimp3, trunk

Children:

097fa014

Parents:

4f1c8743 (diff), 185abbc (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' of git.linuxfromscratch.org:blfs into trunk

Location:

multimedia/libdriv

Files:

• libcddb.xml (modified) (1 diff)
• wireplumber.xml (modified) (1 diff)
• xine-lib.xml (modified) (2 diffs)

multimedia/libdriv/libcddb.xml

@@ -93 +93 @@
     </para>
 
-<screen><userinput>sed -i '/getsockopt/s/&amp;l/(void*)&amp;/' lib/cddb_net.c</userinput></screen>
+<screen><userinput>sed -i 's/size_t l;/socklen_t l;/' lib/cddb_net.c</userinput></screen>
 
     <para>

multimedia/libdriv/wireplumber.xml

@@ -7 +7 @@
   <!ENTITY wireplumber-download-http "https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/&wireplumber-version;/wireplumber-&wireplumber-version;.tar.bz2">
   <!ENTITY wireplumber-download-ftp  " ">
-  <!ENTITY wireplumber-md5sum        "6893d7bd1a3ef28781ed8be23fcd1432">
-  <!ENTITY wireplumber-size          "400 KB">
+  <!ENTITY wireplumber-md5sum        "d85ab206735a4045c7be44f31500c0a2">
+  <!ENTITY wireplumber-size          "404 KB">
   <!ENTITY wireplumber-buildsize     "88 MB (with tests)">
   <!ENTITY wireplumber-time          "0.3 SBU (with tests)">

multimedia/libdriv/xine-lib.xml

@@ -66 +66 @@
         <para>
           Estimated build time: &xine-lib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xine-lib-&xine-lib-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -127 +137 @@
     <title>Installation of Xine Libraries</title>
 
-    <!-- See this thread for more details:
-    https://lists.linuxfromscratch.org/sympa/arc/lfs-dev/2022-07/msg00044.html
-    -->
-
-
     <para>
       First, fix building this package with ffmpeg-7.0 and later:
     </para>
 
-<screen><userinput remap="pre">sed -i '/xine_set_flags/s/XINE_PROTECTED//' include/xine.h </userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../xine-lib-&xine-lib-version;-upstream_fixes-1.patch</userinput></screen>
 
 <!--<note>