Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
a97563c8
Commit
a97563c8
authored
8 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
configure: Simplify libxcb check
parent
c29da01a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+4
-14
4 additions, 14 deletions
configure
with
4 additions
and
14 deletions
configure
+
4
−
14
View file @
a97563c8
...
...
@@ -2401,6 +2401,7 @@ sndio_outdev_deps="sndio"
v4l2_indev_deps_any
=
"linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps
=
"vfw32 vfwcap_defines"
xcbgrab_indev_deps
=
"libxcb"
xcbgrab_indev_suggest
=
"libxcb_shm libxcb_xfixes"
# protocols
ffrtmpcrypt_protocol_deps
=
"!librtmp_protocol"
...
...
@@ -4783,22 +4784,11 @@ if enabled libcdio; then
fi
if
enabled libxcb
;
then
check_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles
||
{
enabled libxcb
&&
die
"ERROR: libxcb not found"
;
}
&&
enable
libxcb
require_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles
disabled libxcb_shm
||
check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach
||
{
enabled libxcb_shm
&&
die
"ERROR: libxcb_shm not found"
;
}
&&
check_header sys/shm.h
&&
enable
libxcb_shm
require_pkg_config xcb-shm xcb/shm.h xcb_shm_attach
disabled libxcb_xfixes
||
check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image
||
{
enabled libxcb_xfixes
&&
die
"ERROR: libxcb_xfixes not found"
;
}
&&
enable
libxcb_xfixes
add_cflags
"
$xcb_shape_cflags
$xcb_shm_cflags
$xcb_xfixes_cflags
"
add_extralibs
"
$xcb_shape_extralibs
$xcb_shm_extralibs
$xcb_xfixes_extralibs
"
require_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image
fi
enabled dxva2
&&
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment