From 1363b0b7be175125f2e62ecff97ed87b79bfabb2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 16:58:17 +0000 Subject: add udev-065 --- packages/udev/udev-065/.mtn2git_empty | 0 packages/udev/udev-065/fix-alignment.patch | 24 +++++++++++ packages/udev/udev-065/flags.patch | 66 ++++++++++++++++++++++++++++++ packages/udev/udev-065/noasmlinkage.patch | 38 +++++++++++++++++ packages/udev/udev-065/tty-symlinks.patch | 11 +++++ packages/udev/udev_065.bb | 22 ++++++++++ 6 files changed, 161 insertions(+) create mode 100644 packages/udev/udev-065/.mtn2git_empty create mode 100644 packages/udev/udev-065/fix-alignment.patch create mode 100644 packages/udev/udev-065/flags.patch create mode 100644 packages/udev/udev-065/noasmlinkage.patch create mode 100644 packages/udev/udev-065/tty-symlinks.patch create mode 100644 packages/udev/udev_065.bb diff --git a/packages/udev/udev-065/.mtn2git_empty b/packages/udev/udev-065/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-065/fix-alignment.patch b/packages/udev/udev-065/fix-alignment.patch new file mode 100644 index 0000000000..8c7b8b5ac5 --- /dev/null +++ b/packages/udev/udev-065/fix-alignment.patch @@ -0,0 +1,24 @@ +diff --git a/udev_rules_parse.c b/udev_rules_parse.c +--- a/udev_rules_parse.c ++++ b/udev_rules_parse.c +@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule + int valid; + char *linepos; + char *attr; ++ size_t padding; + int retval; + + /* get all the keys */ +@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule + + /* grow buffer and add rule */ + rule_size = sizeof(struct udev_rule) + rule->bufsize; ++ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t); ++ dbg("add %zi padding bytes", padding); ++ rule_size += padding; ++ rule->bufsize += padding; ++ + rules->buf = realloc(rules->buf, rules->bufsize + rule_size); + if (!rules->buf) { + err("realloc failed"); + diff --git a/packages/udev/udev-065/flags.patch b/packages/udev/udev-065/flags.patch new file mode 100644 index 0000000000..d95daa51e2 --- /dev/null +++ b/packages/udev/udev-065/flags.patch @@ -0,0 +1,66 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-065/Makefile~flags ++++ udev-065/Makefile +@@ -106,11 +106,11 @@ + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} + +-CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ ++override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ + -Wstrict-prototypes -Wsign-compare +-CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) +-CFLAGS += -pipe +-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) ++override CFLAGS += -pipe ++override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + + # use '-Os' optimization if available, else use -O2 + OPTFLAGS := $(call cc-supports, -Os, -O2) +@@ -154,16 +154,16 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +@@ -180,18 +180,18 @@ + CC = $(KLCC) + LD = $(KLCC) + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + endif + + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC +- LDFLAGS += -static ++ override CFLAGS += -DUSE_STATIC ++ override LDFLAGS += -static + endif + + ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-065/noasmlinkage.patch b/packages/udev/udev-065/noasmlinkage.patch new file mode 100644 index 0000000000..0d8e854c0e --- /dev/null +++ b/packages/udev/udev-065/noasmlinkage.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/udev.c~noasmlinkage.patch ++++ udev-062/udev.c +@@ -54,7 +54,7 @@ + } + #endif + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +--- udev-062/udevd.c~noasmlinkage.patch ++++ udev-062/udevd.c +@@ -639,7 +639,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + int rc; + +--- udev-062/udevstart.c~noasmlinkage.patch ++++ udev-062/udevstart.c +@@ -323,7 +323,7 @@ + exec_list(&device_list); + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/packages/udev/udev-065/tty-symlinks.patch b/packages/udev/udev-065/tty-symlinks.patch new file mode 100644 index 0000000000..6a458de64c --- /dev/null +++ b/packages/udev/udev-065/tty-symlinks.patch @@ -0,0 +1,11 @@ +--- udev-063/etc/udev/udev.rules.devfs.orig 2005-07-27 19:55:51 +0200 ++++ udev-063/etc/udev/udev.rules.devfs 2005-07-27 19:56:49 +0200 +@@ -103,3 +103,8 @@ + + # raw devices + KERNEL="raw[0-9]*", NAME="raw/%k" ++ ++# tty devices ++KERNEL=="tty[0-9]*", SYMLINK="%k" ++KERNEL=="ttyS[0-9]*", SYMLINK="%k" ++ diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb new file mode 100644 index 0000000000..f6a2783136 --- /dev/null +++ b/packages/udev/udev_065.bb @@ -0,0 +1,22 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://tty-symlinks.patch;patch=1 \ + file://init" + +include udev.inc + +PR = "r0" +UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" + +#FIXME UDEV MIGRATION PLAN: +#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) +#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug +#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() +#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules + +do_install_append() { + install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/ + echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules +} -- cgit v1.2.3 From c6a08d425d2d828833f6bf4a7979d186a1c27889 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 17:53:23 +0000 Subject: - evas-x11 depends on xext - fix evas-x11 example programs packaging --- packages/evas/evas-x11_0.9.9.013.bb | 4 ++-- packages/evas/evas_0.9.9.013.inc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/evas/evas-x11_0.9.9.013.bb b/packages/evas/evas-x11_0.9.9.013.bb index a733822b16..eef87843a4 100644 --- a/packages/evas/evas-x11_0.9.9.013.bb +++ b/packages/evas/evas-x11_0.9.9.013.bb @@ -1,6 +1,6 @@ include evas_${PV}.inc -DEPENDS += "x11" -PR = "r1" +DEPENDS += "x11 xext" +PR = "r2" EXTRA_OECONF = "--enable-fb \ --disable-directfb \ diff --git a/packages/evas/evas_0.9.9.013.inc b/packages/evas/evas_0.9.9.013.inc index a0135e1aaa..a0c7dc8134 100644 --- a/packages/evas/evas_0.9.9.013.inc +++ b/packages/evas/evas_0.9.9.013.inc @@ -9,6 +9,7 @@ PRIORITY = "optional" PROVIDES = "virtual/evas" DEPENDS = "libpng jpeg edb eet freetype" MAINTAINER = "Michael 'Mickey' Lauer " +PR = "r1" SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://pkg.m4" @@ -36,4 +37,4 @@ PACKAGES =+ "evas-examples" FILES_${PN} = "${libdir}/libevas*.so*" FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig" -FILES_evas-examples = "${bindir}/evas_fb_test ${datadir}" +FILES_evas-examples = "${bindir}/evas_fb_test ${bindir}/evas_software* ${datadir}" -- cgit v1.2.3 From 4d1091bec57d6991545152b2de9bf546cf92d598 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 17:55:28 +0000 Subject: ecore depends on curl, ecore-x11 depends on evas-x11 --- packages/ecore/ecore-x11_0.9.9.013.bb | 3 +-- packages/ecore/ecore_0.9.9.013.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/ecore/ecore-x11_0.9.9.013.bb b/packages/ecore/ecore-x11_0.9.9.013.bb index 785cc2be97..c37b50dbd6 100644 --- a/packages/ecore/ecore-x11_0.9.9.013.bb +++ b/packages/ecore/ecore-x11_0.9.9.013.bb @@ -1,6 +1,5 @@ include ecore_${PV}.inc - -DEPENDS += "x11" +DEPENDS += "evas-x11" PR = "r1" EXTRA_OECONF = "--enable-ecore-fb \ diff --git a/packages/ecore/ecore_0.9.9.013.inc b/packages/ecore/ecore_0.9.9.013.inc index 3fd4e17a3a..4598b20a4f 100644 --- a/packages/ecore/ecore_0.9.9.013.inc +++ b/packages/ecore/ecore_0.9.9.013.inc @@ -7,7 +7,7 @@ PRIORITY = "optional" LEAD_SONAME = "libecore.so" PROVIDES = "virtual/ecore" LICENSE = "MIT" -DEPENDS = "edb eet virtual/evas freetype edb-native" +DEPENDS = "curl edb eet virtual/evas freetype edb-native" MAINTAINER = "Michael 'Mickey' Lauer " SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ -- cgit v1.2.3 From dd3dcfb11907fdae6776ac2c3cb5fd7253b9ae87 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 19:24:50 +0000 Subject: fix wrong #define in diet-x11 Xlib.h: don't say you X_HAVE_UTF8_STRING if you don't... --- packages/x11/diet-x11_20050226.bb | 3 +++ packages/x11/diet-x11_6.2.1.bb | 2 ++ packages/x11/diet-x11_cvs.bb | 3 +++ packages/x11/files/fix-utf8-wrong-define.patch | 16 ++++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 packages/x11/files/fix-utf8-wrong-define.patch diff --git a/packages/x11/diet-x11_20050226.bb b/packages/x11/diet-x11_20050226.bb index 6f8c1d36ad..acb6fc330b 100644 --- a/packages/x11/diet-x11_20050226.bb +++ b/packages/x11/diet-x11_20050226.bb @@ -1,3 +1,6 @@ SECTION = "x11/base" include x11_${PV}.bb + EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/x11/diet-x11_6.2.1.bb index bc6e8224ed..1313bd08d0 100644 --- a/packages/x11/diet-x11_6.2.1.bb +++ b/packages/x11/diet-x11_6.2.1.bb @@ -4,3 +4,5 @@ include x11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" + diff --git a/packages/x11/diet-x11_cvs.bb b/packages/x11/diet-x11_cvs.bb index b820fae8b2..404794ff5e 100644 --- a/packages/x11/diet-x11_cvs.bb +++ b/packages/x11/diet-x11_cvs.bb @@ -2,3 +2,6 @@ SECTION = "x11/base" include x11_cvs.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" + diff --git a/packages/x11/files/fix-utf8-wrong-define.patch b/packages/x11/files/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..dca88fba92 --- /dev/null +++ b/packages/x11/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; + -- cgit v1.2.3 From 2807a92f94e9dcdecc51699ca95506a6e3737dc0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 21:18:22 +0000 Subject: e/libs: add some more dependencies and some implicit --with-config --- packages/ecore/ecore-x11_0.9.9.013.bb | 6 +++++- packages/edje/edje_0.5.0.013.bb | 2 +- packages/epsilon/epsilon_0.3.0.004.bb | 2 +- packages/evas/evas-native_0.9.9.013.bb | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/ecore/ecore-x11_0.9.9.013.bb b/packages/ecore/ecore-x11_0.9.9.013.bb index c37b50dbd6..9e7389c8ad 100644 --- a/packages/ecore/ecore-x11_0.9.9.013.bb +++ b/packages/ecore/ecore-x11_0.9.9.013.bb @@ -14,9 +14,13 @@ EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-txt \ --enable-ecore-x \ --enable-ecore-config \ - --disable-openssl" + --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" + +export x_cflags = "" diff --git a/packages/edje/edje_0.5.0.013.bb b/packages/edje/edje_0.5.0.013.bb index fd67d9d3f7..3730fbcf94 100644 --- a/packages/edje/edje_0.5.0.013.bb +++ b/packages/edje/edje_0.5.0.013.bb @@ -22,7 +22,7 @@ do_stage () { install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/ } -BINARIES = "ejde edje_ls edje_test edje_cc edje_decc edje_thumb" +BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb" PACKAGES += "edje-examples" diff --git a/packages/epsilon/epsilon_0.3.0.004.bb b/packages/epsilon/epsilon_0.3.0.004.bb index 74086afd32..12a7ec4e0a 100644 --- a/packages/epsilon/epsilon_0.3.0.004.bb +++ b/packages/epsilon/epsilon_0.3.0.004.bb @@ -6,7 +6,7 @@ To provide the best possible performance Epsilon can even integrate \ with Epeg directly to harness it's speed." SECTION = "e/libs" LICENSE = "GPL" -DEPENDS = "epeg libpng virtual/imlib2" +DEPENDS = "edje epeg libpng virtual/imlib2" MAINTAINER = "Michael 'Mickey' Lauer " SRC_URI = "http://enlightenment.freedesktop.org/files/epsilon-${PV}.tar.gz \ diff --git a/packages/evas/evas-native_0.9.9.013.bb b/packages/evas/evas-native_0.9.9.013.bb index 3f1390800a..ce45eedcc5 100644 --- a/packages/evas/evas-native_0.9.9.013.bb +++ b/packages/evas/evas-native_0.9.9.013.bb @@ -2,6 +2,9 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native" + do_stage () { for i in ${headers} do -- cgit v1.2.3