From 73f29cc7c76299863fbc6b4af65275c7d5fe2f8f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:05:09 +0000 Subject: xproto: add X11R7.1 release --- packages/xproto/compositeproto_0.3.1.bb | 3 +++ packages/xproto/fixesproto_4.0.bb | 3 +++ packages/xproto/glproto_1.4.7.bb | 2 ++ packages/xproto/proto-common.inc | 6 ++++-- packages/xproto/scrnsaverproto_1.1.0.bb | 2 ++ packages/xproto/xproto_7.0.5.bb | 2 ++ 6 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/xproto/compositeproto_0.3.1.bb create mode 100644 packages/xproto/fixesproto_4.0.bb create mode 100644 packages/xproto/glproto_1.4.7.bb create mode 100644 packages/xproto/scrnsaverproto_1.1.0.bb create mode 100644 packages/xproto/xproto_7.0.5.bb diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb new file mode 100644 index 0000000000..bb55a2022e --- /dev/null +++ b/packages/xproto/compositeproto_0.3.1.bb @@ -0,0 +1,3 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" +CONFLICTS = "compositeext" diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb new file mode 100644 index 0000000000..8e552e6bc5 --- /dev/null +++ b/packages/xproto/fixesproto_4.0.bb @@ -0,0 +1,3 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" +CONFLICTS = "fixesext" diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xproto/glproto_1.4.7.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc index f35a791171..65dfd4207a 100644 --- a/packages/xproto/proto-common.inc +++ b/packages/xproto/proto-common.inc @@ -3,9 +3,11 @@ SECTION = "x11/libs" LICENSE= "MIT-X" #MAINTAINER = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" +S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}" + +XORG_RELEASE ?= "X11R7.0" inherit autotools pkgconfig diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xproto/scrnsaverproto_1.1.0.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xproto/xproto_7.0.5.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" -- cgit v1.2.3 From 47f6ed2bdfb5b20903727b2f48f228d3be439920 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:08:43 +0000 Subject: libxi-X11R7.0-1.0.0: depend on libxext, not xext --- packages/xlibs/libxi_X11R7.0-1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb index 20a29e094a..4e357cde7c 100644 --- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb +++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "X Input extension library." SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "xproto libx11 xext" +DEPENDS = "xproto libx11 libxext" XORG_PN = "libXi" -- cgit v1.2.3 From 7b5146db076218b7180208d6f6d1a500b8e10bc6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:11:47 +0000 Subject: xlibs: move patches for lbxutil and libx11 to common dirs --- packages/xlibs/files/fix-utf8-wrong-define.patch | 16 +++++++ packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty | 0 packages/xlibs/liblbxutil-1.0.0/mkg3states.patch | 51 ----------------------- packages/xlibs/liblbxutil/.mtn2git_empty | 0 packages/xlibs/liblbxutil/mkg3states.patch | 51 +++++++++++++++++++++++ packages/xlibs/libx11/fix-utf8-wrong-define.patch | 16 ------- 6 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 packages/xlibs/files/fix-utf8-wrong-define.patch delete mode 100644 packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty delete mode 100644 packages/xlibs/liblbxutil-1.0.0/mkg3states.patch create mode 100644 packages/xlibs/liblbxutil/.mtn2git_empty create mode 100644 packages/xlibs/liblbxutil/mkg3states.patch delete mode 100644 packages/xlibs/libx11/fix-utf8-wrong-define.patch diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xlibs/files/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..dca88fba92 --- /dev/null +++ b/packages/xlibs/files/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-6.2.1/include/X11/Xlib.h +@@ -100,7 +100,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch deleted file mode 100644 index 58463db46b..0000000000 --- a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 -+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 -@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) ---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 -+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 -@@ -1,9 +1,6 @@ - lib_LTLIBRARIES = liblbxutil.la - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 - ---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 -+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xlibs/liblbxutil/.mtn2git_empty b/packages/xlibs/liblbxutil/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xlibs/liblbxutil/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/packages/xlibs/liblbxutil/mkg3states.patch @@ -0,0 +1,51 @@ +--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 ++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 +@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 ++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 ++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/packages/xlibs/libx11/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba92..0000000000 --- a/packages/xlibs/libx11/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-6.2.1/include/X11/Xlib.h -@@ -100,7 +100,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - -- cgit v1.2.3 From 2da9c36b509afda1e4a421d8805ffe41c9eb5539 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:15:49 +0000 Subject: xlibs: add X11R7.1 release --- packages/xlibs/diet-x11_X11R7.1-1.0.1.bb | 11 +++++++++++ packages/xlibs/libfontenc_1.0.2.bb | 12 ++++++++++++ packages/xlibs/libice_X11R7.1-1.0.1.bb | 13 +++++++++++++ packages/xlibs/liblbxutil_1.0.1.bb | 18 ++++++++++++++++++ packages/xlibs/libsm_X11R7.1-1.0.1.bb | 13 +++++++++++++ packages/xlibs/libx11_X11R7.1-1.0.1.bb | 26 ++++++++++++++++++++++++++ packages/xlibs/libxau_1.0.1.bb | 14 ++++++++++++++ packages/xlibs/libxaw_X11R7.1-1.0.2.bb | 16 ++++++++++++++++ packages/xlibs/libxcomposite_X11R7.1-0.3.bb | 15 +++++++++++++++ packages/xlibs/libxcursor_1.1.6.bb | 14 ++++++++++++++ packages/xlibs/libxdamage_1.0.3.bb | 12 ++++++++++++ packages/xlibs/libxdmcp_1.0.1.bb | 13 +++++++++++++ packages/xlibs/libxext_1.0.1.bb | 16 ++++++++++++++++ packages/xlibs/libxfixes_4.0.1.bb | 11 +++++++++++ packages/xlibs/libxfont_X11R7.1-1.1.0.bb | 13 +++++++++++++ packages/xlibs/libxi_X11R7.1-1.0.1.bb | 12 ++++++++++++ packages/xlibs/libxkbfile_1.0.3.bb | 12 ++++++++++++ packages/xlibs/libxkbui_1.0.2.bb | 13 +++++++++++++ packages/xlibs/libxmu_1.0.1.bb | 20 ++++++++++++++++++++ packages/xlibs/libxpm_3.5.5.bb | 21 +++++++++++++++++++++ packages/xlibs/libxrandr_1.1.1.bb | 13 +++++++++++++ packages/xlibs/libxrender_0.9.1.bb | 13 +++++++++++++ packages/xlibs/libxres_X11R7.1-1.0.1.bb | 14 ++++++++++++++ packages/xlibs/libxt_1.0.2.bb | 23 +++++++++++++++++++++++ packages/xlibs/libxxf86dga_1.0.1.bb | 16 ++++++++++++++++ packages/xlibs/libxxf86misc_1.0.1.bb | 12 ++++++++++++ packages/xlibs/libxxf86vm_1.0.1.bb | 13 +++++++++++++ packages/xlibs/util-macros_1.0.2.bb | 11 +++++++++++ packages/xlibs/xorg-xlibs.inc | 7 +++++-- 29 files changed, 415 insertions(+), 2 deletions(-) create mode 100644 packages/xlibs/diet-x11_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/libfontenc_1.0.2.bb create mode 100644 packages/xlibs/libice_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/liblbxutil_1.0.1.bb create mode 100644 packages/xlibs/libsm_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/libx11_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/libxau_1.0.1.bb create mode 100644 packages/xlibs/libxaw_X11R7.1-1.0.2.bb create mode 100644 packages/xlibs/libxcomposite_X11R7.1-0.3.bb create mode 100644 packages/xlibs/libxcursor_1.1.6.bb create mode 100644 packages/xlibs/libxdamage_1.0.3.bb create mode 100644 packages/xlibs/libxdmcp_1.0.1.bb create mode 100644 packages/xlibs/libxext_1.0.1.bb create mode 100644 packages/xlibs/libxfixes_4.0.1.bb create mode 100644 packages/xlibs/libxfont_X11R7.1-1.1.0.bb create mode 100644 packages/xlibs/libxi_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/libxkbfile_1.0.3.bb create mode 100644 packages/xlibs/libxkbui_1.0.2.bb create mode 100644 packages/xlibs/libxmu_1.0.1.bb create mode 100644 packages/xlibs/libxpm_3.5.5.bb create mode 100644 packages/xlibs/libxrandr_1.1.1.bb create mode 100644 packages/xlibs/libxrender_0.9.1.bb create mode 100644 packages/xlibs/libxres_X11R7.1-1.0.1.bb create mode 100644 packages/xlibs/libxt_1.0.2.bb create mode 100644 packages/xlibs/libxxf86dga_1.0.1.bb create mode 100644 packages/xlibs/libxxf86misc_1.0.1.bb create mode 100644 packages/xlibs/libxxf86vm_1.0.1.bb create mode 100644 packages/xlibs/util-macros_1.0.2.bb diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..747c525535 --- /dev/null +++ b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +PROVIDES += "libx11" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb new file mode 100644 index 0000000000..b67c4a0e38 --- /dev/null +++ b/packages/xlibs/libfontenc_1.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X fontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib xproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..a1e92b66fa --- /dev/null +++ b/packages/xlibs/libice_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X11 ICE library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "libx11 util-macros" +PROVIDES = "ice" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libICE" + +include xorg-xlibs.inc diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb new file mode 100644 index 0000000000..795cd4555d --- /dev/null +++ b/packages/xlibs/liblbxutil_1.0.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "xproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \ + file://mkg3states.patch;patch=1" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..468b014165 --- /dev/null +++ b/packages/xlibs/libsm_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Session management library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT-X" +#PV="1:1.0.1" + +DEPENDS = "libx11 libice util-macros" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libSM" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..6836c872bd --- /dev/null +++ b/packages/xlibs/libx11_X11R7.1-1.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +XORG_PN = "libX11" +XORG_RELEASE = "X11R7.1" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb new file mode 100644 index 0000000000..39e2f88b95 --- /dev/null +++ b/packages/xlibs/libxau_1.0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Authorization Protocol for X." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xau" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXau" + +include xorg-xlibs.inc + diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..7fb68385a1 --- /dev/null +++ b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Athena Widgets library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXaw" + +include xorg-xlibs.inc + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb new file mode 100644 index 0000000000..2847ada716 --- /dev/null +++ b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X Composite extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 compositeproto libxfixes" +PROVIDES = "xcomposite" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXcomposite" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \ + file://change-include-order.patch;patch=1" diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb new file mode 100644 index 0000000000..20f44bfb41 --- /dev/null +++ b/packages/xlibs/libxcursor_1.1.6.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "X Cursor library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libxfixes" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXcursor" + +include xorg-xlibs.inc + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb new file mode 100644 index 0000000000..b97e01cfb0 --- /dev/null +++ b/packages/xlibs/libxdamage_1.0.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Damage extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 damageproto libxfixes xproto" +PROVIDES = "xdamage" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXdamage" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb new file mode 100644 index 0000000000..d9cfadbf7b --- /dev/null +++ b/packages/xlibs/libxdmcp_1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Display Manager Control Protocol library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xdmcp" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXdmcp" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb new file mode 100644 index 0000000000..5ee1d82990 --- /dev/null +++ b/packages/xlibs/libxext_1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto libx11 util-macros" +PROVIDES = "xext" + +EXTRA_OECONF="--enable-malloc0returnsnull" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXext" + +include xorg-xlibs.inc + diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb new file mode 100644 index 0000000000..5b8881e0b8 --- /dev/null +++ b/packages/xlibs/libxfixes_4.0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X Fixes extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 fixesproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXfixes" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..d17359dc29 --- /dev/null +++ b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +PROVIDES = "xfont" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXfont" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..d698f04ee1 --- /dev/null +++ b/packages/xlibs/libxi_X11R7.1-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Input extension library." +SECTION = "x11/libs" +LICENSE = "MIT-X" + +DEPENDS = "xproto libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXi" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb new file mode 100644 index 0000000000..36e3e5f600 --- /dev/null +++ b/packages/xlibs/libxkbfile_1.0.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb new file mode 100644 index 0000000000..a914f1e0ef --- /dev/null +++ b/packages/xlibs/libxkbui_1.0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxt libxkbfile" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc + diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb new file mode 100644 index 0000000000..cc06d2a671 --- /dev/null +++ b/packages/xlibs/libxmu_1.0.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "X Window System miscellaneous utility library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libxt libxext util-macros" +PROVIDES = "xmu" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXmu" + +include xorg-xlibs.inc + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb new file mode 100644 index 0000000000..397be2faf4 --- /dev/null +++ b/packages/xlibs/libxpm_3.5.5.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "X Pixmap library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-BSD" + +DEPENDS = "xproto libx11 util-macros" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXpm" + +include xorg-xlibs.inc + +do_stage () { + install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so libXpm ${STAGING_LIBDIR} +} + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb new file mode 100644 index 0000000000..0c7978945a --- /dev/null +++ b/packages/xlibs/libxrandr_1.1.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Resize and Rotate extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "randrproto libx11 libxrender libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXrandr" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb new file mode 100644 index 0000000000..1ee518645b --- /dev/null +++ b/packages/xlibs/libxrender_0.9.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Render extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "BSD" + +DEPENDS = "renderproto libx11" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXrender" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..e2ac5aee7b --- /dev/null +++ b/packages/xlibs/libxres_X11R7.1-1.0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "X Resource usage library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libxext" +PROVIDES = "xres" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXres" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb new file mode 100644 index 0000000000..69c74343a4 --- /dev/null +++ b/packages/xlibs/libxt_1.0.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "X Toolkit Intrinsics" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libsm util-macros" +PROVIDES = "xt" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXt" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) + oe_runmake +} diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb new file mode 100644 index 0000000000..2842c2c458 --- /dev/null +++ b/packages/xlibs/libxxf86dga_1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xxf86dga extension library." +SECTION = "x11/libs" +LICENSE = "XFree86" + +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86dga" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb new file mode 100644 index 0000000000..2544f91ab1 --- /dev/null +++ b/packages/xlibs/libxxf86misc_1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86misc" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb new file mode 100644 index 0000000000..0ab206a0df --- /dev/null +++ b/packages/xlibs/libxxf86vm_1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86vm" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb new file mode 100644 index 0000000000..76101b0345 --- /dev/null +++ b/packages/xlibs/util-macros_1.0.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +XORG_PN = "${PN}" +XORG_RELEASE = "X11R7.1" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2" diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc index 1a89d35363..8fb46777b0 100644 --- a/packages/xlibs/xorg-xlibs.inc +++ b/packages/xlibs/xorg-xlibs.inc @@ -1,7 +1,10 @@ -XORG_PV = "${@['X11R7.0-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:8]=='X11R7.0-']}" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2" +XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}" +XORG_RELEASE ?= "X11R7.0" + +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" + inherit autotools pkgconfig do_stage() { -- cgit v1.2.3 From 86ed3e8e938796e1d7f6b24ba5d7f6731dd32553 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:21:34 +0000 Subject: xserver-kdrive: add X11R7.1 release and git version --- .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 37 +++++++++++++++ .../xserver-kdrive/enable-builtin-fonts.patch | 12 +++++ packages/xserver/xserver-kdrive/enable-tslib.patch | 23 +++++++++ packages/xserver/xserver-kdrive/optional-xkb.patch | 54 ++++++++++++++++++++++ packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 44 ++++++++++++++++++ packages/xserver/xserver-kdrive_git.bb | 47 +++++++++++++++++++ 6 files changed, 217 insertions(+) create mode 100644 packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xserver/xserver-kdrive/enable-builtin-fonts.patch create mode 100644 packages/xserver/xserver-kdrive/enable-tslib.patch create mode 100644 packages/xserver/xserver-kdrive/optional-xkb.patch create mode 100644 packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb create mode 100644 packages/xserver/xserver-kdrive_git.bb diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..9c43e52ead --- /dev/null +++ b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,37 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -505,7 +505,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1514,7 +1526,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1534,10 +1548,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch new file mode 100644 index 0000000000..13a6c2c954 --- /dev/null +++ b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch @@ -0,0 +1,12 @@ +--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 ++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 +@@ -52,8 +52,8 @@ + /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ + + #define NEED_REPLIES + #ifdef HAVE_DIX_CONFIG_H +-#include ++#include + #endif + + #include diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xserver/xserver-kdrive/enable-tslib.patch new file mode 100644 index 0000000000..e488657b74 --- /dev/null +++ b/packages/xserver/xserver-kdrive/enable-tslib.patch @@ -0,0 +1,23 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -1438,6 +1446,10 @@ + fi + +- # tslib... ++ AC_CHECK_HEADERS([tslib.h]) ++ if test "$ac_cv_header_tslib_h" = yes; then ++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support]) ++ fi + + # damage shadow extension glx (NOTYET) fb mi + KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' +@@ -1467,7 +1479,7 @@ + AC_SUBST(KDRIVE_CFLAGS) + AC_SUBST(KDRIVE_PURE_LIBS) + AC_SUBST(KDRIVE_LIBS) +-AM_CONDITIONAL(TSLIB, false) ++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes]) + AM_CONDITIONAL(H3600_TS, false) + AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xserver/xserver-kdrive/optional-xkb.patch new file mode 100644 index 0000000000..d9ef51c5ba --- /dev/null +++ b/packages/xserver/xserver-kdrive/optional-xkb.patch @@ -0,0 +1,54 @@ +--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200 ++++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200 +@@ -35,6 +35,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -51,7 +55,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -418,6 +418,7 @@ + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -739,12 +740,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..fd7a323eee --- /dev/null +++ b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -0,0 +1,44 @@ +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xserver/xserver-kdrive_git.bb new file mode 100644 index 0000000000..1f42cc159c --- /dev/null +++ b/packages/xserver/xserver-kdrive_git.bb @@ -0,0 +1,47 @@ +PV = "0.0+git" +DEFAULT_PREFERENCE = "-2" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 44d425781d950fc09c4d3df318e2c1b0bb31eab0 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 10 Jun 2006 18:04:52 +0000 Subject: efl, e17: update to newest versions --- packages/e17/e-wm_0.16.999.026.bb | 52 ------------------------- packages/e17/e-wm_0.16.999.027.bb | 52 +++++++++++++++++++++++++ packages/efl/e_0.16.999.026.bb | 30 -------------- packages/efl/e_0.16.999.027.bb | 30 ++++++++++++++ packages/efl/ecore-fb_0.9.9.026.bb | 27 ------------- packages/efl/ecore-fb_0.9.9.027.bb | 27 +++++++++++++ packages/efl/ecore-native_0.9.9.026.bb | 6 --- packages/efl/ecore-native_0.9.9.027.bb | 6 +++ packages/efl/ecore-x11_0.9.9.026.bb | 27 ------------- packages/efl/ecore-x11_0.9.9.027.bb | 27 +++++++++++++ packages/efl/edje-native_0.5.0.026.bb | 25 ------------ packages/efl/edje-native_0.5.0.027.bb | 25 ++++++++++++ packages/efl/edje-utils_0.5.0.026.bb | 23 ----------- packages/efl/edje-utils_0.5.0.027.bb | 23 +++++++++++ packages/efl/edje_0.5.0.026.bb | 32 --------------- packages/efl/edje_0.5.0.027.bb | 32 +++++++++++++++ packages/efl/eet-native_0.9.10.026.bb | 7 ---- packages/efl/eet-native_0.9.10.027.bb | 7 ++++ packages/efl/eet_0.9.10.026.bb | 9 ----- packages/efl/eet_0.9.10.027.bb | 9 +++++ packages/efl/embryo-native_0.9.1.026.bb | 7 ---- packages/efl/embryo-native_0.9.1.027.bb | 7 ++++ packages/efl/embryo-utils_0.9.1.026.bb | 18 --------- packages/efl/embryo-utils_0.9.1.027.bb | 18 +++++++++ packages/efl/embryo_0.9.1.026.bb | 11 ------ packages/efl/embryo_0.9.1.027.bb | 11 ++++++ packages/efl/evas-fb_0.9.9.026.bb | 47 ---------------------- packages/efl/evas-fb_0.9.9.027.bb | 47 ++++++++++++++++++++++ packages/efl/evas-native_0.9.9.026.bb | 5 --- packages/efl/evas-native_0.9.9.027.bb | 5 +++ packages/efl/evas-x11_0.9.9.026.bb | 52 ------------------------- packages/efl/evas-x11_0.9.9.027.bb | 52 +++++++++++++++++++++++++ packages/efl/evas.inc | 2 +- packages/efl/evas/fix-configure-0.9.9.026.patch | 35 ----------------- packages/efl/evas/fix-configure.patch | 35 +++++++++++++++++ 35 files changed, 414 insertions(+), 414 deletions(-) delete mode 100644 packages/e17/e-wm_0.16.999.026.bb create mode 100644 packages/e17/e-wm_0.16.999.027.bb delete mode 100644 packages/efl/e_0.16.999.026.bb create mode 100644 packages/efl/e_0.16.999.027.bb delete mode 100644 packages/efl/ecore-fb_0.9.9.026.bb create mode 100644 packages/efl/ecore-fb_0.9.9.027.bb delete mode 100644 packages/efl/ecore-native_0.9.9.026.bb create mode 100644 packages/efl/ecore-native_0.9.9.027.bb delete mode 100644 packages/efl/ecore-x11_0.9.9.026.bb create mode 100644 packages/efl/ecore-x11_0.9.9.027.bb delete mode 100644 packages/efl/edje-native_0.5.0.026.bb create mode 100644 packages/efl/edje-native_0.5.0.027.bb delete mode 100644 packages/efl/edje-utils_0.5.0.026.bb create mode 100644 packages/efl/edje-utils_0.5.0.027.bb delete mode 100644 packages/efl/edje_0.5.0.026.bb create mode 100644 packages/efl/edje_0.5.0.027.bb delete mode 100644 packages/efl/eet-native_0.9.10.026.bb create mode 100644 packages/efl/eet-native_0.9.10.027.bb delete mode 100644 packages/efl/eet_0.9.10.026.bb create mode 100644 packages/efl/eet_0.9.10.027.bb delete mode 100644 packages/efl/embryo-native_0.9.1.026.bb create mode 100644 packages/efl/embryo-native_0.9.1.027.bb delete mode 100644 packages/efl/embryo-utils_0.9.1.026.bb create mode 100644 packages/efl/embryo-utils_0.9.1.027.bb delete mode 100644 packages/efl/embryo_0.9.1.026.bb create mode 100644 packages/efl/embryo_0.9.1.027.bb delete mode 100644 packages/efl/evas-fb_0.9.9.026.bb create mode 100644 packages/efl/evas-fb_0.9.9.027.bb delete mode 100644 packages/efl/evas-native_0.9.9.026.bb create mode 100644 packages/efl/evas-native_0.9.9.027.bb delete mode 100644 packages/efl/evas-x11_0.9.9.026.bb create mode 100644 packages/efl/evas-x11_0.9.9.027.bb delete mode 100644 packages/efl/evas/fix-configure-0.9.9.026.patch create mode 100644 packages/efl/evas/fix-configure.patch diff --git a/packages/e17/e-wm_0.16.999.026.bb b/packages/e17/e-wm_0.16.999.026.bb deleted file mode 100644 index df78fbdcd0..0000000000 --- a/packages/e17/e-wm_0.16.999.026.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" -LICENSE = "MIT" -PR = "r3" - -inherit e - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://Xsession.d/98enlightenment" - -# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" -# file://disable-splash.patch;patch=1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" - - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" -# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -} - -#pkg_postinst() { -# enlightenment_remote -menu-autoscroll-margin-set 5 -# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 -#} \ No newline at end of file diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb new file mode 100644 index 0000000000..df78fbdcd0 --- /dev/null +++ b/packages/e17/e-wm_0.16.999.027.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" +LICENSE = "MIT" +PR = "r3" + +inherit e + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ + file://Xsession.d/98enlightenment" + +# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" +# file://disable-splash.patch;patch=1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" + + +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LOWRES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" +# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" +# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" +# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" +} + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} + +#pkg_postinst() { +# enlightenment_remote -menu-autoscroll-margin-set 5 +# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 +#} \ No newline at end of file diff --git a/packages/efl/e_0.16.999.026.bb b/packages/efl/e_0.16.999.026.bb deleted file mode 100644 index 5078c71365..0000000000 --- a/packages/efl/e_0.16.999.026.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "virtual/evas virtual/ecore edje eet embryo" -LICENSE = "MIT" -PR = "r2" - -inherit efl - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -do_compile() { - oe_runmake -C src/lib -} - -headers = "E_Lib.h ../bin/e*.h" - -do_install() { - oe_runmake -C src/lib install DESTDIR=${D} -} diff --git a/packages/efl/e_0.16.999.027.bb b/packages/efl/e_0.16.999.027.bb new file mode 100644 index 0000000000..5078c71365 --- /dev/null +++ b/packages/efl/e_0.16.999.027.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Enlightenment Window Mananger Library" +DEPENDS = "virtual/evas virtual/ecore edje eet embryo" +LICENSE = "MIT" +PR = "r2" + +inherit efl + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LOWRES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +do_compile() { + oe_runmake -C src/lib +} + +headers = "E_Lib.h ../bin/e*.h" + +do_install() { + oe_runmake -C src/lib install DESTDIR=${D} +} diff --git a/packages/efl/ecore-fb_0.9.9.026.bb b/packages/efl/ecore-fb_0.9.9.026.bb deleted file mode 100644 index a957c5dd8c..0000000000 --- a/packages/efl/ecore-fb_0.9.9.026.bb +++ /dev/null @@ -1,27 +0,0 @@ -include ecore.inc -PR = "r2" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-poll \ - --enable-ecore-dbus \ - --enable-ecore-evas \ - --enable-ecore-evas-buffer \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x \ - --disable-ecore-evas-xrender \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-config \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --disable-ecore-x \ - --disable-curl \ - --without-curl-config \ - --enable-ecore-config \ - --disable-openssl" - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-fb_0.9.9.027.bb b/packages/efl/ecore-fb_0.9.9.027.bb new file mode 100644 index 0000000000..a957c5dd8c --- /dev/null +++ b/packages/efl/ecore-fb_0.9.9.027.bb @@ -0,0 +1,27 @@ +include ecore.inc +PR = "r2" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-poll \ + --enable-ecore-dbus \ + --enable-ecore-evas \ + --enable-ecore-evas-buffer \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-xrender \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-config \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ + --enable-ecore-config \ + --disable-openssl" + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-native_0.9.9.026.bb b/packages/efl/ecore-native_0.9.9.026.bb deleted file mode 100644 index 299470841c..0000000000 --- a/packages/efl/ecore-native_0.9.9.026.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ecore-fb_${PV}.bb -inherit native -# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it -# DEPENDS = "curl-native eet-native evas-native" -DEPENDS = "eet-native evas-native" -PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-native_0.9.9.027.bb b/packages/efl/ecore-native_0.9.9.027.bb new file mode 100644 index 0000000000..299470841c --- /dev/null +++ b/packages/efl/ecore-native_0.9.9.027.bb @@ -0,0 +1,6 @@ +include ecore-fb_${PV}.bb +inherit native +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-x11_0.9.9.026.bb b/packages/efl/ecore-x11_0.9.9.026.bb deleted file mode 100644 index 3a88ad229b..0000000000 --- a/packages/efl/ecore-x11_0.9.9.026.bb +++ /dev/null @@ -1,27 +0,0 @@ -include ecore.inc -DEPENDS += "evas-x11" -PR = "r3" - -SRC_URI += "file://evas-x11-include.patch;patch=1" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-ecore-dbus \ - --enable-ecore-evas-fb \ - --enable-ecore-evas-x \ - --enable-ecore-evas-buffer \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --enable-ecore-x \ - --enable-ecore-config \ - --disable-openssl \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} " - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_X" diff --git a/packages/efl/ecore-x11_0.9.9.027.bb b/packages/efl/ecore-x11_0.9.9.027.bb new file mode 100644 index 0000000000..3a88ad229b --- /dev/null +++ b/packages/efl/ecore-x11_0.9.9.027.bb @@ -0,0 +1,27 @@ +include ecore.inc +DEPENDS += "evas-x11" +PR = "r3" + +SRC_URI += "file://evas-x11-include.patch;patch=1" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-ecore-dbus \ + --enable-ecore-evas-fb \ + --enable-ecore-evas-x \ + --enable-ecore-evas-buffer \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --enable-ecore-x \ + --enable-ecore-config \ + --disable-openssl \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} " + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_X" diff --git a/packages/efl/edje-native_0.5.0.026.bb b/packages/efl/edje-native_0.5.0.026.bb deleted file mode 100644 index 5eb077922a..0000000000 --- a/packages/efl/edje-native_0.5.0.026.bb +++ /dev/null @@ -1,25 +0,0 @@ -include edje_${PV}.bb -PR = "r3" - -inherit native - -DEPENDS = "evas-native ecore-native eet-native embryo-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" - -EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ - --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ - --with-eet-config=${STAGING_BINDIR}/eet-config-native \ - --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c -} - -do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` - # could also use ${STAGING_DATADIR}/edje/include - install -d $edje_data_dir/include - install -m 0644 data/include/edje.inc $edje_data_dir/include -} diff --git a/packages/efl/edje-native_0.5.0.027.bb b/packages/efl/edje-native_0.5.0.027.bb new file mode 100644 index 0000000000..5eb077922a --- /dev/null +++ b/packages/efl/edje-native_0.5.0.027.bb @@ -0,0 +1,25 @@ +include edje_${PV}.bb +PR = "r3" + +inherit native + +DEPENDS = "evas-native ecore-native eet-native embryo-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" + +EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ + --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ + --with-eet-config=${STAGING_BINDIR}/eet-config-native \ + --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c +} + +do_stage_append() { + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include +} diff --git a/packages/efl/edje-utils_0.5.0.026.bb b/packages/efl/edje-utils_0.5.0.026.bb deleted file mode 100644 index f8eb917e4d..0000000000 --- a/packages/efl/edje-utils_0.5.0.026.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "edje embryo-utils gcc" -LICENSE = "MIT" -PR = "r6" - -inherit efl - -PACKAGES = "edje-utils" -FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ - ${E_CVS};module=e17/libs/edje/m4;date=20060101" -S = "${WORKDIR}/edje-${PV}" - -libraries = "" -headers = "" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} diff --git a/packages/efl/edje-utils_0.5.0.027.bb b/packages/efl/edje-utils_0.5.0.027.bb new file mode 100644 index 0000000000..f8eb917e4d --- /dev/null +++ b/packages/efl/edje-utils_0.5.0.027.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +DEPENDS = "edje embryo-utils gcc" +LICENSE = "MIT" +PR = "r6" + +inherit efl + +PACKAGES = "edje-utils" +FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ + ${E_CVS};module=e17/libs/edje/m4;date=20060101" +S = "${WORKDIR}/edje-${PV}" + +libraries = "" +headers = "" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/edje_0.5.0.026.bb b/packages/efl/edje_0.5.0.026.bb deleted file mode 100644 index d51dd119e4..0000000000 --- a/packages/efl/edje_0.5.0.026.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" -LICENSE = "MIT" -PR = "r7" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "edje-utils" -#RPROVIDES_edje-utils += "libedje-utils" -#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -inherit efl - -SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -LEAD_SONAME = "libedje.so" - -FILES_${PN}-examples = "${datadir}/edje/data/images \ - ${datadir}/edje/data/src \ - ${datadir}/edje/data/test \ - ${datadir}/edje/data/*.sh" - -FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/edje_0.5.0.027.bb b/packages/efl/edje_0.5.0.027.bb new file mode 100644 index 0000000000..d51dd119e4 --- /dev/null +++ b/packages/efl/edje_0.5.0.027.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" +LICENSE = "MIT" +PR = "r7" + +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "edje-utils" +#RPROVIDES_edje-utils += "libedje-utils" +#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +inherit efl + +SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + +LEAD_SONAME = "libedje.so" + +FILES_${PN}-examples = "${datadir}/edje/data/images \ + ${datadir}/edje/data/src \ + ${datadir}/edje/data/test \ + ${datadir}/edje/data/*.sh" + +FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/eet-native_0.9.10.026.bb b/packages/efl/eet-native_0.9.10.026.bb deleted file mode 100644 index fa20c9fb30..0000000000 --- a/packages/efl/eet-native_0.9.10.026.bb +++ /dev/null @@ -1,7 +0,0 @@ -include eet_${PV}.bb -inherit native -DEPENDS = "zlib-native jpeg-native" - -do_stage_append() { - install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} -} diff --git a/packages/efl/eet-native_0.9.10.027.bb b/packages/efl/eet-native_0.9.10.027.bb new file mode 100644 index 0000000000..fa20c9fb30 --- /dev/null +++ b/packages/efl/eet-native_0.9.10.027.bb @@ -0,0 +1,7 @@ +include eet_${PV}.bb +inherit native +DEPENDS = "zlib-native jpeg-native" + +do_stage_append() { + install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} +} diff --git a/packages/efl/eet_0.9.10.026.bb b/packages/efl/eet_0.9.10.026.bb deleted file mode 100644 index 6e6032e098..0000000000 --- a/packages/efl/eet_0.9.10.026.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." -DEPENDS = "zlib jpeg" -LICENSE = "BSD" -PR = "r2" - -inherit efl diff --git a/packages/efl/eet_0.9.10.027.bb b/packages/efl/eet_0.9.10.027.bb new file mode 100644 index 0000000000..6e6032e098 --- /dev/null +++ b/packages/efl/eet_0.9.10.027.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "EET is a tiny library designed to write an \ +arbitary set of chunks of data to a file and optionally compress \ +each chunk (very much like a zip file) and allow fast \ +random-access reading of the file later on." +DEPENDS = "zlib jpeg" +LICENSE = "BSD" +PR = "r2" + +inherit efl diff --git a/packages/efl/embryo-native_0.9.1.026.bb b/packages/efl/embryo-native_0.9.1.026.bb deleted file mode 100644 index a33adb7bd2..0000000000 --- a/packages/efl/embryo-native_0.9.1.026.bb +++ /dev/null @@ -1,7 +0,0 @@ -include embryo_${PV}.bb -inherit native - -do_stage_append() { - install -d ${STAGING_DATADIR}/embryo/include - install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include -} \ No newline at end of file diff --git a/packages/efl/embryo-native_0.9.1.027.bb b/packages/efl/embryo-native_0.9.1.027.bb