diff options
93 files changed, 961 insertions, 593 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 65f6a10095..072bf0a4c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -275,8 +275,8 @@ Recipes: jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native Recipes: classpath*, cacao*, jamvm* Recipes: miglayout, javasqlite*, sqlitejbdc Recipes: swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull -Recipes: woodstox2 +Recipes: woodstox2, phoneme-advanced-* Recipes: midpath*, logic-analyze -Recipes: kobodeluxe +Recipes: kobodeluxe, wesnoth Recipes: hildon-thumbnail, libhildon*, libosso*, mce-dev, libconic Recipes: libgpsbt, libgpsmgr, osso-gnome-vfs2, osso-gwconnect, osso-ic-oss diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 94fdbf41c4..6d348d3ded 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -108,6 +108,7 @@ def oestats_stop(server, d, failures): def oestats_task(server, d, task, status): import bb import glob + import os.path import time # retrieve build id @@ -130,6 +131,13 @@ def oestats_task(server, d, task, status): 'filename': 'log.txt', 'content': file(log).read(), 'content-type': 'text/plain'} + if task == 'do_package': + qalog = "%s/log.qa_package" % bb.data.getVar('T', d, True) + if os.path.exists(qalog): + files['qalog'] = { + 'filename': 'qalog.txt', + 'content': file(qalog).read(), + 'content-type': 'text/plain'} # prepare report vars = { diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index d65f8a6253..2a8199d135 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,6 +2,13 @@ inherit base DEPENDS_prepend = "pkgconfig-native " +do_install_prepend () { + +for i in `find ${S}/ -name "*.pc" -type f` ; do \ + sed -i -e 's:-L${STAGING_LIBDIR}::g' $i + done +} + do_stage_append () { install -d ${PKG_CONFIG_DIR} for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 823dd9d340..da0aabee38 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -63,8 +63,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #Initramfs for kernels -KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/" -KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" +#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/" +#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index 24a90e4e59..b9d882d5d6 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -211,6 +211,7 @@ PKG_zlib = "zlib1g" PKG_libglade = "libglade2-0" PKG_libsoup = "libsoup2.2-8" +PKG_libsdl-mixer = "libsdl-mixer1.2" PKG_libsdl-image = "libsdl-image1.2" PKG_libsdl-directfb = "libsdl1.2" PKG_libsdl-ttf = "libsdl-ttf2.0-0" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a42e555c48..4f9df3b714 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -288,7 +288,7 @@ PREFERRED_VERSION_e2tools-native ?= "0.0.16" PREFERRED_VERSION_eb ?= "4.3" PREFERRED_VERSION_ebtables ?= "2.0.6" PREFERRED_VERSION_eciadsl ?= "0.11" -PREFERRED_VERSION_ecj-native ?= "3.3" +PREFERRED_VERSION_libecj-bootstrap ?= "3.3" PREFERRED_VERSION_editres ?= "1.0.2" PREFERRED_VERSION_eds-feed ?= "0.3.2" PREFERRED_VERSION_eel ?= "2.12.2" @@ -1378,7 +1378,7 @@ PREFERRED_VERSION_openssh ?= "4.6p1" PREFERRED_VERSION_openssl ?= "0.9.7g" PREFERRED_VERSION_openssl-native ?= "0.9.7g" PREFERRED_VERSION_openswan ?= "2.4.7" -PREFERRED_VERSION_openttd ?= "0.4.0.1" +PREFERRED_VERSION_openttd ?= "0.6.2" PREFERRED_VERSION_openvpn ?= "2.0.9" SRCREV_pn-opkg-native ?= "4640" SRCREV_pn-opkg ?= "4640" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 20fc2fb873..18c9db1f3f 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -5,7 +5,7 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/zaurus-clamshell.inc -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES += "jffs2" ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 5e8f34fad6..a688f2f64b 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -52,7 +52,7 @@ zaurus_make_installkit () { mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" ]; then + if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage # we need also tgz for mmc or cf cards cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 6a32bf2e4f..8d5a75fcdf 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -40,7 +40,7 @@ do_report_success() { for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free" BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \ gdb gdbserver strace \ usbutils pciutils mtd-utils usbview hal setserial \ diff --git a/packages/abiword/abiword-embedded_2.6.4.bb b/packages/abiword/abiword-embedded_2.6.4.bb new file mode 100644 index 0000000000..98e69515fa --- /dev/null +++ b/packages/abiword/abiword-embedded_2.6.4.bb @@ -0,0 +1,8 @@ +require abiword-2.5.inc + +EXTRA_OECONF += "--enable-embedded" + +S = "${WORKDIR}/abiword-${PV}" + +RCONFLICTS = "abiword" +RPROVIDES += "abiword" diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb index e83071fa0b..fb579f476f 100644 --- a/packages/aufs/aufs_cvs.bb +++ b/packages/aufs/aufs_cvs.bb @@ -28,7 +28,6 @@ EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" # I suggest you to read http://osdir.com/ml/linux.kernel.tracing/2006-12/msg00020.html do_configure() { -echo ${S} > /home/nice/sdir K_VERSION=$(echo ${KERNEL_VERSION} | awk 'BEGIN{FS="."}{print $3}') cd ${S} if [ $K_VERSION -ge 24 ] ; then @@ -59,4 +58,3 @@ else depmod -ae fi } - diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 287f022562..d2fb1be5a1 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r79" +PR = "r81" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb index 68afcafea5..7fb691f360 100644 --- a/packages/boost/boost_1.34.1.bb +++ b/packages/boost/boost_1.34.1.bb @@ -2,12 +2,15 @@ # # Warning! The build system for boost seems to have changed # significantly since 1.33 (again). +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Boost Software License" -include boost.inc +DEPENDS = "python boost-jam-native zlib bzip2" -DEFAULT_PREFERENCE = "-1" - -DEPENDS += "bzip2" +PR = "r2" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ @@ -15,13 +18,15 @@ SRC_URI = "\ file://${PV}-gcc43.patch;patch=1 \ " -PR = "r0" +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/${BOOST_P}" -BJAM_TOOLS = "--toolset=gcc \ - '-sGCC=${CC} '${BJAM_CONF} \ - '-sGXX=${CXX} '${BJAM_CONF} \ - '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ - '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +BJAM_TOOLS = "--toolset=gcc \ '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ '-sPYTHON_VERSION=${PYTHON_VERSION}' \ '-sPYTHON=${STAGING_BINDIR_NATIVE}/python' \ @@ -31,11 +36,134 @@ BJAM_TOOLS = "--toolset=gcc \ '--layout=system' \ " -BJAM_OPTS = '${BJAM_TOOLS} \ +BJAM_OPTS = '${BJAM_TOOLS} \ --builddir=${S}/${TARGET_SYS} \ ${BJAM_EXTRA}' +PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +PYTHON_VERSION = "2.5" + do_configure() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp + + platform_config="-DBOOST_PLATFORM_CONFIG='boost/config/platform/${TARGET_OS}.hpp'" + echo "import toolset : using ;" > tools/build/v2/user-config.jam - echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} <linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam + echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} $platform_config<linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam } + +do_compile() { + set -ex + bjam ${BJAM_OPTS} --prefix=${prefix} \ + --exec-prefix=${exec_prefix} \ + --libdir=${libdir} \ + --includedir=${includedir} +} + +do_stage() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} \ + install +} + +do_install() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${D}${libdir} \ + --includedir=${D}${includedir} \ + install +} + +BOOSTLIBS = "" + +# -dev last to pick up the remaining stuff +PACKAGES = "${BOOSTLIBS} ${PN}-dev ${PN}" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# "boost" is a metapackage which pulls in all boost librabries +RRECOMMENDS_${PN} += "${BOOSTLIBS}" + +BOOSTLIBS += "boost-date-time boost-date-time-dbg boost-date-time-mt boost-date-time-mt-dbg" +FILES_boost-date-time = "${libdir}/libboost_date_time.so" +FILES_boost-date-time-dbg = "${libdir}/libboost_date_time-d.so ${libdir}/.debug/libboost_date_time-d.so" +FILES_boost-date-time-mt = "${libdir}/libboost_date_time-mt.so" +FILES_boost-date-time-mt-dbg = "${libdir}/libboost_date_time-mt-d.so ${libdir}/.debug/libboost_date_time-mt-d.so" + +BOOSTLIBS += "boost-filesystem boost-filesystem-dbg boost-filesystem-mt boost-filesystem-mt-dbg" +FILES_boost-filesystem = "${libdir}/libboost_filesystem.so" +FILES_boost-filesystem-dbg = "${libdir}/libboost_filesystem-d.so ${libdir}/.debug/libboost_filesystem-d.so" +FILES_boost-filesystem-mt = "${libdir}/libboost_filesystem-mt.so" +FILES_boost-filesystem-mt-dbg = "${libdir}/libboost_filesystem-mt-d.so ${libdir}/.debug/libboost_filesystem-mt-d.so" + +BOOSTLIBS += "boost-graph boost-graph-dbg boost-graph-mt boost-graph-mt-dbg" +FILES_boost-graph = "${libdir}/libboost_graph.so" +FILES_boost-graph-dbg = "${libdir}/libboost_graph-d.so ${libdir}/.debug/libboost_graph-d.so" +FILES_boost-graph-mt = "${libdir}/libboost_graph-mt.so" +FILES_boost-graph-mt-dbg = "${libdir}/libboost_graph-mt-d.so ${libdir}/.debug/libboost_graph-mt-d.so" + +BOOSTLIBS += "boost-iostreams boost-iostreams-dbg boost-iostreams-mt boost-iostreams-mt-dbg" +FILES_boost-iostreams = "${libdir}/libboost_iostreams.so" +FILES_boost-iostreams-dbg = "${libdir}/libboost_iostreams-d.so ${libdir}/.debug/libboost_iostreams-d.so" +FILES_boost-iostreams-mt = "${libdir}/libboost_iostreams-mt.so" +FILES_boost-iostreams-mt-dbg = "${libdir}/libboost_iostreams-mt-d.so ${libdir}/.debug/libboost_iostreams-mt-d.so" + +BOOSTLIBS += "boost-prg-exec-monitor boost-prg-exec-monitor-dbg boost-prg-exec-monitor-mt boost-prg-exec-monitor-mt-dbg" +FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so" +FILES_boost-prg-exec-monitor-dbg = "${libdir}/libboost_prg_exec_monitor-d.so ${libdir}/.debug/libboost_prg_exec_monitor-d.so" +FILES_boost-prg-exec-monitor-mt = "${libdir}/libboost_prg_exec_monitor-mt.so" +FILES_boost-prg-exec-monitor-mt-dbg = "${libdir}/libboost_prg_exec_monitor-mt-d.so ${libdir}/.debug/libboost_prg_exec_monitor-mt-d.so" + +BOOSTLIBS += "boost-program-options boost-program-options-dbg boost-program-options-mt boost-program-options-mt-dbg" +FILES_boost-program-options = "${libdir}/libboost_program_options.so" +FILES_boost-program-options-dbg = "${libdir}/libboost_program_options-d.so ${libdir}/.debug/libboost_program_options-d.so" +FILES_boost-program-options-mt = "${libdir}/libboost_program_options-mt.so" +FILES_boost-program-options-mt-dbg = "${libdir}/libboost_program_options-mt-d.so ${libdir}/.debug/libboost_program_options-mt-d.so" + +BOOSTLIBS += "boost-python boost-python-dbg boost-python-mt boost-python-mt-dbg" +FILES_boost-python = "${libdir}/libboost_python.so" +FILES_boost-python-dbg = "${libdir}/libboost_python-d.so ${libdir}/.debug/libboost_python-d.so" +FILES_boost-python-mt = "${libdir}/libboost_python-mt.so" +FILES_boost-python-mt-dbg = "${libdir}/libboost_python-mt-d.so ${libdir}/.debug/libboost_python-mt-d.so" + +BOOSTLIBS += "boost-regex boost-regex-dbg boost-regex-mt boost-regex-mt-dbg" +FILES_boost-regex = "${libdir}/libboost_regex.so" +FILES_boost-regex-dbg = "${libdir}/libboost_regex-d.so ${libdir}/.debug/libboost_regex-d.so" +FILES_boost-regex-mt = "${libdir}/libboost_regex-mt.so" +FILES_boost-regex-mt-dbg = "${libdir}/libboost_regex-mt-d.so ${libdir}/.debug/libboost_regex-mt-d.so" + +BOOSTLIBS += "boost-serialization boost-serialization-dbg boost-serialization-mt boost-serialization-mt-dbg" +FILES_boost-serialization = "${libdir}/libboost_serialization.so" +FILES_boost-serialization-dbg = "${libdir}/libboost_serialization-d.so ${libdir}/.debug/libboost_serialization-d.so" +FILES_boost-serialization-mt = "${libdir}/libboost_serialization-mt.so" +FILES_boost-serialization-mt-dbg = "${libdir}/libboost_serialization-mt-d.so ${libdir}/.debug/libboost_serialization-mt-d.so" + +BOOSTLIBS += "boost-signals boost-signals-dbg boost-signals-mt boost-signals-mt-dbg" +FILES_boost-signals = "${libdir}/libboost_signals.so" +FILES_boost-signals-dbg = "${libdir}/libboost_signals-d.so ${libdir}/.debug/libboost_signals-d.so" +FILES_boost-signals-mt = "${libdir}/libboost_signals-mt.so" +FILES_boost-signals-mt-dbg = "${libdir}/libboost_signals-mt-d.so ${libdir}/.debug/libboost_signals-mt-d.so" + +BOOSTLIBS += "boost-thread-mt boost-thread-mt-dbg" +FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so" +FILES_boost-thread-mt-dbg = "${libdir}/libboost_thread-mt-d.so ${libdir}/.debug/libboost_thread-mt-d.so" + +BOOSTLIBS += "boost-unit-test-framework boost-unit-test-framework-dbg boost-unit-test-framework-mt boost-unit-test-framework-mt-dbg" +FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so" +FILES_boost-unit-test-framework-dbg = "${libdir}/libboost_unit_test_framework-d.so ${libdir}/.debug/libboost_unit_test_framework-d.so" +FILES_boost-unit-test-framework-mt = "${libdir}/libboost_unit_test_framework-mt.so" +FILES_boost-unit-test-framework-mt-dbg = "${libdir}/libboost_unit_test_framework-mt-d.so ${libdir}/.debug/libboost_unit_test_framework-mt-d.so" + +BOOSTLIBS += "boost-wave boost-wave-dbg boost-wave-mt boost-wave-mt-dbg" +FILES_boost-wave = "${libdir}/libboost_wave.so" +FILES_boost-wave-dbg = "${libdir}/libboost_wave-d.so ${libdir}/.debug/libboost_wave-d.so" +FILES_boost-wave-mt = "${libdir}/libboost_wave-mt.so" +FILES_boost-wave-mt-dbg = "${libdir}/libboost_wave-mt-d.so ${libdir}/.debug/libboost_wave-mt-d.so" + +BOOSTLIBS += "boost-wserialization boost-wserialization-dbg boost-wserialization-mt boost-wserialization-mt-dbg" +FILES_boost-wserialization = "${libdir}/libboost_wserialization.so" +FILES_boost-wserialization-dbg = "${libdir}/libboost_wserialization-d.so ${libdir}/.debug/libboost_wserialization-d.so" +FILES_boost-wserialization-mt = "${libdir}/libboost_wserialization-mt.so" +FILES_boost-wserialization-mt-dbg = "${libdir}/libboost_wserialization-mt-d.so ${libdir}/.debug/libboost_wserialization-mt-d.so" + diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch deleted file mode 100644 index e36e143b5f..0000000000 --- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: classpath-0.97.2/configure.ac -=================================================================== ---- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200 -+++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200 -@@ -41,6 +41,8 @@ - AC_CONFIG_HEADERS([include/config.h]) - AC_PREFIX_DEFAULT(/usr/local/classpath) - -+AC_CONFIG_MACRO_DIR([m4]) -+ - dnl ----------------------------------------------------------- - dnl Enable collections.jar (disabled by default) - dnl ----------------------------------------------------------- diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb index 44cffcec32..e03dc85760 100644 --- a/packages/classpath/classpath-minimal_0.97.2.bb +++ b/packages/classpath/classpath-minimal_0.97.2.bb @@ -1,5 +1,7 @@ require classpath.inc +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PBN}-${PV}" + SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch deleted file mode 100644 index e36e143b5f..0000000000 --- a/packages/classpath/classpath-native-0.97.2/autotools.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: classpath-0.97.2/configure.ac -=================================================================== ---- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200 -+++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200 -@@ -41,6 +41,8 @@ - AC_CONFIG_HEADERS([include/config.h]) - AC_PREFIX_DEFAULT(/usr/local/classpath) - -+AC_CONFIG_MACRO_DIR([m4]) -+ - dnl ----------------------------------------------------------- - dnl Enable collections.jar (disabled by default) - dnl ----------------------------------------------------------- diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index 992a16ec7a..d178ce6779 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -2,15 +2,15 @@ DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "Classpath" -S = "${WORKDIR}/classpath-${PV}" - -SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" - +inherit autotools native DEPENDS = "ecj-initial fastjar-native zip-native gettext-native" -inherit autotools native +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" + +S = "${WORKDIR}/classpath-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/classpath-${PV}" do_configure_prepend () { @@ -18,6 +18,7 @@ do_configure_prepend () { } export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" +export JAVACFLAGS="-nowarn" # Note: the --with-ecj options seems redundant but is # for compatibility with older classpath versions. diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 65bc465200..e0d6a2abb7 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -21,6 +21,8 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" +export JAVA = "java" + EXTRA_OECONF = "\ --with-glibj \ --with-ecj=javac \ diff --git a/packages/cnc/openredalert/gcc43-fix.patch b/packages/cnc/openredalert/gcc43-fix.patch new file mode 100644 index 0000000000..aa99d991b7 --- /dev/null +++ b/packages/cnc/openredalert/gcc43-fix.patch @@ -0,0 +1,13 @@ +Index: openredalert-0.0+svnr438-r0/src/misc/Compression.h +=================================================================== +--- openredalert-0.0+svnr438-r0.orig/src/misc/Compression.h 2008-09-21 15:20:33.000000000 +0200 ++++ openredalert-0.0+svnr438-r0/src/misc/Compression.h 2008-09-21 15:21:10.000000000 +0200 +@@ -20,6 +20,8 @@ +
+ #include "SDL/SDL_types.h"
+
++#include <cstring>
++
+ /**
+ * Various decompression routines for format80, format40, and
+ * format20 type graphics
diff --git a/packages/cnc/openredalert_r438.bb b/packages/cnc/openredalert_r438.bb index 4da245614a..098f293b2e 100644 --- a/packages/cnc/openredalert_r438.bb +++ b/packages/cnc/openredalert_r438.bb @@ -4,8 +4,11 @@ LICENSE = "GPLv2" DEPENDS = "virtual/libsdl libsdl-mixer" SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.gz \ + file://gcc43-fix.patch;patch=1 \ file://openredalert-launcher" +PR = "r1" + S = "${WORKDIR}" CFLAGS_append = " -I. -I${STAGING_INCDIR}" diff --git a/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty b/packages/cowsay/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty +++ b/packages/cowsay/.mtn2git_empty diff --git a/packages/cowsay/xcowsay_1.1.bb b/packages/cowsay/xcowsay_1.1.bb new file mode 100644 index 0000000000..85f336c85f --- /dev/null +++ b/packages/cowsay/xcowsay_1.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "xcowsay displays a cute cow and message on your desktop" +LICENSE = "GPLv3" +DEPENDS = "gtk+ dbus" + +SRC_URI = "http://www.nickg.me.uk/files/xcowsay-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/ecj/ecj-bootstrap-native_3.3.2.bb b/packages/ecj/ecj-bootstrap-native.bb index bd4347457c..04f8ba4062 100644 --- a/packages/ecj/ecj-bootstrap-native_3.3.2.bb +++ b/packages/ecj/ecj-bootstrap-native.bb @@ -1,9 +1,7 @@ # ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more # and no less features. # -# Since the VM running the compiler has no effect on the produced bytecode this recipe -# uses the jar created by ecj-initial and creates a start script that runs it with a different -# VM. +# This recipe uses the jar created by libecj-bootstrap. DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" HOMEPAGE = "http://www.eclipse.org/" @@ -11,7 +9,7 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "EPL" -DEPENDS = "ecj-initial virtual/java-native" +DEPENDS = "libecj-bootstrap" PROVIDES = "virtual/javac-native" @@ -19,7 +17,7 @@ SRC_URI = "file://ecj.in" S = "${WORKDIR}" -JAR = "ecj-bootstrap-${PV}.jar" +JAR = "ecj-bootstrap.jar" inherit native diff --git a/packages/ecj/ecj-bootstrap-native_3.3.bb b/packages/ecj/ecj-bootstrap-native_3.3.bb deleted file mode 100644 index bd4347457c..0000000000 --- a/packages/ecj/ecj-bootstrap-native_3.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. -# -# Since the VM running the compiler has no effect on the produced bytecode this recipe -# uses the jar created by ecj-initial and creates a start script that runs it with a different -# VM. - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" -HOMEPAGE = "http://www.eclipse.org/" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "EPL" - -DEPENDS = "ecj-initial virtual/java-native" - -PROVIDES = "virtual/javac-native" - -SRC_URI = "file://ecj.in" - -S = "${WORKDIR}" - -JAR = "ecj-bootstrap-${PV}.jar" - -inherit native - -do_compile() { - # Create the start script - echo "#!/bin/sh" > ecj-bootstrap - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap - echo "RUNTIME=java" >> ecj-bootstrap - cat ecj.in >> ecj-bootstrap -} - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR} - install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac -} diff --git a/packages/ecj/ecj-bootstrap-native_3.4.bb b/packages/ecj/ecj-bootstrap-native_3.4.bb deleted file mode 100644 index bd4347457c..0000000000 --- a/packages/ecj/ecj-bootstrap-native_3.4.bb +++ /dev/null @@ -1,38 +0,0 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. -# -# Since the VM running the compiler has no effect on the produced bytecode this recipe -# uses the jar created by ecj-initial and creates a start script that runs it with a different -# VM. - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" -HOMEPAGE = "http://www.eclipse.org/" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "EPL" - -DEPENDS = "ecj-initial virtual/java-native" - -PROVIDES = "virtual/javac-native" - -SRC_URI = "file://ecj.in" - -S = "${WORKDIR}" - -JAR = "ecj-bootstrap-${PV}.jar" - -inherit native - -do_compile() { - # Create the start script - echo "#!/bin/sh" > ecj-bootstrap - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap - echo "RUNTIME=java" >> ecj-bootstrap - cat ecj.in >> ecj-bootstrap -} - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR} - install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac -} diff --git a/packages/ecj/ecj-initial.bb b/packages/ecj/ecj-initial.bb new file mode 100644 index 0000000000..106453691b --- /dev/null +++ b/packages/ecj/ecj-initial.bb @@ -0,0 +1,31 @@ +# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more +# and no less features. + +# This variant runs on the initial (not Java5-compatible runtime). + +DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" +HOMEPAGE = "http://www.eclipse.org/" +LICENSE = "EPL" + +DEPENDS = "libecj-bootstrap" + +SRC_URI = "file://ecj.in" + +S = "${WORKDIR}" + +inherit native + +JAR = "ecj-bootstrap.jar" + +do_compile() { + # Create the start script + echo "#!/bin/sh" > ecj-initial + echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial + echo "RUNTIME=java-initial" >> ecj-initial + cat ecj.in >> ecj-initial +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 ${S}/ecj-initial ${STAGING_BINDIR} +} diff --git a/packages/ecj/ecj-initial_3.3.2.bb b/packages/ecj/ecj-initial_3.3.2.bb deleted file mode 100644 index 60bbc5546c..0000000000 --- a/packages/ecj/ecj-initial_3.3.2.bb +++ /dev/null @@ -1,84 +0,0 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. - -# This variant runs on the initial (not Java5-compatible runtime). - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" -HOMEPAGE = "http://www.eclipse.org/" -LICENSE = "EPL" - -DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial" - -SRC_URI = "\ - http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \ - file://ecj.in \ - " - -S = "${WORKDIR}" - -inherit native - -JAR = "ecj-bootstrap-${PV}.jar" - -do_unpackpost() { - if [ ! -d source ]; then - mkdir source - fi - - if [ ! -d build ]; then - mkdir build - fi - - # Remove crap. - rm about.html build.xml - rm -rf META-INF - - # Move source into separate subdir. - mv org source/ - - # Remove stuff unneeded for the bootstrap compiler. - rm -rf source/org/eclipse/jdt/internal/compiler/apt - rm -rf source/org/eclipse/jdt/internal/compiler/tool - rm -rf source/org/eclipse/jdt/internal/antadapter - rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java - - # Make a copy of the remaining source to get the embedded - # resources. - cp -r source/org build/ - - # Remove source code and other stuff. - find build -name '*.java' -exec rm -f {} \; - find build -name '*.html' -exec rm -f {} \; -} - -addtask unpackpost after do_unpack before do_patch - -do_compile() { - find source -name '*.java' > sourcefiles - split -l 25 sourcefiles ecj-sources. - - # Compiling in place is done because the sources contain - # property files which need to be available at runtime. - for list in `find . -name 'ecj-sources.*'`; do - echo "building files in $list ..."; - echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`; - jikes-initial \ - -d build -source 1.4 -sourcepath source `cat $list`; - done - - fastjar -c -C build . -f ${JAR} - - # Create the start script - echo "#!/bin/sh" > ecj-initial - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial - echo "RUNTIME=java-initial" >> ecj-initial - cat ecj.in >> ecj-initial -} - -do_stage() { - install -d ${STAGING_DATADIR}/java - install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java - - install -d ${STAGING_BINDIR} - install -m 755 ${S}/ecj-initial ${STAGING_BINDIR} -} diff --git a/packages/ecj/ecj-initial_3.4.bb b/packages/ecj/ecj-initial_3.4.bb deleted file mode 100644 index dcc08139c1..0000000000 --- a/packages/ecj/ecj-initial_3.4.bb +++ /dev/null @@ -1,84 +0,0 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. - -# This variant runs on the initial (not Java5-compatible runtime). - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" -HOMEPAGE = "http://www.eclipse.org/" -LICENSE = "EPL" - -DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial" - -SRC_URI = "\ - http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip \ - file://ecj.in \ - " - -S = "${WORKDIR}" - -inherit native - -JAR = "ecj-bootstrap-${PV}.jar" - -do_unpackpost() { - if [ ! -d source ]; then - mkdir source - fi - - if [ ! -d build ]; then - mkdir build - fi - - # Remove crap. - rm about.html build.xml - rm -rf META-INF - - # Move source into separate subdir. - mv org source/ - - # Remove stuff unneeded for the bootstrap compiler. - rm -rf source/org/eclipse/jdt/internal/compiler/apt - rm -rf source/org/eclipse/jdt/internal/compiler/tool - rm -rf source/org/eclipse/jdt/internal/antadapter - rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java - - # Make a copy of the remaining source to get the embedded - # resources. - cp -r source/org build/ - - # Remove source code and other stuff. - find build -name '*.java' -exec rm -f {} \; - find build -name '*.html' -exec rm -f {} \; -} - -addtask unpackpost after do_unpack before do_patch - -do_compile() { - find source -name '*.java' > sourcefiles - split -l 25 sourcefiles ecj-sources. - - # Compiling in place is done because the sources contain - # property files which need to be available at runtime. - for list in `find . -name 'ecj-sources.*'`; do - echo "building files in $list ..."; - echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`; - jikes-initial \ - -d build -source 1.4 -sourcepath source `cat $list`; - done - - fastjar -c -C build . -f ${JAR} - - # Create the start script - echo "#!/bin/sh" > ecj-initial - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial - echo "RUNTIME=java-initial" >> ecj-initial - cat ecj.in >> ecj-initial -} - -do_stage() { - install -d ${STAGING_DATADIR}/java - install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java - - install -d ${STAGING_BINDIR} - install -m 755 ${S}/ecj-initial ${STAGING_BINDIR} -} diff --git a/packages/ecj/ecj-initial_3.3.bb b/packages/ecj/libecj-bootstrap.inc index 884d98f30b..c24c1af5ca 100644 --- a/packages/ecj/ecj-initial_3.3.bb +++ b/packages/ecj/libecj-bootstrap.inc @@ -1,23 +1,15 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. +# This package compiles and stages only the Jar. -# This variant runs on the initial (not Java5-compatible runtime). - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" +DESCRIPTION = "JDT Core Batch Compiler - Jar only" HOMEPAGE = "http://www.eclipse.org/" LICENSE = "EPL" -DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial" +DEPENDS = "fastjar-native jikes-initial virtual/java-initial" -SRC_URI = "\ - http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \ - file://ecj.in \ - " +inherit native java S = "${WORKDIR}" -inherit native - JAR = "ecj-bootstrap-${PV}.jar" do_unpackpost() { @@ -67,18 +59,9 @@ do_compile() { done fastjar -c -C build . -f ${JAR} - - # Create the start script - echo "#!/bin/sh" > ecj-initial - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial - echo "RUNTIME=java-initial" >> ecj-initial - cat ecj.in >> ecj-initial } do_stage() { - install -d ${STAGING_DATADIR}/java - install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java - - install -d ${STAGING_BINDIR} - install -m 755 ${S}/ecj-initial ${STAGING_BINDIR} + oe_jarinstall -s ${JAR} ecj-bootstrap.jar } + diff --git a/packages/ecj/libecj-bootstrap_3.3.2.bb b/packages/ecj/libecj-bootstrap_3.3.2.bb new file mode 100644 index 0000000000..dab6ed724c --- /dev/null +++ b/packages/ecj/libecj-bootstrap_3.3.2.bb @@ -0,0 +1,6 @@ +require libecj-bootstrap.inc + +SRC_URI = "\ + http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \ + " + diff --git a/packages/ecj/libecj-bootstrap_3.3.bb b/packages/ecj/libecj-bootstrap_3.3.bb new file mode 100644 index 0000000000..b65e99cb54 --- /dev/null +++ b/packages/ecj/libecj-bootstrap_3.3.bb @@ -0,0 +1,6 @@ +require libecj-bootstrap.inc + +SRC_URI = "\ + http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \ + " + diff --git a/packages/ecj/libecj-bootstrap_3.4.bb b/packages/ecj/libecj-bootstrap_3.4.bb new file mode 100644 index 0000000000..c321a8f2c1 --- /dev/null +++ b/packages/ecj/libecj-bootstrap_3.4.bb @@ -0,0 +1,6 @@ +require libecj-bootstrap.inc + +SRC_URI = "\ + http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip \ + " + diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb index 99656dbe83..c9f03a7920 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb @@ -4,9 +4,3 @@ require gcc-cross-initial.inc S = "${WORKDIR}/gcc-4.2" EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - -# Hack till we fix *libc properly -do_stage_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ -} - diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb index 99656dbe83..c9f03a7920 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb @@ -4,9 +4,3 @@ require gcc-cross-initial.inc S = "${WORKDIR}/gcc-4.2" EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - -# Hack till we fix *libc properly -do_stage_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ -} - diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb index 114d9831c6..5423626a99 100644 --- a/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb +++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb @@ -4,9 +4,3 @@ require gcc-cross-intermediate.inc S = "${WORKDIR}/gcc-4.2" EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - -# Hack till we fix *libc properly -do_stage_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ -} - diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb index 114d9831c6..5423626a99 100644 --- a/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb +++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb @@ -4,9 +4,3 @@ require gcc-cross-intermediate.inc S = "${WORKDIR}/gcc-4.2" EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - -# Hack till we fix *libc properly -do_stage_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ -} - diff --git a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index bc66b51f7c..fc5c2e5deb 100644 --- a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" inherit sdk @@ -20,8 +20,3 @@ EXTRA_OECONF += " \ CFLAGS = "" CXXFLAGS = "" LDFLAGS = "" - -# Hack till we fix *libc properly -do_install_append() { - cp -a ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include/ -} diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb index 6fb4dd7d89..c8e1c19da3 100644 --- a/packages/gnome/gnome-games_2.23.6.bb +++ b/packages/gnome/gnome-games_2.23.6.bb @@ -19,7 +19,7 @@ do_configure_prepend() { done } -do_configure_prepend() { +do_configure_append() { for i in $(find ${S} -name "Makefile") ; do sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i done diff --git a/packages/gnome/orbit2/pkgconfig-fix.patch b/packages/gnome/orbit2/pkgconfig-fix.patch new file mode 100644 index 0000000000..f629e506dd --- /dev/null +++ b/packages/gnome/orbit2/pkgconfig-fix.patch @@ -0,0 +1,12 @@ +diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in +--- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100 ++++ ORBit2-2.14.12/ORBit-2.0.pc.in 2008-09-23 20:13:07.000000000 +0200 +@@ -2,7 +2,7 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-orbit_idl=@bindir@/orbit-idl-2@EXEEXT@ ++orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@ + + + Name: ORBit-2.0 diff --git a/packages/gnome/orbit2_2.14.12.bb b/packages/gnome/orbit2_2.14.12.bb index 1ac0136e10..140776114d 100644 --- a/packages/gnome/orbit2_2.14.12.bb +++ b/packages/gnome/orbit2_2.14.12.bb @@ -1,9 +1,10 @@ LICENSE = "GPL" -PR = "r0" +PR = "r1" DESCRIPTION = "CORBA ORB" SECTION = "x11/gnome/libs" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ file://configure-lossage.patch;patch=1;pnum=1 \ + file://pkgconfig-fix.patch;patch=1 \ file://gtk-doc.m4 \ file://gtk-doc.make" DEPENDS = "libidl popt orbit2-native gtk-doc" @@ -28,16 +29,6 @@ do_configure_prepend() { install ${WORKDIR}/gtk-doc.make ./ } -do_compile_append () { - cp ORBit-2.0.pc ORBit-2.0.pc.old - sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new - mv ORBit-2.0.pc.new ORBit-2.0.pc -} - -do_install_append () { - mv ORBit-2.0.pc.old ORBit-2.0.pc -} - do_stage() { oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} diff --git a/packages/gnumeric/gnumeric_1.8.2.bb b/packages/gnumeric/gnumeric_1.8.2.bb index f7654117d7..8d3b1b5fb7 100644 --- a/packages/gnumeric/gnumeric_1.8.2.bb +++ b/packages/gnumeric/gnumeric_1.8.2.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r1" +PARALLEL_MAKE = "" + inherit gnome flow-lossage SRC_URI += "file://remove-docs.patch;patch=1" diff --git a/packages/gnumeric/gnumeric_1.8.3.bb b/packages/gnumeric/gnumeric_1.8.3.bb index 9fa01408f6..0f70e37d5c 100644 --- a/packages/gnumeric/gnumeric_1.8.3.bb +++ b/packages/gnumeric/gnumeric_1.8.3.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r0" +PARALLEL_MAKE = "" + inherit gnome flow-lossage SRC_URI += "file://remove-docs.patch;patch=1" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 6d4b7e6ea5..2ed20952f1 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r107" +PR = "r108" SRC_URI = "file://functions \ file://halt \ @@ -125,3 +125,8 @@ do_install () { install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table } + +# Angstrom doesn't support devfs +do_install_append_angstrom () { + rm ${D}${sysconfdir}/init.d/devices ${D}${sysconfdir}/rcS.d/S05devices +} diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 87fb6498f4..ff67450f50 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -17,6 +17,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' KLIBC_ARCH_mipsel = 'mips' +KLIBC_ARCH_x86 = 'i386' +KLIBC_ARCH_i486 = 'i386' +KLIBC_ARCH_i586 = 'i386' +KLIBC_ARCH_i686 = 'i386' +KLIBC_ARCH_pentium = 'i386' # the klibc code contains ARM instructions (for ARM), this # could be fixed, but for the moment: diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index f7015ffaf7..14a9f6b4d7 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r10" +PR = "r11" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 70d2819394..a607aa8a21 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r8" +PR = "r9" diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb index 3446b4f74e..9017c11dbf 100644 --- a/packages/leafpad/leafpad_0.8.15.bb +++ b/packages/leafpad/leafpad_0.8.15.bb @@ -1,25 +1,19 @@ DESCRIPTION = "GTK+ based simple text editor" +DESCRIPTION_${PN}-icons = "Extra icon files for leafpad text editor" HOMEPAGE = "http://tarot.freeshell.org/leafpad" AUTHOR = "Tarot Osuji <tarot@sdf.lonestar.org>" SECTION = "x11/applications" LICENSE = "GPLv2" -DEPENDS = "gtk+" -SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ - file://leafpad.desktop \ - file://leafpad.png" -PR = "r0" +DEPENDS = "gtk+ intltool-native" +SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz" + +PR = "r1" inherit autotools pkgconfig EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print" -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications -} +PACKAGES =+ "${PN}-icons" +FILES_${PN}-icons = "${datadir}/icons" FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons" diff --git a/packages/libopie/libopie2/c7x0_w100_disable.patch b/packages/libopie/libopie2/c7x0_w100_disable.patch new file mode 100644 index 0000000000..959c56c443 --- /dev/null +++ b/packages/libopie/libopie2/c7x0_w100_disable.patch @@ -0,0 +1,20 @@ +--- libopie2/opiecore/device/odevice_zaurus.cpp 10 Aug 2008 09:07:32 -0000 1.55 ++++ libopie2/opiecore/device/odevice_zaurus.cpp 20 Sep 2008 23:56:20 -0000 +@@ -313,14 +313,14 @@ + } + + // set default qte driver +- switch( d->m_model ) ++/* switch( d->m_model ) + { + case Model_Zaurus_SLC7x0: + d->m_qteDriver = "W100"; + break; +- default: ++ default:*/ + d->m_qteDriver = "Transformed"; +- } ++// } + + m_leds[0] = Led_Off; + diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb index 522fe55f7c..d0f9e9e17a 100644 --- a/packages/libopie/libopie2_1.2.3.bb +++ b/packages/libopie/libopie2_1.2.3.bb @@ -1,12 +1,13 @@ require ${PN}.inc -PR = "r5" +PR = "r6" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ file://gcc-syntax-fix.patch;patch=1 \ file://h4000_and_default_rot.patch;patch=1 \ file://ipaq_rotate_fix.patch;patch=1 \ - file://spitz_rotate_fix.patch;patch=1" + file://spitz_rotate_fix.patch;patch=1 \ + file://c7x0_w100_disable.patch;patch=1" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/libsdl/libsdl-gfx_2.0.17.bb b/packages/libsdl/libsdl-gfx_2.0.17.bb new file mode 100644 index 0000000000..79af40ae1d --- /dev/null +++ b/packages/libsdl/libsdl-gfx_2.0.17.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Simple DirectMedia Layer graphic primitives library." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "zlib libpng jpeg virtual/libsdl" +LICENSE = "LGPL" + +SRC_URI = "http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" +S = "${WORKDIR}/SDL_gfx-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-mmx" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/libtool/libtool-sdk_2.2.4.bb b/packages/libtool/libtool-sdk_2.2.4.bb index b6b2aa966c..e92c4dbfaf 100644 --- a/packages/libtool/libtool-sdk_2.2.4.bb +++ b/packages/libtool/libtool-sdk_2.2.4.bb @@ -1,7 +1,7 @@ require libtool.inc require libtool_${PV}.bb -PR = "r0" +PR = "r1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://cross_compile.patch;patch=1" @@ -40,6 +40,7 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ install -d ${STAGING_DATADIR}/libtool/config/ diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index c5f75a04d6..9c01480cdd 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Sun Sep 7 18:10:04 2008 +# Mon Sep 22 19:07:49 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -200,7 +200,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=n +# CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -850,64 +850,7 @@ CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -# CONFIG_SND_SEQUENCER is not set -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_AC97_CODEC=m -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set - -# -# AVR32 devices -# -CONFIG_SND_ATMEL_AC97=m - -# -# SPI devices -# -CONFIG_SND_AT73C213=m -CONFIG_SND_AT73C213_TARGET_BITRATE=48000 - -# -# USB devices -# -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_CAIAQ is not set - -# -# PCMCIA devices -# -# CONFIG_SND_VXPOCKET is not set -# CONFIG_SND_PDAUDIOCF is not set - -# -# System on Chip audio support -# -# CONFIG_SND_SOC is not set - -# -# SoC Audio support for SuperH -# - -# -# ALSA SoC audio for Freescale SOCs -# +# CONFIG_SND is not set # # Open Sound System @@ -916,7 +859,6 @@ CONFIG_SOUND_PRIME=m # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_AT32_ABDAC=m -CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=m # CONFIG_HID_DEBUG is not set diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index 4b1844832c..96d1d46a6f 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -2,10 +2,10 @@ DEPENDS += "cairo alsa-lib " # Yes, we'll need to bump PE later on :( PV = "1.0a1pre" -PR = "r5" +PR = "r6" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=31c03e2ff02d \ - hg://hg.mozilla.org/;module=mobile-browser;rev=bcea2e901482 \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7bfd2ee7016f \ + hg://hg.mozilla.org/;module=mobile-browser;rev=a48464d3ea42 \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ " diff --git a/packages/classpath/classpath-native-0.97.2/.mtn2git_empty b/packages/mozilla/files/i386/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/classpath/classpath-native-0.97.2/.mtn2git_empty +++ b/packages/mozilla/files/i386/.mtn2git_empty diff --git a/packages/mozilla/files/i386/jsautocfg.h b/packages/mozilla/files/i386/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i386/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty b/packages/mozilla/files/i486/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty +++ b/packages/mozilla/files/i486/.mtn2git_empty diff --git a/packages/mozilla/files/i486/jsautocfg.h b/packages/mozilla/files/i486/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i486/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/files/i586/.mtn2git_empty b/packages/mozilla/files/i586/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i586/.mtn2git_empty diff --git a/packages/mozilla/files/i586/jsautocfg.h b/packages/mozilla/files/i586/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i586/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/files/i686/.mtn2git_empty b/packages/mozilla/files/i686/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i686/.mtn2git_empty diff --git a/packages/mozilla/files/i686/jsautocfg.h b/packages/mozilla/files/i686/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i686/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/wesnoth/wesnoth_svn.bb b/packages/obsolete/wesnoth_svn.bb index 430abe7d0f..430abe7d0f 100644 --- a/packages/wesnoth/wesnoth_svn.bb +++ b/packages/obsolete/wesnoth_svn.bb diff --git a/packages/openttd/files/openttd_0.6.0-buildfix.patch b/packages/openttd/files/openttd_0.6.2-buildfix.patch index d815cfc9c6..483ff492a9 100644 --- a/packages/openttd/files/openttd_0.6.0-buildfix.patch +++ b/packages/openttd/files/openttd_0.6.2-buildfix.patch @@ -1,8 +1,8 @@ -Index: openttd-0.6.0-beta4/config.lib +Index: openttd-0.6.2/config.lib =================================================================== ---- openttd-0.6.0-beta4.orig/config.lib 2008-02-20 20:24:58.000000000 +0100 -+++ openttd-0.6.0-beta4/config.lib 2008-02-20 20:26:55.000000000 +0100 -@@ -1255,7 +1255,7 @@ +--- openttd-0.6.2.orig/config.lib 2008-08-02 01:52:22.000000000 +0200 ++++ openttd-0.6.2/config.lib 2008-09-23 08:57:53.000000000 +0200 +@@ -1247,7 +1247,7 @@ if [ -z "$6" ]; then compiler="$3" else @@ -11,7 +11,7 @@ Index: openttd-0.6.0-beta4/config.lib fi machine=`eval $compiler $9 2>/dev/null` ret=$? -@@ -1271,11 +1271,6 @@ +@@ -1263,11 +1263,6 @@ exit 1 fi diff --git a/packages/openttd/openttd.inc b/packages/openttd/openttd.inc index a27da0fd4c..b1a5e956d7 100644 --- a/packages/openttd/openttd.inc +++ b/packages/openttd/openttd.inc @@ -9,7 +9,7 @@ LICENSE = "GPLv2" DEPENDS = "libsdl-net libpng zlib freetype fontconfig" -SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.bz2" +SRC_URI = "http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2" APPIMAGE = "media/openttd.48.png" @@ -30,7 +30,7 @@ do_configure() { --prefix-dir=${prefix} \ --binary-dir=bin \ --with-midi=/bin/true \ - --with-zlib \ + --with-zlib=${STAGING_LIBDIR} \ --with-png \ --with-freetype \ --cc-build=gcc \ diff --git a/packages/openttd/openttd_0.6.0.bb b/packages/openttd/openttd_0.6.0.bb deleted file mode 100644 index 893551ac59..0000000000 --- a/packages/openttd/openttd_0.6.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require openttd.inc - -PR = "r1" - -SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1" - - - diff --git a/packages/openttd/openttd_0.6.2.bb b/packages/openttd/openttd_0.6.2.bb new file mode 100644 index 0000000000..a8a06738f4 --- /dev/null +++ b/packages/openttd/openttd_0.6.2.bb @@ -0,0 +1,9 @@ +require openttd.inc + +PR = "r0" + +# When upgrading this recipe make sure to refresh this patch. +SRC_URI += "file://openttd_${PV}-buildfix.patch;patch=1" + + + diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pycairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pycairo/.mtn2git_empty diff --git a/packages/python/python-pycairo/fix-setup-py.patch b/packages/python/python-pycairo/fix-setup-py.patch new file mode 100644 index 0000000000..6165184448 --- /dev/null +++ b/packages/python/python-pycairo/fix-setup-py.patch @@ -0,0 +1,24 @@ +diff -urN pycairo-1.4.0.orig/setup.py pycairo-1.4.0/setup.py +--- pycairo-1.4.0.orig/setup.py 2007-03-14 10:53:30.000000000 +0100 ++++ pycairo-1.4.0/setup.py 2008-09-23 18:55:25.000000000 +0200 +@@ -37,20 +37,6 @@ + runtime_library_dirs = pkg_config_parse('--libs-only-L', 'cairo') + + pkgconfig_file='pycairo.pc' +-print 'creating %s' % pkgconfig_file +-fo = open (pkgconfig_file, 'w') +-fo.write ("""\ +-prefix=%s +- +-Name: Pycairo +-Description: Python bindings for cairo +-Version: %s +-Requires: cairo +-Cflags: -I${prefix}/include/pycairo +-Libs: +-""" % (sys.prefix, pycairo_version) +- ) +-fo.close() + + cairo = dic.Extension( + name = 'cairo._cairo', diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb index 9bb2fdfcd8..bd3c1a7aa0 100644 --- a/packages/python/python-pycairo_1.4.0.bb +++ b/packages/python/python-pycairo_1.4.0.bb @@ -3,17 +3,19 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" -PR = "ml1" +PR = "ml2" -SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz" +SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ + file://fix-setup-py.patch;patch=1" S = "${WORKDIR}/pycairo-${PV}" inherit distutils pkgconfig +do_configure_append() { + sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc +} + do_stage() { install -d ${STAGING_INCDIR} install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} - - # nasty pkgconfig fix necessary here - sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc } diff --git a/packages/smpeg/smpeg/as-fix.patch b/packages/smpeg/smpeg/as-fix.patch new file mode 100644 index 0000000000..1a747018e5 --- /dev/null +++ b/packages/smpeg/smpeg/as-fix.patch @@ -0,0 +1,18 @@ +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +--- trunk.orig/configure.in ++++ trunk/configure.in +@@ -54,10 +54,11 @@ AC_PROG_MAKE_SET + AC_PROG_CC + AC_PROG_CXX + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_INSTALL ++AM_PROG_AS + + dnl Ugh. + AS="$CC" + CCAS="$CC" + AC_SUBST(AS) diff --git a/packages/smpeg/smpeg/compile.patch b/packages/smpeg/smpeg/compile.patch index 86ec4fca45..563334c972 100644 --- a/packages/smpeg/smpeg/compile.patch +++ b/packages/smpeg/smpeg/compile.patch @@ -3,17 +3,6 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # ---- smpeg/Makefile.am~compile 2002-09-26 01:24:04.000000000 -0400 -+++ smpeg/Makefile.am 2004-03-05 09:31:19.000000000 -0500 -@@ -4,7 +4,7 @@ - # These are the subdirectories that are always built - SUBDIRS = audio video - --CXXLD = cc -+CXXLD = $(CC) - - bin_SCRIPTS = smpeg-config - --- smpeg/MPEGaudio.h~compile 2006-06-10 22:41:41.000000000 +0200 +++ smpeg/MPEGaudio.h 2006-06-10 22:41:51.000000000 +0200 @@ -34,6 +34,9 @@ diff --git a/packages/smpeg/smpeg_svn.bb b/packages/smpeg/smpeg_svn.bb new file mode 100644 index 0000000000..e6c0f6444a --- /dev/null +++ b/packages/smpeg/smpeg_svn.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \ +player for Linux based on the mpeg_play and SPLAY MPEG decoders." +LICENSE = "LGPL" +SECTION = "libs/multimedia" +DEPENDS = "virtual/libsdl" +PROVIDES = "smpeg" +PV = "0.4.5+rsvn${SRCREV}" +SRCREV = "370" + +SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk \ + file://m4.patch;patch=1 \ + file://as-fix.patch;patch=1" + +S = "${WORKDIR}/trunk" + +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +CFLAGS_append = " -I${STAGING_INCDIR}/SDL" +EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \ + --without-gtk --disable-gtk-player" + +do_configure_prepend () { + touch NEWS AUTHORS ChangeLog + rm -f acinclude.m4 +} + +do_stage() { + oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR} + ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so + + for f in "*.h" + do + install -m 0644 ${f} ${STAGING_INCDIR}/SDL + done + + cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \ + | sed -e "s,-I/usr/include/smpeg, ," \ + | sed -e "s,libdirs ,mickey_is_cool ," \ + | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config + chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config +} + +PACKAGES =+ "plaympeg " +SECTION_plaympeg = "console/multimedia" +FILES_${PN} = "${libdir}" +FILES_plaympeg = "${bindir}/plaympeg" +FILES_${PN}-dev += "${bindir}" + diff --git a/packages/v86d/v86d_0.1.5.bb b/packages/v86d/v86d_0.1.8.bb index 12b7718279..bb91e386a1 100644 --- a/packages/v86d/v86d_0.1.5.bb +++ b/packages/v86d/v86d_0.1.8.bb @@ -1,18 +1,23 @@ DESCRIPTION = "User support binary for the uvesafb kernel module" SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.bz2 \ file://fbsetup" -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel klibc" LICENSE = "GPLv2" -PR = "r3" +PR = "r0" RRECOMMENDS_${PN} = "kernel-module-uvesafb" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(qemux86|bootcdx86)" +COMPATIBLE_MACHINE = "(qemux86|bootcdx86|i586-generic)" INITSCRIPT_NAME = "fbsetup" INITSCRIPT_PARAMS = "start 0 S ." +export CC=${TARGET_PREFIX}klcc + +# klcc doesn't work with -isystem +export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" + do_configure () { ./configure --default } diff --git a/packages/vnc/tightvnc_1.3.9.bb b/packages/vnc/tightvnc_1.3.9.bb new file mode 100644 index 0000000000..ec6a7057d9 --- /dev/null +++ b/packages/vnc/tightvnc_1.3.9.bb @@ -0,0 +1,25 @@ +DESCRIPTION-${PN}-viewer = "A lightweight VNC viewer" +HOMEPAGE = "http://www.tightvnc.com/" +DEPENDS = "virtual/libx11 zlib libxmu libxaw" +LICENSE = "GPL" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/${PN}-${PV}_unixsrc.tar.gz \ + file://Makefile" + +S = "${WORKDIR}/vnc_unixsrc/vncviewer/" + +PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" +FILES_${PN}-viewer-dbg = "${bindir}/.debug" +FILES_${PN}-viewer = "${bindir}/${PN}viewer" + +do_compile () { + install ${WORKDIR}/Makefile ${S} + oe_runmake +} + +do_install () { + install -d ${D}${bindir} + install ${PN}viewer ${D}${bindir} +} diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb deleted file mode 100644 index 64d9748755..0000000000 --- a/packages/vnc/tightvnc_1.3dev7.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A Unix VNC client" -HOMEPAGE = "http://www.tightvnc.com/" -DEPENDS = "virtual/libx11 zlib libxmu libxaw" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz \ - file://Makefile" - -S = "${WORKDIR}/vnc_unixsrc/vncviewer/" - -PACKAGES = "tightvncviewer-dbg tightvncviewer" -FILES_tightvncviewer = "/usr/bin/tightvncviewer" - -do_compile () { - install ${WORKDIR}/Makefile ${S} - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install tightvncviewer ${D}${bindir} -} - diff --git a/packages/wesnoth/wesnoth_1.4.5.bb b/packages/wesnoth/wesnoth_1.4.5.bb new file mode 100644 index 0000000000..2c08a89bee --- /dev/null +++ b/packages/wesnoth/wesnoth_1.4.5.bb @@ -0,0 +1,151 @@ +DESCRIPTION = "The Battle for Wesnoth is a turn-based strategy game with a fantasy theme." +HOMEPAGE = "http://www.wesnoth.org/" +SECTION = "games" +LICENSE = "GPL" + +DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native" + +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2" + +EXTRA_OECONF = "\ + --enable-tinygui \ + --enable-editor \ + --enable-lowmem \ + --with-boost=${STAGING_INCDIR} \ + --with-freetype=${STAGING_INCDIR} \ + --without-fribidi \ + --disable-python \ +" + +inherit autotools + +PACKAGES = "wesnoth-editor wesnoth-doc wesnoth-music wesnoth-sounds \ + wesnoth-aoi wesnoth-did wesnoth-ei wesnoth-httt wesnoth-l \ + wesnoth-nr wesnoth-sof wesnoth-sotbe wesnoth-thot wesnoth-trow \ + wesnoth-tsg wesnoth-tb wesnoth-utbs \ + wesnoth-data \ + wesnoth-all-campaigns \ + wesnoth-all \ + wesnoth wesnoth-dbg \ + " + +DESCRIPTION_wesnoth-editor = "Map Editor for The Battle for Wesnoth" +DESCRIPTION_wesnoth-all = "The Battle for Wesnoth with all campaigns, music and sounds" +DESCRIPTION_wesnoth-all-campaigns = "The Battle for Wesnoth with all campaigns." +DESCRIPTION_wesnoth-sounds = "Optional sound package for The Battle for Wesnoth" +DESCRIPTION_wesnoth-music = "Optional music package for The Battle for Wesnoth" +DESCRIPTION_wesnoth-data = "Mandatory data package for The Battle for Wesnoth" + +do_install_append() { + # icons directory should not be packaged/installed + if [ -d ${D}${datadir}/wesnoth/icons ]; then + rm -rf ${D}${datadir}/wesnoth/icons + fi +} + +RDEPENDS_wesnoth = "wesnoth-data" + +RDEPENDS_wesnoth-editor = "wesnoth-data" + +RDEPENDS_wesnoth-all-campaigns = "wesnoth \ + wesnoth-aoi wesnoth-did wesnoth-ei wesnoth-httt wesnoth-l \ + wesnoth-nr wesnoth-sof wesnoth-sotbe wesnoth-thot wesnoth-trow \ + wesnoth-tsg wesnoth-tb wesnoth-utbs" + +# Installing wesnoth-all should pull everything in (like in Debian). +RDEPENDS_wesnoth-all = "wesnoth wesnoth-sounds wesnoth-music" + +FILES_wesnoth-music = "\ + ${datadir}/wesnoth/data/core/music \ +" + +FILES_wesnoth-sounds = "\ + ${datadir}/wesnoth/data/core/sounds \ +" + +# Picks up remaining translations and data. Must be packaged after +# wesnoth-music, wesnoth-sounds and all campaigns. +FILES_wesnoth-data = "\ + ${datadir}/wesnoth/sounds \ + ${datadir}/wesnoth/images \ + ${datadir}/wesnoth/data \ + ${datadir}/wesnoth/fonts \ + ${datadir}/wesnoth/translations \ +" + +FILES_${PN} = "\ + ${bindir}/wesnoth \ + ${datadir}/icons \ + ${datadir}/applications \ +" + +FILES_wesnoth-editor = "\ + ${bindir}/wesnoth_editor \ +" + +FILES_wesnoth-aoi = "\ + ${datadir}/wesnoth/data/campaigns/An_Orcish_Incursion \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \ +" + +FILES_wesnoth-did = "\ + ${datadir}/wesnoth/data/campaigns/Descent_Into_Darkness \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-did.mo \ +" + +FILES_wesnoth-ei = "\ + ${datadir}/wesnoth/data/campaigns/Eastern_Invasion \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-ei.mo \ +" + +FILES_wesnoth-httt = "\ + ${datadir}/wesnoth/data/campaigns/Heir_To_The_Throne \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-httt.mo \ +" + +FILES_wesnoth-l = "\ + ${datadir}/wesnoth/data/campaigns/Liberty \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \ +" + +FILES_wesnoth-nr = "\ + ${datadir}/wesnoth/data/campaigns/Northern_Rebirth \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-nr.mo \ +" + +FILES_wesnoth-sof = "\ + ${datadir}/wesnoth/data/campaigns/Sceptre_Of_Fire \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sof.mo \ +" + +FILES_wesnoth-sotbe = "\ + ${datadir}/wesnoth/data/campaigns/Son_Of_The_Black_Eye \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sotbe.mo \ +" + +FILES_wesnoth-thot = "\ + ${datadir}/wesnoth/data/campaigns/The_Hammer_Of_Thursagan \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \ +" + +FILES_wesnoth-trow = "\ + ${datadir}/wesnoth/data/campaigns/The_Rise_Of_Wesnoth \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-trow.mo \ +" + +FILES_wesnoth-tsg = "\ + ${datadir}/wesnoth/data/campaigns/The_South_Guard \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tsg.mo \ +" + +FILES_wesnoth-tb = "\ + ${datadir}/wesnoth/data/campaigns/Two_Brothers \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tb.mo \ +" + +FILES_wesnoth-utbs = "\ + ${datadir}/wesnoth/data/campaigns/Under_the_Burning_Suns \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-utbs.mo \ +" diff --git a/packages/wolf3d/.mtn2git_empty b/packages/wolf3d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wolf3d/.mtn2git_empty diff --git a/packages/wolf3d/wolf4sdl_1.6.bb b/packages/wolf3d/wolf4sdl_1.6.bb new file mode 100644 index 0000000000..2e3483b164 --- /dev/null +++ b/packages/wolf3d/wolf4sdl_1.6.bb @@ -0,0 +1,17 @@ +LICENSE = "Various" +DESCRIPTION = "Wolfenstein3d game engine" +DEPENDS = "virtual/libsdl libsdl-mixer" + +SRC_URI = "http://www.stud.uni-karlsruhe.de/~uvaue/chaos/bins/Wolf4SDL-${PV}-src.zip" + +S = "${WORKDIR}/Wolf4SDL-1.6-src" + +TARGET_CFLAGS_append = " -lSDL -lSDL_mixer -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL" + +do_compile() { + oe_runmake -e Q= PREFIX=${prefix} +} + +do_install() { + oe_runmake -e Q= PREFIX=${D}/${prefix} install +} diff --git a/packages/wpa-supplicant/wpa-gui_0.6.4.bb b/packages/wpa-supplicant/wpa-gui_0.6.4.bb new file mode 100644 index 0000000000..6f63958288 --- /dev/null +++ b/packages/wpa-supplicant/wpa-gui_0.6.4.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Qt interface for choosing which configured network to connect \ +to. It also provides a method for browsing 802.11 SSID scan results, an event \ +history log of messages generated by wpa_supplicant, and a method to add or \ +edit wpa_supplicant networks." +SECTION = "network" +LICENSE = "GPL BSD" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +RDEPENDS = "wpa-supplicant" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " + +S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant/wpa_gui" + +inherit qt4x11 + +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_gui ${D}${sbindir} +} diff --git a/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty diff --git a/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch index 2c495d7884..4081212bc5 100644 --- a/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch +++ b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch @@ -1,6 +1,6 @@ ---- wxBase-2.8.7/Makefile.in.old 2008-03-30 01:04:57.000000000 -0500 -+++ wxBase-2.8.7/Makefile.in 2008-03-30 01:05:58.000000000 -0500 -@@ -11331,13 +11331,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = +--- wxBase-2.8.9/Makefile.in.old 2008-09-22 10:13:30.000000000 -0500 ++++ wxBase-2.8.9/Makefile.in 2008-09-22 10:17:44.000000000 -0500 +@@ -11339,13 +11339,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = ### Targets: ### @@ -12,7 +12,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ diff --git a/packages/wxwidgets/wxbase_2.8.7.bb b/packages/wxwidgets/wxbase_2.8.9.bb index 816b96de6e..bb46a52a88 100644 --- a/packages/wxwidgets/wxbase_2.8.7.bb +++ b/packages/wxwidgets/wxbase_2.8.9.bb @@ -6,7 +6,10 @@ PR = "r0" SRC_URI += "file://Makefile.in.patch;patch=1" -EXTRA_OECONF = " --disable-gui --enable-largefile --without-subdirs " +EXTRA_OECONF = " --disable-gui \ + --enable-largefile \ + --enable-gpe \ + --without-subdirs" LEAD_SONAME = "libwx_base-2.8.so" diff --git a/packages/wxwidgets/wxwidgets_2.8.7.bb b/packages/wxwidgets/wxwidgets_2.8.9.bb index 8e8d3565fd..8e8d3565fd 100644 --- a/packages/wxwidgets/wxwidgets_2.8.7.bb +++ b/packages/wxwidgets/wxwidgets_2.8.9.bb diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 09489b1cf8..429b9907c0 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -13,6 +13,12 @@ inherit autotools pkgconfig FILES_${PN} += " ${libdir}/X11/fonts" +do_configure_prepend() { + if [ -f "${S}"/configure.ac ] ; then + sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac + fi +} + do_install_append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb index 8036af6b78..9d2193d4ee 100644 --- a/packages/zbedic/libbedic_1.1.bb +++ b/packages/zbedic/libbedic_1.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Library for bedic dictionary" +DESCRIPTION = "Library to handle bedic dictionary" HOMEPAGE = "http://bedic.sourceforge.net/" AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>" SECTION = "opie/libs" diff --git a/packages/zbedic/zbedic/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch index 1e028d5210..cd320b3b1d 100644 --- a/packages/zbedic/zbedic/opie-icons.patch +++ b/packages/zbedic/zbedic/opie-icons.patch @@ -1,16 +1,14 @@ -Index: zbedic/src/zbedic.cpp -=================================================================== ---- zbedic.orig/src/zbedic.cpp 2006-03-15 11:24:12.000000000 +0100 -+++ zbedic/src/zbedic.cpp 2006-03-15 11:30:21.000000000 +0100 -@@ -129,9 +129,9 @@ - // ========== create actions +--- zbedic/src/zbedic.cpp.old 2008-09-20 14:36:24.000000000 -0500 ++++ zbedic/src/zbedic.cpp 2008-09-20 14:37:21.000000000 -0500 +@@ -142,9 +142,9 @@ ZBEDic::ZBEDic(QWidget *parent, const ch action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", SLOT(switchToPreviousDict()), CTRL+Key_S ); -- action[TB_Back] = createAction( tr( "History previous" ), "zbedic/back", -+ action[TB_Back] = createAction( tr( "History previous" ), "back", + action[TB_ShowHistory] = createAction( tr( "Show history" ), "zbedic/history", SLOT(showHistoryPopup()), CTRL+Key_H ); +- action[TB_Back] = createAction( tr( "Go back" ), "zbedic/back", ++ action[TB_Back] = createAction( tr( "Go back" ), "back", SLOT(navigationPrevious()), Key_End ); -- action[TB_Forward] = createAction( tr( "History next" ), "zbedic/forward", -+ action[TB_Forward] = createAction( tr( "History next" ), "forward", +- action[TB_Forward] = createAction( tr( "Go forward" ), "zbedic/forward", ++ action[TB_Forward] = createAction( tr( "Go forward" ), "forward", SLOT(navigationNext()), Key_Home ); action[TB_LookupSelection] = createAction( tr( "Lookup selection" ), "zbedic/lookup_selection", SLOT(lookupSelection()), CTRL+Key_L ); diff --git a/packages/zbedic/zbedic/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch index 7b890aab8d..749fde2c7e 100644 --- a/packages/zbedic/zbedic/qtopia17.patch +++ b/packages/zbedic/zbedic/qtopia17.patch @@ -1,23 +1,21 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- zbedic/src/main.cpp~compilefix -+++ zbedic/src/main.cpp -@@ -25,5 +25,13 @@ - #include "zbedic.h" - #include <qtopia/qpeapplication.h> +--- zbedic/src/main.cpp.old 2008-09-20 14:40:57.000000000 -0500 ++++ zbedic/src/main.cpp 2008-09-20 14:51:11.000000000 -0500 +@@ -48,8 +48,16 @@ int main( int argc, char **argv ) + + #include <qpe/qpeapplication.h> -QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) -QTOPIA_MAIN -+//QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) -+//QTOPIA_MAIN -+ +int main(int argc, char** argv) +{ -+ QPEApplication a( argc, argv ); -+ ZBEDic* myapp = new ZBEDic(); -+ a.showMainWidget( myapp ); -+ a.exec(); ++ QPEApplication app( argc, argv ); ++ ++ ZBEDic mainWindow( NULL, NULL ); ++ app.setMainWidget( &mainWindow ); ++ ++ mainWindow.show(); ++ return app.exec(); +} + + #endif + diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch deleted file mode 100644 index 913e201dc7..0000000000 --- a/packages/zbedic/zbedic/version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zbedic/src/settings.cpp -=================================================================== ---- zbedic.orig/src/settings.cpp 2006-03-15 11:24:11.000000000 +0100 -+++ zbedic/src/settings.cpp 2006-03-15 15:03:55.000000000 +0100 -@@ -117,7 +117,7 @@ - - ZBEDicSettings::ZBEDicSettings( QWidget *parent ): QTabDialog( parent, "options", true ) - { -- setCaption( tr( "ZBEDic Settings (v. " VERSION ")" ) ); -+ setCaption( tr( "ZBEDic Settings (v. 1.0)" ) ); - - } - diff --git a/packages/zbedic/zbedic_1.2.bb b/packages/zbedic/zbedic_1.2.bb index afdfdd5350..61348c32f2 100644 --- a/packages/zbedic/zbedic_1.2.bb +++ b/packages/zbedic/zbedic_1.2.bb @@ -1,21 +1,23 @@ DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +HOMEPAGE = "http://bedic.sourceforge.net/" +AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" +PR = "r3" -SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-2.tgz \ file://opie-icons.patch;patch=1 \ - file://version.patch;patch=1 \ file://qtopia17.patch;patch=1" S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" +export OE_QMAKE_CXXFLAGS=" -DVERSION=\\"${PV}.2\\" -DPREFIX_PATH=\\"/usr\\"" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" @@ -38,5 +40,6 @@ do_install() { rm ${D}${palmtopdir}/pics/zbedic/forward.png } -PACKAGES =+ "zbedic-help-en" -FILES_zbedic-help-en = "${palmtopdir}/help/html/*" +PACKAGES = "${PN}-dbg ${PN}-doc ${PN} ${PN}-dev" + +FILES_${PN}-doc += "${palmtopdir}/help" diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb index 246bf2835c..d7e0777f34 100644 --- a/packages/zlib/zlib-native_1.2.3.bb +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -1,12 +1,5 @@ require zlib_${PV}.bb ZLIB_EXTRA = "" -inherit native - -do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} - - DEPENDS = "libtool-native" + +inherit native diff --git a/packages/zlib/zlib-sdk.inc b/packages/zlib/zlib-sdk.inc deleted file mode 100644 index a5901300ee..0000000000 --- a/packages/zlib/zlib-sdk.inc +++ /dev/null @@ -1,9 +0,0 @@ -ZLIB_EXTRA = "" -inherit sdk - -do_stage() { - install -d ${STAGING_INCDIR} - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} diff --git a/packages/zlib/zlib-sdk_1.2.3.bb b/packages/zlib/zlib-sdk_1.2.3.bb index b6e15c3ae2..48633950ad 100644 --- a/packages/zlib/zlib-sdk_1.2.3.bb +++ b/packages/zlib/zlib-sdk_1.2.3.bb @@ -1,2 +1,4 @@ require zlib_${PV}.bb -require zlib-sdk.inc +LIB_EXTRA = "" + +inherit sdk diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index 1f96816ae8..d4efeb08c8 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" -PR="r4" +PR="r5" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ @@ -13,19 +13,8 @@ S = "${WORKDIR}/zlib-${PV}" DEPENDS = "libtool-cross" -inherit autotools pkgconfig +inherit autotools do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - oe_libinstall -a -so libz ${STAGING_LIBDIR} -} - -do_install() { - install -d ${D}${prefix} ${D}${includedir} ${D}${libdir} - oe_runmake "prefix=${D}${prefix}" \ - "exec_prefix=${D}${exec_prefix}" \ - "man3dir=${D}${mandir}/man3" \ - "includedir=${D}${includedir}" \ - "libdir=${D}${libdir}" install + autotools_stage_all } |