diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-16 12:53:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-16 12:53:07 +0000 |
| commit | e5720261f0c09f815a23f6b2c8f0b5c4d9258bf5 (patch) | |
| tree | 42380a9a174449458aafb47ae731e972fed8db0c | |
| parent | 4bc98b67904cb6c401ff22e42f3009c5d8e1c0f2 (diff) | |
| parent | cf518f3a05751660df1097901883054306390d96 (diff) | |
merge of '41716f313f0efdbc890ccb2a7a5d8c24cae3ed69'
and '6a15d9f49ea8804172ee689f3791cd3ee9ef66d6'
| -rw-r--r-- | packages/xorg-app/xkbcomp_1.0.4.bb | 5 | ||||
| -rw-r--r-- | packages/xorg-app/xprop_1.0.4.bb | 6 | ||||
| -rw-r--r-- | packages/xorg-app/xrandr_1.2.3.bb | 8 | ||||
| -rw-r--r-- | packages/xorg-app/xrdb_1.0.5.bb | 6 | ||||
| -rw-r--r-- | packages/xorg-xserver/files/sysroot_fix.patch | 13 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.bb | 4 |
6 files changed, 41 insertions, 1 deletions
diff --git a/packages/xorg-app/xkbcomp_1.0.4.bb b/packages/xorg-app/xkbcomp_1.0.4.bb new file mode 100644 index 0000000000..ca6cdb8898 --- /dev/null +++ b/packages/xorg-app/xkbcomp_1.0.4.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." + +DEPENDS += " virtual/libx11 libxkbfile" diff --git a/packages/xorg-app/xprop_1.0.4.bb b/packages/xorg-app/xprop_1.0.4.bb new file mode 100644 index 0000000000..1781fb1a1b --- /dev/null +++ b/packages/xorg-app/xprop_1.0.4.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "a property displayer for X" + +DEPENDS += " libxmu virtual/libx11" diff --git a/packages/xorg-app/xrandr_1.2.3.bb b/packages/xorg-app/xrandr_1.2.3.bb new file mode 100644 index 0000000000..05ef6af95d --- /dev/null +++ b/packages/xorg-app/xrandr_1.2.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" +DEPENDS += "libxrandr libxrender" +PE = "1" + +SRC_URI += "file://resolve_symbol_clash.patch;patch=1" diff --git a/packages/xorg-app/xrdb_1.0.5.bb b/packages/xorg-app/xrdb_1.0.5.bb new file mode 100644 index 0000000000..177d3ab23b --- /dev/null +++ b/packages/xorg-app/xrdb_1.0.5.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X server resource database utility" +LICENSE = "xrdb" +DEPENDS += "libxmu" +PE = "1" diff --git a/packages/xorg-xserver/files/sysroot_fix.patch b/packages/xorg-xserver/files/sysroot_fix.patch new file mode 100644 index 0000000000..59753d5803 --- /dev/null +++ b/packages/xorg-xserver/files/sysroot_fix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.4/xorg-server.m4 +=================================================================== +--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100 ++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100 +@@ -30,7 +30,7 @@ + + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index b89be011fa..ee84cac779 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,9 +3,11 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" +PR = "r1" SRC_URI += "file://drmfix.patch;patch=1 \ - file://pkgconfig_fix.patch;patch=1" + file://pkgconfig_fix.patch;patch=1 \ + file://sysroot_fix.patch;patch=1" MESA_VER = "7.0.2" |