diff options
63 files changed, 1390 insertions, 267 deletions
diff --git a/classes/gtk-doc.bbclass b/classes/gtk-doc.bbclass new file mode 100644 index 0000000000..58daaf39e2 --- /dev/null +++ b/classes/gtk-doc.bbclass @@ -0,0 +1,4 @@ +# We don't have gtk-doc so disable it +do_configure_prepend() { + echo "EXTRA_DIST=">> ${S}/gtk-doc.make +} diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index e52a8ddb68..ebdca4a416 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,10 +13,11 @@ PREFERRED_VERSION_libtool-native = "2.2.4" PREFERRED_VERSION_libtool-cross = "2.2.4" PREFERRED_VERSION_libtool-sdk = "2.2.4" PREFERRED_VERSION_pango = "1.18.3" -PREFERRED_VERSION_pixman = "0.10.0" +PREFERRED_VERSION_pixman = "0.11.8" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_udev = "124" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_xserver-xorg = "1.4.2" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2c0ad6539d..5fb4dece1f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -17,6 +17,10 @@ SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-uclibc ?= "23129" SRCREV_pn-uclibc-initial ?= "23129" +SRCREV_pn-clutter-box2d = "3197" +SRCREV_pn-clutter-cairo ?= "3210" +SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter ?= "3240" SRCREV_pn-connman ?= "f9f84ccfa0cd338e2de22878f277352436570b83" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" @@ -88,7 +92,7 @@ SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-mplayer ?= "27047" +SRCREV_pn-mplayer ?= "27380" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" @@ -168,6 +172,7 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-tichy ?= "168" +SRCREV_pn-tidy ?= "242" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb index 53a71f71df..9cac359636 100644 --- a/packages/cairo/cairo_1.6.4.bb +++ b/packages/cairo/cairo_1.6.4.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch;patch=1 " -PR = "r2" +PR = "r3" diff --git a/packages/clutter/aaina.inc b/packages/clutter/aaina.inc new file mode 100644 index 0000000000..fbef34f563 --- /dev/null +++ b/packages/clutter/aaina.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Aaina Clutter Demo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPL" + +DEPENDS = "clutter libxml2 gtk+ neon" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb new file mode 100644 index 0000000000..52a2b3ae0e --- /dev/null +++ b/packages/clutter/aaina_svn.bb @@ -0,0 +1,7 @@ +require aaina.inc + +PV = "0.3.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http" + +S = "${WORKDIR}/aaina" diff --git a/packages/clutter/clutter-box2d.inc b/packages/clutter/clutter-box2d.inc new file mode 100644 index 0000000000..8189d12bbb --- /dev/null +++ b/packages/clutter/clutter-box2d.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter Box2D" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPLv2" + +DEPENDS = "clutter" + +# The main clutter lib is machine specific so we need to be too +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig gtk-doc + +do_stage () { + autotools_stage_all +} + +do_install_append () { + install -d ${D}${bindir} + install ${S}/examples/.libs/blockbox ${D}${bindir} +} diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb new file mode 100644 index 0000000000..f241622a50 --- /dev/null +++ b/packages/clutter/clutter-box2d_svn.bb @@ -0,0 +1,10 @@ +require clutter-box2d.inc + +PV = "0.0+svnr${SRCREV}" +PR = "r3" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-cairo.inc b/packages/clutter/clutter-cairo.inc new file mode 100644 index 0000000000..1095a7e8ef --- /dev/null +++ b/packages/clutter/clutter-cairo.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Clutter Cairo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter cairo" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-cairo/.mtn2git_empty b/packages/clutter/clutter-cairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter-cairo/.mtn2git_empty diff --git a/packages/clutter/clutter-cairo/enable_examples.patch b/packages/clutter/clutter-cairo/enable_examples.patch new file mode 100644 index 0000000000..c5ed63ff12 --- /dev/null +++ b/packages/clutter/clutter-cairo/enable_examples.patch @@ -0,0 +1,28 @@ +--- + examples/Makefile.am | 2 +- + examples/flowers.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-cairo/examples/Makefile.am +=================================================================== +--- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = clock flowers bubbles ++bin_PROGRAMS = clock flowers bubbles + + INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@ + AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la +Index: clutter-cairo/examples/flowers.c +=================================================================== +--- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100 +@@ -11,7 +11,7 @@ + + #define PETAL_MIN 20 + #define PETAL_VAR 40 +-#define N_FLOWERS 40 /* reduce if you have a small card */ ++#define N_FLOWERS 8 /* reduce if you have a small card */ + + typedef struct Flower + { diff --git a/packages/clutter/clutter-cairo_svn.bb b/packages/clutter/clutter-cairo_svn.bb new file mode 100644 index 0000000000..1084c1cc16 --- /dev/null +++ b/packages/clutter/clutter-cairo_svn.bb @@ -0,0 +1,10 @@ +require clutter-cairo.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://enable_examples.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-gst.inc b/packages/clutter/clutter-gst.inc new file mode 100644 index 0000000000..caaa7559b8 --- /dev/null +++ b/packages/clutter/clutter-gst.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter GStreamer" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter gstreamer gst-plugins-base" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" + +inherit autotools pkgconfig + +do_configure_prepend() { + touch ${S}/gtk-doc.make +} + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-gst/.mtn2git_empty b/packages/clutter/clutter-gst/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter-gst/.mtn2git_empty diff --git a/packages/clutter/clutter-gst/autofoo-0.4.patch b/packages/clutter/clutter-gst/autofoo-0.4.patch new file mode 100644 index 0000000000..54df63d297 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo-0.4.patch @@ -0,0 +1,15 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + diff --git a/packages/clutter/clutter-gst/autofoo.patch b/packages/clutter/clutter-gst/autofoo.patch new file mode 100644 index 0000000000..569b0d8be9 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo.patch @@ -0,0 +1,25 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + +Index: clutter-gst/doc/reference/Makefile.am +=================================================================== +--- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 ++++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 +@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in diff --git a/packages/clutter/clutter-gst_0.4svn.bb b/packages/clutter/clutter-gst_0.4svn.bb new file mode 100644 index 0000000000..1af797888c --- /dev/null +++ b/packages/clutter/clutter-gst_0.4svn.bb @@ -0,0 +1,9 @@ +require clutter-gst.inc + +PV = "0.4.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ + file://autofoo-0.4.patch;patch=1" + + +S = "${WORKDIR}/clutter-gst-0-4" diff --git a/packages/clutter/clutter-gst_svn.bb b/packages/clutter/clutter-gst_svn.bb new file mode 100644 index 0000000000..8ef87236f7 --- /dev/null +++ b/packages/clutter/clutter-gst_svn.bb @@ -0,0 +1,8 @@ +require clutter-gst.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/${PN}" diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc index b89070f3ea..63773ad530 100644 --- a/packages/clutter/clutter.inc +++ b/packages/clutter/clutter.inc @@ -2,20 +2,47 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+" +COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|beagleboard|overo|omap3evm)" -inherit autotools pkgconfig +STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" +BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" -EXTRA_OECONF = "--disable-gtk-doc " +DEPENDS = "${STDDEPENDS} mesa" +EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" + +DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" +EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}" +LDFLAGS_append_zylonite = " -lnws -lstdc++ " + +DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}" +LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ " + +DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" + +DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" + +DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" +LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " + +inherit autotools pkgconfig gtk-doc + +PACKAGES =+ "clutter-examples" +FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require clutter-fpu.inc -EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}" - #Fix up some weirdness in the docs do_configure_prepend() { - touch ${S}/gtk-doc.make sed -i s:doc/reference/Makefile::g ${S}/configure.ac sed -i s:doc::g ${S}/Makefile.am } @@ -23,4 +50,3 @@ do_configure_prepend() { do_stage () { autotools_stage_all } - diff --git a/packages/clutter/clutter/.mtn2git_empty b/packages/clutter/clutter/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter/.mtn2git_empty diff --git a/packages/clutter/clutter/enable-tests-r2990.patch b/packages/clutter/clutter/enable-tests-r2990.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/packages/clutter/clutter/enable-tests-r2990.patch @@ -0,0 +1,50 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -17,8 +17,8 @@ + test-invariants + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap +-noinst_PROGRAMS += test-devices ++bin_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-devices + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter +@@ -73,4 +73,9 @@ + test_invariants_SOURCES = test-invariants.c + test_devices_SOURCES = test-devices.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 +@@ -195,7 +195,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/packages/clutter/clutter/enable_tests-0.4.patch b/packages/clutter/clutter/enable_tests-0.4.patch new file mode 100644 index 0000000000..3178a2cd6c --- /dev/null +++ b/packages/clutter/clutter/enable_tests-0.4.patch @@ -0,0 +1,52 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter-0-4/tests/Makefile.am +=================================================================== +--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-boxes test-perspective test-rotate test-depth \ + test-threads test-timeline +@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c + test_threads_SOURCES = test-threads.c + test_timeline_SOURCES = test-timeline.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png +Index: clutter-0-4/tests/test-actors.c +=================================================================== +--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000 +@@ -143,7 +143,7 @@ main (int argc, char *argv[]) + stage = clutter_stage_get_default (); + clutter_actor_set_size (stage, 800, 600); + +- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); ++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); + + if (!pixbuf) + g_error("pixbuf load failed"); +Index: clutter-0-4/tests/test-text.c +=================================================================== +--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000 +@@ -27,7 +27,7 @@ main (int argc, char *argv[]) + + stage = clutter_stage_get_default (); + +- if (!g_file_get_contents ("test-text.c", &text, &size, NULL)) ++ if (! |