summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-lib
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-01 12:59:42 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-01 12:59:42 +0000
commit2a2673811815b4e692a27b96dd5e3c70cd86fe4a (patch)
treebeb42ee7bbdd13870fb0da4373730369e83bf650 /meta/packages/xorg-lib
parent8e9daeff495cf1058df072e7a6417f24d3711ab6 (diff)
downloadpoky-2a2673811815b4e692a27b96dd5e3c70cd86fe4a.tar.gz
libxdamage: updated to 1.1.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2274 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib')
-rw-r--r--meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch17
-rw-r--r--meta/packages/xorg-lib/libxdamage/m4.patch65
-rw-r--r--meta/packages/xorg-lib/libxdamage_1.1.1.bb (renamed from meta/packages/xorg-lib/libxdamage_1.0.4.bb)0
3 files changed, 0 insertions, 82 deletions
diff --git a/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
deleted file mode 100644
index 1e3ec45d4a..0000000000
--- a/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Index: libXdamage-1.0.1/configure.ac
2===================================================================
3--- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500
4+++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500
5@@ -33,11 +33,11 @@
6 dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
7 dnl
8 AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
9+AC_CONFIG_AUX_DIR(.)
10 AM_INIT_AUTOMAKE([dist-bzip2])
11 AM_MAINTAINER_MODE
12
13 AM_CONFIG_HEADER(config.h)
14-AC_CONFIG_AUX_DIR(.)
15
16 # Check for progs
17 AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch
deleted file mode 100644
index 393f3d13d2..0000000000
--- a/meta/packages/xorg-lib/libxdamage/m4.patch
+++ /dev/null
@@ -1,65 +0,0 @@
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+
diff --git a/meta/packages/xorg-lib/libxdamage_1.0.4.bb b/meta/packages/xorg-lib/libxdamage_1.1.1.bb
index e56d1d0954..e56d1d0954 100644
--- a/meta/packages/xorg-lib/libxdamage_1.0.4.bb
+++ b/meta/packages/xorg-lib/libxdamage_1.1.1.bb