Re: [Mesa-dev] [PATCH 1/3] build: Require X11 pkg-config files
On Tue, 14 Aug 2012 12:59:42 -0700 Matt Turner wrote: > Cc: Jeremy Huddleston > --- > Jeremy, does OS X ship the pkg-config files? Haiku doesn't... Mesa should have a path to properly handle a system not having X11 installed. ( Mesa *is* the only open source GL project in town... lets keep a level playing field ) We use scons so we may not be affected by this change... but food for thought :) -- Alex signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/3] build: Require X11 pkg-config files
On Wed, Aug 15, 2012 at 2:21 AM, Andreas Boll wrote: >> @@ -975,38 +941,19 @@ xyesno) >> fi >> >> # find the DRI deps for libGL >> -if test "$x11_pkgconfig" = yes; then >> -PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) > > Don't we need to check against xcb-glx >= 1.8.1? Yes, thank you. I'll fix that before I commit it. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/3] build: Require X11 pkg-config files
2012/8/14 Matt Turner : > Cc: Jeremy Huddleston > --- > Jeremy, does OS X ship the pkg-config files? > > configure.ac | 85 > +++--- > 1 files changed, 16 insertions(+), 69 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 2ecedaf..e1c8818 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -153,8 +153,6 @@ AC_SUBST([EXTRA_LIB_PATH]) > > dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later > _SAVE_CPPFLAGS="$CPPFLAGS" > -AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers]) > -AC_SUBST([X11_INCLUDES]) > > dnl Compiler macros > DEFINES="" > @@ -878,32 +876,8 @@ if test "x$enable_dri" = xyes; then > fi > fi > > -dnl > -dnl Find out if X is available. The variable have_x is set if libX11 is > -dnl found to mimic AC_PATH_XTRA. > -dnl > -if test -n "$PKG_CONFIG"; then > -AC_MSG_CHECKING([pkg-config files for X11 are available]) > -PKG_CHECK_EXISTS([x11],[ > -x11_pkgconfig=yes > -have_x=yes > -],[ > -x11_pkgconfig=no > -]) > -AC_MSG_RESULT([$x11_pkgconfig]) > -else > -x11_pkgconfig=no > -fi > -dnl Use the autoconf macro if no pkg-config files > -if test "$x11_pkgconfig" = yes; then > -PKG_CHECK_MODULES([X11], [x11]) > -else > -AC_PATH_XTRA > -test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS" > -test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11" > -AC_SUBST([X11_CFLAGS]) > -AC_SUBST([X11_LIBS]) > -fi > +dnl Find out if X is available. > +PKG_CHECK_MODULES([X11], [x11]) > > dnl Try to tell the user that the --x-* options are only used when > dnl pkg-config is not available. This must be right after AC_PATH_XTRA. > @@ -947,18 +921,10 @@ dnl > case "x$enable_glx$enable_xlib_glx" in > xyesyes) > # Xlib-based GLX > -if test "$x11_pkgconfig" = yes; then > -PKG_CHECK_MODULES([XLIBGL], [x11 xext]) > -GL_PC_REQ_PRIV="x11 xext" > -X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" > -GL_LIB_DEPS="$XLIBGL_LIBS" > -else > -# should check these... > -X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" > -GL_LIB_DEPS="$X_LIBS -lX11 -lXext" > -GL_PC_LIB_PRIV="$GL_LIB_DEPS" > -GL_PC_CFLAGS="$X11_INCLUDES" > -fi > +PKG_CHECK_MODULES([XLIBGL], [x11 xext]) > +GL_PC_REQ_PRIV="x11 xext" > +X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" > +GL_LIB_DEPS="$XLIBGL_LIBS" > GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" > GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" > ;; > @@ -975,38 +941,19 @@ xyesno) > fi > > # find the DRI deps for libGL > -if test "$x11_pkgconfig" = yes; then > -PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) Don't we need to check against xcb-glx >= 1.8.1? > -dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" > - > -# add xf86vidmode if available > -PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, > HAVE_XF86VIDMODE=no) > -if test "$HAVE_XF86VIDMODE" = yes ; then > -dri_modules="$dri_modules xxf86vm" > -fi > +dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" > > -PKG_CHECK_MODULES([DRIGL], [$dri_modules]) > -GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" > -X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" > -GL_LIB_DEPS="$DRIGL_LIBS" > -else > -# should check these... > -X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" > -if test "x$HAVE_XF86VIDMODE" == xyes; then > - GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes" > - else > - GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXdamage -lXfixes" > - fi > -GL_PC_LIB_PRIV="$GL_LIB_DEPS" > -GL_PC_CFLAGS="$X11_INCLUDES" > - > -# XCB can only be used from pkg-config > -PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) > -GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx" > -X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS" > -GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS" > +# add xf86vidmode if available > +PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, > HAVE_XF86VIDMODE=no) > +if test "$HAVE_XF86VIDMODE" = yes ; then > +dri_modules="$dri_modules xxf86vm" > fi > > +PKG_CHECK_MODULES([DRIGL], [$dri_modules]) > +GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" > +X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" > +GL_LIB_DEPS="$DRIGL_LIBS" > + > # need DRM libs, -lpthread, etc. > GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" > GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" > -- > 1.7.8.6 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.free
Re: [Mesa-dev] [PATCH 1/3] build: Require X11 pkg-config files
On 08/14/12, Matt Turner wrote: > Cc: Jeremy Huddleston > --- > Jeremy, does OS X ship the pkg-config files? > Yes, Leopard and later ship the pkg-config files with Apple's X11. XQuartz also ships the pkg-config files. I've been meaning to get mesa building on OS X using autoconf. master is currently broken for OS X because of the build change, and I want to try to get that fixed soon. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/3] build: Require X11 pkg-config files
Cc: Jeremy Huddleston --- Jeremy, does OS X ship the pkg-config files? configure.ac | 85 +++--- 1 files changed, 16 insertions(+), 69 deletions(-) diff --git a/configure.ac b/configure.ac index 2ecedaf..e1c8818 100644 --- a/configure.ac +++ b/configure.ac @@ -153,8 +153,6 @@ AC_SUBST([EXTRA_LIB_PATH]) dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later _SAVE_CPPFLAGS="$CPPFLAGS" -AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers]) -AC_SUBST([X11_INCLUDES]) dnl Compiler macros DEFINES="" @@ -878,32 +876,8 @@ if test "x$enable_dri" = xyes; then fi fi -dnl -dnl Find out if X is available. The variable have_x is set if libX11 is -dnl found to mimic AC_PATH_XTRA. -dnl -if test -n "$PKG_CONFIG"; then -AC_MSG_CHECKING([pkg-config files for X11 are available]) -PKG_CHECK_EXISTS([x11],[ -x11_pkgconfig=yes -have_x=yes -],[ -x11_pkgconfig=no -]) -AC_MSG_RESULT([$x11_pkgconfig]) -else -x11_pkgconfig=no -fi -dnl Use the autoconf macro if no pkg-config files -if test "$x11_pkgconfig" = yes; then -PKG_CHECK_MODULES([X11], [x11]) -else -AC_PATH_XTRA -test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS" -test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11" -AC_SUBST([X11_CFLAGS]) -AC_SUBST([X11_LIBS]) -fi +dnl Find out if X is available. +PKG_CHECK_MODULES([X11], [x11]) dnl Try to tell the user that the --x-* options are only used when dnl pkg-config is not available. This must be right after AC_PATH_XTRA. @@ -947,18 +921,10 @@ dnl case "x$enable_glx$enable_xlib_glx" in xyesyes) # Xlib-based GLX -if test "$x11_pkgconfig" = yes; then -PKG_CHECK_MODULES([XLIBGL], [x11 xext]) -GL_PC_REQ_PRIV="x11 xext" -X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" -GL_LIB_DEPS="$XLIBGL_LIBS" -else -# should check these... -X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" -GL_LIB_DEPS="$X_LIBS -lX11 -lXext" -GL_PC_LIB_PRIV="$GL_LIB_DEPS" -GL_PC_CFLAGS="$X11_INCLUDES" -fi +PKG_CHECK_MODULES([XLIBGL], [x11 xext]) +GL_PC_REQ_PRIV="x11 xext" +X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" +GL_LIB_DEPS="$XLIBGL_LIBS" GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" ;; @@ -975,38 +941,19 @@ xyesno) fi # find the DRI deps for libGL -if test "$x11_pkgconfig" = yes; then -PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) -dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" - -# add xf86vidmode if available -PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) -if test "$HAVE_XF86VIDMODE" = yes ; then -dri_modules="$dri_modules xxf86vm" -fi +dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" -PKG_CHECK_MODULES([DRIGL], [$dri_modules]) -GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" -X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" -GL_LIB_DEPS="$DRIGL_LIBS" -else -# should check these... -X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" -if test "x$HAVE_XF86VIDMODE" == xyes; then - GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes" - else - GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXdamage -lXfixes" - fi -GL_PC_LIB_PRIV="$GL_LIB_DEPS" -GL_PC_CFLAGS="$X11_INCLUDES" - -# XCB can only be used from pkg-config -PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) -GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx" -X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS" -GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS" +# add xf86vidmode if available +PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) +if test "$HAVE_XF86VIDMODE" = yes ; then +dri_modules="$dri_modules xxf86vm" fi +PKG_CHECK_MODULES([DRIGL], [$dri_modules]) +GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" +X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" +GL_LIB_DEPS="$DRIGL_LIBS" + # need DRM libs, -lpthread, etc. GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" -- 1.7.8.6 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
