diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
| commit | 8beb70740dbd64d2138df8a07aafc24719cb50a6 (patch) | |
| tree | b9afae298a6bcb79696984da4422d5ef939a4031 /packages | |
| parent | d2bbf4ace892d7f32933ca26f1f2b320fc0bcb99 (diff) | |
| parent | e25bfd9221d17ae8fe0efdc96ed9cd74de0e4a4d (diff) | |
merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
Diffstat (limited to 'packages')
63 files changed, 813 insertions, 314 deletions
diff --git a/packages/e17/expedite/.mtn2git_empty b/packages/e17/expedite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e17/expedite/.mtn2git_empty diff --git a/packages/e17/expedite/hack-disable-opengl.patch b/packages/e17/expedite/hack-disable-opengl.patch new file mode 100644 index 0000000000..7d368d320d --- /dev/null +++ b/packages/e17/expedite/hack-disable-opengl.patch @@ -0,0 +1,87 @@ +Index: expedite/configure.in +=================================================================== +--- expedite.orig/configure.in ++++ expedite/configure.in +@@ -47,24 +47,11 @@ + PKG_CHECK_MODULES([EVAS], evas) + + dnl OpenGL GLEW +-PKG_CHECK_EXISTS(evas-opengl-glew, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support]) +- have_opengl_glew="yes" +- glew_libs="-lglew32 -lgdi32" +- ], +- [ have_opengl_glew="no" ] +-) ++have_opengl_glew="no" + AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes") + + dnl OpenGL X11 +-PKG_CHECK_EXISTS(evas-opengl-x11, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support]) +- have_opengl_x11="yes" +- ], +- [ have_opengl_x11="no" ] +-) ++have_opengl_x11="no" + AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes") + + dnl Software X11 +@@ -109,49 +96,23 @@ + + # TODO: Check availability of libs + dnl DirectDraw +-PKG_CHECK_EXISTS(evas-software-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support]) +- have_software_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_ddraw="no" ] +-) ++have_software_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl 16bit DirectDraw +-PKG_CHECK_EXISTS(evas-software-16-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support]) +- have_software_16_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_16_ddraw="no" ] +-) ++have_software_16_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl Direct3D +-PKG_CHECK_EXISTS(evas-direct3d, +- [ +- AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support]) +- have_direct3d="yes" +- d3d_libs="-ld3d9 -ld3dx9d" +- ], +- [ have_direct3d="no" ] +-) ++have_direct3d="no" + AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes") + + dnl Software SDL +-PKG_CHECK_EXISTS(evas-software-sdl, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support]) +- have_software_sdl="yes" +- ], +- [ have_direct3d="no" ] +-) +-AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++have_software_sdl="no" ++AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++ + + if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then + AC_PATH_XTRA diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 9d8a7d6070..a35d3b182e 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,15 +1,18 @@ -DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas" -DEPENDS = "evas" +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" +DEPENDS = "eet evas" LICENSE = "MIT" PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" -inherit e +inherit autotools -SRC_URI = "${E_CVS};module=e17/apps/expedite" +SRC_URI = "${E_CVS};module=e17/apps/expedite \ + file://hack-disable-opengl.patch;patch=1" S = "${WORKDIR}/${PN}" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } +FILES_${PN} += "${datadir}" + diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb deleted file mode 100644 index ab527e214b..0000000000 --- a/packages/e17/rage_0.2.0.003.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "rage is a media center application based on EFL" -AUTHOR = "Carsten 'The Rasterman' Heitzler" -HOMEPAGE = "http://www.rasterman.com" -LICENSE = "GPL" -DEPENDS = "evas ecore edje" -SECTION = "x11/multimedia" - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz" - -inherit e diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb new file mode 100644 index 0000000000..e5b5032b10 --- /dev/null +++ b/packages/e17/rage_0.2.0.005.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Rage is a media center application based on EFL" +AUTHOR = "Carsten 'The Rasterman' Heitzler" +HOMEPAGE = "http://www.rasterman.com" +LICENSE = "GPL" +DEPENDS = "evas ecore edje" +SECTION = "x11/multimedia" + +SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 86c87214cf..b71a4b7582 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -9,9 +9,11 @@ PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -SRC_URI += "file://configure.patch;patch=1 \ - file://fix-tslib-configure.patch;patch=1 \ - file://fix-directfb-include.patch;patch=1" +# SRC_URI += "file://configure.patch;patch=1 \ +# file://fix-tslib-configure.patch;patch=1 \ +# file://fix-directfb-include.patch;patch=1" + +SRC_URI += "file://fix-directfb-include.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index dd6c467c54..53ee8642d8 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -6,8 +6,8 @@ EXTRA_OECONF = "\ --disable-ecore-x-xcb \ --enable-ecore-x \ --enable-ecore-job \ - --enable-ecore-directfb \ - --enable-ecore-sdl \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ --disable-ecore-evas-gl \ diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb index 8b8694899e..204abbb821 100644 --- a/packages/efl1/evas-native_cvs.bb +++ b/packages/efl1/evas-native_cvs.bb @@ -6,7 +6,7 @@ PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --disable-fb \ + --enable-fb \ --disable-directfb \ --disable-sdl \ --enable-buffer \ diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 840f2929c5..de3359114c 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -3,13 +3,13 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ down to using normal X11 primitives such as pixmaps, lines and rectangles if \ your CPU or graphics hardware are too slow." LICENSE = "MIT" -# can also depend on valgrind (?) -DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext" +# can also depend on valgrind, libsdl-x11, directfb +DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender" PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -SRC_URI += "file://fix-configure.patch;patch=1" +# SRC_URI += "file://fix-configure.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index b80ff8bcba..a19a9c944b 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,17 +1,17 @@ require evas.inc -PR = "r0" +PR = "r2" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-fb \ - --enable-directfb \ - --enable-sdl \ + --disable-directfb \ + --disable-sdl \ --enable-buffer \ --disable-software-ddraw \ --disable-software-qtopia \ --enable-software-x11 \ - --disable-software-16-x11 \ + --enable-software-16-x11 \ --disable-software-xcb \ --disable-gl-x11 \ --enable-xrender-x11 \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 2ac7c65279..8fb8521d62 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -1,14 +1,26 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library \ based on the enlightenment foundation libraries." -DEPENDS = "evas ecore edje emotion efreet" +DEPENDS = "evas ecore edje emotion efreet epsilon" RSUGGESTS_${PN} += "ewl-themes" LICENSE = "MIT" PV = "0.5.1+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library +EXTRA_OECONF = "\ + --enable-software-x11 \ + --enable-software-16-x11 \ + --enable-xrender-x11 \ + --disable-opengl-x11 \ + --disable-software-xcb \ + --disable-software-sdl \ + --enable-framebuffer \ + --enable-software-buffer \ + --disable-opengl-glew \ +" + # TODO package engines more granular PACKAGES += "${PN}-plugins ${PN}-engines" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 1f14bb83fb..b96aae37b9 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -220,10 +220,13 @@ python package_do_split_gconvs () { dot_re = re.compile("(.*)\.(.*)") # Collate the locales by base and encoding + utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0) encodings = {} for l in supported: l = l[:-1] (locale, charset) = l.split(" ") + if utf8_only and charset != 'UTF-8': + continue m = dot_re.match(locale) if m: locale = m.group(1) diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb new file mode 100644 index 0000000000..3c9995cf2e --- /dev/null +++ b/packages/images/console-mipv6-image.bb @@ -0,0 +1,7 @@ +# This image is for testing the ipv6 mobility extensions + +require console-image.bb +IMAGE_INSTALL += " task-mipl " + +export IMAGE_BASENAME = "console-mobile-ipv6-image" + diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index 329cd01217..557131e530 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r37" +DEFAULT_PREFERENCE_poodle = "99" + # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index b818b0f3e8..60305488ca 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r19" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 2084930192..d990a77e48 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -2,6 +2,7 @@ require linux-rp.inc PR = "r11" +DEFAULT_PREFERENCE_poodle = "-99" DEFAULT_PREFERENCE_collie = "1" # Handy URLs diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb index 939e630624..57094b3fb7 100644 --- a/packages/linux/linux-rp_2.6.22.bb +++ b/packages/linux/linux-rp_2.6.22.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r10" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 83077b66b8..3fb304f51f 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -4,6 +4,7 @@ PR = "r9" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" +DEFAULT_PREFERENCE_poodle = "-99" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/mipl-mipv6/mipv6_2.0.2.bb b/packages/mipl-mipv6/mipv6_2.0.2.bb new file mode 100644 index 0000000000..8bbcb4cb75 --- /dev/null +++ b/packages/mipl-mipv6/mipv6_2.0.2.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6" + +SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz" + +inherit autotools module-base + +CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + oe_runmake CFLAGS="${CFLAGS}" +} + +do_install() { + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/init.d + oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install +} + +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + diff --git a/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch @@ -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) diff --git a/packages/mozilla/firefox-2.0.0.3/mozconfig b/packages/mozilla/firefox-2.0.0.3/mozconfig index 9737330a77..96caace6bb 100644 --- a/packages/mozilla/firefox-2.0.0.3/mozconfig +++ b/packages/mozilla/firefox-2.0.0.3/mozconfig @@ -55,3 +55,6 @@ ac_add_options --enable-image-decoders=png,gif,jpeg #ac_add_options --disable-shared #ac_add_options --enable-static ac_add_options --enable-optimize=-O1 + +# Use cairo from system +ac_add_options --enable-system-cairo diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb index ede30a6b05..e1fb5a996d 100644 --- a/packages/mozilla/firefox_2.0.0.3.bb +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -1,17 +1,22 @@ -PR = "r2" +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://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 \ " + S = "${WORKDIR}/mozilla" + DEFAULT_PREFERENCE = "-1" inherit mozilla @@ -36,4 +41,3 @@ do_stage() { # removes 2 lines that call absent headers sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h } - diff --git a/packages/mozilla/mozilla/.mtn2git_empty b/packages/mozilla/mozilla/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/.mtn2git_empty b/packages/mozilla/mozilla/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i386/.mtn2git_empty b/packages/mozilla/mozilla/files/i386/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/i386/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i386/jsautocfg.h b/packages/mozilla/mozilla/files/i386/jsautocfg.h new file mode 100644 index 0000000000..7e8171fc23 --- /de |