← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-08-04 16:25:08 UTC
  • mfrom: (1.2.37 upstream)
  • Revision ID: james.westby@ubuntu.com-20110804162508-kujg82moxerjg1kk
Tags: 7.11-0ubuntu1
https://launchpad.net/bugs/800778
https://launchpad.net/bugs/812639
https://launchpad.net/bugs/810339
https://launchpad.net/bugs/410264
* Fake merge from Debian experimental, updating previous changelog entries.
  New upstream release fixes infrequent X crash (LP: #800778).
  Remaining Ubuntu changes:
 - debian/control
    + Drop lesstif-dev from Build-Depends; it's in Universe.
    + Comment out GLw libs since it depends on lesstif-dev.
    + Drop i686 swx11 libgl package.
    + Add libdrm-dev to mesa-common-dev Depends.
    + Drop libwayland-dev from Build-Depends; it's in Universe.
    + Update Breaks for Ubuntu versions
    + Enable llvm on armel as well as i386 and amd64
  - debian/rules
    + Use --disable-glw for swx11 targets too.
    + Don't enable motif for swx11 targets.
    + Use lzma compression for binary debs to save CD space.
    + Drop unloved mach64 driver.
    + Use --enable-shared-dricore to claw back CD space.
    + Enable llvmpipe software rasteriser.
    + Enable llvm on armel as well as i386 and amd64
  - debian/patches
    + 100_no_abi_tag.patch
    + 101_ubuntu_hidden_glname.patch
    + 103_savage-expose_fbmodes_with_nonzero_alpha.patch
  - rules, libgl1-mesa-{glx,dev,swx11,swx11-dev}.install.in,
    libgl1-mesa-{glx,swx11}.{postinst,prerm}.in, libgl1-mesa-dev.links.in:
    Install libGL.so* in /usr/lib/mesa to allow things to work with
    alternatives.
  - debian/not-installed:
    + Drop i686 files; we don't build 686-optimised packages in the first
      place.
  - debian/gbp.conf
    + Point at Ubuntu branch to make git-buildpackage less narky.
  - 113_fix_tls.diff: Fix crashes in unrelated code due to TLS usage.
  - debian/patches/111_export_searchdirs_in_dripc.diff:
    + Add drisearchdirs variable to dri.pc so the Xserver can pick up the
      alternate DRI driver dirs.
  - debian/patches/115_llvm_dynamic_linking.diff
    + Dynamically link DRI drivers to libllvm.  Saves ~6MiB per DRI driver.
  - debian/patches/116_use_shared_galliumcore.diff:
  - debian/libgl1-mesa-dri.install.in:
    + Link gallium DRI drivers against shared gallium routines to save CD
      space.
* debian/rules:
* debian/libgl1-mesa-dri-experimental.install.{i386,amd64}.in
  - Explicitly install i915g only when it has been built, matching what is
    done with r300g.
* debian/rules:
* debian/control:
* debian/libegl1-mesa{,-dev}.install.in:
* debian/libegl1-mesa.symbols:
  - Enable the Wayland EGL backend.
* debian/rules:
* debian/libegl1-mesa.{postinst,prerm,install}.in:
* debian/libegl1-mesa-dev.{install,links}.in:
* debian/libgles{1,2}-mesa.install.in:
* debian/libgles{1,2}-mesa-dev.links.in:
* debian/libopenvg1-mesa{,-dev}.install.in:
* debian/libopenvg1-mesa-dev.links.in:
  - Use alternatives for libEGL to match the handling of libGL.
    libEGL (and associated GL|ES and OpenVG libraries) now live in
    /usr/lib/$MULTIARCH/mesa-egl.  (LP: #812639)
* debian/patches/118_fix_24bpp_software_rendering.diff:
  - Cherry pick upstream patch from master fixing graphical corruption when
    using a 24bpp framebuffer and software rendering. (LP: #810339)
* debian/rules:
* debian/clean:
  - Generate xmlpool pot file and clean up other po files for
    pkgbinarymangler's benefit (LP: #410264).
* debian/patches/119_r600g_gnome_shell_rendering_fix.diff:
  - Cherry pick upstream commit fixing rendering corruption in gnome-shell
    (and therefore likely Unity as well).

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
563
563
    [AS_HELP_STRING([--enable-gallium-gbm],
564
564
        [enable optional gbm state tracker (not required for
565
565
         gbm support in Gallium)
566
 
         @<:@default=disable@:>@])],
 
566
         @<:@default=auto@:>@])],
