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
23ec8db8
Commit
23ec8db8
authored
10 years ago
by
Carl Eugen Hoyos
Browse files
Options
Downloads
Patches
Plain Diff
Autodetect libxcb.
parent
d1b5ad39
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
-2
4 additions, 2 deletions
configure
with
4 additions
and
2 deletions
configure
+
4
−
2
View file @
23ec8db8
...
@@ -251,7 +251,7 @@ External library support:
...
@@ -251,7 +251,7 @@ External library support:
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libx265 enable HEVC encoding via x265 [no]
--enable-libx265 enable HEVC encoding via x265 [no]
--enable-libxavs enable AVS encoding via xavs [no]
--enable-libxavs enable AVS encoding via xavs [no]
--enable-libxcb enable X11 grabbing using XCB [
n
o]
--enable-libxcb enable X11 grabbing using XCB [
aut
o]
--enable-libxcb-shm enable X11 grabbing shm communication [auto]
--enable-libxcb-shm enable X11 grabbing shm communication [auto]
--enable-libxcb-xfixes enable X11 grabbing mouse rendering [auto]
--enable-libxcb-xfixes enable X11 grabbing mouse rendering [auto]
--enable-libxvid enable Xvid encoding via xvidcore,
--enable-libxvid enable Xvid encoding via xvidcore,
...
@@ -5024,11 +5024,12 @@ fi
...
@@ -5024,11 +5024,12 @@ fi
enabled xlib
&&
enabled xlib
&&
check_lib X11/Xlib.h XOpenDisplay
-lX11
||
disable xlib
check_lib X11/Xlib.h XOpenDisplay
-lX11
||
disable xlib
if
enabled libxcb
||
enabled x11grab
&&
!
disabled libxcb
;
then
if
!
disabled libxcb
;
then
check_pkg_config xcb xcb/xcb.h xcb_connect
||
{
check_pkg_config xcb xcb/xcb.h xcb_connect
||
{
enabled libxcb
&&
die
"ERROR: libxcb not found"
;
enabled libxcb
&&
die
"ERROR: libxcb not found"
;
}
&&
disable x11grab
&&
enable
libxcb
}
&&
disable x11grab
&&
enable
libxcb
if
enabled libxcb
;
then
disabled libxcb_shm
||
disabled libxcb_shm
||
check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach
||
{
check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach
||
{
enabled libxcb_shm
&&
die
"ERROR: libxcb_shm not found"
;
enabled libxcb_shm
&&
die
"ERROR: libxcb_shm not found"
;
...
@@ -5042,6 +5043,7 @@ if enabled libxcb || enabled x11grab && ! disabled libxcb; then
...
@@ -5042,6 +5043,7 @@ if enabled libxcb || enabled x11grab && ! disabled libxcb; then
add_cflags
"
$xcb_event_cflags
$xcb_shm_cflags
$xcb_xfixes_cflags
"
add_cflags
"
$xcb_event_cflags
$xcb_shm_cflags
$xcb_xfixes_cflags
"
add_extralibs
"
$xcb_event_libs
$xcb_shm_libs
$xcb_xfixes_libs
"
add_extralibs
"
$xcb_event_libs
$xcb_shm_libs
$xcb_xfixes_libs
"
fi
fi
fi
if
enabled x11grab
;
then
if
enabled x11grab
;
then
enabled xlib
||
die
"ERROR: Xlib not found"
enabled xlib
||
die
"ERROR: Xlib not found"
...
...
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