testing/clutter: remove glx1.2 hack

This commit is contained in:
William Pitcock 2011-03-11 07:36:48 -06:00
parent 160bd9a877
commit c26a055a67
2 changed files with 3 additions and 41 deletions

View File

@ -2,7 +2,7 @@
# Maintainer:
pkgname=clutter
pkgver=1.6.8
pkgrel=0
pkgrel=1
pkgdesc="library for creating fast, visually-appealing interfaces"
url="http://www.clutter-project.org/"
arch="all"
@ -12,8 +12,7 @@ depends_dev="gdk-pixbuf-dev json-glib-dev atk-dev pango-dev mesa-dev libxcomposi
makedepends="$depends_dev gobject-introspection intltool"
install=""
subpackages="$pkgname-dev $pkgname-doc"
source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
clutter-1.6.0-glx1.2-only.patch"
source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
@ -38,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
md5sums="9eedac4216f709a9f144940d24bfbb3e clutter-1.6.8.tar.bz2
4f5fd8064ef97eed3cf435799e8eefa8 clutter-1.6.0-glx1.2-only.patch"
md5sums="9eedac4216f709a9f144940d24bfbb3e clutter-1.6.8.tar.bz2"

View File

@ -1,36 +0,0 @@
--- clutter-1.6.0/clutter/glx/clutter-backend-glx.c
+++ clutter-1.6.0.mod/clutter/glx/clutter-backend-glx.c
@@ -634,6 +634,7 @@
/* Try and create a GLXWindow to use with extensions dependent on
* GLX versions >= 1.3 that don't accept regular X Windows as GLX
* drawables. */
+#if 0
if (glXQueryVersion (backend_x11->xdpy, &major, &minor) &&
major == 1 && minor >= 3)
{
@@ -642,6 +643,7 @@
backend_glx->dummy_xwin,
NULL);
}
+#endif
if (backend_glx->dummy_glxwin)
dummy_drawable = backend_glx->dummy_glxwin;
--- clutter-1.6.0/clutter/glx/clutter-stage-glx.c
+++ clutter-1.6.0.mod/clutter/glx/clutter-stage-glx.c
@@ -124,6 +124,7 @@
* GLX versions >= 1.3 that don't accept regular X Windows as GLX
* drawables.
*/
+#if 0
if (glXQueryVersion (backend_x11->xdpy, &major, &minor) &&
major == 1 && minor >= 3 &&
_clutter_backend_glx_get_fbconfig (backend_glx, &config))
@@ -133,6 +134,7 @@
stage_x11->xwin,
NULL);
}
+#endif
}
#ifdef GLX_INTEL_swap_event