diff options
Diffstat (limited to 'recipes')
124 files changed, 1618 insertions, 421 deletions
diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb new file mode 100644 index 0000000000..eff114de4b --- /dev/null +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "LGPL" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1 \ + file://fix_libmath.patch;patch=1 \ + " + +inherit autotools pkgconfig + + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + + +do_stage () { + autotools_stage_all +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb new file mode 100644 index 0000000000..3b4cf79f93 --- /dev/null +++ b/recipes/alsa/alsa-scenario_0.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "ALSA Scenario Library" +HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +PR = "r0" +PE = "1" + +SRC_URI = "http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2" + +S = "${WORKDIR}/scenario-lib-0.2.0" + +inherit autotools diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb index 74c25c247e..edc77d2bbc 100644 --- a/recipes/alsa/alsa-scenario_git.bb +++ b/recipes/alsa/alsa-scenario_git.bb @@ -3,11 +3,13 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PV = "0.1+gitr${SRCREV}" +PV = "0.2+gitr${SRCREV}" PR = "r0" PE = "1" -SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://slimlogic.co.uk/alsa-scenario;branch=master;protocol=git" S = "${WORKDIR}/git" inherit autotools diff --git a/recipes/angstrom/angstrom-led-config.bb b/recipes/angstrom/angstrom-led-config.bb index 12cdb96d93..464979b39c 100644 --- a/recipes/angstrom/angstrom-led-config.bb +++ b/recipes/angstrom/angstrom-led-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r4" +PR = "r5" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d diff --git a/recipes/angstrom/angstrom-led-config/sheevaplug/leds b/recipes/angstrom/angstrom-led-config/sheevaplug/leds new file mode 100644 index 0000000000..d39426bd90 --- /dev/null +++ b/recipes/angstrom/angstrom-led-config/sheevaplug/leds @@ -0,0 +1,2 @@ +#file format: name trigger +plug:green:health heartbeat diff --git a/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch b/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch new file mode 100644 index 0000000000..30d4bcdf78 --- /dev/null +++ b/recipes/binutils/binutils-2.14.90.0.7/binutils-2.14.90.0.7-fix-broken-configure.patch @@ -0,0 +1,78 @@ +--- binutils-2.14.90.0.7/configure.in-orig 2009-03-30 13:12:57.000000000 +0200 ++++ binutils-2.14.90.0.7/configure.in 2009-03-30 13:13:36.000000000 +0200 +@@ -1795,21 +1795,21 @@ + # at the end of the argument list. + # These will be expanded by make, so quote '$'. + cat <<\EOF_SED > conftestsed +-s/ --no[[^ ]]* / / +-s/ --c[[a-z-]]*[[= ]][[^ ]]* / / +-s/ --sr[[a-z-]]*[[= ]][[^ ]]* / / +-s/ --ho[[a-z-]]*[[= ]][[^ ]]* / / +-s/ --bu[[a-z-]]*[[= ]][[^ ]]* / / +-s/ --t[[a-z-]]*[[= ]][[^ ]]* / / +-s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / / +-s/ -cache-file[[= ]][[^ ]]* / / +-s/ -srcdir[[= ]][[^ ]]* / / +-s/ -host[[= ]][[^ ]]* / / +-s/ -build[[= ]][[^ ]]* / / +-s/ -target[[= ]][[^ ]]* / / +-s/ -program-prefix[[= ]][[^ ]]* / / +-s/ -program-suffix[[= ]][[^ ]]* / / +-s/ -program-transform-name[[= ]][[^ ]]* / / ++s/ --no[[^ ]]* / /g ++s/ --c[[a-z-]]*[[= ]][[^ ]]* / /g ++s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /g ++s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /g ++s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /g ++s/ --t[[a-z-]]*[[= ]][[^ ]]* / /g ++s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / /g ++s/ -cache-file[[= ]][[^ ]]* / /g ++s/ -srcdir[[= ]][[^ ]]* / /g ++s/ -host[[= ]][[^ ]]* / /g ++s/ -build[[= ]][[^ ]]* / /g ++s/ -target[[= ]][[^ ]]* / /g ++s/ -program-prefix[[= ]][[^ ]]* / /g ++s/ -program-suffix[[= ]][[^ ]]* / /g ++s/ -program-transform-name[[= ]][[^ ]]* / /g + s/ [[^' -][^ ]*] / / + s/^ *//;s/ *$// + s,\$,$$,g +--- binutils-2.14.90.0.7/configure-orig 2009-03-30 13:12:51.000000000 +0200 ++++ binutils-2.14.90.0.7/configure 2009-03-30 13:13:25.000000000 +0200 +@@ -2556,21 +2556,21 @@ + # at the end of the argument list. + # These will be expanded by make, so quote '$'. + cat <<\EOF_SED > conftestsed +-s/ --no[^ ]* / / +-s/ --c[a-z-]*[= ][^ ]* / / +-s/ --sr[a-z-]*[= ][^ ]* / / +-s/ --ho[a-z-]*[= ][^ ]* / / +-s/ --bu[a-z-]*[= ][^ ]* / / +-s/ --t[a-z-]*[= ][^ ]* / / +-s/ --program-[pst][a-z-]*[= ][^ ]* / / +-s/ -cache-file[= ][^ ]* / / +-s/ -srcdir[= ][^ ]* / / +-s/ -host[= ][^ ]* / / +-s/ -build[= ][^ ]* / / +-s/ -target[= ][^ ]* / / +-s/ -program-prefix[= ][^ ]* / / +-s/ -program-suffix[= ][^ ]* / / +-s/ -program-transform-name[= ][^ ]* / / ++s/ --no[^ ]* / /g ++s/ --c[a-z-]*[= ][^ ]* / /g ++s/ --sr[a-z-]*[= ][^ ]* / /g ++s/ --ho[a-z-]*[= ][^ ]* / /g ++s/ --bu[a-z-]*[= ][^ ]* / /g ++s/ --t[a-z-]*[= ][^ ]* / /g ++s/ --program-[pst][a-z-]*[= ][^ ]* / /g ++s/ -cache-file[= ][^ ]* / /g ++s/ -srcdir[= ][^ ]* / /g ++s/ -host[= ][^ ]* / /g ++s/ -build[= ][^ ]* / /g ++s/ -target[= ][^ ]* / /g ++s/ -program-prefix[= ][^ ]* / /g ++s/ -program-suffix[= ][^ ]* / /g ++s/ -program-transform-name[= ][^ ]* / /g + s/ [^' -][^ ]* / / + s/^ *//;s/ *$// + s,\$,$$,g diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb index b47c8e51b1..3447c4fea8 100644 --- a/recipes/binutils/binutils_2.14.90.0.7.bb +++ b/recipes/binutils/binutils_2.14.90.0.7.bb @@ -48,7 +48,8 @@ SRC_URI = \ file://binutils-uclibc-210-cflags.patch;patch=1 \ file://binutils-100_cflags_for_build.patch;patch=1 \ file://plt32trunc.patch;patch=1 \ - file://600-arm-textrel.patch;patch=1" + file://600-arm-textrel.patch;patch=1 \ + file://binutils-2.14.90.0.7-fix-broken-configure.patch;patch=1" S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/recipes/busybox/busybox-1.13.2/angstrom/defconfig b/recipes/busybox/busybox-1.13.2/angstrom/defconfig index 0db650fcf1..8934890ef4 100644 --- a/recipes/busybox/busybox-1.13.2/angstrom/defconfig +++ b/recipes/busybox/busybox-1.13.2/angstrom/defconfig @@ -214,8 +214,8 @@ CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 602e782d4d..96d0f0baca 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r18" +PR = "r19" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 8b214c13bd..5b82c11ca1 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -15,12 +15,12 @@ FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" FILES_${PN} = "${bindir}" python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) + e2fs_libdir = bb.data.expand('${libdir}', d) + e2fs_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, e2fs_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, e2fs_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, e2fs_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, e2fs_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) } do_stage () { diff --git a/recipes/elvis/elvis_2.2.0.bb b/recipes/elvis/elvis_2.2.0.bb index c0f92627bf..f038c6b110 100644 --- a/recipes/elvis/elvis_2.2.0.bb +++ b/recipes/elvis/elvis_2.2.0.bb @@ -4,8 +4,7 @@ PRIORITY = "optional" LICENSE = "Perl Clarified Artistic License" DEPENDS = "ncurses" -#SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz" -SRC_URI = "http://www.fh-wedel.de/pub/elvis/elvis-2.2_0.tar.gz" +SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz" S = "${WORKDIR}/elvis-2.2_0" CFLAGS_prepend = " -I. -Iosunix -L${STAGING_LIBDIR} " diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc index 05acd828dc..0464a26706 100644 --- a/recipes/emacs/emacs.inc +++ b/recipes/emacs/emacs.inc @@ -5,6 +5,8 @@ SECTION = "editor" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" +DEPENDS +=" liblockfile" + inherit autotools PACKAGES =+ "${PN}-el" @@ -16,8 +18,12 @@ FILES_${PN} += "${datadir}/emacs" FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug" +TREEDIR = "${WORKDIR}/qemu-treedir" + # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR}" + +export LOGNAME = "$(whoami)" do_compile_prepend() { sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` @@ -26,6 +32,19 @@ do_compile_prepend() { ln -sf ../src/emacs lisp/emacs ln -sf ../src/emacs lib-src/emacs ln -sf ../src/emacs leim/emacs +#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass + treedir=${TREEDIR} + if [ -e $treedir ];then + rm -rf $treedir + fi + mkdir $treedir + cp -pPR ${STAGING_DIR_TARGET}/* $treedir + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + fi + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + fi } EXTRA_OEMAKE += 'QEMU="${QEMU}"' diff --git a/recipes/emacs/emacs_22.3.bb b/recipes/emacs/emacs_22.3.bb index da8de39eec..4eeff7b567 100644 --- a/recipes/emacs/emacs_22.3.bb +++ b/recipes/emacs/emacs_22.3.bb @@ -1,5 +1,7 @@ require emacs.inc +PR="r1" + EXTRA_OECONF = "--without-sound --without-x" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \ diff --git a/recipes/flac/files/flac-gcc43-fixes.diff b/recipes/flac/files/flac-gcc43-fixes.diff new file mode 100644 index 0000000000..8d41490975 --- /dev/null +++ b/recipes/flac/files/flac-gcc43-fixes.diff @@ -0,0 +1,10 @@ +--- examples/cpp/encode/file/main.cpp-dist 2007-10-22 15:14:12.000000000 +0200 ++++ examples/cpp/encode/file/main.cpp 2007-10-22 15:14:41.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + diff --git a/recipes/flac/files/flac-printf-format-fix.diff b/recipes/flac/files/flac-printf-format-fix.diff new file mode 100644 index 0000000000..2296cdbe91 --- /dev/null +++ b/recipes/flac/files/flac-printf-format-fix.diff @@ -0,0 +1,43 @@ +--- src/test_grabbag/cuesheet/main.c-dist 2007-04-10 19:14:42.000000000 +0200 ++++ src/test_grabbag/cuesheet/main.c 2007-04-10 19:15:33.000000000 +0200 +@@ -115,12 +115,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc < 3 || argc > 4) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + +@@ -129,7 +129,7 @@ int main(int argc, char *argv[]) + if(0 == strcmp(argv[3], "cdda")) + is_cdda = true; + else { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + } +--- src/test_grabbag/picture/main.c-dist 2007-04-10 19:15:47.000000000 +0200 ++++ src/test_grabbag/picture/main.c 2007-04-10 19:16:02.000000000 +0200 +@@ -211,12 +211,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_pictures path_prefix\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc != 2) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb index 94f24fc169..eea1cbb9a5 100644 --- a/recipes/flac/flac_1.2.1.bb +++ b/recipes/flac/flac_1.2.1.bb @@ -1,3 +1,7 @@ require flac.inc -PR = "r0" +PR = "r1" + +# fixes from openSUSE: +SRC_URI += "file://flac-gcc43-fixes.diff;patch=1;pnum=0 \ + file://flac-printf-format-fix.diff;patch=1;pnum=0" diff --git a/recipes/fltk/fltk_1.1.9.bb b/recipes/fltk/fltk_1.1.9.bb index a2c5dcb5ab..b30da2eeea 100644 --- a/recipes/fltk/fltk_1.1.9.bb +++ b/recipes/fltk/fltk_1.1.9.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \ file://disable_test.patch;patch=1 \ @@ -12,7 +12,9 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl S = "${WORKDIR}/fltk-${PV}" -inherit lib_package autotools binconfig +inherit lib_package autotools_stage binconfig + +TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OECONF = "--enable-shared \ --enable-threads \ @@ -23,10 +25,6 @@ do_configure() { oe_runconf } -do_stage() { - autotools_stage_all -} - python populate_packages_prepend () { if (bb.data.getVar('DEBIAN_NAMES', d, 1)): bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d) diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index ee5784afc3..9363585de1 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -89,4 +89,7 @@ do_configure () { echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h oe_runconf + + # make sure that no @LDFLAG@ is left in the generated Makefile + sed -i "s/@LDFLAGS@//g" ${B}/Makefile } diff --git a/recipes/glibc/glibc-2.3.2/allow-gcc.patch b/recipes/glibc/glibc-2.3.2/allow-gcc.patch new file mode 100644 index 0000000000..1e38f0ef14 --- /dev/null +++ b/recipes/glibc/glibc-2.3.2/allow-gcc.patch @@ -0,0 +1,70 @@ +--- glibc-2.3.2/configure-orig 2009-03-26 15:46:33.000000000 +0100 ++++ glibc-2.3.2/configure 2009-03-26 15:49:15.000000000 +0100 +@@ -3850,67 +3850,6 @@ + + # These programs are version sensitive. + +-for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$CC" && break +-done +- +-if test -z "$CC"; then +- ac_verc_fail=yes +-else +- # Found it, now check the version. +- echo "$as_me:$LINENO: checking version of $CC" >&5 +-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 +- ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` +- case $ac_prog_version in +- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.[2-9]*) +- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; +- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; +- +- esac +- echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +-echo "${ECHO_T}$ac_prog_version" >&6 +-fi +-if test $ac_verc_fail = yes; then +- critic_missing="$critic_missing gcc" +-fi +- + for ac_prog in gnumake gmake make + do + # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/recipes/glibc/glibc-2.3.2/mips-abio32.patch b/recipes/glibc/glibc-2.3.2/mips-abio32.patch new file mode 100644 index 0000000000..49c46f9113 --- /dev/null +++ b/recipes/glibc/glibc-2.3.2/mips-abio32.patch @@ -0,0 +1,12 @@ +--- glibc-2.3.3-r16/sysdeps/mips/sgidefs.h-orig 2009-02-27 16:05:55.000000000 +0100 ++++ glibc-2.3.3-r16/sysdeps/mips/sgidefs.h 2009-02-27 16:06:26.000000000 +0100 +@@ -43,4 +43,9 @@ + #define _MIPS_SIM_NABI32 2 + #define _MIPS_SIM_ABI64 3 + ++/* compatibility stuff needed e.g. by gdb */ ++#ifndef _ABIO32 ++# define _ABIO32 _MIPS_SIM_ABI32 ++#endif ++ + #endif /* sgidefs.h */ diff --git a/recipes/glibc/glibc-2.3.3/allow-gcc.patch b/recipes/glibc/glibc-2.3.3/allow-gcc.patch new file mode 100644 index 0000000000..1e38f0ef14 --- /dev/null +++ b/recipes/glibc/glibc-2.3.3/allow-gcc.patch @@ -0,0 +1,70 @@ +--- glibc-2.3.2/configure-orig 2009-03-26 15:46:33.000000000 +0100 ++++ glibc-2.3.2/configure 2009-03-26 15:49:15.000000000 +0100 +@@ -3850,67 +3850,6 @@ + + # These programs are version sensitive. + +-for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$CC" && break +-done +- +-if test -z "$CC"; then +- ac_verc_fail=yes +-else +- # Found it, now check the version. +- echo "$as_me:$LINENO: checking version of $CC" >&5 +-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 +- ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` +- case $ac_prog_version in +- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.[2-9]*) +- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; +- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; +- +- esac +- echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +-echo "${ECHO_T}$ac_prog_version" >&6 +-fi +-if test $ac_verc_fail = yes; then +- critic_missing="$critic_missing gcc" +-fi +- + for ac_prog in gnumake gmake make + do + # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/recipes/glibc/glibc-2.3.3/etc/ld.so.conf b/recipes/glibc/glibc-2.3.3/etc/ld.so.conf new file mode 100644 index 0000000000..dfa65edb85 --- /dev/null +++ b/recipes/glibc/glibc-2.3.3/etc/ld.so.conf @@ -0,0 +1,2 @@ +/usr/local/lib +/usr/X11R6/lib diff --git a/recipes/glibc/glibc-2.3.3/mips-abio32.patch b/recipes/glibc/glibc-2.3.3/mips-abio32.patch new file mode 100644 index 0000000000..49c46f9113 --- /dev/null +++ b/recipes/glibc/glibc-2.3.3/mips-abio32.patch @@ -0,0 +1,12 @@ +--- glibc-2.3.3-r16/sysdeps/mips/sgidefs.h-orig 2009-02-27 16:05:55.000000000 +0100 ++++ glibc-2.3.3-r16/sysdeps/mips/sgidefs.h 2009-02-27 16:06:26.000000000 +0100 +@@ -43,4 +43,9 @@ + #define _MIPS_SIM_NABI32 2 + #define _MIPS_SIM_ABI64 3 + ++/* compatibility stuff needed e.g. by gdb */ ++#ifndef _ABIO32 ++# define _ABIO32 _MIPS_SIM_ABI32 ++#endif ++ + #endif /* sgidefs.h */ diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb index 2d2663f56b..0ed7d3e723 100644 --- a/recipes/glibc/glibc_2.3.2.bb +++ b/recipes/glibc/glibc_2.3.2.bb @@ -104,6 +104,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ file://etc/ld.so.conf \ file://generate-supported.mk" +SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " +SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb index 05a8581957..dada4bb2fb 100644 --- a/recipes/glibc/glibc_2.3.3.bb +++ b/recipes/glibc/glibc_2.3.3.bb @@ -49,6 +49,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ file://etc/ld.so.conf \ file://generate-supported.mk" +SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " +SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc index e438423c9c..004161a9f6 100644 --- a/recipes/gnutls/gnutls.inc +++ b/recipes/gnutls/gnutls.inc @@ -1,6 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" -DEPENDS = "zlib libgcrypt lzo" +DEPENDS = "zlib libgcrypt lzo guile-native" LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" diff --git a/recipes/h2200-bootloader/h2200-bootloader.bb b/recipes/h2200-bootloader/h2200-bootloader.bb index 5db3cd058d..69214c76f2 100644 --- a/recipes/h2200-bootloader/h2200-bootloader.bb +++ b/recipes/h2200-bootloader/h2200-bootloader.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ" -RRECOMMENDS_${PN} = "kernel-module-mtdblock" ALLOW_EMPTY = "1" -PR = "r3" +PR = "r4" COMPATIBLE_MACHINE = "h2200" #it is a shell script, but lets protect the innocent some more @@ -10,6 +9,5 @@ PACKAGE_ARCH = "h2200" pkg_postinst() { #!/bin/sh mkdir -p /lib/firmware -modprobe mtdblock dd if=/dev/mtdblock0 of=/lib/firmware/h2200_bootloader.bin 2>/dev/null } diff --git a/recipes/hostap/files/hostap-no-bsd.patch b/recipes/hostap/files/hostap-no-bsd.patch new file mode 100644 index 0000000000..c40d98c959 --- /dev/null +++ b/recipes/hostap/files/hostap-no-bsd.patch @@ -0,0 +1,19 @@ +--- hostapd-0.4.4/driver_madwifi.c-orig 2008-04-16 15:11:49.000000000 +0200 ++++ hostapd-0.4.4/driver_madwifi.c 2008-04-16 15:10:38.000000000 +0200 +@@ -26,14 +26,14 @@ + #include <net80211/ieee80211.h> + #ifdef WME_NUM_AC + /* Assume this is built against BSD branch of madwifi driver. */ +-#define MADWIFI_BSD ++/*#define MADWIFI_BSD*/ ++#include <linux/wireless.h> + #include <net80211/_ieee80211.h> + #endif /* WME_NUM_AC */ + #include <net80211/ieee80211_crypto.h> + #include <net80211/ieee80211_ioctl.h> + + #include <net/if_arp.h> +-#include <linux/wireless.h> + + #include <netinet/in.h> + #include <netpacket/packet.h> diff --git a/recipes/hostap/hostap-daemon_0.4.4.bb b/recipes/hostap/hostap-daemon_0.4.4.bb index bece7d1450..83a5386f3a 100644 --- a/recipes/hostap/hostap-daemon_0.4.4.bb +++ b/recipes/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,7 @@ require hostap-daemon.inc +SRC_URI_append_nylon = "\ + file://hostap-no-bsd.patch;patch=1" + + PR = "r2" diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb index 3fc1d8dc11..ea493017fe 100644 --- a/recipes/hostap/hostap-daemon_0.5.10.bb +++ b/recipes/hostap/hostap-daemon_0.5.10.bb @@ -5,6 +5,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" PR = "r1" +DEPENDS_append_mtx-1 = " madwifi-modules" +DEPENDS_append_mtx-2 = " madwifi-modules" +CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/" +CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" diff --git a/recipes/initscripts/initscripts-1.0/bootmisc.sh b/recipes/initscripts/initscripts-1.0/bootmisc.sh index dde1209be5..d19477be87 100755 --- a/recipes/initscripts/initscripts-1.0/bootmisc.sh +++ b/recipes/initscripts/initscripts-1.0/bootmisc.sh @@ -66,7 +66,7 @@ fi # Set the system clock from hardware clock # If the timestamp is 1 day or more recent than the current time, # use the timestamp instead. -/etc/init.d/hwclock.sh start +test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh start if test -e /etc/timestamp then SYSTEMDATE=`date "+%Y%m%d"` diff --git a/recipes/jamvm/jamvm-native_1.5.2.bb b/recipes/jamvm/jamvm-native_1.5.2.bb deleted file mode 100644 index e174e2a312..0000000000 --- a/recipes/jamvm/jamvm-native_1.5.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require jamvm-native.inc - -PR = "r0" - diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb new file mode 100644 index 0000000000..07a213c260 --- /dev/null +++ b/recipes/jamvm/jamvm-native_1.5.3.bb @@ -0,0 +1,6 @@ +# Note: You *must* use this together with classpath-native 0.98. Otherwise it won't work! + +require jamvm-native.inc + +PR = "r0" + diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index fb3816b348..74767b0b12 100644 --- a/recipes/kexecboot/linux-kexecboot.inc +++ b/recipes/kexecboot/linux-kexecboot.inc @@ -6,7 +6,7 @@ SRC_URI = "file://defconfig" LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" -require recipes/linux/linux.inc +require ../linux/linux.inc DONT_CHECK_KERNELSIZE = "" INITRAMFS_IMAGE = "initramfs-kexecboot-image" diff --git a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch b/recipes/kismet/files/fix_strip.patch index 54e7a9b1b7..54e7a9b1b7 100644 --- a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch +++ b/recipes/kismet/files/fix_strip.patch diff --git a/recipes/kismet/kismet-2007-10-R1/string_h.patch b/recipes/kismet/kismet-2007-10-R1/string_h.patch new file mode 100644 index 0000000000..363664fb6f --- /dev/null +++ b/recipes/kismet/kismet-2007-10-R1/string_h.patch @@ -0,0 +1,36 @@ +Index: kismet-2007-10-R1/kismet_wrapper.cc +=================================================================== +--- kismet-2007-10-R1.orig/kismet_wrapper.cc 2007-10-06 21:50:03.000000000 +0000 ++++ kismet-2007-10-R1/kismet_wrapper.cc 2009-05-26 12:58:01.000000000 +0000 +@@ -25,6 +25,7 @@ + #include <sys/wait.h> + #include <fcntl.h> + #include <unistd.h> ++#include <string.h> + + #include "config.h" + +Index: kismet-2007-10-R1/ringbuf.cc +=================================================================== +--- kismet-2007-10-R1.orig/ringbuf.cc 2005-12-11 19:14:39.000000000 +0000 ++++ kismet-2007-10-R1/ringbuf.cc 2009-05-26 12:56:17.000000000 +0000 +@@ -17,6 +17,7 @@ + */ + + #include "ringbuf.h" ++#include <string.h> + + RingBuffer::RingBuffer(int in_size) { + ring_len = in_size; +Index: kismet-2007-10-R1/util.cc +=================================================================== +--- kismet-2007-10-R1.orig/util.cc 2006-08-28 20:37:29.000000000 +0000 ++++ kismet-2007-10-R1/util.cc 2009-05-26 12:57:00.000000000 +0000 +@@ -22,6 +22,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <string.h> + + // We need this to make uclibc happy since they don't even have rintf... + #ifndef rintf diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff new file mode 100644 index 0000000000..4c1d3a2360 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff @@ -0,0 +1,20 @@ +--- kismet_wrapper.cc ++++ kismet_wrapper.cc +@@ -79,7 +79,7 @@ void reap(int sig) { + if (FD_ISSET(epipe[0], &rset)) { + if (fgets(ret, 2048, err) == NULL || + feof(err)) { +- if (feof(out)) ++ if (!check_out || feof(out)) + break; + + fclose(err); +@@ -98,7 +98,7 @@ void reap(int sig) { + if (FD_ISSET(rpipe[0], &rset)) { + if (fgets(ret, 2048, out) == NULL || + feof(out)) { +- if (feof(err)) ++ if (!check_err || feof(err)) + break; + + fclose(out); diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff new file mode 100644 index 0000000000..032f92ba22 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff @@ -0,0 +1,11 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -3825,7 +3825,7 @@ + else if (tok == "location") + network_labels.push_back(NETLABEL_LOCATION); + else { +- fprintf(stderr, "Invalid label '%s'\n", tok.c_str()); ++ fprintf(stderr, "Invalid label '%zs'\n", tok.c_str()); + exit(1); + } + } diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff new file mode 100644 index 0000000000..f8417943e8 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff @@ -0,0 +1,20 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -874,7 +874,7 @@ + + // Break up the path to the gpsxml file and form a path based on that + unsigned int lastslash = 0; +- for (unsigned int x = origxmlfile.find('/'); x != string::npos; ++ for (string::size_type x = origxmlfile.find('/'); x != string::npos; + lastslash = x, x = origxmlfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } +@@ -882,7 +882,7 @@ + comp = origxmlfile.substr(0, lastslash); + + lastslash = 0; +- for (unsigned int x = orignetfile.find('/'); x != string::npos; ++ for (string::size_type x = orignetfile.find('/'); x != string::npos; + lastslash = x, x = orignetfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff new file mode 100644 index 0000000000..e068f8dac5 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff @@ -0,0 +1,10 @@ +--- pcapsource.cc ++++ pcapsource.cc +@@ -2914,6 +2914,7 @@ + return -1; + + } ++ return -1; + } + #endif + diff --git a/recipes/kismet/kismet_2007-10-R1.bb b/recipes/kismet/kismet_2007-10-R1.bb index 4786543ec8..ac3c56f156 100644 --- a/recipes/kismet/kismet_2007-10-R1.bb +++ b/recipes/kismet/kismet_2007-10-R1.bb @@ -1,5 +1,6 @@ require kismet.inc -SRC_URI += "file://fix_strip.patch;patch=1" +SRC_URI += "file://fix_strip.patch;patch=1 \ + file://string_h.patch;patch=1" PR = "r5" diff --git a/recipes/kismet/kismet_2008-05-R1.bb b/recipes/kismet/kismet_2008-05-R1.bb new file mode 100644 index 0000000000..c413ed508a --- /dev/null +++ b/recipes/kismet/kismet_2008-05-R1.bb @@ -0,0 +1,10 @@ +require kismet.inc + +# patches *.diff are from openSUSE +SRC_URI += "file://kismet-2008-05-R1-crash.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-fmt.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-infinite-loop.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-nonvoid.diff;patch=1;pnum=0 \ + file://fix_strip.patch;patch=1" + +PR = "r0" diff --git a/recipes/libopie/libopie2/rotate_fix.patch b/recipes/libopie/libopie2/rotate_fix.patch new file mode 100644 index 0000000000..c6a59846a0 --- /dev/null +++ b/recipes/libopie/libopie2/rotate_fix.patch @@ -0,0 +1,87 @@ +--- libopie2/opiecore/device/odevice_ipaq.cpp 24 May 2009 20:09:49 -0000 1.40 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 27 May 2009 21:16:24 -0000 +@@ -35,6 +35,7 @@ + #include <qfile.h> + #include <qtextstream.h> + #include <qwindowsystem_qws.h> ++#include <qgfx_qws.h> + + /* OPIE */ + #include <qpe/config.h> +@@ -335,11 +336,11 @@ + int quarters; + switch (d->m_rotation) { + case Rot0: quarters = 0/*0deg*/; break; +- case Rot90: quarters = 1/*90deg*/; break; ++ case Rot90: quarters = 3/*90deg*/; break; + case Rot180: quarters = 2/*180deg*/; break; +- case Rot270: quarters = 3/*270deg*/; break; ++ case Rot270: quarters = 1/*270deg*/; break; + } +- newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; ++ newkeycode = Key_Left + ( keycode - Key_Left + quarters + qt_screen->transformOrientation() ) % 4; + break; + } + +--- libopie2/opiecore/device/odevice_zaurus.cpp 24 May 2009 20:09:49 -0000 1.57 ++++ libopie2/opiecore/device/odevice_zaurus.cpp 27 May 2009 21:16:24 -0000 +@@ -807,16 +807,8 @@ + case Key_Up : + case Key_Down : + { +- if (d->m_model == Model_Zaurus_SLC3000) { +- // This ensures that the cursor keys work correctly and that the +- // side wheel works as expected when the screen is flipped over +- if (rotation() == Rot270) +- newkeycode = Key_Left + ( keycode - Key_Left + 1 ) % 4; +- } +- else { +- if (rotation()==Rot90) +- newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; +- } ++ if (rotation()==Rot90) ++ newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; + break; + + } +--- libopie2/opiecore/device/odevice_palm.cpp 2009-05-27 22:28:37.000000000 +0100 ++++ libopie2/opiecore/device/odevice_palm.cpp 2009-05-27 22:28:09.000000000 +0100 +@@ -295,25 +295,21 @@ + { + int newkeycode = keycode; + +- if (qt_screen->transformOrientation() != Rot0){ +- +- switch ( keycode ) { +- case Key_Left : +- case Key_Right: +- case Key_Up : +- case Key_Down : +- newkeycode = Key_Left + ( keycode - Key_Left + 4 ) % 4; +- default: +- break; +- } ++ switch ( keycode ) { ++ case Key_Left : ++ case Key_Right: ++ case Key_Up : ++ case Key_Down : ++ newkeycode = Key_Left + ( keycode - Key_Left + qt_screen->transformOrientation() ) % 4; ++ default: ++ break; ++ } + +- if (newkeycode!=keycode) { +- if ( newkeycode != Key_unknown ) { +- QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); +- } +- return true; ++ if (newkeycode!=keycode) { ++ if ( newkeycode != Key_unknown ) { ++ QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); + } +- ++ return true; + } + + return false; diff --git a/recipes/libopie/libopie2_1.2.4.bb b/recipes/libopie/libopie2_1.2.4.bb index 0634ad7d22..d66cf3fea5 100644 --- a/recipes/libopie/libopie2_1.2.4.bb +++ b/recipes/libopie/libopie2_1.2.4.bb @@ -1,10 +1,11 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ file://libopie2-tosa.patch;patch=1 \ - file://c7x0_w100_disable.patch;patch=1" + file://c7x0_w100_disable.patch;patch=1 \ + file://rotate_fix.patch;patch=1" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/recipes/libsdl/libsdl-gfx_2.0.17.bb b/recipes/libsdl/libsdl-gfx_2.0.17.bb index 79af40ae1d..b07be45ac5 100644 --- a/recipes/libsdl/libsdl-gfx_2.0.17.bb +++ b/recipes/libsdl/libsdl-gfx_2.0.17.bb @@ -10,6 +10,7 @@ S = "${WORKDIR}/SDL_gfx-${PV}" inherit autotools EXTRA_OECONF = "--disable-mmx" +TARGET_CC_ARCH += "${LDFLAGS}" do_stage() { autotools_stage_all diff --git a/recipes/libsdl/libsdl-ttf_2.0.3.bb b/recipes/libsdl/libsdl-ttf_2.0.3.bb index 250fb698ce..b1da5b47f8 100644 --- a/recipes/libsdl/libsdl-ttf_2.0.3.bb +++ b/recipes/libsdl/libsdl-ttf_2.0.3.bb @@ -11,6 +11,8 @@ S = "${WORKDIR}/SDL_ttf-${PV}" inherit autotools +TARGET_CC_ARCH += "${LDFLAGS}" + do_stage() { autotools_stage_all } diff --git a/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch new file mode 100644 index 0000000000..f07b5383bf --- /dev/null +++ b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch @@ -0,0 +1,22 @@ +--- libusb-compat-0.1.0/configure.ac-orig 2009-02-26 15:30:51.000000000 +0100 ++++ libusb-compat-0.1.0/configure.ac 2009-02-26 15:31:04.000000000 +0100 +@@ -55,7 +55,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile]) +--- libusb-compat-0.1.0/libusb/Makefile.am-orig 2009-02-26 15:33:30.000000000 +0100 ++++ libusb-compat-0.1.0/libusb/Makefile.am 2009-02-26 15:33:40.000000000 +0100 +@@ -2,7 +2,7 @@ + lib_LTLIBRARIES = libusb.la + + libusb_la_SOURCES = core.c usbi.h +-libusb_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS) ++libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS) + libusb_la_LIBADD = $(LIBUSB_1_0_LIBS) + libusb_la_LDFLAGS = -version-info $(LT_MAJOR):$(LT_REVISION):$(LT_AGE) \ + -release 0.1 diff --git a/recipes/libusb/libusb-compat_0.1.0.bb b/recipes/libusb/libusb-compat_0.1.0.bb index 887765133a..48694403e5 100644 --- a/recipes/libusb/libusb-compat_0.1.0.bb +++ b/recipes/libusb/libusb-compat_0.1.0.bb @@ -11,7 +11,8 @@ DEPENDS = "libusb1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ " - +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" diff --git a/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch new file mode 100644 index 0000000000..d1bc6803d8 --- /dev/null +++ b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch @@ -0,0 +1,22 @@ +--- libusb-1.0.0/configure.ac-orig 2009-02-26 13:18:31.000000000 +0100 ++++ libusb-1.0.0/configure.ac 2009-02-26 13:18:43.000000000 +0100 +@@ -62,7 +62,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile] [doc/doxygen.cfg]) +--- libusb-1.0.0/libusb/Makefile.am-orig 2009-02-26 13:18:11.000000000 +0100 ++++ libusb-1.0.0/libusb/Makefile.am 2009-02-26 13:18:23.000000000 +0100 +@@ -8,7 +8,7 @@ + OS_SRC = $(LINUX_USBFS_SRC) + endif + +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + libusb_1_0_la_LIBADD = -lrt + diff --git a/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch new file mode 100644 index 0000000000..98c3674bca --- /dev/null +++ b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch @@ -0,0 +1,33 @@ +--- libusb-1.0.1/libusb/Makefile.am-orig 2009-05-19 22:41:07.000000000 +0200 ++++ libusb-1.0.1/libusb/Makefile.am 2009-05-19 22:41:27.000000000 +0200 +@@ -14,7 +14,7 @@ + AM_CFLAGS_EXT = -no-cpp-precomp + endif + +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + + hdrdir = $(includedir)/libusb-1.0 +--- libusb-1.0.1/libusb/Makefile.in-orig 2009-05-19 22:41:13.000000000 +0200 ++++ libusb-1.0.1/libusb/Makefile.in 2009-05-19 22:41:42.000000000 +0200 +@@ -210,7 +210,7 @@ + @OS_DARWIN_TRUE@OS_SRC = $(DARWIN_USB_SRC) + @OS_LINUX_TRUE@OS_SRC = $(LINUX_USBFS_SRC) + @OS_DARWIN_TRUE@AM_CFLAGS_EXT = -no-cpp-precomp +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + hdrdir = $(includedir)/libusb-1.0 + hdr_HEADERS = libusb.h +--- libusb-1.0.1/configure.ac-orig 2009-05-19 22:44:06.000000000 +0200 ++++ libusb-1.0.1/configure.ac 2009-05-19 22:44:16.000000000 +0200 +@@ -72,7 +72,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + + AC_SUBST(AM_CFLAGS) + AC_SUBST(AM_LDFLAGS) diff --git a/recipes/libusb/libusb1_1.0.0.bb b/recipes/libusb/libusb1_1.0.0.bb index 8450a7c946..978d819a6f 100644 --- a/recipes/libusb/libusb1_1.0.0.bb +++ b/recipes/libusb/libusb1_1.0.0.bb @@ -9,6 +9,8 @@ PR = "r0" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ " +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig binconfig lib_package diff --git a/recipes/libusb/libusb1_1.0.1.bb b/recipes/libusb/libusb1_1.0.1.bb index 1af46bcf98..3856812965 100644 --- a/recipes/libusb/libusb1_1.0.1.bb +++ b/recipes/libusb/libusb1_1.0.1.bb @@ -8,6 +8,8 @@ LICENSE = "LGPL" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ " +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools_stage binconfig lib_package diff --git a/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch b/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch new file mode 100644 index 0000000000..c68a0099fa --- /dev/null +++ b/recipes/linux-hotplug/linux-hotplug-20040920/hotplug-binary-path.patch @@ -0,0 +1,20 @@ +--- hotplug-2004_09_20/etc/hotplug/pci.rc-orig 2009-04-07 21:00:18.000000000 +0200 ++++ hotplug-2004_09_20/etc/hotplug/pci.rc 2009-04-07 21:00:43.000000000 +0200 +@@ -38,7 +38,7 @@ + sub_vendor_id=`cat $PCI_DEVICE/subsystem_vendor` + sub_device_id=`cat $PCI_DEVICE/subsystem_device` + PCI_SUBSYS_ID="${sub_vendor_id#0x}:${sub_device_id#0x}" +- /sbin/hotplug pci ++ /usr/sbin/hotplug pci + done + fi + else +@@ -53,7 +53,7 @@ + for BUS in `cd /proc/bus/pci;find * -type d -print`; do + for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do + PCI_SLOT=$BUS:$SLOT_FUNC +- /sbin/hotplug pci ++ /usr/sbin/hotplug pci + done + done + fi diff --git a/recipes/linux-hotplug/linux-hotplug_20040920.bb b/recipes/linux-hotplug/linux-hotplug_20040920.bb index 6209504c20..5cab3b81d8 100644 --- a/recipes/linux-hotplug/linux-hotplug_20040920.bb +++ b/recipes/linux-hotplug/linux-hotplug_20040920.bb @@ -27,7 +27,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20 file://sysconfig-usb \ file://isapnp-exit.diff;patch=1 \ file://usb-storage \ - file://soc.agent" + file://soc.agent \ + file://hotplug-binary-path.patch;patch=1" SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1" diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb index 73e9b07d7f..3a6de1c72e 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb @@ -49,9 +49,12 @@ do_stage () { } do_stage_append_nylon () { - cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/ - cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ - cp -pPR include/linux/* ${STAGING_INCDIR}/linux/ - cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/ + install -d ${STAGING_INCDIR}/asm/ + cp -vpPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm/ + cp -vpPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ + cp -vpPR include/linux/* ${STAGING_INCDIR}/linux/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/linux/ + cp -vpPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/ } diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb index d71b68a930..60d621b1dc 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -69,9 +69,12 @@ do_stage () { } do_stage_append_nylon () { - cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/ - cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ - cp -pPR include/linux/* ${STAGING_INCDIR}/linux/ - cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/ + install -d ${STAGING_INCDIR}/asm/ + cp -vpPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm/ + cp -vpPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ + cp -vpPR include/linux/* ${STAGING_INCDIR}/linux/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/linux/ + cp -vpPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/ } diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0070-DSS2-fix-irq1.diff b/recipes/linux/linux-omap-2.6.29/dss2/0070-DSS2-fix-irq1.diff new file mode 100644 index 0000000000..8f384dfe2d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0070-DSS2-fix-irq1.diff @@ -0,0 +1,221 @@ +From 093988f36ffcb0201927f8b452e546e1141aa0fa Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Sat, 23 May 2009 15:00:21 +0000 +Subject: DSS2: DISPC: fix irq handling locking + +--- +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index b0e4960..b3685b2 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -154,23 +154,20 @@ static struct { + + struct clk *dpll4_m4_ck; + +- spinlock_t irq_lock; +- + unsigned long cache_req_pck; + unsigned long cache_prate; + struct dispc_clock_info cache_cinfo; + +- u32 irq_error_mask; ++ spinlock_t irq_lock; ++ u32 irq_error_mask; + struct omap_dispc_isr_data registered_isr[DISPC_MAX_NR_ISRS]; +- +- spinlock_t error_lock; + u32 error_irqs; + struct work_struct error_work; + + u32 ctx[DISPC_SZ_REGS / sizeof(u32)]; + } dispc; + +-static void omap_dispc_set_irqs(void); ++static void _omap_dispc_set_irqs(void); + + static inline void dispc_write_reg(const struct dispc_reg idx, u32 val) + { +@@ -1691,10 +1688,13 @@ void dispc_enable_digit_out(bool enable) + } + + if (enable) { ++ unsigned long flags; + /* When we enable digit output, we'll get an extra digit + * sync lost interrupt, that we need to ignore */ ++ spin_lock_irqsave(&dispc.irq_lock, flags); + dispc.irq_error_mask &= ~DISPC_IRQ_SYNC_LOST_DIGIT; +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + } + + /* When we disable digit output, we need to wait until fields are done. +@@ -1728,9 +1728,12 @@ void dispc_enable_digit_out(bool enable) + DSSERR("failed to unregister EVSYNC isr\n"); + + if (enable) { ++ unsigned long flags; ++ spin_lock_irqsave(&dispc.irq_lock, flags); + dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR; + dispc_write_reg(DISPC_IRQSTATUS, DISPC_IRQ_SYNC_LOST_DIGIT); +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + } + + enable_clocks(0); +@@ -2508,14 +2511,14 @@ int dispc_get_clock_div(struct dispc_clock_info *cinfo) + return 0; + } + +-static void omap_dispc_set_irqs(void) ++/* dispc.irq_lock has to be locked by the caller */ ++static void _omap_dispc_set_irqs(void) + { +- unsigned long flags; +- u32 mask = dispc.irq_error_mask; ++ u32 mask; + int i; + struct omap_dispc_isr_data *isr_data; + +- spin_lock_irqsave(&dispc.irq_lock, flags); ++ mask = dispc.irq_error_mask; + + for (i = 0; i < DISPC_MAX_NR_ISRS; i++) { + isr_data = &dispc.registered_isr[i]; +@@ -2528,9 +2531,8 @@ static void omap_dispc_set_irqs(void) + + enable_clocks(1); + dispc_write_reg(DISPC_IRQENABLE, mask); +- enable_clocks(0); + +- spin_unlock_irqrestore(&dispc.irq_lock, flags); ++ enable_clocks(0); + } + + int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask) +@@ -2571,11 +2573,14 @@ int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask) + + break; + } +-err: ++ ++ _omap_dispc_set_irqs(); ++ + spin_unlock_irqrestore(&dispc.irq_lock, flags); + +- if (ret == 0) +- omap_dispc_set_irqs(); ++ return 0; ++err: ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + + return ret; + } +@@ -2606,10 +2611,10 @@ int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask) + break; + } + +- spin_unlock_irqrestore(&dispc.irq_lock, flags); +- + if (ret == 0) +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); ++ ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + + return ret; + } +@@ -2645,11 +2650,15 @@ static void print_irq_status(u32 status) + void dispc_irq_handler(void) + { + int i; +- u32 irqstatus = dispc_read_reg(DISPC_IRQSTATUS); ++ u32 irqstatus; + u32 handledirqs = 0; + u32 unhandled_errors; + struct omap_dispc_isr_data *isr_data; + ++ spin_lock(&dispc.irq_lock); ++ ++ irqstatus = dispc_read_reg(DISPC_IRQSTATUS); ++ + #ifdef DEBUG + if (dss_debug) + print_irq_status(irqstatus); +@@ -2673,15 +2682,15 @@ void dispc_irq_handler(void) + unhandled_errors = irqstatus & ~handledirqs & dispc.irq_error_mask; + + if (unhandled_errors) { +- spin_lock(&dispc.error_lock); + dispc.error_irqs |= unhandled_errors; +- spin_unlock(&dispc.error_lock); + + dispc.irq_error_mask &= ~unhandled_errors; +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); + + schedule_work(&dispc.error_work); + } ++ ++ spin_unlock(&dispc.irq_lock); + } + + static void dispc_error_worker(struct work_struct *work) +@@ -2690,10 +2699,10 @@ static void dispc_error_worker(struct work_struct *work) + u32 errors; + unsigned long flags; + +- spin_lock_irqsave(&dispc.error_lock, flags); ++ spin_lock_irqsave(&dispc.irq_lock, flags); + errors = dispc.error_irqs; + dispc.error_irqs = 0; +- spin_unlock_irqrestore(&dispc.error_lock, flags); ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + + if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) { + DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n"); +@@ -2836,8 +2845,10 @@ static void dispc_error_worker(struct work_struct *work) + } + } + ++ spin_lock_irqsave(&dispc.irq_lock, flags); + dispc.irq_error_mask |= errors; +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + } + + int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout) +@@ -2921,6 +2932,10 @@ void dispc_fake_vsync_irq(void) + + static void _omap_dispc_initialize_irq(void) + { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&dispc.irq_lock, flags); ++ + memset(dispc.registered_isr, 0, sizeof(dispc.registered_isr)); + + dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR; +@@ -2929,7 +2944,9 @@ static void _omap_dispc_initialize_irq(void) + * so clear it */ + dispc_write_reg(DISPC_IRQSTATUS, dispc_read_reg(DISPC_IRQSTATUS)); + +- omap_dispc_set_irqs(); ++ _omap_dispc_set_irqs(); ++ ++ spin_unlock_irqrestore(&dispc.irq_lock, flags); + } + + void dispc_enable_sidle(void) +@@ -2970,7 +2987,6 @@ int dispc_init(void) + u32 rev; + + spin_lock_init(&dispc.irq_lock); +- spin_lock_init(&dispc.error_lock); + + INIT_WORK(&dispc.error_work, dispc_error_worker); + +-- +cgit v0.8.2.1-10-g45e7 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0071-DSS2-fix-irq2.diff b/recipes/linux/linux-omap-2.6.29/dss2/0071-DSS2-fix-irq2.diff new file mode 100644 index 0000000000..cb8aaf1a28 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0071-DSS2-fix-irq2.diff @@ -0,0 +1,35 @@ +From 8af2f6550d6971875e4c5d3f93982f86f4bcf216 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Sat, 23 May 2009 15:00:00 +0000 +Subject: DSS2: DISPC: clear irqstatus for newly enabled irqs + +This fixes the problem that when requesting a new irq +we could get the isr called too early in case irqstatus +already had that irq flag on. +--- +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index b3685b2..2471cfe 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -2515,6 +2515,7 @@ int dispc_get_clock_div(struct dispc_clock_info *cinfo) + static void _omap_dispc_set_irqs(void) + { + u32 mask; ++ u32 old_mask; + int i; + struct omap_dispc_isr_data *isr_data; + +@@ -2530,6 +2531,11 @@ static void _omap_dispc_set_irqs(void) + } + + enable_clocks(1); ++ ++ old_mask = dispc_read_reg(DISPC_IRQENABLE); ++ /* clear the irqstatus for newly enabled irqs */ ++ dispc_write_reg(DISPC_IRQSTATUS, (mask ^ old_mask) & mask); ++ + dispc_write_reg(DISPC_IRQENABLE, mask); + + enable_clocks(0); +-- +cgit v0.8.2.1-10-g45e7 diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 5be04d2a84..67a4803893 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -91,6 +91,8 @@ SRC_URI_append = " \ file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \ file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \ file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \ + file://dss2/0070-DSS2-fix-irq1.diff;patch=1 \ + file://dss2/0071-DSS2-fix-irq2.diff;patch=1 \ file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \ file://fix-unaligned-access.diff;patch=1 \ file://make-alignment-visible.diff;patch=1 \ diff --git a/recipes/logrotate-script/logrotate-script_cvs.bb b/recipes/logrotate-script/logrotate-script_cvs.bb index a46b265e2f..2c6fd909b8 100644 --- a/recipes/logrotate-script/logrotate-script_cvs.bb +++ b/recipes/logrotate-script/logrotate-script_cvs.bb @@ -4,7 +4,7 @@ SECTION = "admin" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://meshcube.org/download/logrotate_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/logrotate_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/recipes/lowpan-tools/lowpan-tools_git.bb b/recipes/lowpan-tools/lowpan-tools_git.bb new file mode 100644 index 0000000000..1fde23218d --- /dev/null +++ b/recipes/lowpan-tools/lowpan-tools_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)" +LICENSE = "GPL" +SRCREV = "e9e80a2eefa7aadbbb15bef1519b373e2e907aa0" +#SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git" +SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee;protocol=git" +DEPENDS = "libnl bison-native flex-native" +PR = "r6" + +S = "${WORKDIR}/git" +PACKAGES += "${PN}-tests-dbg" +PACKAGES += "${PN}-tests" +FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \ + ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \ + ${sbindir}/izattach" +FILES_${PN}-tests = "${libexecdir}/lowpan-tools ${libdir}/python*/site-packages" +FILES_${PN}-tests-dbg = "${libexecdir}/lowpan-tools/.debug" + +EXTRA_OECONF = "--disable-manpages" + +inherit autotools_stage diff --git a/recipes/lowpan-utils/lowpan-utils_git.bb b/recipes/lowpan-utils/lowpan-utils_git.bb deleted file mode 100644 index 89a5e438ab..0000000000 --- a/recipes/lowpan-utils/lowpan-utils_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)" -LICENSE = "GPL" -SRCREV = "master" -SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git" -DEPENDS = "libnl bison-native flex-native" -PR = "r4" - -S = "${WORKDIR}/git" -PACKAGES += "${PN}-tests-dbg" -PACKAGES += "${PN}-tests" -FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \ - ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \ - ${sbindir}/izattach" -FILES_${PN}-tests = "${libexecdir}/zigbee ${libdir}/python*/site-packages" -FILES_${PN}-tests-dbg = "${libexecdir}/zigbee/.debug" - -inherit autotools - -do_stage() { - autotools_stage_all -} diff --git a/recipes/meta/nylon-feed.inc b/recipes/meta/nylon-feed.inc index f20bcec824..15f0b20881 100644 --- a/recipes/meta/nylon-feed.inc +++ b/recipes/meta/nylon-feed.inc @@ -56,7 +56,6 @@ tcl \ tcpdump \ tinc \ tzdata \ -usbutils \ vtun \ wireless-tools \ wpa-supplicant \ diff --git a/recipes/mobilemesh/mobilemesh_1.2.bb b/recipes/mobilemesh/mobilemesh_1.2.bb index df8f2f98bb..4fdf2aba3b 100644 --- a/recipes/mobilemesh/mobilemesh_1.2.bb +++ b/recipes/mobilemesh/mobilemesh_1.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "MobileMesh mobile ad-hoc routing protocol" HOMEPAGE = "http://www.mitre.org/work/tech_transfer/mobilemesh/" LICENSE = "GPL" DEPENDS = "openssl" -SRC_URI = "http://meshcube.org/download/mobilemesh_1.2.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/mobilemesh_1.2.tgz" PR = "r1" S = "${WORKDIR}/mobilemesh" @@ -34,4 +34,7 @@ do_install() { install ${S}/mobilemesh.init ${D}${sysconfdir}/init.d/mobilemesh } +FILES_${PN}-dbg += "${sysconfdir}/mobilemesh/mmtodot.debug ${sysconfdir}/mobilemesh/mmborder.debug \ + ${sysconfdir}/mobilemesh/mmrp.debug ${sysconfdir}/mobilemesh/mmdiscover.debug" CONFFILES_${PN}_nylon = "${sysconfdir}/mobilemesh/mmrp.conf ${sysconfdir}/mobilemesh/mmdiscover.conf" + diff --git a/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch new file mode 100644 index 0000000000..c9685301b4 --- /dev/null +++ b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch @@ -0,0 +1,58 @@ +diff -Naur libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp +--- libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp 2008-01-07 11:36:10.105820000 +0100 ++++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp 2008-01-07 11:38:45.794974000 +0100 +@@ -20,6 +20,7 @@ + #endif + #include <stdlib.h> + #include <assert.h> ++#include <cstring> + + const char* g_strCOMVer = "libmusicbrainz/"VERSION; + +diff -Naur libmusicbrainz-2.1.5.org/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp +--- libmusicbrainz-2.1.5.org/lib/comsocket.cpp 2008-01-07 11:36:10.145783000 +0100 ++++ libmusicbrainz-2.1.5/lib/comsocket.cpp 2008-01-07 11:44:12.604854000 +0100 +@@ -34,6 +34,7 @@ + #include "comsocket.h" + #ifndef WIN32 + ++#include <string.h> + #include <netinet/tcp.h> + #include <errno.h> + #include <stdio.h> +diff -Naur libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp +--- libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp 2008-01-07 11:36:10.083846000 +0100 ++++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp 2008-01-07 11:41:45.093496000 +0100 +@@ -21,6 +21,7 @@ + $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $ + + ----------------------------------------------------------------------------*/ ++#include <cstring> + #include "musicbrainz.h" + #include "trm.h" + #include "mb_c.h" +diff -Naur libmusicbrainz-2.1.5.org/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp +--- libmusicbrainz-2.1.5.org/lib/http.cpp 2008-01-07 11:36:10.210725000 +0100 ++++ libmusicbrainz-2.1.5/lib/http.cpp 2008-01-07 11:46:38.053245000 +0100 +@@ -23,7 +23,8 @@ + + ----------------------------------------------------------------------------*/ + #include <stdlib.h> +-#include <stdio.h> ++#include <stdio.h> ++#include <string.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <ctype.h> +diff -Naur libmusicbrainz-2.1.5.org/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp +--- libmusicbrainz-2.1.5.org/lib/sigclient.cpp 2008-01-07 11:36:10.338589000 +0100 ++++ libmusicbrainz-2.1.5/lib/sigclient.cpp 2008-01-07 11:48:42.883323000 +0100 +@@ -33,6 +33,8 @@ + #pragma warning(disable:4786) + #endif + ++#include <string.h> ++ + #include "sigclient.h" + #include "comhttpsocket.h" + diff --git a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb index 7ab0997218..452e874e1f 100644 --- a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb +++ b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb @@ -4,7 +4,9 @@ HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" DEPENDS = "expat" -SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" +# gcc43.patch from openSUSE +SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz \ + file://libmusicbrainz-2.1.5-gcc43.patch;patch=1" inherit autotools pkgconfig diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb index 87b59a1bcf..b3cdaf4208 100644 --- a/recipes/musicpd/mpd-alsa_0.14.2.bb +++ b/recipes/musicpd/mpd-alsa_0.14.2.bb @@ -24,8 +24,8 @@ INITSCRIPT_NAME = "mpd" EXTRA_OECONF = "\ --enable-ogg \ --enable-oggvorbis \ ---disable-oggflac \ ---enable-flac \ +--disable-oggflac \ +--enable-flac \ --enable-faad \ --with-ao-libraries=${STAGING_LIBDIR} \ --with-ao-includes=${STAGING_INCDIR} \ @@ -41,14 +41,15 @@ EXTRA_OECONF = "\ --with-ogg-includes=${STAGING_INCDIR} \ --with-vorbis-libraries=${STAGING_LIBDIR} \ --with-vorbis-includes=${STAGING_INCDIR} \ ---disable-aotest \ ---disable-alsatest \ ---disable-oggtest \ ---disable-vorbistest \ ---disable-libFLACtest \ ---disable-libOggFLACtest \ ---disable-audiofiletest \ +--disable-aotest \ +--disable-alsatest \ +--disable-oggtest \ +--disable-vorbistest \ +--disable-libFLACtest \ +--disable-libOggFLACtest \ +--disable-audiofiletest \ --disable-libmikmodtest \ +--with-lame-includes=${STAGING_INCDIR} \ " do_configure_append() { diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb index 8aed178af2..822608c817 100644 --- a/recipes/musicpd/mpd_0.14.2.bb +++ b/recipes/musicpd/mpd_0.14.2.bb @@ -30,7 +30,8 @@ EXTRA_OECONF = "\ --disable-jack \ --enable-pulse \ --enable-mod \ - --disable-oggflac" + --disable-oggflac \ + --with-lame-includes=${STAGING_INCDIR}" do_compile_prepend() { find -name Makefile | xargs sed -i 's~-I/usr/include~-I${STAGING_INCDIR}~g' diff --git a/recipes/netbase/netbase/mtx-1/interfaces b/recipes/netbase/netbase/mtx-1/interfaces index a7c6da5752..ae50a5cec3 100644 --- a/recipes/netbase/netbase/mtx-1/interfaces +++ b/recipes/netbase/netbase/mtx-1/interfaces @@ -1,24 +1,34 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -# The loopback interface +# the loopback interface auto lo iface lo inet loopback -# Ethernet +# ethernet auto eth0 iface eth0 inet dhcp + alias conf 192.168.0.250 -# wlan interface 1 for clients -auto wlan0 +# auto is not needed for the wlan interfaces +# - hotplug will ifup the interfaces automatically + +# first wlan interface for clients iface wlan0 inet static address 10.0.0.1 netmask 255.0.0.0 wireless_mode master wireless_essid cube-ap wireless_channel 1 - -# wlan interface 2 for mesh -auto wlan1 + +iface ath0 inet static + address 10.0.0.1 + netmask 255.0.0.0 + wireless_standard g + wireless_mode master + wireless_essid cube-ap + wireless_channel 1 + +# second wlan interface for mesh iface wlan1 inet static address 172.16.0.1 netmask 255.240.0.0 @@ -27,3 +37,12 @@ iface wlan1 inet static wireless_essid cube-mesh wireless_channel 11 wireless_rts 250 + +iface ath1 inet static + address 172.16.0.1 + netmask 255.240.0.0 + broadcast 172.31.255.255 + wireless_mode ad-hoc + wireless_essid cube-mesh + wireless_channel 11 + wireless_rts 250 diff --git a/recipes/netbase/netbase/mtx-2/interfaces b/recipes/netbase/netbase/mtx-2/interfaces index a7c6da5752..ae50a5cec3 100644 --- a/recipes/netbase/netbase/mtx-2/interfaces +++ b/recipes/netbase/netbase/mtx-2/interfaces @@ -1,24 +1,34 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -# The loopback interface +# the loopback interface auto lo iface lo inet loopback -# Ethernet +# ethernet auto eth0 iface eth0 inet dhcp + alias conf 192.168.0.250 -# wlan interface 1 for clients -auto wlan0 +# auto is not needed for the wlan interfaces +# - hotplug will ifup the interfaces automatically + +# first wlan interface for clients iface wlan0 inet static address 10.0.0.1 netmask 255.0.0.0 wireless_mode master wireless_essid cube-ap wireless_channel 1 - -# wlan interface 2 for mesh -auto wlan1 + +iface ath0 inet static + address 10.0.0.1 + netmask 255.0.0.0 + wireless_standard g + wireless_mode master + wireless_essid cube-ap + wireless_channel 1 + +# second wlan interface for mesh iface wlan1 inet static address 172.16.0.1 netmask 255.240.0.0 @@ -27,3 +37,12 @@ iface wlan1 inet static wireless_essid cube-mesh wireless_channel 11 wireless_rts 250 + +iface ath1 inet static + address 172.16.0.1 + netmask 255.240.0.0 + broadcast 172.31.255.255 + wireless_mode ad-hoc + wireless_essid cube-mesh + wireless_channel 11 + wireless_rts 250 diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb index b1c5271b13..bcf5a28756 100644 --- a/recipes/openswan/openswan_2.2.0.bb +++ b/recipes/openswan/openswan_2.2.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" +RDEPENDS_append_nylon = "perl" PR = "r5" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb index 353e0eacdd..28e599b282 100644 --- a/recipes/openswan/openswan_2.4.7.bb +++ b/recipes/openswan/openswan_2.4.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" +RDEPENDS_append_nylon = "perl" PR = "r0" SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index e3d73845fc..57e9e1c394 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -85,5 +85,11 @@ do_stage_append() { install $i ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE done } +do_stage_append_nylon() { + # get rid of definitions not supported by the gcc version we use for nylon... + for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do + perl -pi -e 's/-Wdeclaration-after-statement //g' ${i} + done +} PARALLEL_MAKE = "" diff --git a/recipes/pidgin/pidgin.inc b/recipes/pidgin/pidgin.inc index 913cf1c248..7b2f350ce2 100644 --- a/recipes/pidgin/pidgin.inc +++ b/recipes/pidgin/pidgin.inc @@ -52,11 +52,11 @@ FILES_${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" python populate_packages_prepend () { - root = bb.data.expand('${libdir}/pidgin', d) - purple = bb.data.expand('${libdir}/purple-2', d) - finch = bb.data.expand('${libdir}/finch', d) + pidgroot = bb.data.expand('${libdir}/pidgin', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) - do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', prepend=True, extra_depends='') diff --git a/recipes/qte/qte-2.3.10/disable-dup-rotation.patch b/recipes/qte/qte-2.3.10/disable-dup-rotation.patch index 8a2a02240d..6874ba5ac4 100644 --- a/recipes/qte/qte-2.3.10/disable-dup-rotation.patch +++ b/recipes/qte/qte-2.3.10/disable-dup-rotation.patch @@ -4,7 +4,7 @@ case Qt::Key_Down: unicode = 0xffff; mod_key = false; -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) ++#if 0 if (qt_screen->isTransformed()) qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) ); +#endif diff --git a/recipes/qte/qte-mt_2.3.10.bb b/recipes/qte/qte-mt_2.3.10.bb index 32afeda271..71873dc51a 100644 --- a/recipes/qte/qte-mt_2.3.10.bb +++ b/recipes/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r27" +PR = "r28" EXTRA_OECONF += "-thread" diff --git a/recipes/qte/qte_2.3.10.bb b/recipes/qte/qte_2.3.10.bb index 68825b6ce8..1183bc29bf 100644 --- a/recipes/qte/qte_2.3.10.bb +++ b/recipes/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r52" +PR = "r53" diff --git a/recipes/quake/files/quake3_makefile.patch b/recipes/quake/files/quake3_makefile.patch new file mode 100644 index 0000000000..b9e94577b2 --- /dev/null +++ b/recipes/quake/files/quake3_makefile.patch @@ -0,0 +1,29 @@ +--- /tmp/Makefile 2009-05-25 14:59:16.000000000 +0530 ++++ git/pandora/Makefile 2009-05-25 15:07:46.000000000 +0530 +@@ -64,14 +64,14 @@ ARFLAGS=ar rv
+ DLL_ONLY=true
+ ARCH=arm
+ VENDOR=dec +-
BASE_CFLAGS = -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -mfloat-abi=softfp \
+- -mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer \ ++
BASE_CFLAGS = -O3 -mtune=cortex-a8 -march=armv7-a -mfloat-abi=softfp \
++ -mfpu=neon -ffast-math -fomit-frame-pointer \ + -fno-strict-aliasing -fsingle-precision-constant \ + -I$(PNDSDK)/usr/include -DIPHONE -DBOTLIB -DDLL_ONLY -DC_ONLY -D__arm__ -DSHLIB_SUFFIX="\"so\"" -D_PANDORA_ + + THREAD_LDFLAGS=-lpthread +
+-LDFLAGS=-L$(PNDSDK)/usr/lib -ldl -lm -lX11 -lXau -lXdmcp -lXxf86vm -lXext ++LDFLAGS+=-L$(PNDSDK)/usr/lib -ldl -lm -lX11 -lXau -lXdmcp -lXxf86vm -lXext + + GL_CFAGS = -I$(PNDSDK)/usr/X11R6/include +
+@@ -126,7 +126,7 @@ DO_NASM=nasm -f elf -o $@ $<
+ DO_DED_CC=$(CC) -DDEDICATED -DC_ONLY $(CFLAGS) -o $@ -c $<
+
+ #### DEFAULT TARGET
+-default:build_debug
++default:build_release
+
+ debug: build_debug
+ release: build_release
diff --git a/recipes/quake/quake3-pandora-gles_git.bb b/recipes/quake/quake3-pandora-gles_git.bb new file mode 100644 index 0000000000..d468d34a44 --- /dev/null +++ b/recipes/quake/quake3-pandora-gles_git.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "OpenGL ES quake3 port to the omap3-pandora" +LICENSE = "GPL" + +SRCREV = "39d08bf6e81f7cdc29380858dfe671b0722332a3" +PR_append = "+gitr${SRCREV}" +PV = "0.0" + +DEPENDS = "virtual/libsdl libgles-omap3" + +SRC_URI = "git://github.com/Cpasjuste/quake3_pandora_gles.git;branch=master;protocol=git \ + file://quake3_makefile.patch;patch=1 \ +" +S = "${WORKDIR}/git" + +export PNDSDK="${STAGING_DIR}" + +do_compile() { + cd pandora + sed -i -e s:=arm-none-linux-gnueabi-:=${TARGET_PREFIX}:g Makefile + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -d ${D}/${libdir}/quake3/baseq3/ + + install -m 0755 ${S}/pandora/release${TARGET_ARCH}/baseq3/*.so ${D}/${libdir}/quake3/baseq3 + install -m 0755 ${S}/pandora/release${TARGET_ARCH}/quake3 ${D}/${libdir}/quake3 + + install -m 0755 ${S}/pandora/autoexec.cfg ${D}/${libdir}/quake3/baseq3 + install -m 0755 ${S}/pandora/autoexec_high_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/autoexec_medium_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/autoexec_low_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/run.sh ${D}/${libdir}/quake3 +} + +FILES_${PN} += "${libdir}" +FILES_${PN}-dbg += "${libdir}/quake3/.debug ${libdir}/quake3/baseq3/.debug" + diff --git a/recipes/rhythmbox/rhythmbox/ogg.m4 b/recipes/rhythmbox/rhythmbox/ogg.m4 deleted file mode 100644 index 1f643f1204..0000000000 --- a/recipes/rhythmbox/rhythmbox/ogg.m4 +++ /dev/null @@ -1,102 +0,0 @@ -# Configure paths for libogg -# Jack Moffitt <jack@icecast.org> 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -define(arch-tag) -# arch-tag: Autoconf macro for checking libogg - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN(MM_PATH_OGG, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ogg/ogg.h> - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include <stdio.h> -#include <ogg/ogg.h> -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest -]) diff --git a/recipes/rhythmbox/rhythmbox/omfmake.patch b/recipes/rhythmbox/rhythmbox/omfmake.patch deleted file mode 100644 index 8950a7b66f..0000000000 --- a/recipes/rhythmbox/rhythmbox/omfmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rhythmbox-0.8.4/omf.make 2004-04-15 12:30:20.000000000 -0700 -+++ rhythmbox-0.8.4.new/omf.make 2004-06-08 16:11:06.130981816 -0700 -@@ -41,7 +41,9 @@ - install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ -- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ if [ -f $$file.out ]; then \ -+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ fi; \ - done - -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir) - diff --git a/recipes/rhythmbox/rhythmbox/vorbis.m4 b/recipes/rhythmbox/rhythmbox/vorbis.m4 deleted file mode 100644 index 4761b32661..0000000000 --- a/recipes/rhythmbox/rhythmbox/vorbis.m4 +++ /dev/null @@ -1,122 +0,0 @@ -# Configure paths for libvorbis -# Jack Moffitt <jack@icecast.org> 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -# thomasvs added check for vorbis_bitrate_addblock which is new in rc3 -define(arch-tag) -# arch-tag: Autoconf macro for checking libvorbis - -dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS -dnl -AC_DEFUN(MM_PATH_VORBIS, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") -AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") -AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") -AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) - - if test "x$vorbis_libraries" != "x" ; then - VORBIS_LIBS="-L$vorbis_libraries" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_LIBS="-L$vorbis_prefix/lib" - elif test "x$prefix" != "xNONE"; then - VORBIS_LIBS="-L$prefix/lib" - fi - - VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - - if test "x$vorbis_includes" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_includes" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_prefix/include" - fi - - - AC_MSG_CHECKING(for Vorbis) - no_vorbis="" - - - if test "x$enable_vorbistest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Vorbis is sufficiently new. -dnl - rm -f conf.vorbistest - AC_TRY_RUN([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <vorbis/codec.h> -#include <vorbis/vorbisenc.h> - -int main () -{ - vorbis_block vb; - vorbis_dsp_state vd; - vorbis_info vi; - - vorbis_info_init (&vi); - vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1); - vorbis_analysis_init (&vd, &vi); - vorbis_block_init (&vd, &vb); - /* this function was added in 1.0rc3, so this is what we're testing for */ - vorbis_bitrate_addblock (&vb); - - system("touch conf.vorbistest"); - return 0; -} - -],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_vorbis" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.vorbistest ; then - : - else - echo "*** Could not run Vorbis test program, checking why..." - CFLAGS="$CFLAGS $VORBIS_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include <stdio.h> -#include <vorbis/codec.h> -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Vorbis or finding the wrong" - echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" - echo "*** or that you have moved Vorbis since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - VORBIS_CFLAGS="" - VORBIS_LIBS="" - VORBISFILE_LIBS="" - VORBISENC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(VORBIS_CFLAGS) - AC_SUBST(VORBIS_LIBS) - AC_SUBST(VORBISFILE_LIBS) - AC_SUBST(VORBISENC_LIBS) - rm -f conf.vorbistest -]) diff --git a/recipes/rhythmbox/rhythmbox_0.12.1.bb b/recipes/rhythmbox/rhythmbox_0.12.1.bb new file mode 100644 index 0000000000..da2ad63e26 --- /dev/null +++ b/recipes/rhythmbox/rhythmbox_0.12.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Integrated music management application for GNOME" +LICENSE = "GPL" +DEPENDS = "dbus-glib-native gtk+ glib-2.0 gnome-doc-utils gnome-media gstreamer gst-plugins-base libgnomeui libglade libnotify libsoup totem-pl-parser" +# optional dependencies: +DEPENDS += "avahi gnome-keyring hal libgpod libmusicbrainz nautilus-cd-burner python-pygtk vala" +#DEPENDS += "brasero mtp" + +inherit gnome + +# FIXME: Native doc processing with xsltproc using docbook needs additional work: +do_configure_prepend() { + sed -i '/^SUBDIRS/,/^$/s/help//' Makefile.am +} + +EXTRA_OECONF = "--disable-static --disable-scrollkeeper ac_cv_strftime_supports_E_O=yes" +# FIXME: Verify that in uclibc: +EXTRA_OECONF_linux-uclibc += "ac_cv_strftime_supports_E_O=no" + +EXTRA_OEMAKE = "DBUS_GLIB_BIN=${STAGING_BINDIR_NATIVE} VALAC=${STAGING_BINDIR_NATIVE}/valac" + +FILES_${PN}-dbg += "${libdir}/rhythmbox/plugins/.debug ${libdir}/rhythmbox/plugins/*/.debug" + +do_install_append () { + rm -f ${D}${libdir}/rhythmbox/plugins/*.la + rm -f ${D}${libdir}/rhythmbox/plugins/*/*.la +} diff --git a/recipes/rhythmbox/rhythmbox_0.8.5.bb b/recipes/rhythmbox/rhythmbox_0.8.5.bb deleted file mode 100644 index 8a6f3a8905..0000000000 --- a/recipes/rhythmbox/rhythmbox_0.8.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "unknown" -PR = "r4" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-${PV}.tar.gz \ - file://ogg.m4 file://vorbis.m4 \ - file://omfmake.patch;patch=1" - -DEPENDS = "gstreamer gst-plugins libgnomeui" - -EXTRA_OECONF = "--disable-schemas-install" - -FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/*.so ${datadir}/omf ${datadir}/mime-info \ - ${datadir}/application-registry ${datadir}/gnome-2.0 ${datadir}/idl" -FILES_${PN}-doc += " ${datadir}/gnome/help" -FILES_${PN}-dev += " ${libdir}/bonobo/*.la ${libdir}/bonobo/*.a" - -RDEPENDS_${PN} = "gst-plugin-gnomevfs gst-plugin-esd gst-plugin-mad gst-plugin-ivorbis" - -do_configure_prepend() { - mkdir -p ${S}/m4 - cp ${WORKDIR}/ogg.m4 ${S}/m4/ - cp ${WORKDIR}/vorbis.m4 ${S}/m4/ -} - -inherit autotools gconf - -do_compile() { - oe_runmake ORBIT_IDL=`which orbit-idl-2` -} diff --git a/recipes/rhythmbox/rhythmbox_0.8.7.bb b/recipes/rhythmbox/rhythmbox_0.8.7.bb deleted file mode 100644 index 2adb11fb8d..0000000000 --- a/recipes/rhythmbox/rhythmbox_0.8.7.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPL" -SECTION = "unknown" -PR = "r0" - -inherit gnome - -SRC_URI += "file://ogg.m4 file://vorbis.m4" - -DEPENDS = "gstreamer gst-plugins libgnomeui" - -EXTRA_OECONF = "--disable-schemas-install" - -FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/*.so ${datadir}/omf ${datadir}/mime-info \ - ${datadir}/application-registry ${datadir}/gnome-2.0 ${datadir}/idl" -FILES_${PN}-doc += " ${datadir}/gnome/help" -FILES_${PN}-dev += " ${libdir}/bonobo/*.la ${libdir}/bonobo/*.a" - -RDEPENDS_${PN} = "gst-plugin-gnomevfs gst-plugin-esd gst-plugin-mad gst-plugin-ivorbis" - -do_configure_prepend() { - mkdir -p ${S}/m4 - cp ${WORKDIR}/ogg.m4 ${S}/m4/ - cp ${WORKDIR}/vorbis.m4 ${S}/m4/ -} - -do_compile() { - oe_runmake ORBIT_IDL=`which orbit-idl-2` -} diff --git a/recipes/rrdtool/rrdtool_1.0.49.bb b/recipes/rrdtool/rrdtool_1.0.49.bb index 11968ea609..f4216487df 100644 --- a/recipes/rrdtool/rrdtool_1.0.49.bb +++ b/recipes/rrdtool/rrdtool_1.0.49.bb @@ -5,13 +5,17 @@ LICENSE = "GPLv2" DEPENDS = "libpng zlib" DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" PR = "r2" -SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \ +SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \ file://perl-make-options.diff;patch=1;pnum=0" inherit autotools EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" +do_configure_append_nylon() { + perl -pi -e 's/-Wdeclaration-after-statement //g' ${S}/perl-shared/Makefile +} + do_install_append() { install -d ${D}${docdir}/rrdtool/ mv ${D}/usr/html ${D}${docdir}/rrdtool/ @@ -24,4 +28,5 @@ do_stage () { autotools_stage_all } -FILES_${PN} += "${libdir}/perl" +FILES_${PN} += "${libdir}/perl/auto/RRDs/RRDs.bs ${libdir}/perl/auto/RRDs/RRDs.so ${libdir}/perl/RRDs.pm ${libdir}/perl/RRDp.pm" + diff --git a/recipes/sdr/hamlib_1.2.9.bb b/recipes/sdr/hamlib_1.2.9.bb new file mode 100644 index 0000000000..8815c622e6 --- /dev/null +++ b/recipes/sdr/hamlib_1.2.9.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "The Ham Radio Control Libraries, Hamlib for short, is a development effort to provide a consistent interface for programmers wanting to incorporate radio control in their programs" +LICENSE = "GPLv2" + +DEPENDS = "swig-native perl python libusb-compat tcl gnuradio" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hamlib/hamlib-${PV}.tar.gz" + +PR = "r1" + +inherit autotools_stage + +EXTRA_OECONF = "--with-perl-inc=${STAGING_LIBDIR}/perl/5.8.8/CORE" +# This is a hack, someone with some more time should fix the autofoo +do_configure() { + oe_runconf +} + +PARALLEL_MAKE = "" + +do_compile_prepend() { + mkdir -p ${STAGING_LIBDIR}/.libs + ln -sf ${STAGING_LIBDIR}/libusb* ${STAGING_LIBDIR}/.libs/ + for i in $(find ${S} -name "Makefile") ; do + sed -i -e 's:${STAGING_LIBDIR_NATIVE}:${STAGING_LIBDIR}:g' \ + -e s:-L/usr/local/lib::g \ + -e 's:\"$(CC)\":\"${CC}\" LD=\"${LD}\" LDFLAGS=\"${LDFLAGS}\":g' \ + -e s:${STAGING_INCDIR_NATIVE}/python2.6:${STAGING_INCDIR}/python2.6:g $i + done +} + +# There's one perl module that doesn't honour CFLAGS :( +INSANE_SKIP_${PN} = True +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/hamlib* ${libdir}/p*/ ${libdir}/tcl" +FILES_${PN}-dbg += "${libdir}/perl/*/auto/Hamlib/.debug/" + +python populate_packages_prepend () { + hamlib_libdir = bb.data.expand('${libdir}', d) + hamlib_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, hamlib_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, hamlib_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, hamlib_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, hamlib_libdir, '^lib(.*)\.so\.*', 'lib%s', 'hamlib %s library', extra_depends='', allow_links=True) +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + + diff --git a/recipes/totem/totem-pl-parser_2.26.2.bb b/recipes/totem/totem-pl-parser_2.26.2.bb new file mode 100644 index 0000000000..f9694b05d8 --- /dev/null +++ b/recipes/totem/totem-pl-parser_2.26.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player" +HOMEPAGE = "http://www.gnome.org/projects/totem/" +LICENSE = "GPL" + +DEPENDS = "eds-dbus" + +inherit gnome + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + +# Build of documentation is not yet possible: +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am +} diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index e7438fb4d6..e687989e9f 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,10 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r6" +PR = "r8" + +# needed for init.d script +RDEPENDS_udev += "udev-utils" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ @@ -64,6 +67,9 @@ do_install () { mv ${D}${base_libdir}/udev/rules.d ${D}${sysconfdir}/udev/ ln -sf ${sysconfdir}/udev/rules.d ${D}${base_libdir}/udev/ + cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ + cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 45fd1a6048..9c70b9e3ff 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -123,12 +123,12 @@ do_install () { } python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) + ulinxng_libdir = bb.data.expand('${libdir}', d) + ulinxng_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) } diff --git a/recipes/wlan-ng/wlan-ng-utils.inc b/recipes/wlan-ng/wlan-ng-utils.inc index 3dd25d9d7f..736e12b942 100644 --- a/recipes/wlan-ng/wlan-ng-utils.inc +++ b/recipes/wlan-ng/wlan-ng-utils.inc @@ -10,11 +10,11 @@ DEPENDS = "virtual/kernel" SRC_URI = "file://only-the-utils.patch;patch=1 \ file://wlan-ng.modutils \ file://wlan.agent \ - file://usbctl \ file://resume \ file://pre-up \ file://post-down \ file://config.in" +SRC_URI_append_arm = " file://usbctl" # yeah, it's kind of backwards, but otherwise the config step will fail inherit module @@ -59,11 +59,14 @@ do_install() { install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng install -d ${D}${sysconfdir}/apm/resume.d install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl install -d ${D}${mandir}/man1 install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ rm -rf ${D}/usr/local/man } +do_install_append_arm() { + install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl +} + FILES_${PN}-dbg += "/sbin/.debug" FILES_${PN} = "/etc /sbin" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.2.2.bb b/recipes/xorg-driver/xf86-input-evdev_2.2.2.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evdev_2.2.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb index ccaa3fa996..bf3a5a6f00 100644 --- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb +++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb @@ -2,7 +2,6 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evtouch input driver" -PR = "r1" SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2 \ " diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb b/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb new file mode 100644 index 0000000000..28a834a274 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- keyboard input driver" + +DEPENDS += " kbproto" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-tslib/xserver16.patch b/recipes/xorg-driver/xf86-input-tslib/xserver16.patch new file mode 100644 index 0000000000..c3108b645a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-tslib/xserver16.patch @@ -0,0 +1,26 @@ +XServer 1.6.x introduced XInput3. Official drivers were fixed by X.org +developers. This change is based on xf86-input-citron: + +http://cgit.freedesktop.org/xorg/driver/xf86-input-citron/commit/?id=591674bee43061f1169ebeede653fb6d98147724 + +Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net> +--- + src/tslib.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- xf86-input-tslib-0.0.5.orig/src/tslib.c ++++ xf86-input-tslib-0.0.5/src/tslib.c +@@ -199,11 +199,13 @@ xf86TslibControlProc(DeviceIntPtr device + return !Success; + } + + if (InitValuatorClassDeviceStruct(device, + 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, ++#endif + 0, Absolute) == FALSE) { + ErrorF("unable to allocate Valuator class device\n"); + return !Success; + } + diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb index f5c0186565..7e8e2e52d1 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb @@ -4,12 +4,12 @@ DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS += "hal" DEPENDS += "tslib" -PR = "r6" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ file://use-hal-for-device.diff;patch=1 \ file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \ file://dynamic-xy.patch;patch=1 \ + file://xserver16.patch;patch=1 \ file://10-x11-input-tslib.fdi" do_configure_prepend() { diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.2.bb b/recipes/xorg-driver/xf86-video-geode_2.11.2.bb index 5f1cc3ad03..e98c4fce09 100644 --- a/recipes/xorg-driver/xf86-video-geode_2.11.2.bb +++ b/recipes/xorg-driver/xf86-video-geode_2.11.2.bb @@ -1,6 +1,5 @@ require xorg-driver-video.inc PE = "1" -PR = "r1" COMPATIBLE_HOST = 'i.86.*-linux' DESCRIPTION = "X.org server -- Geode GX2/LX display driver" diff --git a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb b/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb index bf50e87839..d317223db3 100644 --- a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb +++ b/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb @@ -1,6 +1,5 @@ require xorg-driver-video.inc PE = "1" -PR = "r2" DEPENDS += " xf86dgaproto" diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index f718e7684e..cc68163df4 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -2,17 +2,20 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -PR ="r20" - -SRCREV = "ef0b41c332a710fb33f996df77bd4a96b56878da" -PV = "0.0.1+${PR}+gitr${SRCREV}" +SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc" +PV = "0.1.1+${PR}+gitr${SRCREV}" PE = "1" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ " -SRC_URI_append_armv7a = " file://omapfb-neon.diff;patch=1" - S = "${WORKDIR}/git" +EXTRA_OECONF_armv7a = " --enable-neon " CFLAGS += " -I${STAGING_INCDIR}/xorg " + +# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) +do_compile_prepend_armv7a () { + sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c +} + diff --git a/recipes/xorg-driver/xorg-driver-common.inc b/recipes/xorg-driver/xorg-driver-common.inc index 0f24dd5e30..36c0ddf3b3 100644 --- a/recipes/xorg-driver/xorg-driver-common.inc +++ b/recipes/xorg-driver/xorg-driver-common.inc @@ -2,7 +2,7 @@ DESCRIPTION = "X driver" HOMEPAGE = "http://www.x.org" SECTION = "x11/drivers" LICENSE = "MIT-X" -PR = "r2" +PR = "r7" DEPENDS = "randrproto xorg-server xproto" diff --git a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9e9e75ea43 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch @@ -0,0 +1,23 @@ +--- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200 ++++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200 +@@ -1,20 +1 @@ +-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-CC = @CC_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb index a22b7a0158..31b42eb058 100644 --- a/recipes/xorg-lib/libx11_1.1.5.bb +++ b/recipes/xorg-lib/libx11_1.1.5.bb @@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" PROVIDES = "virtual/libx11" PE = "1" -PR = "r3" +PR = "r4" XORG_PN = "libX11" @@ -19,6 +19,7 @@ do_compile() { unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS cd src/util; mv makekeys.c.orig makekeys.c || true + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb new file mode 100644 index 0000000000..a3d000f030 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.2.bb @@ -0,0 +1,31 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" +PROVIDES = "virtual/libx11" +PE = "1" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://keysymdef_include.patch;patch=1" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/recipes/xorg-lib/libxext_1.0.5.bb b/recipes/xorg-lib/libxext_1.0.5.bb new file mode 100644 index 0000000000..3e8aa50f7c --- /dev/null +++ b/recipes/xorg-lib/libxext_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" +PE = "1" + +XORG_PN = "libXext" diff --git a/recipes/xorg-lib/xtrans-native_1.2.3.bb b/recipes/xorg-lib/xtrans-native_1.2.3.bb new file mode 100644 index 0000000000..c7988c7264 --- /dev/null +++ b/recipes/xorg-lib/xtrans-native_1.2.3.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-native" + +inherit native diff --git a/recipes/xorg-lib/xtrans-sdk_1.2.3.bb b/recipes/xorg-lib/xtrans-sdk_1.2.3.bb new file mode 100644 index 0000000000..9f671180b2 --- /dev/null +++ b/recipes/xorg-lib/xtrans-sdk_1.2.3.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-sdk" + +inherit sdk diff --git a/recipes/xorg-lib/xtrans_1.2.3.bb b/recipes/xorg-lib/xtrans_1.2.3.bb new file mode 100644 index 0000000000..81464f49bc --- /dev/null +++ b/recipes/xorg-lib/xtrans_1.2.3.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." +PE = "1" +PR = "r0" + +ALLOW_EMPTY = "1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans" + +RDEPENDS_${PN}-dev = "" + +XORG_PN = "xtrans" diff --git a/recipes/xorg-proto/applewmproto_1.2.0.bb b/recipes/xorg-proto/applewmproto_1.2.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/applewmproto_1.2.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/dri2proto_2.0.bb b/recipes/xorg-proto/dri2proto_2.0.bb new file mode 100644 index 0000000000..a0e1fd3989 --- /dev/null +++ b/recipes/xorg-proto/dri2proto_2.0.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DRI2 extension headers" + +require xorg-proto-common.inc diff --git a/recipes/xorg-proto/inputproto-native_1.5.0.bb b/recipes/xorg-proto/inputproto-native_1.5.0.bb new file mode 100644 index 0000000000..11e0dae601 --- /dev/null +++ b/recipes/xorg-proto/inputproto-native_1.5.0.bb @@ -0,0 +1,7 @@ +require inputproto_${PV}.bb + +PR = "r1" + +XORG_PN = "inputproto" + +inherit native diff --git a/recipes/xorg-proto/inputproto-sdk_1.5.0.bb b/recipes/xorg-proto/inputproto-sdk_1.5.0.bb new file mode 100644 index 0000000000..f0e1985bf9 --- /dev/null +++ b/recipes/xorg-proto/inputproto-sdk_1.5.0.bb @@ -0,0 +1,3 @@ +require inputproto_${PV}.bb + +inherit sdk diff --git a/recipes/xorg-proto/randrproto_1.3.0.bb b/recipes/xorg-proto/randrproto_1.3.0.bb new file mode 100644 index 0000000000..85000cc900 --- /dev/null +++ b/recipes/xorg-proto/randrproto_1.3.0.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "randrext" +PR = "r1" +PE = "1" + +XORG_PN = "randrproto" diff --git a/recipes/xorg-proto/xextproto-native_7.0.5.bb b/recipes/xorg-proto/xextproto-native_7.0.5.bb new file mode 100644 index 0000000000..cdf1f09e61 --- /dev/null +++ b/recipes/xorg-proto/xextproto-native_7.0.5.bb @@ -0,0 +1,9 @@ +require xextproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xextproto" + +inherit native + +DEPENDS += "util-macros-native" diff --git a/recipes/xorg-proto/xextproto-sdk_7.0.5.bb b/recipes/xorg-proto/xextproto-sdk_7.0.5.bb new file mode 100644 index 0000000000..3b182a02ff --- /dev/null +++ b/recipes/xorg-proto/xextproto-sdk_7.0.5.bb @@ -0,0 +1,3 @@ +require xextproto_${PV}.bb + +inherit sdk diff --git a/recipes/xorg-proto/xextproto_7.0.5.bb b/recipes/xorg-proto/xextproto_7.0.5.bb new file mode 100644 index 0000000000..3637929316 --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.0.5.bb @@ -0,0 +1,3 @@ +require xorg-proto-common.inc + +PE = "1" diff --git a/recipes/xorg-proto/xorg-proto-common.inc b/recipes/xorg-proto/xorg-proto-common.inc index c2b47572cf..1ab4ad91d1 100644 --- a/recipes/xorg-proto/xorg-proto-common.inc +++ b/recipes/xorg-proto/xorg-proto-common.inc @@ -3,6 +3,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/libs" LICENSE = "MIT-X" +DEPENDS = "util-macros" + XORG_PN = "${PN}" ALLOW_EMPTY = "1" diff --git a/recipes/xorg-proto/xproto-native_7.0.15.bb b/recipes/xorg-proto/xproto-native_7.0.15.bb new file mode 100644 index 0000000000..5dde8a7d4a --- /dev/null +++ b/recipes/xorg-proto/xproto-native_7.0.15.bb @@ -0,0 +1,3 @@ +require xproto_${PV}.bb + +inherit native diff --git a/recipes/xorg-proto/xproto-sdk_7.0.15.bb b/recipes/xorg-proto/xproto-sdk_7.0.15.bb new file mode 100644 index 0000000000..1c1a934bb0 --- /dev/null +++ b/recipes/xorg-proto/xproto-sdk_7.0.15.bb @@ -0,0 +1,3 @@ +require xproto_${PV}.bb + +inherit sdk diff --git a/recipes/xorg-proto/xproto_7.0.15.bb b/recipes/xorg-proto/xproto_7.0.15.bb new file mode 100644 index 0000000000..b403ff5615 --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.15.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r0" +PE = "1" + +XORG_PN = "xproto" diff --git a/recipes/xorg-util/util-macros-native_1.2.1.bb b/recipes/xorg-util/util-macros-native_1.2.1.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.2.1.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb new file mode 100644 index 0000000000..4775fc6901 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.2.1.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +ALLOW_EMPTY = "1" diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch new file mode 100644 index 0000000000..e0f633bc24 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb new file mode 100644 index 0000000000..a177b19e6a --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb @@ -0,0 +1,13 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" +RDEPENDS += "hal" +PE = "2" +PR = "r1" + +SRC_URI += "file://sysroot_fix.patch;patch=1" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " |