[FFmpeg-devel] [PATCH 3.4 1/2] Revert "configure: add LIBDRM to extralibs_avutil"

Giulio Benetti giulio.benetti at micronovasrl.com
Wed Oct 17 15:02:17 EEST 2018


This reverts commit c50dc77ac708e98d02da7c422a6b9cbf9f565aa5.

The offending commit appends -ldrm to "Libs:" instead of "Libs.private:"
in libavutil.pc. This makes no sense, since -ldrm must be listed in
linking libraries list only when static linking.

Signed-off-by: Giulio Benetti <giulio.benetti at micronovasrl.com>
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9fe7760822..7377046d0a 100755
--- a/configure
+++ b/configure
@@ -5919,7 +5919,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
 enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
-enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion && LIBDRM="-ldrm"
+enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
 enabled libfdk_aac        && { use_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
                                { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
                                  warn "using libfdk without pkg-config"; } }
@@ -7096,7 +7096,7 @@ source_path=${source_path}
 LIBPREF=${LIBPREF}
 LIBSUF=${LIBSUF}
 
-extralibs_avutil="$LIBRT $LIBDRM $LIBM"
+extralibs_avutil="$LIBRT $LIBM"
 extralibs_avcodec="$extralibs"
 extralibs_avformat="$extralibs"
 extralibs_avdevice="$extralibs"
-- 
2.17.1



More information about the ffmpeg-devel mailing list