summaryrefslogtreecommitdiff
path: root/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
commitca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib/libxcomposite/change-include-order.patch
parentc210d01a7ca8c00ddc45d292878b89086b137129 (diff)
downloadopenembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz
openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.bz2
openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.xz
openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.zip
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/libxcomposite/change-include-order.patch')
-rw-r--r--meta/packages/xorg-lib/libxcomposite/change-include-order.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 000000000..630b8818f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+
+--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+
+ lib_LTLIBRARIES = libXcomposite.la
+