Hi Juha-Pekka, On 28/08/14 13:51, Juha-Pekka Heikkila wrote: > Added '--enable-pixman' (default=no) parameter for autogen > and the corresponding behaviour to include paths and Pixman > library for Mesa if Pixman found. > > Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikk...@gmail.com> > --- > configure.ac | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/configure.ac b/configure.ac > index be6898f..5041ca0 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -45,6 +45,7 @@ XCBDRI2_REQUIRED=1.8 > XCBGLX_REQUIRED=1.8.1 > XSHMFENCE_REQUIRED=1.1 > XVMC_REQUIRED=1.0.6 > +LIBPIXMAN_REQUIRED=0.30.2 > > dnl Check for progs > AC_PROG_CPP > @@ -683,6 +684,14 @@ AC_ARG_ENABLE([gallium-tests], > [enable_gallium_tests="$enableval"], > [enable_gallium_tests=no]) > > +AC_ARG_ENABLE([pixman], > + [AS_HELP_STRING([--enable-pixman], > + [Enable Pixman library to be used for texture format conversion > + fast paths > + @<:@default=disable@:>@])], > + [enable_pixman="$enableval"], > + [enable_pixman=no]) > + > # Option for Gallium drivers > > # Keep this in sync with the --with-gallium-drivers help string default value > @@ -1468,6 +1477,21 @@ AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = > xyes) > AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes) > AC_SUBST([OPENCL_LIBNAME]) > > +#Pixman > +if test "x$enable_pixman" = xyes; then > + PKG_CHECK_MODULES([PIXMAN], [pixman-1], [have_libpixman=yes], > + [have_libpixman=no]) > + We can just error out when pixman is not foind - "User requested --enable-pixman but it's not available on the system so... look into the issue"
> + CFLAGS="$CFLAGS $PIXMAN_CFLAGS" > + GL_LIB_DEPS="$GL_LIB_DEPS $PIXMAN_LIBS" > + EGL_LIB_DEPS="$EGL_LIB_DEPS $PIXMAN_LIBS" > + Can you rework the above three into the Makefiles where needed ? Currently this cause over-linkikng in libGL, libEGL and perhaps others. Thanks Emil > + if test "x$have_libpixman" = "xyes"; then > + DEFINES="$DEFINES -DHAVE_PIXMAN" > + fi > +fi > + > + > dnl > dnl Gallium configuration > dnl > @@ -2358,6 +2382,12 @@ else > echo " Gallium: no" > fi > > +echo "" > +if test "x$enable_pixman" = xyes; then > + echo " Pixman: yes" > +else > + echo " Pixman: no" > +fi > > dnl Libraries > echo "" > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
