[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: srt: rebuild if the library doesn't export the C++ runtime properly

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
e6722f5f by Steve Lhomme at 2022-09-06T15:47:59+00:00
contrib: srt: rebuild if the library doesn't export the C++ runtime properly

See https://github.com/Haivision/srt/commit/61e01510c25488a5fabf30d9899c2555b4f87a6d

- - - - -
e923aa69 by Steve Lhomme at 2022-09-06T15:47:59+00:00
configure: only use SRT libraries that export C++ runtimes correctly

- - - - -
8d5c0815 by Steve Lhomme at 2022-09-06T15:47:59+00:00
srt: remove dummy.cpp

The proper cmake-based export of the C++ runtime in pkg-config is present in
the library since version 1.3.2.

- - - - -


4 changed files:

- configure.ac
- contrib/src/srt/rules.mak
- modules/access/Makefile.am
- modules/access_output/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -4078,7 +4078,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"])
 dnl
 dnl  SRT plugin
 dnl
-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.3.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
 
 dnl
 dnl  RIST plugin


=====================================
contrib/src/srt/rules.mak
=====================================
@@ -7,7 +7,7 @@ ifdef BUILD_NETWORK
 PKGS += srt
 endif
 
-ifeq ($(call need_pkg,"srt >= 1.3.1"),)
+ifeq ($(call need_pkg,"srt >= 1.3.2"),)
 PKGS_FOUND += srt
 endif
 


=====================================
modules/access/Makefile.am
=====================================
@@ -462,7 +462,7 @@ EXTRA_LTLIBRARIES += libaccess_mtp_plugin.la
 
 ### SRT ###
 
-libaccess_srt_plugin_la_SOURCES = access/srt.c access/srt_common.c access/srt_common.h dummy.cpp
+libaccess_srt_plugin_la_SOURCES = access/srt.c access/srt_common.c access/srt_common.h
 libaccess_srt_plugin_la_CFLAGS = $(AM_CFLAGS) $(SRT_CFLAGS)
 libaccess_srt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SRT_CPPFLAGS)
 libaccess_srt_plugin_la_LIBADD = $(SRT_LIBS)


=====================================
modules/access_output/Makefile.am
=====================================
@@ -29,7 +29,7 @@ libaccess_http_put_plugin_la_LIBADD = libvlc_http.la
 access_out_LTLIBRARIES += libaccess_http_put_plugin.la
 
 ### SRT ###
-libaccess_output_srt_plugin_la_SOURCES = access_output/srt.c access/srt_common.c access/srt_common.h dummy.cpp
+libaccess_output_srt_plugin_la_SOURCES = access_output/srt.c access/srt_common.c access/srt_common.h
 libaccess_output_srt_plugin_la_CFLAGS = $(AM_CFLAGS) $(SRT_CFLAGS)
 libaccess_output_srt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SRT_CPPFLAGS)
 libaccess_output_srt_plugin_la_LIBADD = $(SRT_LIBS)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2ca66bbed6c400e6e952dffe4fbdd09f5ca804fa...8d5c08159eb3907014d9ddf05aff4f953ea4b90c

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


VideoLAN code repository instance