[vlc-commits] [Git][videolan/vlc][master] 6 commits: Revert "meson: put the HAVE_ARIBB24 define in config.h"
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Sat Feb 15 13:11:26 UTC 2025
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
2a4591f4 by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
Revert "meson: put the HAVE_ARIBB24 define in config.h"
This reverts commit 4cd9bdcbd644cc93967c10a59ea4c3cda42e6159.
Modifying cdata requires regenerating config.h which is included by
every single source file in the project. There's no point in
reconfiguring and recompiling the whole project to enable or
disable a library for a module just for the sake of matching what
autotool buildsystem did.
- - - - -
5df1ee7c by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
codec: meson: add missing dependency for d3d11va
The contrib include path was used to specify the include path to the
libavcodec headers, but of course it doesn't work when libavcodec is not
compiled from the contribs.
Originally added with the plugin definition in
07d15477edc9dbeb19f5f1804fcf132cb0601193.
- - - - -
d63771da by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
codec: meson: use define in d3d11va module
Avoid using cdata, which will trigger a full rebuild on
enabling/disabling.
- - - - -
579ffcac by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
codec: meson: remove libcom for d3d11va
It only has C files, so there's no need for cpp flags.
- - - - -
a93c647c by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
codec: meson: add missing dependency for dxva
The contrib include path was used to specify the include path to the
libavcodec headers, but of course it doesn't work when libavcodec is not
compiled from the contribs.
Originally added with the plugin definition in
07d15477edc9dbeb19f5f1804fcf132cb0601193.
- - - - -
cea2602e by Alexandre Janniaux at 2025-02-15T12:40:53+00:00
codec: meson: use define in dxva module
Avoid using cdata, which will trigger a full rebuild on
enabling/disabling.
- - - - -
3 changed files:
- config.h.meson
- modules/codec/meson.build
- modules/demux/meson.build
Changes:
=====================================
config.h.meson
=====================================
@@ -70,9 +70,6 @@
/* AMD HQScaler supported */
#mesondefine HAVE_AMF_SCALER
-/* Define if libaribb24 is available. */
-#mesondefine HAVE_ARIBB24
-
/* Define to 1 if you have the <arpa/inet.h> header file. */
#mesondefine HAVE_ARPA_INET_H
@@ -217,14 +214,6 @@
* Library check macros
*/
-
-
-/* Define to 1 if you have the <libavcodec/d3d11va.h> header file. */
-#mesondefine HAVE_LIBAVCODEC_D3D11VA_H
-
-/* Define to 1 if you have the <libavcodec/dxva2.h> header file. */
-#mesondefine HAVE_LIBAVCODEC_DXVA2_H
-
/* TODO: Properly check for the avformat header
*/
#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
=====================================
modules/codec/meson.build
=====================================
@@ -272,13 +272,11 @@ vlc_modules += {
# aribsub
aribb24_dep = dependency('aribb24', version: '>= 1.0.1', required: get_option('aribsub'))
-if aribb24_dep.found()
- cdata.set('HAVE_ARIBB24', 1)
-endif
vlc_modules += {
'name' : 'aribsub',
'sources' : files('arib/aribsub.c'),
'dependencies' : [aribb24_dep],
+ 'cpp_args' : ['-DHAVE_ARIBB24'],
'enabled' : aribb24_dep.found()
}
@@ -568,7 +566,9 @@ endif
# FFmpeg common helper library
libavcodec_common = disabler()
+avcodec_compile_dep = disabler()
if avcodec_dep.found()
+ avcodec_compile_dep = avcodec_dep.partial_dependency(includes:true, compile_args:true)
libavcodec_common = static_library('avcodec_common',
files('avcodec/fourcc.c', 'avcodec/chroma.c'),
dependencies: [
@@ -658,7 +658,6 @@ if host_system == 'windows'
if (get_option('d3d11va').
enable_auto_if(cc.check_header('libavcodec/d3d11va.h', args: [contrib_inc_args]))
.allowed())
- cdata.set('HAVE_LIBAVCODEC_D3D11VA_H', 1)
vlc_modules += {
'name' : 'd3d11va',
'sources' : files(
@@ -669,9 +668,9 @@ if host_system == 'windows'
'../packetizer/hevc_nal.c',
'avcodec/dxva_blocklist.c',
),
- 'c_args' : [ contrib_inc_args ],
- 'cpp_args' : libcom_cppflags,
+ 'c_args' : ['-DHAVE_LIBAVCODEC_D3D11VA_H=1'],
'link_with' : [ d3d11_common_lib ],
+ 'dependencies' : [avcodec_compile_dep],
'include_directories' : [
vlc_include_dirs,
include_directories('avcodec')
@@ -682,7 +681,6 @@ if host_system == 'windows'
if (get_option('dxva2').
enable_auto_if(cc.check_header('libavcodec/dxva2.h', args: [contrib_inc_args]))
.allowed() and have_win_desktop)
- cdata.set('HAVE_LIBAVCODEC_DXVA2_H', 1)
vlc_modules += {
'name' : 'dxva2',
'sources' : files(
@@ -693,13 +691,13 @@ if host_system == 'windows'
'../packetizer/hevc_nal.c',
'avcodec/dxva_blocklist.c',
),
- 'c_args' : [ contrib_inc_args ],
+ 'c_args' : [ '-DHAVE_LIBAVCODEC_DXVA2_H=1' ],
'link_with' : [ d3d9_common_lib ],
'include_directories' : [
vlc_include_dirs,
include_directories('avcodec')
],
- 'dependencies' : [cc.find_library('dxva2')],
+ 'dependencies' : [avcodec_compile_dep, cc.find_library('dxva2')],
}
endif
=====================================
modules/demux/meson.build
=====================================
@@ -365,6 +365,11 @@ if libdvbcsa_dep.found()
endif
if libdvbpsi_dep.found()
+ arrib24_define = []
+ if aribb24_dep.found()
+ arrib24_define += '-DHAVE_ARIBB24=1'
+ endif
+
vlc_modules += {
'name' : 'ts',
'sources' : files(
@@ -391,7 +396,7 @@ if libdvbpsi_dep.found()
'../codec/opus_header.c',
),
'dependencies' : [libdvbpsi_dep, aribb24_dep, libdvbcsa_dep],
- 'c_args' : libdvbpsi_c_args,
+ 'c_args' : [libdvbpsi_c_args, arrib24_define],
}
endif
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/469464747251c62fa8c548add6fef4a4bc38cc51...cea2602ea9a187a284c5271d53e46241560e8fb9
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/469464747251c62fa8c548add6fef4a4bc38cc51...cea2602ea9a187a284c5271d53e46241560e8fb9
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list