[oe-commits] org.oe.dev merge of '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Dec 6 17:29:04 UTC 2007
merge of '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
and 'd025a5f00ad6ca971cacb9b19194efab7e1bee77'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7299736bd45f29d862cdc7e7e31153ea62402566
ViewMTN: http://monotone.openembedded.org/revision/info/7299736bd45f29d862cdc7e7e31153ea62402566
Files:
1
contrib/angstrom/rss.php
packages/mozilla/firefox-2.0.0.3/linkage-problem.patch
contrib/angstrom/build-release.sh
packages/mozilla/firefox_2.0.0.3.bb
packages/psplash/files/configurability.patch
packages/psplash/psplash_svn.bb
packages/python/python-cython-native_0.9.6.9.bb
packages/python/python-cython_0.9.6.9.bb
packages/python/python-efl.bb
packages/python/python-epsilon_cvs.bb
classes/distutils.bbclass
packages/python/python-ecore_cvs.bb
packages/python/python-efl.inc
Diffs:
#
# mt diff -r1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb -r7299736bd45f29d862cdc7e7e31153ea62402566
#
#
#
# add_file "contrib/angstrom/rss.php"
# content [a3c2ef58537ead249729992e9297b9157e6f1a09]
#
# add_file "packages/mozilla/firefox-2.0.0.3/linkage-problem.patch"
# content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
#
# patch "contrib/angstrom/build-release.sh"
# from [72d4a86091dd82e0b415f8a78c2c36804c722f40]
# to [843df303818fa5ebb602d61d6ece155fa69e1bdf]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [08d4f61dc91156c06adfd55995d6aca49f5c95ba]
# to [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
#
# patch "packages/psplash/files/configurability.patch"
# from [62ed2328f8bd83a1609058709ddf254ee396d33d]
# to [e7accf68bfb32354a51e199c9960e40cf655d9ae]
#
# patch "packages/psplash/psplash_svn.bb"
# from [5f388d9f92a2d8c405d7d667d3c6c45c288c82bb]
# to [4e90d427d5ad257ee0faf49f0e087779364df998]
#
============================================================
--- contrib/angstrom/rss.php a3c2ef58537ead249729992e9297b9157e6f1a09
+++ contrib/angstrom/rss.php a3c2ef58537ead249729992e9297b9157e6f1a09
@@ -0,0 +1,43 @@
+<? print('<?xml version="1.0" encoding="utf-8"?>');?>
+<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<channel>
+ <title>Ã…ngstrom autobuilder updates </title>
+ <link>http://www.angstrom-distribution.org/unstable/autobuild</link>
+ <description></description>
+ <language>en</language>
+<?php
+
+$base_path = "/home/angstrom/website/unstable/autobuild";
+
+if ($handle = opendir("$base_path")) {
+
+ while (false !== ($file = readdir($handle))) {
+ if(is_dir($file) && $file != "." && $file != "..") {
+ $second_handle = opendir("$base_path/$file/");
+ while (false !== ($file2 = readdir($second_handle))) {
+ if(is_file("/$base_path/$file/$file2")) {
+ $fmtime = filemtime("$file/$file2");
+
+print("<item>\n");
+print("<title>$file/$file2 uploaded</title>\n");
+print(" <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n");
+
+$rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
+
+print("<pubDate>$rsstime</pubDate>\n");
+print("<dc:creator>Angstrom autobuilder</dc:creator>");
+print("</item>\n");
+
+ }
+ }
+ closedir($second_handle);
+ }
+
+ }
+ closedir($handle);
+}
+?>
+</channel>
+</rss>
+
+
============================================================
--- packages/mozilla/firefox-2.0.0.3/linkage-problem.patch 7863efd4c4cce2aacd3fca003a8f96089e3189bf
+++ packages/mozilla/firefox-2.0.0.3/linkage-problem.patch 7863efd4c4cce2aacd3fca003a8f96089e3189bf
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ $(NULL)
+ endif
+
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++ $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ $(NULL)
============================================================
--- contrib/angstrom/build-release.sh 72d4a86091dd82e0b415f8a78c2c36804c722f40
+++ contrib/angstrom/build-release.sh 843df303818fa5ebb602d61d6ece155fa69e1bdf
@@ -29,7 +29,7 @@ do_report_success() {
do_report_success() {
- echo "$target ($BUILD_MODE) built for $machine" >> autobuilder.log
+ echo "$(date -u +%Y%M%d%H%M) $target ($BUILD_MODE) built for $machine" >> autobuilder.log
}
# No graphics
============================================================
--- packages/mozilla/firefox_2.0.0.3.bb 08d4f61dc91156c06adfd55995d6aca49f5c95ba
+++ packages/mozilla/firefox_2.0.0.3.bb 0ee74a5aef3cee4364cdc98fcb62c10891e384a5
@@ -1,20 +1,22 @@
+DEPENDS += "cairo"
PR = "r3"
+
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://xptcstubs.patch;patch=1 \
file://no-xmb.patch;patch=1 \
file://jsautocfg.h \
file://extensions-hack.patch;patch=1 \
- file://security-cross.patch;patch=1 \
- file://jsautocfg-dontoverwrite.patch;patch=1 \
- file://xptcinvoke-arm.patch;patch=1 \
- file://eabi-fix.patch;patch=1 \
- file://eabi-fix2.patch;patch=1 \
- file://eabi-fix3.patch;patch=1 \
- file://linkage-problem.patch;patch=1 \
+ file://security-cross.patch;patch=1 \
+ file://jsautocfg-dontoverwrite.patch;patch=1 \
+ file://xptcinvoke-arm.patch;patch=1 \
+ file://eabi-fix.patch;patch=1 \
+ file://eabi-fix2.patch;patch=1 \
+ file://eabi-fix3.patch;patch=1 \
+ file://linkage-problem.patch;patch=1 \
"
-DEPENDS += cairo
S = "${WORKDIR}/mozilla"
+
DEFAULT_PREFERENCE = "-1"
inherit mozilla
============================================================
--- packages/psplash/files/configurability.patch 62ed2328f8bd83a1609058709ddf254ee396d33d
+++ packages/psplash/files/configurability.patch e7accf68bfb32354a51e199c9960e40cf655d9ae
@@ -1,8 +1,8 @@ Index: psplash/psplash.c
Index: psplash/psplash.c
===================================================================
---- psplash.orig/psplash.c
-+++ psplash/psplash.c
-@@ -44,17 +44,17 @@ psplash_draw_msg (PSplashFB *fb, const c
+--- psplash.orig/psplash.c 2007-12-06 11:14:23.000000000 +0000
++++ psplash/psplash.c 2007-12-06 11:19:12.000000000 +0000
+@@ -44,17 +44,17 @@
/* Clear */
@@ -27,7 +27,7 @@ Index: psplash/psplash.c
&radeon_font,
msg);
}
-@@ -66,36 +66,36 @@ psplash_draw_progress (PSplashFB *fb, in
+@@ -66,36 +66,36 @@
/* 4 pix border */
x = ((fb->width - BAR_IMG_WIDTH)/2) + 4 ;
@@ -75,7 +75,7 @@ Index: psplash/psplash.c
{
char *command;
int parsed=0;
-@@ -103,21 +103,21 @@ parse_command (PSplashFB *fb, char *stri
+@@ -103,21 +103,21 @@
parsed = strlen(string)+1;
DBG("got cmd %s", string);
@@ -103,7 +103,7 @@ Index: psplash/psplash.c
{
return 1;
}
-@@ -125,8 +125,8 @@ parse_command (PSplashFB *fb, char *stri
+@@ -125,8 +125,8 @@
return 0;
}
@@ -114,7 +114,7 @@ Index: psplash/psplash.c
{
int err;
ssize_t length = 0;
-@@ -143,14 +143,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -143,14 +143,14 @@
end = command;
@@ -133,7 +133,7 @@ Index: psplash/psplash.c
{
/*
if (errno == EINTR)
-@@ -158,29 +158,29 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -158,29 +158,29 @@
*/
return;
}
@@ -171,7 +171,7 @@ Index: psplash/psplash.c
FD_ZERO(&descriptors);
FD_SET(pipe_fd,&descriptors);
}
-@@ -188,14 +188,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -188,14 +188,14 @@
return;
}
@@ -189,7 +189,7 @@ Index: psplash/psplash.c
signal(SIGHUP, psplash_exit);
signal(SIGINT, psplash_exit);
signal(SIGQUIT, psplash_exit);
-@@ -214,10 +214,10 @@ main (int argc, char** argv)
+@@ -214,10 +214,10 @@
angle = atoi(argv[i]);
continue;
}
@@ -203,7 +203,7 @@ Index: psplash/psplash.c
argv[0]);
exit(-1);
}
-@@ -231,7 +231,7 @@ main (int argc, char** argv)
+@@ -231,7 +231,7 @@
if (mkfifo(PSPLASH_FIFO, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP))
{
@@ -212,7 +212,7 @@ Index: psplash/psplash.c
{
perror("mkfifo");
exit(-1);
-@@ -239,8 +239,8 @@ main (int argc, char** argv)
+@@ -239,8 +239,8 @@
}
pipe_fd = open (PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
@@ -223,22 +223,20 @@ Index: psplash/psplash.c
{
perror("pipe open");
exit(-2);
-@@ -252,30 +252,30 @@ main (int argc, char** argv)
- if ((fb = psplash_fb_new(angle)) == NULL)
+@@ -253,29 +253,29 @@
exit(-1);
-- /* Clear the background with #ecece1 */
+ /* Clear the background with #ecece1 */
- psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1);
-+ /* Clear the background */
+ psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
/* Draw the OH logo */
- psplash_fb_draw_image (fb,
- (fb->width - HAND_IMG_WIDTH)/2,
-- (fb->height - HAND_IMG_HEIGHT)/2,
+- ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2,
+ psplash_fb_draw_image (fb,
-+ (fb->width - HAND_IMG_WIDTH)/2,
-+ (fb->height - HAND_IMG_HEIGHT)/2,
++ (fb->width - HAND_IMG_WIDTH)/2,
++ (fb->height - HAND_IMG_HEIGHT)/2,
HAND_IMG_WIDTH,
HAND_IMG_HEIGHT,
HAND_IMG_BYTES_PER_PIXEL,
@@ -249,8 +247,8 @@ Index: psplash/psplash.c
- (fb->width - BAR_IMG_WIDTH)/2,
- fb->height - (fb->height/6),
+ psplash_fb_draw_image (fb,
-+ (fb->width - BAR_IMG_WIDTH)/2,
-+ fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
++ (fb->width - BAR_IMG_WIDTH)/2,
++ fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
BAR_IMG_WIDTH,
BAR_IMG_HEIGHT,
BAR_IMG_BYTES_PER_PIXEL,
@@ -266,9 +264,9 @@ Index: psplash/psplash.h
Index: psplash/psplash.h
===================================================================
---- psplash.orig/psplash.h
-+++ psplash/psplash.h
-@@ -54,6 +54,21 @@ typedef int bool;
+--- psplash.orig/psplash.h 2007-12-06 11:15:35.000000000 +0000
++++ psplash/psplash.h 2007-12-06 11:15:45.000000000 +0000
+@@ -54,6 +54,21 @@
#define TRUE 1
#endif
============================================================
--- packages/psplash/psplash_svn.bb 5f388d9f92a2d8c405d7d667d3c6c45c288c82bb
+++ packages/psplash/psplash_svn.bb 4e90d427d5ad257ee0faf49f0e087779364df998
@@ -1,9 +1,9 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
HOMEPAGE = "http://projects.o-hand.com/psplash"
SECTION = "base"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r10"
+PR = "r11"
# You can create your own pslash-hand-img.h by doing
# ./make-image-header.sh <file>.png HAND
#
# mt diff -rd025a5f00ad6ca971cacb9b19194efab7e1bee77 -r7299736bd45f29d862cdc7e7e31153ea62402566
#
#
#
# add_file "packages/python/python-cython-native_0.9.6.9.bb"
# content [e1421a5e31559ec41144bbdc77a4c448d493e717]
#
# add_file "packages/python/python-cython_0.9.6.9.bb"
# content [0a9a75ec77d6190dc80054f14140c6d397f4f97c]
#
# add_file "packages/python/python-efl.bb"
# content [38e140ae1f0addeb5ff6e307653bfd5032f4df82]
#
# add_file "packages/python/python-epsilon_cvs.bb"
# content [7bd65f186128ab558629d1d56830b76733712059]
#
# patch "classes/distutils.bbclass"
# from [41980eec92cf67538cc2af843af8a2424a084a31]
# to [d6701363cef5b26ab81a90ffc863f5ea8686cb17]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [8ae4047c69093053f4e143c210798f9df1ea20db]
# to [bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699]
#
# patch "packages/python/python-efl.inc"
# from [80730c5bf36a6a6a0cbbbb65f28daf6416921c23]
# to [52c210d09e0ffddb7db102b3f81f7759c1f7991d]
#
============================================================
--- packages/python/python-cython-native_0.9.6.9.bb e1421a5e31559ec41144bbdc77a4c448d493e717
+++ packages/python/python-cython-native_0.9.6.9.bb e1421a5e31559ec41144bbdc77a4c448d493e717
@@ -0,0 +1,9 @@
+require python-cython_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
============================================================
--- packages/python/python-cython_0.9.6.9.bb 0a9a75ec77d6190dc80054f14140c6d397f4f97c
+++ packages/python/python-cython_0.9.6.9.bb 0a9a75ec77d6190dc80054f14140c6d397f4f97c
@@ -0,0 +1,13 @@
+DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
+It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
+and the messy, low-level world of C."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "cython"
+PR = "ml0"
+
+SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
============================================================
--- packages/python/python-efl.bb 38e140ae1f0addeb5ff6e307653bfd5032f4df82
+++ packages/python/python-efl.bb 38e140ae1f0addeb5ff6e307653bfd5032f4df82
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+DEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon"
+
+ALLOW_EMPTY = "1"
+
============================================================
--- packages/python/python-epsilon_cvs.bb 7bd65f186128ab558629d1d56830b76733712059
+++ packages/python/python-epsilon_cvs.bb 7bd65f186128ab558629d1d56830b76733712059
@@ -0,0 +1,4 @@
+require python-efl.inc
+DEPENDS += "epsilon python-ecore"
+
+PR = "r0"
============================================================
--- classes/distutils.bbclass 41980eec92cf67538cc2af843af8a2424a084a31
+++ classes/distutils.bbclass d6701363cef5b26ab81a90ffc863f5ea8686cb17
@@ -13,13 +13,15 @@ distutils_stage_headers() {
}
distutils_stage_headers() {
+ install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
oefatal "python setup.py install_headers execution failed."
}
distutils_stage_all() {
- install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+ install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+ # is this missing a lib below?
PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
@@ -49,7 +51,7 @@ distutils_do_install() {
done
fi
- rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
+ rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
}
EXPORT_FUNCTIONS do_compile do_install
============================================================
--- packages/python/python-ecore_cvs.bb 8ae4047c69093053f4e143c210798f9df1ea20db
+++ packages/python/python-ecore_cvs.bb bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699
@@ -1,5 +1,9 @@ DEPENDS += "ecore"
require python-efl.inc
DEPENDS += "ecore"
-PR = "r1"
+PR = "r2"
+do_stage() {
+ distutils_stage_all
+}
+
============================================================
--- packages/python/python-efl.inc 80730c5bf36a6a6a0cbbbb65f28daf6416921c23
+++ packages/python/python-efl.inc 52c210d09e0ffddb7db102b3f81f7759c1f7991d
@@ -1,18 +1,16 @@ HOMEPAGE = "http://www.enlightenment.org
DESCRIPTION = "${PN} bindings"
LICENSE = "BSD"
AUTHOR = "Gustavo Sverzut Barbieri <barbieri at gmail.com>"
HOMEPAGE = "http://www.enlightenment.org"
-DEPENDS = "python-pyrex-native python-numeric"
+# somewhere is a bug. cython should be self-contained, but somehow this
+# does not compile unless pyrex has been built
+DEPENDS = "python-cython-native python-pyrex-native python-numeric"
PV = "0.1.1+cvs${SRCDATE}"
-inherit distutils
+inherit setuptools
SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}"
S = "${WORKDIR}/${PN}"
-do_install_append() {
- rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.*
-}
-
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
More information about the Openembedded-commits
mailing list