summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-11-20 22:00:22 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-11-20 22:00:22 +0800
commit0742c220491e28a5e104925ed1700dd73a1ae0be (patch)
treeb917187d1429ee6cd4121d7866abb344b2f12193 /graphics
parent546150b40dc50c49334f5a38715a24f08f64fe2c (diff)
downloadmarcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar.gz
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar.bz2
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar.lz
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar.xz
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.tar.zst
marcuscom-ports-0742c220491e28a5e104925ed1700dd73a1ae0be.zip
Use pkg-config to find where gl is installed instead of hard coding /usr/local/include.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14913 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
-rw-r--r--graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in21
1 files changed, 10 insertions, 11 deletions
diff --git a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
index a699920d1..ec4a62547 100644
--- a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
+++ b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
@@ -1,11 +1,10 @@
---- clutter/cogl/cogl/Makefile.in.orig 2010-10-07 12:11:29.000000000 +0200
-+++ clutter/cogl/cogl/Makefile.in 2010-10-07 12:12:52.000000000 +0200
-@@ -773,7 +773,7 @@
- @HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
- @HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-cogl.la
- @HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cogl_headers) cogl-enum-types.h
--@HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS)
-+@HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) -I/usr/local/include $(AM_CPPFLAGS)
- @HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0
- @HAVE_INTROSPECTION_TRUE@Cogl_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+--- clutter/cogl/cogl/Makefile.in.orig 2010-11-20 14:38:12.000000000 +0100
++++ clutter/cogl/cogl/Makefile.in 2010-11-20 14:47:42.000000000 +0100
+@@ -582,6 +582,7 @@
+ -I$(srcdir)/winsys \
+ -I$(srcdir)/driver/$(COGL_DRIVER) \
+ -I$(top_builddir)/clutter/cogl \
++ `pkg-config --cflags gl` \
+ $(NULL)
+
+ AM_CPPFLAGS = \