diff options
72 files changed, 2771 insertions, 554 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 43eb3f3dc7..f0cc3b3a88 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -252,6 +252,19 @@ if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then cat /tmp/translation-list | xargs ${OPKG} -nodeps install rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + + for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do + if [ -f $i ] && ! sh $i; then + opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst` + fi + done + + for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.postinst; do + if [ -f $i ] && ! sh $i configure; then + opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst` + fi + done + fi } diff --git a/conf/checksums.ini b/conf/checksums.ini index 0a42c6b3f9..2f9c8289ab 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3790,6 +3790,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797 md5=d8f3bbfbcc337d9776991d9561f451f3 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d +[http://install.source.dir.com/codec_engine_2_23_01.tar.gz] +md5=581f548714a53d818ac355a1e4aacfa4 +sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8 + [http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz] md5=581f548714a53d818ac355a1e4aacfa4 sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8 @@ -4838,6 +4842,10 @@ sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 md5=4c6f3eb03ffbd067b6d2fe2344b0d9ad sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin] +md5=f6221188bea76b7aaf0c45e9bcf26329 +sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61 + [http://dmalloc.com/releases/dmalloc-5.5.2.tgz] md5=f92e5606c23a8092f3d5694e8d1c932e sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a @@ -6058,14 +6066,14 @@ sha256=4fc8fbe0cf94a0d281ddc309fa91e2b6e2fb14f4cafe525d20635a196c2cc245 md5=a556eef04aeb574ac8ab0dd8c868fcab sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43 -[http://handhelds.org/~mallum/downloadables/figment/figment-0.3.5.tar.gz] -md5=e20c642ffe7c8a492c0ddc7ee3016f44 -sha256=39fcbdea0c1e31338bca4ae60db700a3f0fce7b6cb75087abd559022e22a2927 - [http://ftp.sh.cvut.cz/MIRRORS/rock/ROCK-2.0/gnome2/figment/figment-0.3.5.tar.bz2] md5=4b317749c7a75c4f283c6ef5aaad4146 sha256=ebafecd9a34dbcb83bcbf69db3e9655e92af2eb0ede33d9f92d13ed5f2e7d8b2 +[http://handhelds.org/~mallum/downloadables/figment/figment-0.3.5.tar.gz] +md5=e20c642ffe7c8a492c0ddc7ee3016f44 +sha256=39fcbdea0c1e31338bca4ae60db700a3f0fce7b6cb75087abd559022e22a2927 + [ftp://ftp.astron.com/pub/file/file-4.18.tar.gz] md5=ce1aa9b0316feb57d40a48cfe6b606e4 sha256=5090d5123ea642842d04d3f93a821e1372e5d9e434c74c08ee2483cc150a6273 @@ -17890,6 +17898,10 @@ sha256=908a69340b020f7d865acf70724e37837016a81a0cb499fb83441759cbef7616 md5=8347c8980ccf6cc46039ca75e8b0f543 sha256=f9bd3921377ab64138c7dd550d5753e3668e99de37d743cf112b88ad933d4420 +[http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin] +md5=a231257e79fffbd4aa87dde13642df4c +sha256=92ecc9be2c638220ebbd7de467a0944d49f1bef84b977421709afadd4508c2b9 + [http://www.devzero.net/openmoko/dist/omext-0.2.tar.gz] md5=3c1fcd85f0a0cd3ccc4d7b4f26996b47 sha256=3d3cc3e4f92f7e0b6a352c3f68a337a599a90f4e4b6e6743adc0c70b570639f5 diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 655cf9d50e..92e22332b7 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -10,11 +10,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION = "-O2 -ggdb3" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_sparc = "-O2" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 3d189b9dd0..1f0967a42e 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -10,14 +10,14 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros" -BUILD_OPTIMIZATION = "-O2" +BUILD_OPTIMIZATION = "-O2 -ggdb3" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 3079e0d365..a60952ff06 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -14,8 +14,8 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3" +BUILD_OPTIMIZATION = "-O2 -ggdb3" #Gcc will die with 'internal consistency error when using the above optimizations #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports). diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index c3f908c2c4..019f814b8f 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -10,8 +10,8 @@ TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_AR #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3" +BUILD_OPTIMIZATION = "-O2 -ggdb3" #Gcc will die with 'internal consistency error when using the above optimizations FULL_OPTIMIZATION_avr32 = "" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1b7c5831cd..6e0ae1f61f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -266,7 +266,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "40978" +EFL_SRCREV ?= "41038" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb index 624ad6e3f1..6155d33fe1 100644 --- a/recipes/clutter/clutter-0.9_git.bb +++ b/recipes/clutter/clutter-0.9_git.bb @@ -1,12 +1,12 @@ require clutter.inc -SRCREV = "745ca8a62ca52eedfad850e556f160f36eb32953" +SRCREV = "b9a53d379d3aaca4b09a90cd44d5a9d9736a2435" PV = "0.9.3" -PR = "r1" +PR = "r2" PR_append = "+git${SRCREV}" -SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=1.0-integration \ +SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \ file://enable_tests.patch;patch=1 " S = "${WORKDIR}/git" diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc index e900c43209..4e2457946a 100644 --- a/recipes/clutter/clutter.inc +++ b/recipes/clutter/clutter.inc @@ -55,8 +55,13 @@ require clutter-fpu.inc #Fix up some weirdness in the docs do_configure_prepend() { - sed -i s:doc/reference/Makefile::g ${S}/configure.ac - sed -i s:doc::g ${S}/Makefile.am + if [ -e ${WORKDIR}/gtk-doc.make ] ; then + cp ${WORKDIR}/gtk-doc.make ${S}/gtk-doc.make + else + touch ${S}/gtk-doc.make + fi + sed -i s:doc/reference/Makefile::g ${S}/configure.ac + sed -i s:doc::g ${S}/Makefile.am } do_stage () { diff --git a/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch b/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch index d73ebe5877..e373bca181 100644 --- a/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch +++ b/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch @@ -1,60 +1,102 @@ -From 69f75d284caed6c38ccbdc4479f69fb16bb3ec46 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 5 Jun 2009 14:21:34 +0200 -Subject: [PATCH] clutter-gst videosink: guard GL calls with #ifdef CLUTTER_COGL_HAS_GL so it can be compiled against the GLES backend +From 0677f1e6b5221caf78d50d94d2d0611e7f4b0abc Mon Sep 17 00:00:00 2001 +From: Damien Lespiau <damien.lespiau@intel.com> +Date: Sun, 14 Jun 2009 15:30:04 +0100 +Subject: [PATCH] Fix compilation with OpenGL ES backends +* Don't try to compile ARB fp1.0 shaders on non GL platforms, +* Use CGL_MAX_COMBINED_TEXTURE_IMAGE_UNITS to query the number of + texture units one can use in a shader in a portable fashion. --- - clutter-gst/clutter-gst-video-sink.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + clutter-gst/clutter-gst-video-sink.c | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c -index c20fbd7..2f2d27b 100644 +index d6eb6a3..516a42c 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c -@@ -245,6 +245,8 @@ _string_array_to_char_array (char *dst, +@@ -236,6 +236,7 @@ _string_array_to_char_array (char *dst, *dst = '\0'; } +#ifdef CLUTTER_COGL_HAS_GL -+ static void clutter_gst_video_sink_fp_paint (ClutterActor *actor, ClutterGstVideoSink *sink) -@@ -284,6 +286,8 @@ clutter_gst_video_sink_set_fp_shader (ClutterGstVideoSink *sink, +@@ -274,6 +275,7 @@ clutter_gst_video_sink_set_fp_shader (ClutterGstVideoSink *sink, + priv->shaders_init = TRUE; } ++#endif -+#endif /* CLUTTER_COGL_HAS_GL */ -+ static void clutter_gst_video_sink_paint (ClutterActor *actor, - ClutterGstVideoSink *sink) -@@ -746,14 +750,17 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) - { +@@ -532,6 +534,7 @@ static ClutterGstRenderer yv12_glsl_renderer = + * 8 bit Y plane followed by 8 bit 2x2 subsampled V and U planes. + */ + ++#ifdef CLUTTER_COGL_HAS_GL + static void + clutter_gst_yv12_fp_init (ClutterActor *actor, + ClutterGstVideoSink *sink) +@@ -573,6 +576,7 @@ static ClutterGstRenderer yv12_fp_renderer = + clutter_gst_yv12_paint, + clutter_gst_yv12_fp_post_paint, + }; ++#endif + + /* + * I420 +@@ -620,6 +624,7 @@ static ClutterGstRenderer i420_glsl_renderer = + * Basically the same as YV12, but with the 2 chroma planes switched. + */ + ++#ifdef CLUTTER_COGL_HAS_GL + static void + clutter_gst_i420_fp_init (ClutterActor *actor, + ClutterGstVideoSink *sink) +@@ -646,6 +651,7 @@ static ClutterGstRenderer i420_fp_renderer = + clutter_gst_yv12_paint, + clutter_gst_yv12_fp_post_paint, + }; ++#endif + + /* + * AYUV +@@ -707,9 +713,11 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) &rgb24_renderer, &rgb32_renderer, -+#ifdef CLUTTER_COGL_HAS_GL &yv12_glsl_renderer, - &yv12_fp_renderer, +- &yv12_fp_renderer, &i420_glsl_renderer, ++#ifdef CLUTTER_COGL_HAS_GL ++ &yv12_fp_renderer, &i420_fp_renderer, ++#endif &ayuv_glsl_renderer, -+#endif /* CLUTTER_COGL_HAS_GL */ NULL }; - -+#ifdef CLUTTER_COGL_HAS_GL +@@ -717,11 +725,12 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) /* get the features */ gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS); - if (cogl_check_extension ("GL_ARB_multitexture", gl_extensions)) -@@ -773,6 +780,7 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) - features |= CLUTTER_GST_MULTI_TEXTURE; - } - } -+#endif /* CLUTTER_COGL_HAS_GL */ +- glGetIntegerv (GL_MAX_TEXTURE_UNITS, &nb_texture_units); ++ glGetIntegerv (CGL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &nb_texture_units); + + if (nb_texture_units >= 3) + features |= CLUTTER_GST_MULTI_TEXTURE; + ++#ifdef CLUTTER_COGL_HAS_GL if (cogl_check_extension ("GL_ARB_fragment_program", gl_extensions)) { + /* the shaders we'll feed to the GPU are simple enough, we don't need +@@ -741,6 +750,7 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) + features |= CLUTTER_GST_FP; + } + } ++#endif + + if (cogl_features_available (COGL_FEATURE_SHADERS_GLSL)) + features |= CLUTTER_GST_GLSL; -- -1.6.1 +1.6.3 diff --git a/recipes/clutter/files/gtk-doc.make b/recipes/clutter/files/gtk-doc.make new file mode 100644 index 0000000000..354ffb7c66 --- /dev/null +++ b/recipes/clutter/files/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \</ |