-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[gstreamer] Support arm-windows and add features #23125
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
cd5cc94
[gstreamer] Support arm-windows and add features
ae7d9f8
version
9e0096e
Fix cmake code
2c5eda2
version
fc5c8ca
Disable more docs
b1e30dd
version
d0cd7b6
Remove code about zlib
edfa587
version
92d90ed
Fix build issues
ab93bb8
version
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index 4a2eb27..1316366 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -70,19 +70,19 @@ endif | ||
|
|
||
| # Ordered list of subprojects (dict has no ordering guarantees) | ||
| subprojects = [ | ||
| - ['gstreamer', {'build-hotdoc': true}], | ||
| - ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}], | ||
| - ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}], | ||
| + ['gstreamer', {'build-hotdoc': false}], | ||
| + ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': false}], | ||
| + ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': false}], | ||
| ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}], | ||
| ['gst-plugins-bad', { 'option': get_option('bad'), 'build-hotdoc': true}], | ||
| - ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}], | ||
| - ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}], | ||
| - ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}], | ||
| - ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true }], | ||
| + ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': false}], | ||
| + ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': false}], | ||
| + ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': false}], | ||
| + ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': false }], | ||
| ['gst-integration-testsuites', { 'option': get_option('devtools') }], | ||
| - ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true}], | ||
| - ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], | ||
| - ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}], | ||
| + ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': false}], | ||
| + ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': false}], | ||
| + ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': false}], | ||
| ['gstreamer-sharp', { 'option': get_option('sharp') }], | ||
| ['pygobject', { 'option': get_option('python'), 'match_gst_version': false }], | ||
| ['gst-python', { 'option': get_option('python')}], | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index bed8c4e..772809e 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -435,8 +435,9 @@ if cc.has_header('execinfo.h') | ||
| endif | ||
| endif | ||
|
|
||
| +build_system = build_machine.system() | ||
| gst_debug = get_option('gst_debug') | ||
| -if not gst_debug | ||
| +if not gst_debug and build_system != 'windows' | ||
| add_project_arguments(['-Wno-unused'], language: 'c') | ||
| endif | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index 9b00253..495671e 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) { | ||
| endif | ||
| endif | ||
|
|
||
| +build_system = build_machine.system() | ||
| if gst_dep.type_name() == 'internal' | ||
| gst_proj = subproject('gstreamer') | ||
|
|
||
| - if not gst_proj.get_variable('gst_debug') | ||
| + if not gst_proj.get_variable('gst_debug') and build_system != 'windows' | ||
| message('GStreamer debug system is disabled') | ||
| add_project_arguments('-Wno-unused', language: 'c') | ||
| else | ||
| @@ -404,7 +405,7 @@ else | ||
| #include <gst/gstconfig.h> | ||
| #ifdef GST_DISABLE_GST_DEBUG | ||
| #error "debugging disabled, make compiler fail" | ||
| -#endif''' , dependencies: gst_dep) | ||
| +#endif''' , dependencies: gst_dep) and build_system != 'windows' | ||
| message('GStreamer debug system is disabled') | ||
| add_project_arguments('-Wno-unused', language: 'c') | ||
| else |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index c5c78fc..14be48c 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -281,7 +281,11 @@ if find_program('xgettext', required : get_option('nls')).found() | ||
| cdata.set('ENABLE_NLS', 1) | ||
| subdir('po') | ||
| endif | ||
| + | ||
| +enable_doc = get_option('doc') | ||
| +if enable_doc.enabled() | ||
| subdir('docs') | ||
| +endif | ||
| subdir('scripts') | ||
|
|
||
| # Set release date |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Neumann-A Do we have any other way to disable the hotdoc? Disable the option
docdoesn't have any effect.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably not since this looks hardcoded.