Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1048cc3d
Commit
1048cc3d
authored
Aug 22, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply patch for directfb detection. Fix #845
parent
7e261699
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
61 additions
and
26 deletions
+61
-26
configure.ac
configure.ac
+61
-26
No files found.
configure.ac
View file @
1048cc3d
...
@@ -4400,39 +4400,74 @@ fi
...
@@ -4400,39 +4400,74 @@ fi
dnl
dnl
dnl DirectFB module
dnl DirectFB module
dnl try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
dnl TODO: support for static linking
dnl
dnl
AC_ARG_ENABLE(directfb,
AC_ARG_ENABLE(directfb,
[ --enable-directfb DirectFB support (default disabled)])
[ --enable-directfb DirectFB support (default disabled)])
if test "${enable_directfb}" = "yes"
AC_ARG_WITH(directfb,
then
[ --with-directfb=PATH path to DirectFB headers and libraries])
if test "${with_directfb}" = "no"
then
if test "${enable_directfb}" = "yes"; then
AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
have_directfb="false"
if test "${have_directfb}"= "true"
CPPFLAGS_mydirectfb=
then
LDFLAGS_mydirectfb=
VLC_ADD_PLUGINS([directfb])
if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then
VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
dnl Trying the given location
VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT])
CPPFLAGS_save=${CPPFLAGS}
else
LDFLAGS_save=${LDFLAGS}
AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb])
CPPFLAGS_new="-I${with_directfb}/include -D_REENTRANT -D_GNU_SOURCE"
LDFLAGS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/"
LDFLAGS_new="${LDFLAGS_new} -L${with_directfb}/src/.libs/"
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}"
LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}"
dnl FIXME: too obscure
AC_CHECK_HEADER([directfb.h], [
AC_CHECK_LIB([direct],[direct_initialize], [
AC_CHECK_LIB([fusion], [fusion_enter], [
AC_CHECK_LIB([directfb], [DirectFBInit], have_directfb="true", have_directfb="false")
], have_directfb="false")
], have_directfb="false")
], have_directfb="false")
dnl Restore flags
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS="${LDFLAGS_save}"
if test "${have_directfb}" = "true"; then
LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
fi
fi
else
else
CPPFLAGS_save="${CPPFLAGS}"
dnl Look for directfb-config
CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include"
AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH})
AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
if test "${DIRECTFB_CONFIG}" != "no"; then
CPPFLAGS="${CPPFLAGS_save}"
CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`"
AC_ARG_WITH(directfb,
LDFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --libs`"
[ --with-directfb=PATH path to directfb],
have_directfb="true"
[ if test "${with_directfb}" != "no" -a -n "${with_directfb}"
else
then
dnl Trying with pkg-config
PKG_CHECK_MODULES(DIRECTFB, directfb, [
CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}"
LDFLAGS_mydirectfb="${DIRECTFB_LIBS}"
have_directfb="true"
], [have_directfb="false"])
fi
fi
if test "${have_directfb}" = "true"; then
VLC_ADD_PLUGINS([directfb])
VLC_ADD_PLUGINS([directfb])
VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT
])
VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}
])
VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl
])
VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}
])
fi ],
else
[ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include])
])
AC_MSG_ERROR([cannot find directfb headers and/or libraries
])
fi
fi
fi
fi
dnl
dnl
dnl GGI module
dnl GGI module
dnl
dnl
...
...
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