[oe-commits] org.oe.dev merge of '8ad08e33aab6e79d2f20645f27087e958b0aa2c7'
woglinde2 commit
oe at amethyst.openembedded.net
Thu Jul 24 13:54:30 UTC 2008
merge of '8ad08e33aab6e79d2f20645f27087e958b0aa2c7'
and 'bd0863efd4fd5edcafb9afbb746e0525af04d455'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: d2b4bc226cfc9c24968c86d29acb371f500acebb
ViewMTN: http://monotone.openembedded.org/revision/info/d2b4bc226cfc9c24968c86d29acb371f500acebb
Files:
1
packages/libsdl/libsdl-image-1.2.3
packages/libsdl/libsdl-net-1.2.7
packages/libsdl/libsdl-image-1.2.3/autotools.patch
packages/libsdl/libsdl-net-1.2.7/libtool2.patch
packages/libsdl/libsdl-image_1.2.3.bb
packages/libsdl/libsdl-net_1.2.7.bb
packages/libsdl/libsdl-ttf_2.0.3.bb
packages/python/python-setuptools
contrib/angstrom/source-mirror.txt
packages/neuros-public/neuros-mainmenu_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/python/python-setuptools/fix-log-usage.patch
conf/distro/angstrom-2008.1.conf
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/python/python-setuptools-native_0.6c8.bb
packages/python/python-setuptools_0.6c8.bb
Diffs:
#
# mt diff -r8ad08e33aab6e79d2f20645f27087e958b0aa2c7 -rd2b4bc226cfc9c24968c86d29acb371f500acebb
#
#
#
# add_dir "packages/libsdl/libsdl-image-1.2.3"
#
# add_dir "packages/libsdl/libsdl-net-1.2.7"
#
# add_file "packages/libsdl/libsdl-image-1.2.3/autotools.patch"
# content [e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3]
#
# add_file "packages/libsdl/libsdl-net-1.2.7/libtool2.patch"
# content [7f670962471074322af84e6361c3955b49a102f3]
#
# patch "packages/libsdl/libsdl-image_1.2.3.bb"
# from [5a0d595f2ccbc6a735854738caa59a51ac3630c0]
# to [f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0]
#
# patch "packages/libsdl/libsdl-net_1.2.7.bb"
# from [3ef6b382d1473344c9d55d2ebbd844d176758bd6]
# to [3fdc54c4a3e7db07f2c72d7d3d7f4348320a6357]
#
# patch "packages/libsdl/libsdl-ttf_2.0.3.bb"
# from [8ca2b92300d01da12e40b4ddfa3eb9b9dd5ab98d]
# to [ea5df0018b0c4a0b3f64c39d9957fc19affe5561]
#
============================================================
--- packages/libsdl/libsdl-image-1.2.3/autotools.patch e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
+++ packages/libsdl/libsdl-image-1.2.3/autotools.patch e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
@@ -0,0 +1,805 @@
+Index: SDL_image-1.2.3/acinclude.m4
+===================================================================
+--- SDL_image-1.2.3.orig/acinclude.m4 2001-11-02 21:39:10.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,608 +0,0 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
+- sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+- sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
+- , enable_sdltest=yes)
+-
+- if test x$sdl_exec_prefix != x ; then
+- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+- if test x${SDL_CONFIG+set} != xset ; then
+- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+- fi
+- fi
+- if test x$sdl_prefix != x ; then
+- sdl_args="$sdl_args --prefix=$sdl_prefix"
+- if test x${SDL_CONFIG+set} != xset ; then
+- SDL_CONFIG=$sdl_prefix/bin/sdl-config
+- fi
+- fi
+-
+- AC_REQUIRE([AC_CANONICAL_TARGET])
+- AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+- min_sdl_version=ifelse([$1], ,0.11.0,$1)
+- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+- no_sdl=""
+- if test "$SDL_CONFIG" = "no" ; then
+- no_sdl=yes
+- else
+- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- if test "x$enable_sdltest" = "xyes" ; then
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $SDL_CFLAGS"
+- LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+- rm -f conf.sdltest
+- AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+- char *new_str;
+-
+- if (str)
+- {
+- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+- strcpy (new_str, str);
+- }
+- else
+- new_str = NULL;
+-
+- return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+- int major, minor, micro;
+- char *tmp_version;
+-
+- /* This hangs on some systems (?)
+- system ("touch conf.sdltest");
+- */
+- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+- /* HP/UX 9 (%@#!) writes to sscanf strings */
+- tmp_version = my_strdup("$min_sdl_version");
+- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+- printf("%s, bad version string\n", "$min_sdl_version");
+- exit(1);
+- }
+-
+- if (($sdl_major_version > major) ||
+- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+- {
+- return 0;
+- }
+- else
+- {
+- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+- printf("*** best to upgrade to the required version.\n");
+- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+- printf("*** config.cache before re-running configure\n");
+- return 1;
+- }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- if test "x$no_sdl" = x ; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+- else
+- AC_MSG_RESULT(no)
+- if test "$SDL_CONFIG" = "no" ; then
+- echo "*** The sdl-config script installed by SDL could not be found"
+- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the SDL_CONFIG environment variable to the"
+- echo "*** full path to sdl-config."
+- else
+- if test -f conf.sdltest ; then
+- :
+- else
+- echo "*** Could not run SDL test program, checking why..."
+- CFLAGS="$CFLAGS $SDL_CFLAGS"
+- LIBS="$LIBS $SDL_LIBS"
+- AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef main
+-#define main K_and_R_C_main
+-], [ return 0; ],
+- [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding SDL or finding the wrong"
+- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+- [ echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- SDL_CFLAGS=""
+- SDL_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
+- AC_SUBST(SDL_CFLAGS)
+- AC_SUBST(SDL_LIBS)
+- rm -f conf.sdltest
+-])
+-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
+-
+-# serial 40 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
+-
+-# Actually configure libtool. ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+-|| AC_MSG_ERROR([libtool configure failed])
+-
+-# Reload cache, that may have been modified by ltconfig
+-AC_CACHE_LOAD
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
+-])
+-
+-AC_DEFUN(AC_LIBTOOL_SETUP,
+-[AC_PREREQ(2.13)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_RANLIB])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-dnl
+-
+-case "$target" in
+-NONE) lt_target="$host" ;;
+-*) lt_target="$target" ;;
+-esac
+-
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+-[libtool_flags="$libtool_flags --enable-dlopen"])
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[libtool_flags="$libtool_flags --enable-win32-dll"])
+-AC_ARG_ENABLE(libtool-lock,
+- [ --disable-libtool-lock avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$lt_target" in
+-*-*-irix6*)
+- # Find out which ABI we are using.
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case "`/usr/bin/file conftest.o`" in
+- *32-bit*)
+- LD="${LD-ld} -32"
+- ;;
+- *N32*)
+- LD="${LD-ld} -n32"
+- ;;
+- *64-bit*)
+- LD="${LD-ld} -64"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+-
+-*-*-sco3.2v5*)
+- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -belf"
+- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS="$SAVE_CFLAGS"
+- fi
+- ;;
+-
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw*)
+- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+- AC_CHECK_TOOL(AS, as, false)
+- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+-])
+-esac
+-])
+-
+-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+-
+-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+-
+-# AC_ENABLE_SHARED - implement the --enable-shared flag
+-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+-# `yes'.
+-AC_DEFUN(AC_ENABLE_SHARED, [dnl
+-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(shared,
+-changequote(<<, >>)dnl
+-<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+- for pkg in $enableval; do
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+- done
+- IFS="$ac_save_ifs"
+- ;;
+-esac],
+-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)])
+-
+-# AC_ENABLE_STATIC - implement the --enable-static flag
+-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+-# `yes'.
+-AC_DEFUN(AC_ENABLE_STATIC, [dnl
+-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(static,
+-changequote(<<, >>)dnl
+-<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+- for pkg in $enableval; do
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$ac_save_ifs"
+- ;;
+-esac],
+-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)])
+-
+-
+-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+-# `yes'.
+-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(fast-install,
+-changequote(<<, >>)dnl
+-<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+- enable_fast_install=no
+- # Look at the argument we got. We use all the common list separators.
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+- for pkg in $enableval; do
+- if test "X$pkg" = "X$p"; then
+- enable_fast_install=yes
+- fi
+- done
+- IFS="$ac_save_ifs"
+- ;;
+-esac],
+-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+-])
+-
+-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)])
+-
+-# AC_PROG_LD - %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbd0863efd4fd5edcafb9afbb746e0525af04d455 -rd2b4bc226cfc9c24968c86d29acb371f500acebb
#
#
#
# add_dir "packages/python/python-setuptools"
#
# add_file "contrib/angstrom/source-mirror.txt"
# content [2e9ab07fc28af71188db82b6db0ad97fdacc72fe]
#
# add_file "packages/neuros-public/neuros-mainmenu_git.bb"
# content [556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa]
#
# add_file "packages/neuros-public/neuros-nwm_git.bb"
# content [8066ae3bdfcaa465ac10245698627f7a5653631c]
#
# add_file "packages/python/python-setuptools/fix-log-usage.patch"
# content [1ee527f30af93cafced84bcc0d71b52bf1c1f1fd]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [f64ebcf55e85b504d3be169befac3c7981aa74d9]
# to [9a6f55539463ce42e6876f571531293184af4d8d]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8]
# to [066f779d14370cd80cffd7fd784d04df7990a255]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [a8b5931e6c77fb22d956e58b1f601344a24ad80b]
# to [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
#
# patch "packages/python/python-setuptools-native_0.6c8.bb"
# from [98f58e21bf03997cb61c8459da61b888c73364f9]
# to [f5d6011427a630faa2fa13103a2503e98045d9ea]
#
# patch "packages/python/python-setuptools_0.6c8.bb"
# from [122ed3dd626cef08ab8b57defb23846772fdaa38]
# to [ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7]
#
============================================================
--- contrib/angstrom/source-mirror.txt 2e9ab07fc28af71188db82b6db0ad97fdacc72fe
+++ contrib/angstrom/source-mirror.txt 2e9ab07fc28af71188db82b6db0ad97fdacc72fe
@@ -0,0 +1,14 @@
+#To populate the source mirror the autobuilder uses the following command:
+
+rsync ~/OE/downloads/ angstrom at linuxtogo.org:~/website/unstable/sources/ -av \
+ --exclude "*.md5" \
+ --exclude "svn" \
+ --exclude "cvs" \
+ --exclude "git" \
+ --exclude "umac.ko" \
+ --exclude "IPL_ixp400NpeLibrary-2_3_2.zip" \
+ --exclude "*.lock" \
+ --exclude "codec_*" \
+ --exclude "dsplink*" \
+ --progress
+
============================================================
--- packages/neuros-public/neuros-mainmenu_git.bb 556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa
+++ packages/neuros-public/neuros-mainmenu_git.bb 556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1"
+SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/main-menu ${D}/${bindir}
+
+ install -d ${D}/${sysconfdir}/menu
+ install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu
+}
+
+
============================================================
--- packages/neuros-public/neuros-nwm_git.bb 8066ae3bdfcaa465ac10245698627f7a5653631c
+++ packages/neuros-public/neuros-nwm_git.bb 8066ae3bdfcaa465ac10245698627f7a5653631c
@@ -0,0 +1,22 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+ rm ${S}/src/Makefile || true
+}
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/nwm ${D}/${bindir}
+}
============================================================
--- packages/python/python-setuptools/fix-log-usage.patch 1ee527f30af93cafced84bcc0d71b52bf1c1f1fd
+++ packages/python/python-setuptools/fix-log-usage.patch 1ee527f30af93cafced84bcc0d71b52bf1c1f1fd
@@ -0,0 +1,13 @@
+Index: setuptools-0.6c8/setuptools/command/sdist.py
+===================================================================
+--- setuptools-0.6c8.orig/setuptools/command/sdist.py
++++ setuptools-0.6c8/setuptools/command/sdist.py
+@@ -95,7 +95,7 @@ def entries_finder(dirname, filename):
+ for match in entries_pattern.finditer(data):
+ yield joinpath(dirname,unescape(match.group(1)))
+ else:
+- log.warn("unrecognized .svn/entries format in %s", dirname)
++ print ("unrecognized .svn/entries format in %s", dirname)
+
+
+ finders = [
============================================================
--- conf/distro/angstrom-2008.1.conf f64ebcf55e85b504d3be169befac3c7981aa74d9
+++ conf/distro/angstrom-2008.1.conf 9a6f55539463ce42e6876f571531293184af4d8d
@@ -111,7 +111,6 @@ PREFERRED_VERSION_gcc-cross-initial ?= "
PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
============================================================
--- packages/neuros-public/neuros-lib-widgets_git.bb 99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8
+++ packages/neuros-public/neuros-lib-widgets_git.bb 066f779d14370cd80cffd7fd784d04df7990a255
@@ -1,6 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "Neuros qt-plugins"
LICENSE = "GPL"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r1"
+
DEPENDS = "qt-embedded"
inherit qtopia4core
@@ -14,4 +17,7 @@ do_install() {
install -m 0755 ${S}/build/lib* ${D}/${libdir}
}
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}
+}
-
============================================================
--- packages/neuros-public/neuros-qt-plugins_git.bb a8b5931e6c77fb22d956e58b1f601344a24ad80b
+++ packages/neuros-public/neuros-qt-plugins_git.bb 8e03d1bc20bb51c31f921404d846b4c6fa902d59
@@ -1,7 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Neuros qt-plugins"
LICENSE = "GPL"
-PR = "r1"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
DEPENDS = "qt-embedded"
============================================================
--- packages/python/python-setuptools-native_0.6c8.bb 98f58e21bf03997cb61c8459da61b888c73364f9
+++ packages/python/python-setuptools-native_0.6c8.bb f5d6011427a630faa2fa13103a2503e98045d9ea
@@ -1,9 +1,9 @@ inherit native
require python-setuptools_${PV}.bb
inherit native
+FILESPATH = "${FILE_DIRNAME}/python-setuptools"
DEPENDS = "python-native"
do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install
+ distutils_stage_all
}
============================================================
--- packages/python/python-setuptools_0.6c8.bb 122ed3dd626cef08ab8b57defb23846772fdaa38
+++ packages/python/python-setuptools_0.6c8.bb ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7
@@ -5,9 +5,12 @@ SRCNAME = "setuptools"
LICENSE = "MIT-like"
RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml1"
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+ http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+ file://fix-log-usage.patch;patch=1 \
+"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
More information about the Openembedded-commits
mailing list