567
567
    [enable_gallium_gbm="$enableval"],
568
 
    [enable_gallium_gbm=no])
 
568
    [enable_gallium_gbm=auto])
569
569
 
570
570
# Option for Gallium drivers
571
571
GALLIUM_DRIVERS_DEFAULT="r300,r600,swrast"
578
578
    [with_gallium_drivers="$withval"],
579
579
    [with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
580
580
 
 
581
# Doing '--without-gallium-drivers' will set this variable to 'no'.  Clear it
 
582
# here so that the script doesn't choke on an unknown driver name later.
 
583
case "$with_gallium_drivers" in
 
584
    yes) with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT" ;;
 
585
    no) with_gallium_drivers='' ;;
 
586
esac
 
587
 
581
588
if test "x$enable_opengl" = xno -a \
582
589
        "x$enable_gles1" = xno -a \
583
590
        "x$enable_gles2" = xno -a \
822
829
        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
823
830
        GL_PC_CFLAGS="$X11_INCLUDES"
824
831
    fi
825
 
    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
 
832
    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
826
833
    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
827
834
 
828
835
    # if static, move the external libraries to the programs
948
955
 
949
956
AC_SUBST([HAVE_XF86VIDMODE])
950
957
 
951
 
PKG_CHECK_MODULES([LIBDRM_RADEON],
952
 
                  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
953
 
                  HAVE_LIBDRM_RADEON=yes,
954
 
                  HAVE_LIBDRM_RADEON=no)
955
 
 
956
958
dnl
957
959
dnl More X11 setup
958
960
dnl
1139
1141
 
1140
1142
case $DRI_DIRS in
1141
1143
*radeon*|*r200*|*r300*|*r600*)
 
1144
    PKG_CHECK_MODULES([LIBDRM_RADEON],
 
1145
                      [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
 
1146
                      HAVE_LIBDRM_RADEON=yes,
 
1147
                      HAVE_LIBDRM_RADEON=no)
 
1148
 
1142
1149
    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
1143
1150
        RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
1144
1151
        RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
1215
1222
AC_SUBST([OSMESA_PC_LIB_PRIV])
1216
1223
 
1217
1224
dnl
 
1225
dnl gbm configuration
 
1226
dnl
 
1227
if test "x$enable_gbm" = xauto; then
 
1228
    case "$with_egl_platforms" in
 
1229
        *drm*)
 
1230
            enable_gbm=yes ;;
 
1231
         *)
 
1232
            enable_gbm=no ;;
 
1233
    esac
 
1234
fi
 
1235
if test "x$enable_gbm" = xyes; then
 
1236
    SRC_DIRS="$SRC_DIRS gbm"
 
1237
    GBM_BACKEND_DIRS=""
 
1238
 
 
1239
    PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
 
1240
                      AC_MSG_ERROR([gbm needs udev]))
 
1241
    GBM_LIB_DEPS="$DLOPEN_LIBS $LIBUDEV_LIBS"
 
1242
 
 
1243
    if test "$mesa_driver" = dri; then
 
1244
        GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri"
 
1245
        if test "$SHARED_GLAPI" -eq 0; then
 
1246
            AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi])
 
1247
        fi
 
1248
    fi
 
1249
fi
 
1250
AC_SUBST([GBM_LIB_DEPS])
 
1251
AC_SUBST([GBM_BACKEND_DIRS])
 
1252
GBM_PC_REQ_PRIV="libudev"
 
1253
GBM_PC_LIB_PRIV="$DLOPEN_LIBS"
 
1254
GBM_PC_CFLAGS=
 
1255
AC_SUBST([GBM_PC_REQ_PRIV])
 
1256
AC_SUBST([GBM_PC_LIB_PRIV])
 
1257
AC_SUBST([GBM_PC_CFLAGS])
 
1258
 
 
1259
dnl
1218
1260
dnl EGL configuration
1219
1261
dnl
1220
1262
EGL_CLIENT_APIS=""
1261
1303
AC_SUBST([EGL_DRIVERS_DIRS])
1262
1304
 
1263
1305
dnl
1264
 
dnl gbm configuration
1265
 
dnl
1266
 
