Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gstreamer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
403
Issues
403
List
Boards
Labels
Service Desk
Milestones
Merge Requests
78
Merge Requests
78
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GStreamer
gstreamer
Commits
c80a1fd6
Commit
c80a1fd6
authored
Jul 25, 2018
by
Nirbheek Chauhan
🐜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
meson: host_machine.system() is darwin even on iOS
Also use host_system everywhere.
parent
38ec9546
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
libs/gst/check/meson.build
libs/gst/check/meson.build
+1
-1
libs/gst/helpers/meson.build
libs/gst/helpers/meson.build
+5
-7
meson.build
meson.build
+4
-4
No files found.
libs/gst/check/meson.build
View file @
c80a1fd6
...
...
@@ -23,7 +23,7 @@ check_cdata.set('ENABLE_SUBUNIT', 0)
check_cdata.set('CHECK_MAJOR_VERSION', 0)
check_cdata.set('CHECK_MINOR_VERSION', 9)
check_cdata.set('CHECK_MICRO_VERSION', 14)
if host_
machine.system()
!= 'windows'
if host_
system
!= 'windows'
check_cdata.set('HAVE_FORK', 1)
else
check_cdata.set('HAVE_FORK', 0)
...
...
libs/gst/helpers/meson.build
View file @
c80a1fd6
...
...
@@ -23,20 +23,18 @@ endif
# Check PTP support
have_ptp = false
if host_
machine.system()
== 'android'
if host_
system
== 'android'
message('PTP not supported on Android because of permissions.')
elif host_
machine.system()
== 'windows'
elif host_
system
== 'windows'
message('PTP not supported on Windows, not ported yet.')
elif host_machine.system() == 'ios' # FIXME: is it also darwing on iOS ?
message('PTP not supported on iOS because of permissions.')
elif host_machine.system() == 'darwin'
elif host_system == 'darwin'
if cc.has_header('MobileCoreServices/MobileCoreServices.h')
message('PTP not supported on iOS because of permissions.')
else
have_ptp = true
endif
elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_
machine.system()
)
message('PTP supported on ' + host_
machine.system()
+ '.')
elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_
system
)
message('PTP supported on ' + host_
system
+ '.')
have_ptp = true
endif
...
...
meson.build
View file @
c80a1fd6
...
...
@@ -156,7 +156,7 @@ check_headers = [
'sys/resource.h',
]
if host_
machine.system()
== 'windows'
if host_
system
== 'windows'
check_headers += ['winsock2.h']
endif
...
...
@@ -269,7 +269,7 @@ if cc.has_function('strdup')
elif host_system == 'windows' and cc.has_function('_strdup')
cdata.set('HAVE__STRDUP', 1) # Windows (MSVC)
endif
if host_
machine.system()
!= 'windows'
if host_
system
!= 'windows'
cdata.set('HAVE_FORK', 1)
else
# libcheck requires HAVE_FORK to be 0 when fork() is not available
...
...
@@ -296,7 +296,7 @@ endif
# Platform deps; only ws2_32 and execinfo for now
platform_deps = []
if host_
machine.system()
== 'windows'
if host_
system
== 'windows'
platform_deps = [cc.find_library('ws2_32')]
endif
...
...
@@ -389,7 +389,7 @@ gobject_dep = dependency('gobject-2.0',
fallback: ['glib', 'libgobject_dep'])
gmodule_dep = dependency('gmodule-2.0',
fallback: ['glib', 'libgmodule_dep'])
if host_
machine.system()
== 'windows'
if host_
system
== 'windows'
gio_dep = dependency('gio-2.0',
fallback: ['glib', 'libgio_dep'])
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment