libxcomposite-X11R7.0-0.2.2.2: build fix for people with an old Xcomposite.h in their...

diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xlibs/libxcomposite/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xlibs/libxcomposite/change-include-order.patch
new file mode 100644 (file)
index 0000000..630b881
--- /dev/null
+++ b/packages/xlibs/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
+ 

diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index 6de1388..57eef74 100644 (file)
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -6,7 +6,8 @@ LICENSE= "BSD-X"
 DEPENDS = "libx11 compositeproto xextproto libxfixes"
 PROVIDES = "xcomposite"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
+          file://change-include-order.patch;patch=1"
 S = "${WORKDIR}/libXcomposite-${PV}"
 
 inherit autotools pkgconfig