if test "x$enable_gbm" = xauto; then
1267
 
    case "$with_egl_platforms" in
1268
 
        *drm*)
1269
 
            enable_gbm=yes ;;
1270
 
         *)
1271
 
            enable_gbm=no ;;
1272
 
    esac
1273
 
fi
1274
 
if test "x$enable_gbm" = xyes; then
1275
 
    SRC_DIRS="$SRC_DIRS gbm"
1276
 
    GBM_BACKEND_DIRS=""
1277
 
 
1278
 
    PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
1279
 
                      AC_MSG_ERROR([gbm needs udev]))
1280
 
    GBM_LIB_DEPS="$DLOPEN_LIBS $LIBUDEV_LIBS"
1281
 
 
1282
 
    if test "$mesa_driver" = dri; then
1283
 
        GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri"
1284
 
        if test "$SHARED_GLAPI" -eq 0; then
1285
 
            AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi])
1286
 
        fi
1287
 
    fi
1288
 
fi
1289
 
AC_SUBST([GBM_LIB_DEPS])
1290
 
AC_SUBST([GBM_BACKEND_DIRS])
1291
 
GBM_PC_REQ_PRIV="libudev"
1292
 
GBM_PC_LIB_PRIV="$DLOPEN_LIBS"
1293
 
GBM_PC_CFLAGS=
1294
 
AC_SUBST([GBM_PC_REQ_PRIV])
1295
 
AC_SUBST([GBM_PC_LIB_PRIV])
1296
 
AC_SUBST([GBM_PC_CFLAGS])
1297
 
 
1298
 
dnl
1299
1306
dnl EGL Gallium configuration
1300
1307
dnl
1301
1308
if test "x$enable_gallium_egl" = xyes; then
1314
1321
dnl
1315
1322
dnl gbm Gallium configuration
1316
1323
dnl
 
1324
if test "x$enable_gallium_gbm" = xauto; then
 
1325
    case "$enable_gbm$HAVE_ST_EGL$with_egl_platforms" in
 
1326
        yesyes*drm*)
 
1327
            enable_gallium_gbm=yes ;;
 
1328
         *)
 
1329
            enable_gallium_gbm=no ;;
 
1330
    esac
 
1331
fi
1317
1332
if test "x$enable_gallium_gbm" = xyes; then
1318
1333
    if test "x$with_gallium_drivers" = x; then
1319
1334
        AC_MSG_ERROR([cannot enable gbm_gallium without Gallium])
1595
1610
dnl
1596
1611
if test "x$with_gallium_drivers" != x; then
1597
1612
    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
1598
 
    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
1599
 
else
1600
 
    LLVM_CONFIG=no
1601
1613
fi
1602
1614
 
1603
1615
AC_SUBST([LLVM_CFLAGS])
1650
1662
                WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"
1651
1663
                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"
1652
1664
        fi
1653
 
        if test "$plat" = "drm" && test "x$enable_gbm" = no; then
 
1665
        if test "$plat" = "drm" && test "x$enable_gbm" = "xno"; then
1654
1666
                AC_MSG_ERROR([EGL platform drm needs gbm])
1655
1667
        fi
 
1668
        case "$plat$have_libudev" in
 
1669
                waylandno|drmno)
 
1670
                    AC_MSG_ERROR([cannot build $plat platfrom without udev]) ;;
 
1671
        esac
1656
1672
    done
1657
1673
    EGL_PLATFORMS="$egl_platforms"
1658
1674
    ;;
1715
1731
    esac
1716
1732
fi
1717
1733
if test "x$enable_gallium_llvm" = xyes; then
 
1734
    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
 
1735
 
1718
1736
    if test "x$LLVM_CONFIG" != xno; then
1719
1737
        LLVM_VERSION=`$LLVM_CONFIG --version`
1720
1738
        LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
1767
1785
            gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
1768
1786
            ;;
1769
1787
        xi915)
 
1788
            PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
1770
1789
            gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
1771
1790
            ;;
1772
1791
        xi965)
 
1792
            PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
1773
1793
            gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
1774
1794
            ;;
1775
1795
        xr300)
1781
1801
            gallium_check_st "r600/drm" "dri-r600"
1782
1802
            ;;
1783
1803
        xnouveau)
 
1804
            PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
1784
1805
            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
1785
1806
            gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
1786
1807
            ;;