aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-02-11 09:15:06 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-02-11 09:16:55 -0600
commit4bd3160a19f490a920852f36f48b7aa429748e3f (patch)
tree6040674e5e583e6e4369e0f79e82cc06137b2199 /testing
parent18f7422d53238a7d6ee220fec02e3de7956add2a (diff)
downloadaports-4bd3160a19f490a920852f36f48b7aa429748e3f.tar.bz2
aports-4bd3160a19f490a920852f36f48b7aa429748e3f.tar.xz
testing/clutter: force GLX 1.2 features always for now (but this is broken, just less so)
Diffstat (limited to 'testing')
-rw-r--r--testing/clutter/APKBUILD8
-rw-r--r--testing/clutter/clutter-1.6.0-glx1.2-only.patch36
2 files changed, 41 insertions, 3 deletions
diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD
index 25f3d43c2d..585567836a 100644
--- a/testing/clutter/APKBUILD
+++ b/testing/clutter/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=clutter
pkgver=1.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="library for creating fast, visually-appealing interfaces"
url="http://www.clutter-project.org/"
arch="all"
@@ -12,7 +12,8 @@ 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"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ clutter-1.6.0-glx1.2-only.patch"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
@@ -37,4 +38,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="71cf28a989c24c3ff2c5f704b080ed3c clutter-1.6.0.tar.bz2"
+md5sums="71cf28a989c24c3ff2c5f704b080ed3c clutter-1.6.0.tar.bz2
+4f5fd8064ef97eed3cf435799e8eefa8 clutter-1.6.0-glx1.2-only.patch"
diff --git a/testing/clutter/clutter-1.6.0-glx1.2-only.patch b/testing/clutter/clutter-1.6.0-glx1.2-only.patch
new file mode 100644
index 0000000000..47f1c37bfc
--- /dev/null
+++ b/testing/clutter/clutter-1.6.0-glx1.2-only.patch
@@ -0,0 +1,36 @@
+--- 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