Changeset f080ae0e for multimedia

Timestamp:

05/14/2016 08:19:09 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

1ef4048

Parents:

2e633b6

Message:

Merge to trunk r17352

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17354 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

multimedia/libdriv

Files:

• fdk-aac.xml (modified) (2 diffs)
• xine-lib.xml (modified) (2 diffs)

multimedia/libdriv/fdk-aac.xml

@@ -86 +86 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>CXX='g++ -Wno-narrowing'     \
+./configure --prefix=/usr    \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -103 +105 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>CXX='g++ -Wno-narrowing' ...</command>: GCC 6 does not support
+      integer narrowing. Setting CXX this way allows to suppress the
+      associated error.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

multimedia/libdriv/xine-lib.xml

@@ -128 +128 @@
         -e 's/avcodec_free_frame/av_frame_free/'          \
         -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
-           src/dxr3/ffmpeg_encoder.c
+           src/dxr3/ffmpeg_encoder.c &&
+
+sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
+    -i src/video_dec/image.c &&
 
 ./configure --prefix=/usr          \
@@ -169 +172 @@
 
     <para>
-      <command>sed ...</command>: This command enables the package to be
-      built with <xref linkend="ffmpeg"/>.
+      <command>sed ...</command>: These commands enables the package to be
+      built with <xref linkend="ffmpeg"/> and <xref linkend="imagemagick"/>.
     </para>