[oe-commits] org.oe.dev merge of 'a6e949d7541dc3ab2d5697151c861cfd4a2efa87'
mickeyl commit
oe at amethyst.openembedded.net
Wed Jun 11 21:42:52 UTC 2008
merge of 'a6e949d7541dc3ab2d5697151c861cfd4a2efa87'
and 'f710df9bab62719eadc5ac425bbc8e07f2e5f704'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 718234cc707062a8d111bc44b3145b2ad4491534
ViewMTN: http://monotone.openembedded.org/revision/info/718234cc707062a8d111bc44b3145b2ad4491534
Files:
1
packages/libmikmod/libmikmod/m4.patch
packages/python/python-pyalsaaudio_0.3.bb
packages/libmikmod/libmikmod_3.1.12.bb
packages/tasks/task-python-everything.bb
packages/freetype/freetype-native_2.3.5.bb
packages/freetype/freetype-native_2.3.6.bb
packages/freetype/freetype_2.3.5.bb
packages/freetype/freetype_2.3.6.bb
packages/gcc/gcc-4.3.1/gcc-release-branch
packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch
conf/machine/neuros-osd2.conf
packages/gcc/gcc-4.3.1.inc
packages/gcc/gcc-cross_4.3.1.bb
packages/images/fso-image.bb
Diffs:
#
# mt diff -ra6e949d7541dc3ab2d5697151c861cfd4a2efa87 -r718234cc707062a8d111bc44b3145b2ad4491534
#
#
#
# add_file "packages/libmikmod/libmikmod/m4.patch"
# content [cb3c2213ef43219f3e8f76e3b5a4bb3254fc2355]
#
# add_file "packages/python/python-pyalsaaudio_0.3.bb"
# content [842c26dae88bac7ad2defe39000da15a959b9750]
#
# patch "packages/libmikmod/libmikmod_3.1.12.bb"
# from [84c2cad4907c0ad00df3cf3695aa07c81df6a53e]
# to [66d22f824b0bc343e1a1d796ca32dd2597ec7e18]
#
# patch "packages/tasks/task-python-everything.bb"
# from [b5a47ec309aff31f780978156e341ad708eae74a]
# to [c91edb7c89a9ec1b1a20f672d7be3f79d46bd282]
#
============================================================
--- packages/libmikmod/libmikmod/m4.patch cb3c2213ef43219f3e8f76e3b5a4bb3254fc2355
+++ packages/libmikmod/libmikmod/m4.patch cb3c2213ef43219f3e8f76e3b5a4bb3254fc2355
@@ -0,0 +1,197 @@
+--- /dev/null
++++ libmikmod-3.2.0-beta2/m4/esd.m4
+@@ -0,0 +1,194 @@
++# Configure paths for ESD
++# Manish Singh 98-9-30
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
++dnl
++AC_DEFUN(AM_PATH_ESD,
++[dnl
++dnl Get the cflags and libraries from the esd-config script
++dnl
++AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)],
++ esd_prefix="$withval", esd_prefix="")
++AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
++ esd_exec_prefix="$withval", esd_exec_prefix="")
++AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program],
++ , enable_esdtest=yes)
++
++ if test x$esd_exec_prefix != x ; then
++ esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
++ if test x${ESD_CONFIG+set} != xset ; then
++ ESD_CONFIG=$esd_exec_prefix/bin/esd-config
++ fi
++ fi
++ if test x$esd_prefix != x ; then
++ esd_args="$esd_args --prefix=$esd_prefix"
++ if test x${ESD_CONFIG+set} != xset ; then
++ ESD_CONFIG=$esd_prefix/bin/esd-config
++ fi
++ fi
++
++ AC_PATH_PROG(ESD_CONFIG, esd-config, no)
++ min_esd_version=ifelse([$1], ,0.2.7,$1)
++ AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
++ no_esd=""
++ if test "$ESD_CONFIG" = "no" ; then
++ no_esd=yes
++ else
++ AC_LANG_SAVE
++ AC_LANG_C
++ ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
++ ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
++
++ esd_major_version=`$ESD_CONFIG $esd_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ esd_minor_version=`$ESD_CONFIG $esd_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_esdtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $ESD_CFLAGS"
++ LIBS="$LIBS $ESD_LIBS"
++dnl
++dnl Now check if the installed ESD is sufficiently new. (Also sanity
++dnl checks the results of esd-config to some extent
++dnl
++ rm -f conf.esdtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <esd.h>
++
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
++
++int main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.esdtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_esd_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_esd_version");
++ exit(1);
++ }
++
++ if (($esd_major_version > major) ||
++ (($esd_major_version == major) && ($esd_minor_version > minor)) ||
++ (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
++ printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
++ printf("*** to point to the correct copy of esd-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
++
++],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ AC_LANG_RESTORE
++ fi
++ fi
++ if test "x$no_esd" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$ESD_CONFIG" = "no" ; then
++ echo "*** The esd-config script installed by ESD could not be found"
++ echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the ESD_CONFIG environment variable to the"
++ echo "*** full path to esd-config."
++ else
++ if test -f conf.esdtest ; then
++ :
++ else
++ echo "*** Could not run ESD test program, checking why..."
++ CFLAGS="$CFLAGS $ESD_CFLAGS"
++ LIBS="$LIBS $ESD_LIBS"
++ AC_LANG_SAVE
++ AC_LANG_C
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <esd.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding ESD or finding the wrong"
++ echo "*** version of ESD. If it is not finding ESD, 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 ESD was incorrectly installed"
++ echo "*** or that you have moved ESD since it was installed. In the latter case, you"
++ echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ AC_LANG_RESTORE
++ fi
++ fi
++ ESD_CFLAGS=""
++ ESD_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(ESD_CFLAGS)
++ AC_SUBST(ESD_LIBS)
++ rm -f conf.esdtest
++])
++
++dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
++dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
++dnl
++AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD,
++[dnl
++ AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
++ ac_save_ESD_CFLAGS="$ESD_CFLAGS"
++ ac_save_ESD_LIBS="$ESD_LIBS"
++ AM_PATH_ESD(0.2.21,
++ ifelse([$1], , [
++ AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
++ AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
++ [Define if you have esound with support of multiple recording clients.])],
++ [$1]),
++ ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
++ if test "x$ac_save_ESD_CFLAGS" != x ; then
++ ESD_CFLAGS="$ac_save_ESD_CFLAGS"
++ fi
++ if test "x$ac_save_ESD_LIBS" != x ; then
++ ESD_LIBS="$ac_save_ESD_LIBS"
++ fi
++ )
++])
============================================================
--- packages/python/python-pyalsaaudio_0.3.bb 842c26dae88bac7ad2defe39000da15a959b9750
+++ packages/python/python-pyalsaaudio_0.3.bb 842c26dae88bac7ad2defe39000da15a959b9750
@@ -0,0 +1,12 @@
+DESCRIPTION = "Support for the Linux 2.6.x ALSA Sound System"
+SECTION = "devel/python"
+DEPENDS = "alsa-lib"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "pyalsaaudio"
+PR = "ml0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyalsaaudio/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
============================================================
--- packages/libmikmod/libmikmod_3.1.12.bb 84c2cad4907c0ad00df3cf3695aa07c81df6a53e
+++ packages/libmikmod/libmikmod_3.1.12.bb 66d22f824b0bc343e1a1d796ca32dd2597ec7e18
@@ -2,10 +2,11 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
+ file://m4.patch;patch=1 \
file://autofoo.patch;patch=1 \
"
============================================================
--- packages/tasks/task-python-everything.bb b5a47ec309aff31f780978156e341ad708eae74a
+++ packages/tasks/task-python-everything.bb c91edb7c89a9ec1b1a20f672d7be3f79d46bd282
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml27"
+PR = "ml28"
RDEPENDS = "\
python-ao \
@@ -39,6 +39,7 @@ RDEPENDS = "\
python-numeric \
python-ogg \
python-pexpect \
+ python-pyalsaaudio \
python-pybluez \
python-pycairo \
python-pychecker \
#
# mt diff -rf710df9bab62719eadc5ac425bbc8e07f2e5f704 -r718234cc707062a8d111bc44b3145b2ad4491534
#
#
#
# rename "packages/freetype/freetype-native_2.3.5.bb"
# to "packages/freetype/freetype-native_2.3.6.bb"
#
# rename "packages/freetype/freetype_2.3.5.bb"
# to "packages/freetype/freetype_2.3.6.bb"
#
# add_dir "packages/gcc/gcc-4.3.1/gcc-release-branch"
#
# add_file "packages/freetype/freetype-native_2.3.5.bb"
# content [dd9daf1996d3774461b7c4f1e0d57e5a6560878e]
#
# add_file "packages/freetype/freetype_2.3.5.bb"
# content [978dbbc3df12b5bdd743efcc3878d15cff9b7c31]
#
# add_file "packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch"
# content [3875698567cf2f0c76da4c500c17523991227ecb]
#
# patch "conf/machine/neuros-osd2.conf"
# from [4e143b8c4022b8858c437bf4ec3eb304da212c84]
# to [5d3d5445dcd1af59e2891676c7738060a43c6fbe]
#
# patch "packages/freetype/freetype_2.3.6.bb"
# from [978dbbc3df12b5bdd743efcc3878d15cff9b7c31]
# to [75ff25f85bf78ae5a013dbcd361a18382302aeff]
#
# patch "packages/gcc/gcc-4.3.1.inc"
# from [2e494a129f468083a15c2912de1beac230d01ca2]
# to [c95319fe788a145ce0a5aecd6d6c270424e47e03]
#
# patch "packages/gcc/gcc-cross_4.3.1.bb"
# from [cc76abacb299b51bb7da2b6bc0a6f7bec093ebeb]
# to [6bacdf326b12e4c3280a994812f4aaeea7dc586c]
#
# patch "packages/images/fso-image.bb"
# from [7304d85db54babe5e9aeb520c3921e41e709de5f]
# to [7760515243184482540deba2c8f87034ea4f1c54]
#
============================================================
--- packages/freetype/freetype-native_2.3.5.bb dd9daf1996d3774461b7c4f1e0d57e5a6560878e
+++ packages/freetype/freetype-native_2.3.5.bb dd9daf1996d3774461b7c4f1e0d57e5a6560878e
@@ -0,0 +1,21 @@
+require freetype_${PV}.bb
+inherit native
+DEPENDS = ""
+FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
+
+EXTRA_OEMAKE=
+
+do_configure() {
+ (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_includes
+ oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+do_install() {
+ :
+}
+
============================================================
--- packages/freetype/freetype_2.3.5.bb 978dbbc3df12b5bdd743efcc3878d15cff9b7c31
+++ packages/freetype/freetype_2.3.5.bb 978dbbc3df12b5bdd743efcc3878d15cff9b7c31
@@ -0,0 +1,40 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+ file://fix-x86_64-build.patch;patch=1 \
+ file://no-hardcode.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+ cd builds/unix
+ libtoolize --force --copy
+ gnu-configize --force
+ aclocal -I .
+ autoconf
+ cd ${S}
+ oe_runconf
+}
+
+do_compile_prepend() {
+ ${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+do_stage() {
+ export LIBTOOL='${LIBTOOL}'
+ autotools_stage_all
+ oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
============================================================
--- packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch 3875698567cf2f0c76da4c500c17523991227ecb
+++ packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch 3875698567cf2f0c76da4c500c17523991227ecb
@@ -0,0 +1,265 @@
+--- foo/gcc/config/arm/arm.c 2008/06/11 10:51:34 136660
++++ foo/gcc/config/arm/arm.c 2008/06/11 10:52:55 136661
+@@ -14830,124 +14830,190 @@
+ {
+ unsigned int i, fcode = ARM_BUILTIN_NEON_BASE;
+
++ tree neon_intQI_type_node;
++ tree neon_intHI_type_node;
++ tree neon_polyQI_type_node;
++ tree neon_polyHI_type_node;
++ tree neon_intSI_type_node;
++ tree neon_intDI_type_node;
++ tree neon_float_type_node;
++
++ tree intQI_pointer_node;
++ tree intHI_pointer_node;
++ tree intSI_pointer_node;
++ tree intDI_pointer_node;
++ tree float_pointer_node;
++
++ tree const_intQI_node;
++ tree const_intHI_node;
++ tree const_intSI_node;
++ tree const_intDI_node;
++ tree const_float_node;
++
++ tree const_intQI_pointer_node;
++ tree const_intHI_pointer_node;
++ tree const_intSI_pointer_node;
++ tree const_intDI_pointer_node;
++ tree const_float_pointer_node;
++
++ tree V8QI_type_node;
++ tree V4HI_type_node;
++ tree V2SI_type_node;
++ tree V2SF_type_node;
++ tree V16QI_type_node;
++ tree V8HI_type_node;
++ tree V4SI_type_node;
++ tree V4SF_type_node;
++ tree V2DI_type_node;
++
++ tree intUQI_type_node;
++ tree intUHI_type_node;
++ tree intUSI_type_node;
++ tree intUDI_type_node;
++
++ tree intEI_type_node;
++ tree intOI_type_node;
++ tree intCI_type_node;
++ tree intXI_type_node;
++
++ tree V8QI_pointer_node;
++ tree V4HI_pointer_node;
++ tree V2SI_pointer_node;
++ tree V2SF_pointer_node;
++ tree V16QI_pointer_node;
++ tree V8HI_pointer_node;
++ tree V4SI_pointer_node;
++ tree V4SF_pointer_node;
++ tree V2DI_pointer_node;
++
++ tree void_ftype_pv8qi_v8qi_v8qi;
++ tree void_ftype_pv4hi_v4hi_v4hi;
++ tree void_ftype_pv2si_v2si_v2si;
++ tree void_ftype_pv2sf_v2sf_v2sf;
++ tree void_ftype_pdi_di_di;
++ tree void_ftype_pv16qi_v16qi_v16qi;
++ tree void_ftype_pv8hi_v8hi_v8hi;
++ tree void_ftype_pv4si_v4si_v4si;
++ tree void_ftype_pv4sf_v4sf_v4sf;
++ tree void_ftype_pv2di_v2di_v2di;
++
++ tree reinterp_ftype_dreg[5][5];
++ tree reinterp_ftype_qreg[5][5];
++ tree dreg_types[5], qreg_types[5];
++
+ /* Create distinguished type nodes for NEON vector element types,
+ and pointers to values of such types, so we can detect them later. */
+- tree neon_intQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode));
+- tree neon_intHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode));
+- tree neon_polyQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode));
+- tree neon_polyHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode));
+- tree neon_intSI_type_node = make_signed_type (GET_MODE_PRECISION (SImode));
+- tree neon_intDI_type_node = make_signed_type (GET_MODE_PRECISION (DImode));
+- tree neon_float_type_node = make_node (REAL_TYPE);
+-
+- tree intQI_pointer_node = build_pointer_type (neon_intQI_type_node);
+- tree intHI_pointer_node = build_pointer_type (neon_intHI_type_node);
+- tree intSI_pointer_node = build_pointer_type (neon_intSI_type_node);
+- tree intDI_pointer_node = build_pointer_type (neon_intDI_type_node);
+- tree float_pointer_node = build_pointer_type (neon_float_type_node);
++ neon_intQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode));
++ neon_intHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode));
++ neon_polyQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode));
++ neon_polyHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode));
++ neon_intSI_type_node = make_signed_type (GET_MODE_PRECISION (SImode));
++ neon_intDI_type_node = make_signed_type (GET_MODE_PRECISION (DImode));
++ neon_float_type_node = make_node (REAL_TYPE);
++ TYPE_PRECISION (neon_float_type_node) = FLOAT_TYPE_SIZE;
++ layout_type (neon_float_type_node);
++
++ intQI_pointer_node = build_pointer_type (neon_intQI_type_node);
++ intHI_pointer_node = build_pointer_type (neon_intHI_type_node);
++ intSI_pointer_node = build_pointer_type (neon_intSI_type_node);
++ intDI_pointer_node = build_pointer_type (neon_intDI_type_node);
++ float_pointer_node = build_pointer_type (neon_float_type_node);
+
+ /* Next create constant-qualified versions of the above types. */
+- tree const_intQI_node = build_qualified_type (neon_intQI_type_node,
+- TYPE_QUAL_CONST);
+- tree const_intHI_node = build_qualified_type (neon_intHI_type_node,
+- TYPE_QUAL_CONST);
+- tree const_intSI_node = build_qualified_type (neon_intSI_type_node,
+- TYPE_QUAL_CONST);
+- tree const_intDI_node = build_qualified_type (neon_intDI_type_node,
+- TYPE_QUAL_CONST);
+- tree const_float_node = build_qualified_type (neon_float_type_node,
+- TYPE_QUAL_CONST);
+-
+- tree const_intQI_pointer_node = build_pointer_type (const_intQI_node);
+- tree const_intHI_pointer_node = build_pointer_type (const_intHI_node);
+- tree const_intSI_pointer_node = build_pointer_type (const_intSI_node);
+- tree const_intDI_pointer_node = build_pointer_type (const_intDI_node);
+- tree const_float_pointer_node = build_pointer_type (const_float_node);
++ const_intQI_node = build_qualified_type (neon_intQI_type_node,
++ TYPE_QUAL_CONST);
++ const_intHI_node = build_qualified_type (neon_intHI_type_node,
++ TYPE_QUAL_CONST);
++ const_intSI_node = build_qualified_type (neon_intSI_type_node,
++ TYPE_QUAL_CONST);
++ const_intDI_node = build_qualified_type (neon_intDI_type_node,
++ TYPE_QUAL_CONST);
++ const_float_node = build_qualified_type (neon_float_type_node,
++ TYPE_QUAL_CONST);
++
++ const_intQI_pointer_node = build_pointer_type (const_intQI_node);
++ const_intHI_pointer_node = build_pointer_type (const_intHI_node);
++ const_intSI_pointer_node = build_pointer_type (const_intSI_node);
++ const_intDI_pointer_node = build_pointer_type (const_intDI_node);
++ const_float_pointer_node = build_pointer_type (const_float_node);
+
+ /* Now create vector types based on our NEON element types. */
+ /* 64-bit vectors. */
+- tree V8QI_type_node =
++ V8QI_type_node =
+ build_vector_type_for_mode (neon_intQI_type_node, V8QImode);
+- tree V4HI_type_node =
++ V4HI_type_node =
+ build_vector_type_for_mode (neon_intHI_type_node, V4HImode);
+- tree V2SI_type_node =
++ V2SI_type_node =
+ build_vector_type_for_mode (neon_intSI_type_node, V2SImode);
+- tree V2SF_type_node =
++ V2SF_type_node =
+ build_vector_type_for_mode (neon_float_type_node, V2SFmode);
+ /* 128-bit vectors. */
+- tree V16QI_type_node =
++ V16QI_type_node =
+ build_vector_type_for_mode (neon_intQI_type_node, V16QImode);
+- tree V8HI_type_node =
++ V8HI_type_node =
+ build_vector_type_for_mode (neon_intHI_type_node, V8HImode);
+- tree V4SI_type_node =
++ V4SI_type_node =
+ build_vector_type_for_mode (neon_intSI_type_node, V4SImode);
+- tree V4SF_type_node =
++ V4SF_type_node =
+ build_vector_type_for_mode (neon_float_type_node, V4SFmode);
+- tree V2DI_type_node =
++ V2DI_type_node =
+ build_vector_type_for_mode (neon_intDI_type_node, V2DImode);
+
+ /* Unsigned integer types for various mode sizes. */
+- tree intUQI_type_node = make_unsigned_type (GET_MODE_PRECISION (QImode));
+- tree intUHI_type_node = make_unsigned_type (GET_MODE_PRECISION (HImode));
+- tree intUSI_type_node = make_unsigned_type (GET_MODE_PRECISION (SImode));
+- tree intUDI_type_node = make_unsigned_type (GET_MODE_PRECISION (DImode));
++ intUQI_type_node = make_unsigned_type (GET_MODE_PRECISION (QImode));
++ intUHI_type_node = make_unsigned_type (GET_MODE_PRECISION (HImode));
++ intUSI_type_node = make_unsigned_type (GET_MODE_PRECISION (SImode));
++ intUDI_type_node = make_unsigned_type (GET_MODE_PRECISION (DImode));
+
+ /* Opaque integer types for structures of vectors. */
+- tree intEI_type_node = make_signed_type (GET_MODE_PRECISION (EImode));
+- tree intOI_type_node = make_signed_type (GET_MODE_PRECISION (OImode));
+- tree intCI_type_node = make_signed_type (GET_MODE_PRECISION (CImode));
+- tree intXI_type_node = make_signed_type (GET_MODE_PRECISION (XImode));
++ intEI_type_node = make_signed_type (GET_MODE_PRECISION (EImode));
++ intOI_type_node = make_signed_type (GET_MODE_PRECISION (OImode));
++ intCI_type_node = make_signed_type (GET_MODE_PRECISION (CImode));
++ intXI_type_node = make_signed_type (GET_MODE_PRECISION (XImode));
+
+ /* Pointers to vector types. */
+- tree V8QI_pointer_node = build_pointer_type (V8QI_type_node);
+- tree V4HI_pointer_node = build_pointer_type (V4HI_type_node);
+- tree V2SI_pointer_node = build_pointer_type (V2SI_type_node);
+- tree V2SF_pointer_node = build_pointer_type (V2SF_type_node);
+- tree V16QI_pointer_node = build_pointer_type (V16QI_type_node);
+- tree V8HI_pointer_node = build_pointer_type (V8HI_type_node);
+- tree V4SI_pointer_node = build_pointer_type (V4SI_type_node);
+- tree V4SF_pointer_node = build_pointer_type (V4SF_type_node);
+- tree V2DI_pointer_node = build_pointer_type (V2DI_type_node);
++ V8QI_pointer_node = build_pointer_type (V8QI_type_node);
++ V4HI_pointer_node = build_pointer_type (V4HI_type_node);
++ V2SI_pointer_node = build_pointer_type (V2SI_type_node);
++ V2SF_pointer_node = build_pointer_type (V2SF_type_node);
++ V16QI_pointer_node = build_pointer_type (V16QI_type_node);
++ V8HI_pointer_node = build_pointer_type (V8HI_type_node);
++ V4SI_pointer_node = build_pointer_type (V4SI_type_node);
++ V4SF_pointer_node = build_pointer_type (V4SF_type_node);
++ V2DI_pointer_node = build_pointer_type (V2DI_type_node);
+
+ /* Operations which return results as pairs. */
+- tree void_ftype_pv8qi_v8qi_v8qi =
++ void_ftype_pv8qi_v8qi_v8qi =
+ build_function_type_list (void_type_node, V8QI_pointer_node, V8QI_type_node,
+ V8QI_type_node, NULL);
+- tree void_ftype_pv4hi_v4hi_v4hi =
++ void_ftype_pv4hi_v4hi_v4hi =
+ build_function_type_list (void_type_node, V4HI_pointer_node, V4HI_type_node,
+ V4HI_type_node, NULL);
+- tree void_ftype_pv2si_v2si_v2si =
++ void_ftype_pv2si_v2si_v2si =
+ build_function_type_list (void_type_node, V2SI_pointer_node, V2SI_type_node,
+ V2SI_type_node, NULL);
+- tree void_ftype_pv2sf_v2sf_v2sf =
++ void_ftype_pv2sf_v2sf_v2sf =
+ build_function_type_list (void_type_node, V2SF_pointer_node, V2SF_type_node,
+ V2SF_type_node, NULL);
+- tree void_ftype_pdi_di_di =
++ void_ftype_pdi_di_di =
+ build_function_type_list (void_type_node, intDI_pointer_node,
+ neon_intDI_type_node, neon_intDI_type_node, NULL);
+- tree void_ftype_pv16qi_v16qi_v16qi =
++ void_ftype_pv16qi_v16qi_v16qi =
+ build_function_type_list (void_type_node, V16QI_pointer_node,
+ V16QI_type_node, V16QI_type_node, NULL);
+- tree void_ftype_pv8hi_v8hi_v8hi =
++ void_ftype_pv8hi_v8hi_v8hi =
+ build_function_type_list (void_type_node, V8HI_pointer_node, V8HI_type_node,
+ V8HI_type_node, NULL);
+- tree void_ftype_pv4si_v4si_v4si =
++ void_ftype_pv4si_v4si_v4si =
+ build_function_type_list (void_type_node, V4SI_pointer_node, V4SI_type_node,
+ V4SI_type_node, NULL);
+- tree void_ftype_pv4sf_v4sf_v4sf =
++ void_ftype_pv4sf_v4sf_v4sf =
+ build_function_type_list (void_type_node, V4SF_pointer_node, V4SF_type_node,
+ V4SF_type_node, NULL);
+- tree void_ftype_pv2di_v2di_v2di =
++ void_ftype_pv2di_v2di_v2di =
+ build_function_type_list (void_type_node, V2DI_pointer_node, V2DI_type_node,
+ V2DI_type_node, NULL);
+
+- tree reinterp_ftype_dreg[5][5];
+- tree reinterp_ftype_qreg[5][5];
+- tree dreg_types[5], qreg_types[5];
+-
+- TYPE_PRECISION (neon_float_type_node) = FLOAT_TYPE_SIZE;
+- layout_type (neon_float_type_node);
+-
+ /* Define typedefs which exactly correspond to the modes we are basing vector
+ types on. If you change these names you'll need to change
+ the table used by arm_mangle_type too. */
============================================================
--- conf/machine/neuros-osd2.conf 4e143b8c4022b8858c437bf4ec3eb304da212c84
+++ conf/machine/neuros-osd2.conf 5d3d5445dcd1af59e2891676c7738060a43c6fbe
@@ -7,7 +7,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
KERNEL_IMAGETYPE = "uImage"
============================================================
--- packages/freetype/freetype_2.3.5.bb 978dbbc3df12b5bdd743efcc3878d15cff9b7c31
+++ packages/freetype/freetype_2.3.6.bb 75ff25f85bf78ae5a013dbcd361a18382302aeff
@@ -1,10 +1,9 @@ LICENSE = "freetype"
DESCRIPTION = "Freetype font rendering library"
SECTION = "libs"
LICENSE = "freetype"
-PR = "r3"
+PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://fix-x86_64-build.patch;patch=1 \
file://no-hardcode.patch;patch=1 \
"
====%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list