From 2a2673811815b4e692a27b96dd5e3c70cd86fe4a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 1 Aug 2007 12:59:42 +0000
Subject: libxdamage: updated to 1.1.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2274 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../xorg-lib/libxdamage-1.0.1/autofoo.patch        | 17 ------
 meta/packages/xorg-lib/libxdamage/m4.patch         | 65 ----------------------
 meta/packages/xorg-lib/libxdamage_1.0.4.bb         | 10 ----
 meta/packages/xorg-lib/libxdamage_1.1.1.bb         | 10 ++++
 4 files changed, 10 insertions(+), 92 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
 delete mode 100644 meta/packages/xorg-lib/libxdamage/m4.patch
 delete mode 100644 meta/packages/xorg-lib/libxdamage_1.0.4.bb
 create mode 100644 meta/packages/xorg-lib/libxdamage_1.1.1.bb

(limited to 'meta')

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 @@
-Index: libXdamage-1.0.1/configure.ac
-===================================================================
---- libXdamage-1.0.1.orig/configure.ac	2004-01-15 03:54:55.000000000 -0500
-+++ libXdamage-1.0.1/configure.ac	2005-01-18 19:07:16.951430928 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- 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 @@
-
-#
-# 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
-+])
-+
-+
diff --git a/meta/packages/xorg-lib/libxdamage_1.0.4.bb b/meta/packages/xorg-lib/libxdamage_1.0.4.bb
deleted file mode 100644
index e56d1d0954..0000000000
--- a/meta/packages/xorg-lib/libxdamage_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 damaged region extension library"
-LICENSE= "BSD-X"
-DEPENDS += "damageproto libxfixes"
-PROVIDES = "xdamage"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXdamage"
diff --git a/meta/packages/xorg-lib/libxdamage_1.1.1.bb b/meta/packages/xorg-lib/libxdamage_1.1.1.bb
new file mode 100644
index 0000000000..e56d1d0954
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_1.1.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE= "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PROVIDES = "xdamage"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdamage"
-- 
cgit v1.2.3-54-g00ecf