summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-03-11 07:36:48 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-03-11 07:36:48 -0600
commitc26a055a6787a96bcdfc0013bc770255d25e31b2 (patch)
treec49a137fa23b3778936955f9b6a685dfc65f6bf3 /testing
parent160bd9a87748cbe58ff6d1dbf2805eb8181f2451 (diff)
downloadaports-c26a055a6787a96bcdfc0013bc770255d25e31b2.tar.bz2
aports-c26a055a6787a96bcdfc0013bc770255d25e31b2.tar.xz
testing/clutter: remove glx1.2 hack
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, 3 insertions, 41 deletions
diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD
index e4744dedc..586ff2c1f 100644
--- a/testing/clutter/APKBUILD
+++ b/testing/clutter/APKBUILD
@@ -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"
diff --git a/testing/clutter/clutter-1.6.0-glx1.2-only.patch b/testing/clutter/clutter-1.6.0-glx1.2-only.patch
deleted file mode 100644
index 47f1c37bf..000000000
--- a/testing/clutter/clutter-1.6.0-glx1.2-only.patch
+++ /dev/null
@@ -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