From 5377e4fa3a003b7dcfce1b153ee9c1b9ddc2537f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 2 Jul 2009 14:28:29 +0100 Subject: libx11 1.1.5 -> 1.2.1 Signed-off-by: Richard Purdie --- meta/packages/xorg-lib/libx11-diet_1.1.5.bb | 17 ----------------- meta/packages/xorg-lib/libx11-diet_1.2.1.bb | 17 +++++++++++++++++ meta/packages/xorg-lib/libx11-native_1.1.5.bb | 6 ------ meta/packages/xorg-lib/libx11-native_1.2.1.bb | 6 ++++++ meta/packages/xorg-lib/libx11-sdk_1.1.5.bb | 6 ------ meta/packages/xorg-lib/libx11-sdk_1.2.1.bb | 6 ++++++ meta/packages/xorg-lib/libx11-trim_1.1.5.bb | 10 ---------- meta/packages/xorg-lib/libx11-trim_1.2.1.bb | 11 +++++++++++ meta/packages/xorg-lib/libx11/nodolt.patch | 12 ++++++++++++ .../packages/xorg-lib/libx11/x11_disable_makekeys.patch | 13 ++++++------- meta/packages/xorg-lib/libx11_1.1.5.bb | 12 ------------ meta/packages/xorg-lib/libx11_1.2.1.bb | 13 +++++++++++++ meta/packages/xorg-lib/libxi_git.bb | 2 +- 13 files changed, 72 insertions(+), 59 deletions(-) delete mode 100644 meta/packages/xorg-lib/libx11-diet_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11-diet_1.2.1.bb delete mode 100644 meta/packages/xorg-lib/libx11-native_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11-native_1.2.1.bb delete mode 100644 meta/packages/xorg-lib/libx11-sdk_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11-sdk_1.2.1.bb delete mode 100644 meta/packages/xorg-lib/libx11-trim_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11-trim_1.2.1.bb create mode 100644 meta/packages/xorg-lib/libx11/nodolt.patch delete mode 100644 meta/packages/xorg-lib/libx11_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11_1.2.1.bb (limited to 'meta/packages/xorg-lib') diff --git a/meta/packages/xorg-lib/libx11-diet_1.1.5.bb b/meta/packages/xorg-lib/libx11-diet_1.1.5.bb deleted file mode 100644 index a76aba16e..000000000 --- a/meta/packages/xorg-lib/libx11-diet_1.1.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libx11.inc - -PR = "r1" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1 \ - file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" - -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb b/meta/packages/xorg-lib/libx11-diet_1.2.1.bb new file mode 100644 index 000000000..a76aba16e --- /dev/null +++ b/meta/packages/xorg-lib/libx11-diet_1.2.1.bb @@ -0,0 +1,17 @@ +require libx11.inc + +PR = "r1" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1 \ + file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" +CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-native_1.1.5.bb b/meta/packages/xorg-lib/libx11-native_1.1.5.bb deleted file mode 100644 index 30f0ff826..000000000 --- a/meta/packages/xorg-lib/libx11-native_1.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libx11_${PV}.bb - -DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" -PROVIDES = "virtual/libx11-native" - -inherit native diff --git a/meta/packages/xorg-lib/libx11-native_1.2.1.bb b/meta/packages/xorg-lib/libx11-native_1.2.1.bb new file mode 100644 index 000000000..30f0ff826 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-native_1.2.1.bb @@ -0,0 +1,6 @@ +require libx11_${PV}.bb + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "virtual/libx11-native" + +inherit native diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb deleted file mode 100644 index 920f7b770..000000000 --- a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libx11_${PV}.bb - -DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native" -PROVIDES = "virtual/libx11-sdk" - -inherit sdk diff --git a/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb b/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb new file mode 100644 index 000000000..920f7b770 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb @@ -0,0 +1,6 @@ +require libx11_${PV}.bb + +DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native" +PROVIDES = "virtual/libx11-sdk" + +inherit sdk diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb deleted file mode 100644 index bd605bee3..000000000 --- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11.inc - -PR = "r5" - -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1" - -EXTRA_OECONF += "--disable-xcms --with-xcb" diff --git a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb b/meta/packages/xorg-lib/libx11-trim_1.2.1.bb new file mode 100644 index 000000000..08c8b163a --- /dev/null +++ b/meta/packages/xorg-lib/libx11-trim_1.2.1.bb @@ -0,0 +1,11 @@ +require libx11.inc + +PR = "r6" + +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1 \ + file://nodolt.patch;patch=1" + +EXTRA_OECONF += "--disable-xcms --with-xcb" diff --git a/meta/packages/xorg-lib/libx11/nodolt.patch b/meta/packages/xorg-lib/libx11/nodolt.patch new file mode 100644 index 000000000..ecf9625ca --- /dev/null +++ b/meta/packages/xorg-lib/libx11/nodolt.patch @@ -0,0 +1,12 @@ +Index: libX11-1.2.1/configure.ac +=================================================================== +--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 ++++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 +@@ -20,7 +20,6 @@ + + # Checks for programs. + AC_PROG_LIBTOOL +-DOLT + AC_PROG_CC + XORG_CWARNFLAGS + diff --git a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch index 2a8a55cdf..670578257 100644 --- a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch +++ b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch @@ -2,22 +2,21 @@ src/util/Makefile.am | 17 ----------------- 1 file changed, 17 deletions(-) -Index: libX11-1.1.2/src/util/Makefile.am +Index: libX11-1.2.1/src/util/Makefile.am =================================================================== ---- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 -+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 -@@ -1,21 +1,4 @@ +--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100 ++++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100 +@@ -1,20 +1,3 @@ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ -noinst_PROGRAMS=makekeys - -makekeys_CFLAGS=$(X11_CFLAGS) - --#override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-CC = @CC_FOR_BUILD@ - EXTRA_DIST = mkks.sh - +- -if LINT -# Check source code with tools like lint & sparse - diff --git a/meta/packages/xorg-lib/libx11_1.1.5.bb b/meta/packages/xorg-lib/libx11_1.1.5.bb deleted file mode 100644 index 81d3f91fa..000000000 --- a/meta/packages/xorg-lib/libx11_1.1.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libx11.inc - -PE = "1" -PR = "r0" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1" - -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - -EXTRA_OECONF += "--without-xcb" diff --git a/meta/packages/xorg-lib/libx11_1.2.1.bb b/meta/packages/xorg-lib/libx11_1.2.1.bb new file mode 100644 index 000000000..9c858fc1a --- /dev/null +++ b/meta/packages/xorg-lib/libx11_1.2.1.bb @@ -0,0 +1,13 @@ +require libx11.inc + +PE = "1" +PR = "r1" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://nodolt.patch;patch=1 \ + file://include_fix.patch;patch=1" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + +EXTRA_OECONF += "--without-xcb" diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb index efa3d93f9..13e51f437 100644 --- a/meta/packages/xorg-lib/libxi_git.bb +++ b/meta/packages/xorg-lib/libxi_git.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Input extension library" DEPENDS += "libxext inputproto" PE = "1" -PV = "1.9.99.5+gitr${SRCREV}" +PV = "1.9.99.5+gitr${SRCPV}" XORG_PN = "libXi" -- cgit v1.2.3