diff options
33 files changed, 2404 insertions, 124 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1213ef07fa..b653bec83f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -160,9 +160,9 @@ DEPENDS_prepend="${@base_dep_prepend(d)} " def base_set_filespath(path, d): import os, bb filespath = [] + # The ":" ensures we have an 'empty' override + overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" for p in path: - overrides = bb.data.getVar("OVERRIDES", d, 1) or "" - overrides = overrides + ":" for o in overrides.split(":"): filespath.append(os.path.join(p, o)) return ":".join(filespath) @@ -325,7 +325,7 @@ oe_libinstall() { __runcmd rm -f $destpath/$libname.la __runcmd sed -e 's/^installed=yes$/installed=no/' \ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ - -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \ + -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la @@ -473,6 +473,24 @@ python base_do_mrproper() { bb.build.exec_func('do_clean', d) } +SCENEFUNCS += "base_scenefunction" + +python base_do_setscene () { + for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split(): + bb.build.exec_func(f, d) + if not os.path.exists(bb.data.getVar('STAMP', d, 1) + ".do_setscene"): + bb.build.make_stamp("do_setscene", d) +} +do_setscene[selfstamp] = "1" +addtask setscene before do_fetch + +python base_scenefunction () { + stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" + if os.path.exists(stamp): + bb.build.exec_func("do_clean", d) +} + + addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[depends] = "shasum-native:do_populate_staging" @@ -543,6 +561,45 @@ base_do_fetchall() { : } +addtask checkuri +do_checkuri[nostamp] = "1" +python do_checkuri() { + import sys + + localdata = bb.data.createCopy(d) + bb.data.update_data(localdata) + + src_uri = bb.data.getVar('SRC_URI', localdata, 1) + + try: + bb.fetch.init(src_uri.split(),d) + except bb.fetch.NoMethodError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("No method: %s" % value) + + try: + bb.fetch.checkstatus(localdata) + except bb.fetch.MissingParameterError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Missing parameters: %s" % value) + except bb.fetch.FetchError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Fetch failed: %s" % value) + except bb.fetch.MD5SumError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("MD5 failed: %s" % value) + except: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Unknown fetch Error: %s" % value) +} + +addtask checkuriall after do_checkuri +do_checkuriall[recrdeptask] = "do_checkuri" +do_checkuriall[nostamp] = "1" +base_do_checkuriall() { + : +} + addtask buildall after do_build do_buildall[recrdeptask] = "do_build" base_do_buildall() { @@ -701,6 +758,7 @@ python base_eventhandler() { dir = "%s.*" % e.stampPrefix[fn] bb.note("Removing stamps: " + dir) os.system('rm -f '+ dir) + os.system('touch ' + e.stampPrefix[fn] + '.needclean') if not data in e.__dict__: return NotHandled @@ -829,7 +887,7 @@ def has_subpkgdata(pkg, d): return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) def read_subpkgdata(pkg, d): - import bb, os + import bb return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) def has_pkgdata(pn, d): @@ -838,7 +896,7 @@ def has_pkgdata(pn, d): return os.access(fn, os.R_OK) def read_pkgdata(pn, d): - import bb, os + import bb fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) return read_pkgdatafile(fn) @@ -978,7 +1036,7 @@ inherit patch # Move to autotools.bbclass? inherit siteinfo -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall +EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall MIRRORS[func] = "0" MIRRORS () { diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index bb166cb2f5..a98b4a71a5 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -41,6 +41,8 @@ PSTAGE_NATIVEDEPENDS = "\ stagemanager-native \ " +BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" + python () { import bb pstage_allowed = True @@ -71,9 +73,9 @@ python () { deps += " stagemanager-native:do_populate_staging" bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) - deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or "" + deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" - bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d) + bb.data.setVarFlag('do_setscene', 'depends', deps, d) bb.data.setVar("PSTAGING_ACTIVE", "1", d) else: bb.data.setVar("PSTAGING_ACTIVE", "0", d) @@ -90,17 +92,48 @@ PSTAGE_LIST_CMD = "opkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" -do_clean_append() { +def pstage_manualclean(srcname, destvarname, d): + import os, bb + + src = os.path.join(bb.data.getVar('PSTAGE_TMPDIR_STAGE', d, True), srcname) + dest = bb.data.getVar(destvarname, d, True) + + for walkroot, dirs, files in os.walk(src): + for file in files: + filepath = os.path.join(walkroot, file).replace(src, dest) + bb.note("rm %s" % filepath) + os.system("rm %s" % filepath) + +def pstage_cleanpackage(pkgname, d): + import os, bb + + path = bb.data.getVar("PATH", d, 1) + list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) + + bb.note("Checking if staging package installed") + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + ret = os.system("PATH=\"%s\" %s | grep %s" % (path, list_cmd, pkgname)) + if ret == 0: + bb.note("Yes. Uninstalling package from staging...") + removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) + ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, pkgname)) + if ret != 0: + bb.note("Failure removing staging package") + else: + bb.note("No. Manually removing any installed files") + pstage_manualclean("staging", "STAGING_DIR", d) + pstage_manualclean("cross", "CROSS_DIR", d) + pstage_manualclean("deploy", "DEPLOY_DIR", d) + + bb.utils.unlockfile(lf) + +do_clean_prepend() { """ Clear the build and temp directories """ - bb.note("Uninstalling package from staging...") - path = bb.data.getVar("PATH", d, 1) - removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) + removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) - ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) - if ret != 0: - bb.note("Failure removing staging package") + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) bb.note("Removing staging package %s" % stagepkg) @@ -123,22 +156,16 @@ staging_helper () { PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging" -python do_prepackaged_stage () { +SCENEFUNCS += "packagestage_scenefunc" + +python packagestage_scenefunc () { import os if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": - bb.build.make_stamp("do_prepackaged_stage", d) return - bb.note("Uninstalling any existing package from staging...") - path = bb.data.getVar("PATH", d, 1) - removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) - ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) - bb.utils.unlockfile(lf) - if ret != 0: - bb.note("Failure attempting to remove staging package") + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) @@ -156,17 +183,11 @@ python do_prepackaged_stage () { if ret != 0: bb.note("Failure installing prestage package") - #bb.build.make_stamp("do_prepackaged_stage", d) - #for task in bb.data.getVar("PSTAGE_TASKS_COVERED", d, 1).split(): - # bb.build.make_stamp("do_" + task, d) bb.build.make_stamp("do_stage_package_populated", d) - else: - bb.build.make_stamp("do_prepackaged_stage", d) } -do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" -do_prepackaged_stage[selfstamp] = "1" -addtask prepackaged_stage before do_fetch +packagestage_scenefunc[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" +packagestage_scenefunc[dirs] = "${STAGING_DIR}" addhandler packagedstage_stampfixing_eventhandler python packagedstage_stampfixing_eventhandler() { @@ -201,7 +222,7 @@ populate_staging_preamble () { populate_staging_postamble () { if [ "$PSTAGING_ACTIVE" = "1" ]; then # list the packages currently installed in staging - ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list + # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list set +e stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging @@ -246,7 +267,14 @@ staging_packager () { } staging_package_installer () { - ${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} + #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} + + STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status + echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE + echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE + echo "Status: install user installed" >> $STATUSFILE + echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE + echo "" >> $STATUSFILE } python do_package_stage () { @@ -281,11 +309,10 @@ python do_package_stage () { if bb.data.inherits_class('package_ipk', d): srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d) srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) - if not os.path.exists(srcfile): - bb.fatal("Package %s does not exist yet it should" % srcfile) - destpath = ipkpath + "/" + arch + "/" - bb.mkdirhier(destpath) - bb.copyfile(srcfile, destpath + srcname) + if os.path.exists(srcfile): + destpath = ipkpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) if bb.data.inherits_class('package_deb', d): if arch == 'all': @@ -293,11 +320,10 @@ python do_package_stage () { else: srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d) srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) - if not os.path.exists(srcfile): - bb.fatal("Package %s does not exist yet it should" % srcfile) - destpath = debpath + "/" + arch + "/" - bb.mkdirhier(destpath) - bb.copyfile(srcfile, destpath + srcname) + if os.path.exists(srcfile): + destpath = debpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) # # Handle stamps/ files @@ -307,7 +333,7 @@ python do_package_stage () { bb.mkdirhier(destdir) # We need to include the package_stage stamp in the staging package so create one bb.build.make_stamp("do_package_stage", d) - os.system("cp %s.do_* %s/" % (stampfn, destdir)) + os.system("cp -dpR %s.do_* %s/" % (stampfn, destdir)) bb.build.exec_func("staging_helper", d) bb.build.exec_func("staging_packager", d) @@ -320,3 +346,13 @@ python do_package_stage () { # Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging # addtask package_stage after do_package_write do_populate_staging before do_build + +do_package_stage_all () { + : +} +do_package_stage_all[recrdeptask] = "do_package_stage" +addtask package_stage_all after do_package_stage before do_build + + + + diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index cbc1742dab..a94332b92c 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -4,6 +4,7 @@ EXCLUDE_FROM_WORLD = "1" OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" +STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk" HOST_ARCH = "${BUILD_ARCH}" HOST_VENDOR = "${BUILD_VENDOR}" @@ -49,4 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \ ${prefix}/bin/.debug \ " -export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ba2b2c71f5..007c359225 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -427,6 +427,7 @@ HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" E_URI = "http://enlightenment.freedesktop.org/files" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" +FREESMARTPHONE_GIT = "git://git.freesmartphone.org" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" APACHE_MIRROR = "http://www.apache.org/dist" KERNELORG_MIRROR = "http://kernel.org/" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index f6330981c5..c7415a7d8b 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -76,8 +76,11 @@ ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_ppc405 ?= "soft" -TARGET_FPU_dht-walnut ?= "soft" +TARGET_FPU_armv6 ?= "hard" +TARGET_FPU_armv7a ?= "hard" +TARGET_FPU_ppc603e ?= "hard" #Set the right arch for the feeds #Alphabetically sorted diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 637126b1e3..824ab2b7b3 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -13,7 +13,6 @@ GUI_MACHINE_CLASS = "bigscreen" #Ship all kernel modules till the board support has matured enough MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc # requires gcc 4.3.0: #include conf/machine/include/tune-cortexa8.inc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index ad17bb82bf..f5f6cb5c66 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -TARGET_FPU = "soft" TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6" PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index 26d1e3f8ca..fbf6ba2384 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -2,7 +2,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard" IMAGE_FSTYPES ?= "tar.bz2 ext2" diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf index 2df6ce0802..4760d64e30 100644 --- a/conf/machine/lsarm.conf +++ b/conf/machine/lsarm.conf @@ -8,7 +8,6 @@ INHERIT += "lsarm-image" MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd" MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" -TARGET_FPU = "soft" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index fcd15ad2ef..78c9b8a462 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB TARGET_ARCH = "powerpc" -TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "ppce300c2" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index e600af8bf2..6a5c09796b 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Freescale MX31ADS TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf index c918404d6c..6884d6e3d6 100644 --- a/conf/machine/mx31moboard.conf +++ b/conf/machine/mx31moboard.conf @@ -4,7 +4,6 @@ #@Website: http://mobots.epfl.ch/mx31MoBoard.html TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 89f79fa185..026339ded6 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "arm" TARGET_OS = "linux" -TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" INHERIT += "n2100-image" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index aa35383410..afdf0ac621 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc ROOT_FLASH_SIZE = "174" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index 213710c97f..cc87511e1e 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -8,17 +8,22 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc440e" -PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" MACHINE_FEATURES = "kernel26 usbhost" -#don't try to access tty1 -USE_VT = "0" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "sequoia_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" + +#don't try to access tty1 +USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_VERSION_u-boot = "git" EXTRA_IMAGECMD = "--big-endian" ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 5b69bbdc9a..336c4e4900 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,5 +1,4 @@ TARGET_ARCH = "powerpc" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" # terminal specs - console, but no other ports diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 6d9362958b..bb923dc19c 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" INHERIT += "turbostation-image" diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc new file mode 100644 index 0000000000..d0bc8d62a0 --- /dev/null +++ b/packages/gnash/gnash-minimal.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" +HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPL-2" +DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype" +PR = "r4" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" +S = ${WORKDIR}/gnash-${PV} + +inherit autotools pkgconfig + +# gnash-minimal is intended for running directly on a framebuffer device +# for memory constrained devices, but does not accept all SWF files. +# As such, it is useful as a GUI frontend for dedicated SWF files. + +# JPEG support and libz cannot be disabled due to a bug in 0.8.2. +# maintainer-mode is enabled to disable the testsuite. + +EXTRA_OECONF="--enable-gui=gtk \ + --enable-renderer=agg \ + --enable-media=none \ + --enable-agg \ + --enable-gui=fb \ + --enable-z \ + --enable-jpeg \ + --disable-klash \ + --disable-glext \ + --disable-Xft \ + --disable-expat \ + --disable-mad \ + --disable-gstreamer \ + --disable-cairo \ + --disable-plugin \ + --disable-cygnal \ + --disable-testsuite \ + --enable-maintainer-mode \ + --enable-fps-debug \ + --enable-allstatic \ + --with-top-level=${STAGING_DIR_HOST}/usr \ + " + +PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" + +FILES_libltdl = "${libdir}/gnash/libltdl*.so*" +FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" +FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" +FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" +FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" + diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index 5cec59f140..bcfb88c42f 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,49 +1,2 @@ -DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" -HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPL-2" -DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype" -PR = "r3" - -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" -S = ${WORKDIR}/gnash-${PV} - -inherit autotools pkgconfig - -# gnash-minimal is intended for running directly on a framebuffer device -# for memory constrained devices, but does not accept all SWF files. -# As such, it is useful as a GUI frontend for dedicated SWF files. - -# JPEG support and libz cannot be disabled due to a bug in 0.8.2. -# maintainer-mode is enabled to disable the testsuite. - -EXTRA_OECONF="--enable-gui=gtk \ - --enable-renderer=agg \ - --enable-media=none \ - --enable-agg \ - --enable-gui=fb \ - --enable-z \ - --enable-jpeg \ - --disable-klash \ - --disable-glext \ - --disable-Xft \ - --disable-expat \ - --disable-mad \ - --disable-gstreamer \ - --disable-cairo \ - --disable-plugin \ - --disable-cygnal \ - --disable-testsuite \ - --enable-maintainer-mode \ - --enable-fps-debug \ - --enable-allstatic \ - --with-top-level=${STAGING_DIR_HOST}/usr \ - " - -PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" - -FILES_libltdl = "${libdir}/gnash/libltdl*.so*" -FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" -FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" -FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" -FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" +require gnash-minimal.inc diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb new file mode 100644 index 0000000000..c079caadc6 --- /dev/null +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -0,0 +1,4 @@ +require gnash-minimal.inc + +SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" +S = ${WORKDIR}/gnash diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 113422596a..31e84b84ac 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -27,12 +27,12 @@ EXTRA_OECONF = "--enable-gui=gtk \ PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" +FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" +FILES_libgnashbackend = "${libdir}/gnash/libgnashbackend-${PV}.so" +FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" +FILES_libgnashgeo = "${libdir}/gnash/libgnashgeo-${PV}.so" +FILES_libgnashgui = "${libdir}/gnash/libgnashgui-${PV}.so" +FILES_libgnashplayer = "${libdir}/gnash/libgnashplayer-${PV}.so" +FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" PARALLEL_MAKE = "" diff --git a/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty b/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/ |