From 3081d60d5a9f8accf016bd43f0ef13dffa9a519b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Sep 2008 19:22:21 +0000 Subject: libx11: Upgrade to 1.1.5, rename diet-x11 to libx11-diet for consistent naming. Create common .inc file for diet,trim and full-fat version versions git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5320 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/xorg-lib/diet-x11_1.1.4.bb | 10 ------- meta/packages/xorg-lib/libx11-diet_1.1.5.bb | 18 ++++++++++++ meta/packages/xorg-lib/libx11-native_1.1.4.bb | 8 ------ meta/packages/xorg-lib/libx11-native_1.1.5.bb | 8 ++++++ meta/packages/xorg-lib/libx11-sdk_1.1.4.bb | 8 ------ meta/packages/xorg-lib/libx11-sdk_1.1.5.bb | 8 ++++++ .../libx11-trim/x11_disable_makekeys.patch | 30 ++++++++++++++++++++ meta/packages/xorg-lib/libx11-trim_1.1.5.bb | 32 ++++------------------ meta/packages/xorg-lib/libx11.inc | 25 +++++++++++++++++ meta/packages/xorg-lib/libx11_1.1.4.bb | 31 --------------------- meta/packages/xorg-lib/libx11_1.1.5.bb | 12 ++++++++ 11 files changed, 106 insertions(+), 84 deletions(-) delete mode 100644 meta/packages/xorg-lib/diet-x11_1.1.4.bb create mode 100644 meta/packages/xorg-lib/libx11-diet_1.1.5.bb delete mode 100644 meta/packages/xorg-lib/libx11-native_1.1.4.bb create mode 100644 meta/packages/xorg-lib/libx11-native_1.1.5.bb delete mode 100644 meta/packages/xorg-lib/libx11-sdk_1.1.4.bb create mode 100644 meta/packages/xorg-lib/libx11-sdk_1.1.5.bb create mode 100644 meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch create mode 100644 meta/packages/xorg-lib/libx11.inc delete mode 100644 meta/packages/xorg-lib/libx11_1.1.4.bb create mode 100644 meta/packages/xorg-lib/libx11_1.1.5.bb (limited to 'meta/packages/xorg-lib') diff --git a/meta/packages/xorg-lib/diet-x11_1.1.4.bb b/meta/packages/xorg-lib/diet-x11_1.1.4.bb deleted file mode 100644 index 19a9efecbf..0000000000 --- a/meta/packages/xorg-lib/diet-x11_1.1.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11_${PV}.bb - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-diet_1.1.5.bb b/meta/packages/xorg-lib/libx11-diet_1.1.5.bb new file mode 100644 index 0000000000..0830a44554 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-diet_1.1.5.bb @@ -0,0 +1,18 @@ +require libx11_${PV}.bb + +PE = "1" +PR = "r0" + +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 --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-native_1.1.4.bb b/meta/packages/xorg-lib/libx11-native_1.1.4.bb deleted file mode 100644 index 71b45afdf4..0000000000 --- a/meta/packages/xorg-lib/libx11-native_1.1.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libx11_${PV}.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -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 = "" - -inherit native diff --git a/meta/packages/xorg-lib/libx11-native_1.1.5.bb b/meta/packages/xorg-lib/libx11-native_1.1.5.bb new file mode 100644 index 0000000000..71b45afdf4 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-native_1.1.5.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +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 = "" + +inherit native diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb deleted file mode 100644 index 6140d13701..0000000000 --- a/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libx11_${PV}.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -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 = "" - -inherit sdk diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb new file mode 100644 index 0000000000..6140d13701 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +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 = "" + +inherit sdk diff --git a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch new file mode 100644 index 0000000000..2a8a55cdf5 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch @@ -0,0 +1,30 @@ +--- + src/util/Makefile.am | 17 ----------------- + 1 file changed, 17 deletions(-) + +Index: libX11-1.1.2/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 @@ + # $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 $@ +- + EXTRA_DIST = mkks.sh + +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb index e99b2a07b0..accdc440db 100644 --- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb +++ b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb @@ -1,33 +1,11 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 protocol and utility library" -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto" - -#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -#SRC_URI += "file://X18NCMSstubs.diff;patch=1 " - -PROVIDES = "virtual/libx11" +require libx11.inc PE = "1" -PR = "r1" +PR = "r4" -XORG_PN = "libX11" -LEAD_SONAME = "libX11.so" +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto" -SRC_URI += "file://include_fix.patch;patch=1" +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1" -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" -#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" EXTRA_OECONF += "--disable-xcms --with-xcb" - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - cd ../../ - ) || exit 1 - oe_runmake -} - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB " - diff --git a/meta/packages/xorg-lib/libx11.inc b/meta/packages/xorg-lib/libx11.inc new file mode 100644 index 0000000000..f4f52fdf7e --- /dev/null +++ b/meta/packages/xorg-lib/libx11.inc @@ -0,0 +1,25 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 protocol and utility library" +PROVIDES = "virtual/libx11" + +XORG_PN = "libX11" +LEAD_SONAME = "libX11.so" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11_1.1.4.bb deleted file mode 100644 index 7ab3a7bb94..0000000000 --- a/meta/packages/xorg-lib/libx11_1.1.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Base X libs." -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -PROVIDES = "virtual/libx11" -PE = "1" -PR = "r3" - -XORG_PN = "libX11" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1" - -EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; - mv makekeys.c.orig makekeys.c || true - touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys - # mv to stop it getting rebuilt - mv makekeys.c makekeys.c.orig - cd ../../ - ) || exit 1 - oe_runmake -} - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/meta/packages/xorg-lib/libx11_1.1.5.bb b/meta/packages/xorg-lib/libx11_1.1.5.bb new file mode 100644 index 0000000000..81d3f91fa6 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_1.1.5.bb @@ -0,0 +1,12 @@ +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" -- cgit v1.2.3-54-g00ecf