[vlc-commits] [Git][videolan/vlc][master] 4 commits: configure/x262: do not confuse LIBS with LDFLAGS

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
57ff8602 by Johannes Kauffmann at 2023-01-27T08:42:05+00:00
configure/x262: do not confuse LIBS with LDFLAGS

${ac_cv_ld_bsymbolic} is a linker flag, and not a library to link, so
that should have been VLC_ADD_LDFLAGS. Similarly, ${X262_LIBS} are
linker flags to link a library, so that should have been VLC_ADD_LIBS.

- - - - -
62cf08b5 by Johannes Kauffmann at 2023-01-27T08:42:05+00:00
configure/x262: move logic to Makefile.am

- - - - -
dc2ae43a by Johannes Kauffmann at 2023-01-27T08:42:05+00:00
configure/x264(10b): move logic to Makefile.am

- - - - -
6d33f4fe by Johannes Kauffmann at 2023-01-27T08:42:05+00:00
configure/swscale: move logic to Makefile.am

- - - - -


3 changed files:

- configure.ac
- modules/codec/Makefile.am
- modules/video_chroma/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -2705,9 +2705,6 @@ then
       VLC_ADD_PLUGIN([swscale])
       VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS])
       VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS])
-      AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [
-        VLC_ADD_LIBS([swscale],[${ac_cv_ld_bsymbolic}])
-      ])
     ],[
       AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
   ])
@@ -2983,10 +2980,7 @@ AC_ARG_ENABLE([x262],
 if test "${enable_x262}" != "no"; then
     PKG_CHECK_MODULES(X262, x262, [
         VLC_ADD_PLUGIN([x262])
-        VLC_ADD_LDFLAGS([x262],[${X262_LIBS}])
-        AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [
-          VLC_ADD_LIBS([x262],[${ac_cv_ld_bsymbolic}])
-        ])
+        VLC_ADD_LIBS([x262],[${X262_LIBS}])
         VLC_ADD_CFLAGS([x262],[${X262_CFLAGS}])
     ], [
        if test "${enable_x262}" = "yes"; then
@@ -3007,11 +3001,6 @@ if test "${enable_x264}" != "no"; then
       PKG_CHECK_MODULES(X264,x264 >= 0.148, [
         VLC_ADD_PLUGIN([x264])
         VLC_ADD_LIBS([x264],[${X264_LIBS}])
-
-        AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [
-          VLC_ADD_LDFLAGS([x264],[${ac_cv_ld_bsymbolic}])
-        ])
-
         VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
       ],[
         if test "${enable_x264}" = "yes"; then
@@ -3029,11 +3018,6 @@ if test "${enable_x26410b}" != "no"; then
       PKG_CHECK_MODULES(X26410b,x264 >= 0.153, [
         VLC_ADD_PLUGIN([x26410b])
         VLC_ADD_LIBS([x26410b],[${X264_LIBS}])
-
-        AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [
-          VLC_ADD_LDFLAGS([x26410b],[${ac_cv_ld_bsymbolic}])
-        ])
-
         VLC_ADD_CFLAGS([x26410b],[${X264_CFLAGS}])
       ],[
         if test "${enable_x26410b}" = "yes"; then


=====================================
modules/codec/Makefile.am
=====================================
@@ -498,7 +498,7 @@ codec_LTLIBRARIES += $(LTLIBx265)
 libx262_plugin_la_SOURCES = codec/x264.c
 libx262_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_X262
 libx262_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x262)
-libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262) -rpath '$(codecdir)'
+libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) -rpath '$(codecdir)'
 libx262_plugin_la_LIBADD = $(LIBS_x262) $(LIBM)
 EXTRA_LTLIBRARIES += libx262_plugin.la
 codec_LTLIBRARIES += $(LTLIBx262)
@@ -506,7 +506,7 @@ codec_LTLIBRARIES += $(LTLIBx262)
 libx264_plugin_la_SOURCES = codec/x264.c
 libx264_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_x264) -DPLUGIN_X264
 libx264_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x264)
-libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264) -rpath '$(codecdir)'
+libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) -rpath '$(codecdir)'
 libx264_plugin_la_LIBADD = $(LIBS_x264) $(LIBM)
 EXTRA_LTLIBRARIES += libx264_plugin.la
 codec_LTLIBRARIES += $(LTLIBx264)
@@ -514,7 +514,7 @@ codec_LTLIBRARIES += $(LTLIBx264)
 libx26410b_plugin_la_SOURCES = codec/x264.c
 libx26410b_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_X264_10B
 libx26410b_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x26410b)
-libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b) -rpath '$(codecdir)'
+libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) -rpath '$(codecdir)'
 libx26410b_plugin_la_LIBADD = $(LIBS_x26410b) $(LIBM)
 EXTRA_LTLIBRARIES += libx26410b_plugin.la
 codec_LTLIBRARIES += $(LTLIBx26410b)


=====================================
modules/video_chroma/Makefile.am
=====================================
@@ -9,7 +9,7 @@ noinst_LTLIBRARIES += libchroma_copy.la
 libswscale_plugin_la_SOURCES = video_chroma/swscale.c codec/avcodec/chroma.c
 libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
 libswscale_plugin_la_LIBADD = $(SWSCALE_LIBS) $(LIBM)
-libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)'
+libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) -rpath '$(chromadir)'
 
 libgrey_yuv_plugin_la_SOURCES = video_chroma/grey_yuv.c
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8c31fe0d623178b0f2e38772a2216ca8754ea9e4...6d33f4fe120cc3ec60ffb7fa6b7a08fe79a6f237

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8c31fe0d623178b0f2e38772a2216ca8754ea9e4...6d33f4fe120cc3ec60ffb7fa6b7a08fe79a6f237
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance