[vlc-commits] [Git][videolan/vlc][master] 3 commits: configure: do not check for swscale/avutil headers

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b33567c3 by Marvin Scholz at 2022-12-08T09:47:09+00:00
configure: do not check for swscale/avutil headers

Nowhere in the code are the defines for these headers checked.

- - - - -
323ad282 by Marvin Scholz at 2022-12-08T09:47:09+00:00
configure: do not check for always-present Darwin headers

The headers are always present, so we can just enable the modules on
Darwin instead of checking for the headers of the Frameworks they need.

- - - - -
2b403af8 by Marvin Scholz at 2022-12-08T09:47:09+00:00
buildsystem: remove hardcoded iOS/tvOS min versions

Those are set by the build script

- - - - -


3 changed files:

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


Changes:

=====================================
configure.ac
=====================================
@@ -2721,18 +2721,12 @@ if test "${enable_swscale}" != "no"
 then
   PKG_CHECK_MODULES(SWSCALE,[libswscale >= 0.5.0],
     [
-      VLC_SAVE_FLAGS
-      CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
-      CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}"
-      AC_CHECK_HEADERS([libswscale/swscale.h])
-      AC_CHECK_HEADERS([libavutil/avutil.h])
       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}])
       ])
-      VLC_RESTORE_FLAGS
     ],[
       AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
   ])
@@ -4244,19 +4238,6 @@ then
 fi
 AM_CONDITIONAL([HAVE_DMGBUILD], [test "$DMGBUILD" != "no" -a "${HAVE_OSX}" = "1"])
 
-dnl
-dnl  VideoToolbox plugins
-AC_CHECK_HEADERS([VideoToolbox/VideoToolbox.h], [
-    VLC_ADD_PLUGIN([videotoolbox])
-    VLC_ADD_PLUGIN([cvpx])
-  ])
-
-dnl
-dnl  AudioToolbox MIDI plugin
-AC_CHECK_HEADERS([AudioToolbox/AudioToolbox.h], [
-  VLC_ADD_PLUGIN([audiotoolboxmidi])
-])
-
 dnl
 dnl  ncurses module
 dnl


=====================================
modules/codec/Makefile.am
=====================================
@@ -62,10 +62,10 @@ libfluidsynth_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,Core
 endif
 
 libaudiotoolboxmidi_plugin_la_SOURCES = codec/audiotoolbox_midi.c
-libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-libaudiotoolboxmidi_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,AudioToolbox
-EXTRA_LTLIBRARIES += libaudiotoolboxmidi_plugin.la
-codec_LTLIBRARIES += $(LTLIBaudiotoolboxmidi)
+libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation,-framework,AudioToolbox
+if HAVE_DARWIN
+codec_LTLIBRARIES += libaudiotoolboxmidi_plugin.la
+endif
 
 liblpcm_plugin_la_SOURCES = codec/lpcm.c
 codec_LTLIBRARIES += liblpcm_plugin.la
@@ -351,17 +351,11 @@ EXTRA_LTLIBRARIES += liboggspots_plugin.la
 codec_LTLIBRARIES += $(LTLIBoggspots)
 
 libvideotoolbox_plugin_la_SOURCES = codec/videotoolbox.c
-libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS)
-if HAVE_IOS
-libvideotoolbox_plugin_la_CFLAGS += -miphoneos-version-min=9.0
-endif
-if HAVE_TVOS
-libvideotoolbox_plugin_la_CFLAGS += -mtvos-version-min=10.2
-endif
 libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la libvlc_vtutils.la
-libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
-EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la
-codec_LTLIBRARIES += $(LTLIBvideotoolbox)
+libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
+if HAVE_DARWIN
+codec_LTLIBRARIES += libvideotoolbox_plugin.la
+endif
 
 ### FFmpeg/libav ###
 libavcodec_common_la_SOURCES = codec/avcodec/fourcc.c codec/avcodec/avcommon.h \


=====================================
modules/video_chroma/Makefile.am
=====================================
@@ -83,16 +83,11 @@ chroma_LTLIBRARIES += \
 endif
 
 libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx.c
-if HAVE_IOS
-libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -miphoneos-version-min=8.0
-endif
-if HAVE_TVOS
-libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -mtvos-version-min=10.2
-endif
 libcvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
 libcvpx_plugin_la_LIBADD = libchroma_copy.la
-EXTRA_LTLIBRARIES += libcvpx_plugin.la
-chroma_LTLIBRARIES += $(LTLIBcvpx)
+if HAVE_DARWIN
+chroma_LTLIBRARIES += libcvpx_plugin.la
+endif
 
 # Tests
 chroma_copy_sse_test_SOURCES = $(libchroma_copy_la_SOURCES)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/18f0e0cabb04da88061aa194d233b0e0c1cbb6a7...2b403af8857e5996cdc10a964d041061c3af0f76

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/18f0e0cabb04da88061aa194d233b0e0c1cbb6a7...2b403af8857e5996cdc10a964d041061c3af0f76
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance