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
author: Chris Larson <kergoth@openedhand.com> 2006-08-15 11:58:37 +0000
committer: Chris Larson <kergoth@openedhand.com> 2006-08-15 11:58:37 +0000
commit: ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree: 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib/libxdamage
parent: c210d01a7ca8c00ddc45d292878b89086b137129 (diff)
download: poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch
new file mode 100644
index 0000000000..393f3d13d2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage/m4.patch
@@ -0,0 +1,65 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- /dev/null
+++ Xdamage/m4/pkg.m4
+@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+
author	Chris Larson <kergoth@openedhand.com>	2006-08-15 11:58:37 +0000
committer	Chris Larson <kergoth@openedhand.com>	2006-08-15 11:58:37 +0000
commit	ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree	2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib/libxdamage
parent	c210d01a7ca8c00ddc45d292878b89086b137129 (diff)
download	poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz

diff --git a/meta/packages/xorg-lib/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch new file mode 100644 index 0000000000..393f3d13d2 --- /dev/null +++ b/meta/packages/xorg-lib/libxdamage/m4.patch
@@ -0,0 +1,65 @@
	1
	2	#
	3	# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
	4	#
	5
	6	--- /dev/null
	7	+++ Xdamage/m4/pkg.m4
	8	@@ -0,0 +1,57 @@
	9	+
	10	+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
	11	+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
	12	+dnl also defines GSTUFF_PKG_ERRORS on error
	13	+AC_DEFUN(PKG_CHECK_MODULES, [
	14	+ succeeded=no
	15	+
	16	+ if test -z "$PKG_CONFIG"; then
	17	+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
	18	+ fi
	19	+
	20	+ if test "$PKG_CONFIG" = "no" ; then
	21	+ echo "*** The pkg-config script could not be found. Make sure it is"
	22	+ echo "*** in your path, or set the PKG_CONFIG environment variable"
	23	+ echo "*** to the full path to pkg-config."
	24	+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
	25	+ else
	26	+ PKG_CONFIG_MIN_VERSION=0.9.0
	27	+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
	28	+ AC_MSG_CHECKING(for $2)
	29	+
	30	+ if $PKG_CONFIG --exists "$2" ; then
	31	+ AC_MSG_RESULT(yes)
	32	+ succeeded=yes
	33	+
	34	+ AC_MSG_CHECKING($1_CFLAGS)
	35	+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
	36	+ AC_MSG_RESULT($$1_CFLAGS)
	37	+
	38	+ AC_MSG_CHECKING($1_LIBS)
	39	+ $1_LIBS=`$PKG_CONFIG --libs "$2"`
	40	+ AC_MSG_RESULT($$1_LIBS)
	41	+ else
	42	+ $1_CFLAGS=""
	43	+ $1_LIBS=""
	44	+ ## If we have a custom action on failure, don't print errors, but
	45	+ ## do set a variable so people can do so.
	46	+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
	47	+ ifelse([$4], ,echo $$1_PKG_ERRORS,)
	48	+ fi
	49	+
	50	+ AC_SUBST($1_CFLAGS)
	51	+ AC_SUBST($1_LIBS)
	52	+ else
	53	+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
	54	+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
	55	+ fi
	56	+ fi
	57	+
	58	+ if test $succeeded = yes; then
	59	+ ifelse([$3], , :, [$3])
	60	+ else
	61	+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
	62	+ fi
	63	+])
	64	+
	65	+