summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-01-26 05:03:07 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-01-26 05:03:07 +0800
commitdab340b63a4c270e9a5074d153cadc57fbd9721d (patch)
tree684cbb64e88a4eda3815f4e09c963cefe7e0a817
parent4e9810b12640f73261fa87a49f8d19e4986ba1b3 (diff)
downloadxorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar.gz
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar.bz2
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar.lz
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar.xz
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.tar.zst
xorg-devel-ports-dab340b63a4c270e9a5074d153cadc57fbd9721d.zip
Fixup dependencies and plug a use before initialized.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1370 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--graphics/glamor/Makefile2
-rw-r--r--graphics/glamor/files/patch-src__glamor_fbo.c12
2 files changed, 13 insertions, 1 deletions
diff --git a/graphics/glamor/Makefile b/graphics/glamor/Makefile
index b1e7193..a10ae69 100644
--- a/graphics/glamor/Makefile
+++ b/graphics/glamor/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USES= pathfix pkgconfig
USE_GL= gl egl
XORG_CAT= driver
-XORG= server pixman
+USE_XORG= xorg-server dri3proto presentproto pixman
# needs libgbm >=9
CONFIGURE_ARGS+=--disable-glamor-dri3
diff --git a/graphics/glamor/files/patch-src__glamor_fbo.c b/graphics/glamor/files/patch-src__glamor_fbo.c
new file mode 100644
index 0000000..26929a3
--- /dev/null
+++ b/graphics/glamor/files/patch-src__glamor_fbo.c
@@ -0,0 +1,12 @@
+--- src/glamor_fbo.c.orig 2014-01-25 21:56:30.893669151 +0100
++++ src/glamor_fbo.c 2014-01-25 21:57:02.604665024 +0100
+@@ -72,7 +72,8 @@
+ int w, int h, GLenum format, int flag)
+ {
+ struct xorg_list *cache;
+- glamor_pixmap_fbo *fbo_entry, *ret_fbo = NULL;
++ glamor_pixmap_fbo *fbo_entry = NULL;
++ glamor_pixmap_fbo *ret_fbo = NULL;
+ int n_format;
+ #ifdef NO_FBO_CACHE
+ return NULL;