diff options
Diffstat (limited to 'packages')
65 files changed, 912 insertions, 307 deletions
diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb new file mode 100644 index 0000000000..68afcafea5 --- /dev/null +++ b/packages/boost/boost_1.34.1.bb @@ -0,0 +1,41 @@ +# This needs bjam (boost-jam-native) 3.1.16 +# +# Warning! The build system for boost seems to have changed +# significantly since 1.33 (again). + +include boost.inc + +DEFAULT_PREFERENCE = "-1" + +DEPENDS += "bzip2" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ + file://linux-uclibc.patch;patch=1 \ + file://${PV}-gcc43.patch;patch=1 \ + " + +PR = "r0" + +BJAM_TOOLS = "--toolset=gcc \ + '-sGCC=${CC} '${BJAM_CONF} \ + '-sGXX=${CXX} '${BJAM_CONF} \ + '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ + '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ + '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ + '-sPYTHON_VERSION=${PYTHON_VERSION}' \ + '-sPYTHON=${STAGING_BINDIR_NATIVE}/python' \ + '-sPYTHON_ROOT=${PYTHON_ROOT}' \ + '-sBZIP2_LIBPATH=${STAGING_LIBDIR}' \ + '-sZLIB_LIBPATH=${STAGING_LIBDIR}' \ + '--layout=system' \ + " + +BJAM_OPTS = '${BJAM_TOOLS} \ + --builddir=${S}/${TARGET_SYS} \ + ${BJAM_EXTRA}' + +do_configure() { + echo "import toolset : using ;" > tools/build/v2/user-config.jam + echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} <linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam +} diff --git a/packages/boost/files/1.34.1-gcc43.patch b/packages/boost/files/1.34.1-gcc43.patch new file mode 100644 index 0000000000..4670ac4295 --- /dev/null +++ b/packages/boost/files/1.34.1-gcc43.patch @@ -0,0 +1,224 @@ +Index: boost_1_34_1/boost/archive/polymorphic_iarchive.hpp +=================================================================== +--- boost_1_34_1.orig/boost/archive/polymorphic_iarchive.hpp 2005-12-11 07:12:51.000000000 +0100 ++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -17,6 +17,7 @@ + // See http://www.boost.org for updates, documentation, and revision history. + + #include <cstddef> // std::size_t ++#include <climits> + #include <boost/config.hpp> + + #if defined(BOOST_NO_STDC_NAMESPACE) +Index: boost_1_34_1/boost/archive/polymorphic_oarchive.hpp +=================================================================== +--- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp 2006-02-12 06:43:06.000000000 +0100 ++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -17,6 +17,7 @@ + // See http://www.boost.org for updates, documentation, and revision history. + + #include <cstddef> // size_t ++#include <climits> + #include <string> + + #include <boost/config.hpp> +Index: boost_1_34_1/boost/date_time/date_facet.hpp +=================================================================== +--- boost_1_34_1.orig/boost/date_time/date_facet.hpp 2005-09-05 23:10:50.000000000 +0200 ++++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -429,7 +429,7 @@ + typedef std::basic_string<CharT> string_type; + typedef CharT char_type; + typedef boost::date_time::period_parser<date_type, CharT> period_parser_type; +- typedef special_values_parser<date_type,CharT> special_values_parser_type; ++ typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; + typedef std::vector<std::basic_string<CharT> > input_collection_type; + typedef format_date_parser<date_type, CharT> format_date_parser_type; + // date_generators stuff goes here +Index: boost_1_34_1/boost/mpl/zip_view.hpp +=================================================================== +--- boost_1_34_1.orig/boost/mpl/zip_view.hpp 2004-09-02 17:40:42.000000000 +0200 ++++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -37,7 +37,7 @@ + typedef zip_iterator< + typename transform1< + IteratorSeq +- , next<_1> ++ , boost::mpl::next<_1> + >::type + > next; + }; +@@ -48,8 +48,8 @@ + struct zip_view + { + private: +- typedef typename transform1< Sequences, begin<_1> >::type first_ones_; +- typedef typename transform1< Sequences, end<_1> >::type last_ones_; ++ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_; ++ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_; + + public: + typedef nested_begin_end_tag tag; +Index: boost_1_34_1/boost/python/detail/def_helper.hpp +=================================================================== +--- boost_1_34_1.orig/boost/python/detail/def_helper.hpp 2004-09-16 03:00:28.000000000 +0200 ++++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -155,7 +155,7 @@ + , T3 const& + , T4 const& + , default_call_policies +- , keywords<0> ++ , boost::python::detail::keywords<0> + , char const* + , void(not_specified::*)() // A function pointer type which is never an + // appropriate default implementation +Index: boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 18:06:38.000000000 +0200 ++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -24,6 +24,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + + namespace re_detail{ +Index: boost_1_34_1/boost/regex/v4/basic_regex.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/basic_regex.hpp 2007-06-05 19:28:18.000000000 +0200 ++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + #ifdef BOOST_MSVC + #pragma warning(push) +Index: boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 18:19:05.000000000 +0100 ++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +Index: boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 12:09:44.000000000 +0100 ++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -41,6 +41,7 @@ + + #include <istream> + #include <ios> ++#include <climits> + + #ifdef BOOST_HAS_ABI_HEADERS + # include BOOST_ABI_PREFIX +Index: boost_1_34_1/boost/regex/v4/perl_matcher.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/perl_matcher.hpp 2006-10-18 14:55:30.000000000 +0200 ++++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -18,6 +18,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +Index: boost_1_34_1/boost/regex/v4/regex_split.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/regex_split.hpp 2005-01-21 18:22:38.000000000 +0100 ++++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -21,6 +21,8 @@ + #ifndef BOOST_REGEX_SPLIT_HPP + #define BOOST_REGEX_SPLIT_HPP + ++#include <climits> ++ + namespace boost{ + + #ifdef BOOST_HAS_ABI_HEADERS +Index: boost_1_34_1/boost/regex/v4/states.hpp +=================================================================== +--- boost_1_34_1.orig/boost/regex/v4/states.hpp 2005-09-20 14:01:25.000000000 +0200 ++++ boost_1_34_1/boost/regex/v4/states.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +Index: boost_1_34_1/boost/serialization/collection_traits.hpp +=================================================================== +--- boost_1_34_1.orig/boost/serialization/collection_traits.hpp 2005-06-21 07:19:04.000000000 +0200 ++++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -22,6 +22,7 @@ + // compiles recognize the same set of primitive types, the possibility + // exists for archives to be non-portable if class information for primitive + // types is included. This is addressed by the following macros. ++#include <climits> + #include <boost/config.hpp> + #include <boost/mpl/integral_c.hpp> + #include <boost/mpl/integral_c_tag.hpp> +Index: boost_1_34_1/boost/spirit/phoenix/operators.hpp +=================================================================== +--- boost_1_34_1.orig/boost/spirit/phoenix/operators.hpp 2006-08-25 18:27:30.000000000 +0200 ++++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <boost/spirit/phoenix/composite.hpp> + #include <boost/config.hpp> + #include <boost/mpl/if.hpp> ++#include <climits> + + /////////////////////////////////////////////////////////////////////////////// + namespace phoenix { +Index: boost_1_34_1/boost/test/test_tools.hpp +=================================================================== +--- boost_1_34_1.orig/boost/test/test_tools.hpp 2007-02-22 18:57:29.000000000 +0100 ++++ boost_1_34_1/boost/test/test_tools.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -42,6 +42,7 @@ + #include <boost/mpl/or.hpp> + + // STL ++#include <climits> + #include <cstddef> // for std::size_t + #include <iosfwd> + +Index: boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp +=================================================================== +--- boost_1_34_1.orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100 ++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -16,6 +16,7 @@ + #include <string> + #include <cstdio> + #include <cstdarg> ++#include <cstring> + #if defined(BOOST_SPIRIT_DEBUG) + #include <iostream> + #endif // defined(BOOST_SPIRIT_DEBUG) +Index: boost_1_34_1/boost/wave/util/flex_string.hpp +=================================================================== +--- boost_1_34_1.orig/boost/wave/util/flex_string.hpp 2006-04-25 19:21:01.000000000 +0200 ++++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-09-20 20:55:21.000000000 +0200 +@@ -94,6 +94,7 @@ + #include <limits> + #include <stdexcept> + #include <cstddef> ++#include <cstring> + + // this must occur after all of the includes and before any code appears + #ifdef BOOST_HAS_ABI_HEADERS diff --git a/packages/cacao/cacao-native_0.99.2.bb b/packages/cacao/cacao-native_0.99.3.bb index 1fd4ed8296..0e4d9e5935 100644 --- a/packages/cacao/cacao-native_0.99.2.bb +++ b/packages/cacao/cacao-native_0.99.3.bb @@ -2,6 +2,6 @@ require cacao-native.inc PR = "r0" -SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f" +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2" diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index e08cd5ec80..cd4d8c6f3f 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -10,7 +10,6 @@ DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native" # and cannot be satisfied with a package that provides classpath. RDEPENDS = "classpath" -PROVIDES = "cacao virtual/java" RPROVIDES_cacao = "java2-runtime" inherit java autotools update-alternatives diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb index e897cfad41..9de8eddce9 100644 --- a/packages/cacao/cacao_0.98+hg20071001.bb +++ b/packages/cacao/cacao_0.98+hg20071001.bb @@ -1,6 +1,6 @@ require cacao.inc -PR = "r9" +PR = "r10" SRC_URI = "\ http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \ diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb index 0cd5132ef7..aa9cc2ed1d 100644 --- a/packages/cacao/cacao_0.98+hg20080519.bb +++ b/packages/cacao/cacao_0.98+hg20080519.bb @@ -1,6 +1,6 @@ require cacao.inc -PR = "r1" +PR = "r2" SRC_URI = "\ http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \ diff --git a/packages/cacao/cacao_0.99.2.bb b/packages/cacao/cacao_0.99.3.bb index e9a80781bc..9817a7ceed 100644 --- a/packages/cacao/cacao_0.99.2.bb +++ b/packages/cacao/cacao_0.99.3.bb @@ -1,8 +1,9 @@ require cacao.inc -PR = "r1" +PR = "r0" -SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f \ +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \ file://cacao-codegen-arm1.patch;patch=1 \ file://cacao-codegen-arm2.patch;patch=1 \ - " + " + diff --git a/packages/cacao/cacaoh-native_0.99.2.bb b/packages/cacao/cacaoh-native_0.99.3.bb index 594e79f7de..d2d833dff3 100644 --- a/packages/cacao/cacaoh-native_0.99.2.bb +++ b/packages/cacao/cacaoh-native_0.99.3.bb @@ -2,4 +2,4 @@ require cacaoh-native.inc PR = "r0" -SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f" +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2" diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/cnc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/php/php-5.1.4/.mtn2git_empty +++ b/packages/cnc/.mtn2git_empty diff --git a/packages/cnc/openredalert/.mtn2git_empty b/packages/cnc/openredalert/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cnc/openredalert/.mtn2git_empty diff --git a/packages/cnc/openredalert/openredalert-launcher b/packages/cnc/openredalert/openredalert-launcher new file mode 100755 index 0000000000..4e5dad4bb6 --- /dev/null +++ b/packages/cnc/openredalert/openredalert-launcher @@ -0,0 +1,3 @@ +#!/bin/sh + +( cd /usr/share/games/redalert && ./openredalert ) diff --git a/packages/cnc/openredalert_r438.bb b/packages/cnc/openredalert_r438.bb new file mode 100644 index 0000000000..4da245614a --- /dev/null +++ b/packages/cnc/openredalert_r438.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Game engine to run Red Alert 1" +LICENSE = "GPLv2" + +DEPENDS = "virtual/libsdl libsdl-mixer" + +SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.gz \ + file://openredalert-launcher" + +S = "${WORKDIR}" + +CFLAGS_append = " -I. -I${STAGING_INCDIR}" + +do_compile() { + cd ${S}/src ; cp ${S}/makefile . + oe_runmake -e +} + +do_install() { + install -d ${D}/${datadir}/games/redalert/ + cp -pPr ${S}/data ${D}/${datadir}/games/redalert/ + install -m 0755 ${S}/src/openredalert ${D}/${datadir}/games/redalert/ + + install -d ${D}/${bindir} + install -m 0755 ${S}/openredalert-launcher ${D}/${bindir} +} + +FILES_${PN} += "${datadir}/games/redalert/" +FILES_${PN}-dbg += "${datadir}/games/redalert/.debug" diff --git a/packages/cnc/redalert-demo-gamedata.bb b/packages/cnc/redalert-demo-gamedata.bb new file mode 100644 index 0000000000..1aa5722647 --- /dev/null +++ b/packages/cnc/redalert-demo-gamedata.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Red Alert Demo game data" +LICENSE = "shareware" + +SRC_URI = "ftp://ftp.westwood.com/pub/redalert/previews/demo/ra95demo.zip" + +do_install() { + install -d ${D}/${datadir}/games/redalert/data/mix + cp ${WORKDIR}/ra95demo/INSTALL/MAIN.MIX ${D}/${datadir}/games/redalert/data/mix/main.mix + cp ${WORKDIR}/ra95demo/INSTALL/REDALERT.MIX ${D}/${datadir}/games/redalert/data/mix/redalert.mix +} + + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/games/redalert/" + diff --git a/packages/curl/curl-native_7.18.2.bb b/packages/curl/curl-native_7.18.2.bb index e056ec10c3..f0e2b8940e 100644 --- a/packages/curl/curl-native_7.18.2.bb +++ b/packages/curl/curl-native_7.18.2.bb @@ -3,9 +3,7 @@ inherit native DEPENDS = "zlib-native" do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} + autotools_stage_all } do_install() { diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb index 7fd3f38848..4e93aa8e5f 100644 --- a/packages/directfb/directfb-examples_1.0.0.bb +++ b/packages/directfb/directfb-examples_1.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPL" SRC_URI = " \ - http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \ + http://www.directfb.org/downloads/Old/DirectFB-examples-${PV}.tar.gz \ " S = "${WORKDIR}/DirectFB-examples-${PV}" diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc index 948ffa892e..9066ff2218 100644 --- a/packages/directfb/directfb.inc +++ b/packages/directfb/directfb.inc @@ -9,7 +9,7 @@ HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" SRC_URI = " \ - http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ + http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ file://fix-pkgconfig-cflags.patch;patch=1 \ file://fix-font-missing-char.patch;patch=1 \ file://getpagesize.patch;patch=1 \ diff --git a/packages/directfb/directfb_1.1.1.bb b/packages/directfb/directfb_1.1.1.bb index cd63eeca1c..9b5588b627 100644 --- a/packages/directfb/directfb_1.1.1.bb +++ b/packages/directfb/directfb_1.1.1.bb @@ -8,7 +8,7 @@ DEPENDS += "sysfsutils" DEFAULT_PREFERENCE = "-1" SRC_URI = " \ - http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ + http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ file://fix-pkgconfig-cflags.patch;patch=1 \ file://fix-font-missing-char.patch;patch=1 \ file://mkdfiff.patch;patch=1 \ diff --git a/packages/directfb/directfb_1.2.3.bb b/packages/directfb/directfb_1.2.3.bb index 57a4721a02..85e42a1fa3 100644 --- a/packages/directfb/directfb_1.2.3.bb +++ b/packages/directfb/directfb_1.2.3.bb @@ -6,7 +6,7 @@ PR = "r0" DEPENDS += "sysfsutils" SRC_URI = " \ - http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ + http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ file://fix-pkgconfig-cflags.patch;patch=1 \ file://mkdfiff.patch;patch=1 \ file://dont-use-linux-config.patch;patch=1 \ diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c4f4677dea..d12bfd7c1d 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm" PE = "1" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r32" +PR = "r33" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -16,8 +16,8 @@ FFBRANCH_arm = "arm" FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "b06c88bbec744970e023a03abed314f10d6936da" -SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d" +SRCREV = "adcf5e23c16d4c26f6e0e9b7eba8bbbd487e1cf5" +SRCREV_arm = "2e95f2adfbb11d033b5736d79f5beacf202ad993" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index efa81fd50a..8c3d0dac36 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r11" +PR = "r12" inherit module-base diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 992998bf55..80564ebe7e 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,7 +1,7 @@ require gnash-minimal.inc -PR = "r1" +PR = "r2" PV = "0.8.3+cvs${SRCDATE}" diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb index cc8de96995..87ea15878f 100644 --- a/packages/gnash/gnash_0.8.3.bb +++ b/packages/gnash/gnash_0.8.3.bb @@ -1,6 +1,6 @@ require gnash.inc -PR = "r2" +PR = "r3" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb index 2cad978a16..d41a013cba 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb @@ -3,7 +3,7 @@ SECTION = "multimedia" PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "gstreamer zlib" +DEPENDS = "gstreamer gst-plugins-base zlib" PR = "r2" inherit autotools pkgconfig diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index f72772a61e..087d5ff670 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -3,8 +3,8 @@ SECTION = "multimedia" PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "ffmpeg gstreamer zlib" -PR = "r5" +DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib" +PR = "r6" inherit autotools pkgconfig diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc index b5655c6d35..af6fd47ee6 100644 --- a/packages/jamvm/jamvm.inc +++ b/packages/jamvm/jamvm.inc @@ -7,7 +7,6 @@ RDEPENDS = "classpath" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz" -PROVIDES = "jamvm virtual/java" RPROVIDES_jamvm = "java2-runtime" # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb index 8414c5615c..e8ca076350 100644 --- a/packages/jamvm/jamvm_1.4.5.bb +++ b/packages/jamvm/jamvm_1.4.5.bb @@ -1,6 +1,6 @@ require jamvm.inc -PR = "r1" +PR = "r2" SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1" diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb index 81977a5f40..92c1992ea9 100644 --- a/packages/jamvm/jamvm_1.5.0.bb +++ b/packages/jamvm/jamvm_1.5.0.bb @@ -2,7 +2,7 @@ require jamvm.inc SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" -PR = "r2" +PR = "r3" do_configure_prepend() { # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb index 366658dd97..81977a5f40 100644 --- a/packages/jamvm/jamvm_1.5.1.bb +++ b/packages/jamvm/jamvm_1.5.1.bb @@ -2,7 +2,7 @@ require jamvm.inc SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" -PR = "r1" +PR = "r2" do_configure_prepend() { # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory diff --git a/packages/leafpad/leafpad_0.8.9.bb b/packages/leafpad/leafpad_0.8.15.bb index 1b1d23fa2a..3446b4f74e 100644 --- a/packages/leafpad/leafpad_0.8.9.bb +++ b/packages/leafpad/leafpad_0.8.15.bb @@ -1,13 +1,17 @@ +DESCRIPTION = "GTK+ based simple text editor" +HOMEPAGE = "http://tarot.freeshell.org/leafpad" +AUTHOR = "Tarot Osuji <tarot@sdf.lonestar.org>" +SECTION = "x11/applications" LICENSE = "GPLv2" -DEPENDS = "gtk+ intltool-native" +DEPENDS = "gtk+" SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ - file://leafpad.desktop \ - file://leafpad.png" -PR = "r1" + file://leafpad.desktop \ + file://leafpad.png" +PR = "r0" inherit autotools pkgconfig -EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print" +EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print" do_install_append () { install -d ${D}/${datadir} @@ -18,4 +22,4 @@ do_install_append () { install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications } -FILES_${PN} += "${datadir}/applications/leafpad.desktop ${datadir}/pixmaps/leafpad.png" +FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons" diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 867b5b885c..47c41f1425 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Wed Sep 3 15:38:48 2008 +# Sat Sep 20 15:44:20 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -615,7 +615,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m # CONFIG_OMAP_STI is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_HAVE_IDE=y @@ -704,20 +704,36 @@ CONFIG_MII=y CONFIG_WLAN_80211=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -# CONFIG_LIBERTAS_SDIO is not set +CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set -# CONFIG_P54_COMMON is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m # CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y -# CONFIG_B43 is not set +CONFIG_B43=m +CONFIG_B43_LEDS=y +# CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y +CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # USB Network Adapters @@ -753,7 +769,7 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -# CONFIG_PPPOL2TP is not set +CONFIG_PPPOL2TP=m # CONFIG_SLIP is not set CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set @@ -1011,7 +1027,9 @@ CONFIG_OMAP_WATCHDOG=y # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB is not set +CONFIG_SSB=m +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set # # Multifunction device drivers diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 5a8aeb16a0..ded3a3bbe8 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r62" +PR = "r63" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig new file mode 100644 index 0000000000..094a0ff642 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig @@ -0,0 +1,67 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 +ac_add_options --with-arm-kuser + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig new file mode 100644 index 0000000000..cd097165ab --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig @@ -0,0 +1,66 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff b/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff new file mode 100644 index 0000000000..f969752381 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff @@ -0,0 +1,26 @@ +# Component manager should not use /dev/random for generation ranodm numbers +# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy +# Bug somewhere exists but it is very old +Index: nsprpub/pr/src/md/unix/uxrng.c +=================================================================== +--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig ++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c +@@ -144,17 +144,17 @@ + #include <sys/stat.h> + #include <fcntl.h> + + static int fdDevRandom; + static PRCallOnceType coOpenDevRandom; + + static PRStatus OpenDevRandom( void ) + { +- fdDevRandom = open( "/dev/random", O_RDONLY ); ++ fdDevRandom = open( "/dev/urandom", O_RDONLY ); + return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); + } /* end OpenDevRandom() */ + + static size_t GetDevRandom( void *buf, size_t size ) + { + int bytesIn; + int rc; + diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 5b9acf9580..b45ac683d7 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,22 +1,24 @@ SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" +MOZPV ?= "${PV}" + PACKAGES =+ "${PN}-inspector" PACKAGES += "${PN}-sdk" -FILES_${PN}-inspector = " ${libdir}/${PN}-${PV}/chrome/inspector* \ - ${libdir}/${PN}-${PV}/components/*nspector* \ - ${libdir}/${PN}-${PV}/extensions/inspector* \ - ${libdir}/${PN}-${PV}/defaults/preferences/inspector* \ +FILES_${PN}-inspector = " ${libdir}/${PN}-${MOZPV}/chrome/inspector* \ + ${libdir}/${PN}-${MOZPV}/components/*nspector* \ + ${libdir}/${PN}-${MOZPV}/extensions/inspector* \ + ${libdir}/${PN}-${MOZPV}/defaults/preferences/inspector* \ " FILES_${PN} = "${bindir}/${PN} \ ${datadir}/applications/ \ ${datadir}/pixmaps/ \ - ${libdir}/${PN}-${PV}/* \ - ${libdir}/${PN}-${PV}/.autoreg \ + ${libdir}/${PN}-${MOZPV}/* \ + ${libdir}/${PN}-${MOZPV}/.autoreg \ ${bindir}/defaults" FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config" -FILES_${PN}-sdk += "${libdir}/${PN}-devel-${PV}" +FILES_${PN}-sdk += "${libdir}/${PN}-devel-${MOZPV}" FILES_${PN}-dbg += " ${libdir}/${PN}-*/.debug \ ${libdir}/${PN}-*/*/.debug \ ${libdir}/${PN}-*/*/*/.debug \ diff --git a/packages/mozilla/firefox_3.1a2.bb b/packages/mozilla/firefox_3.1a2.bb new file mode 100644 index 0000000000..5e7c996ef1 --- /dev/null +++ b/packages/mozilla/firefox_3.1a2.bb @@ -0,0 +1,47 @@ +DEPENDS += "cairo" + +PV = "3.0.1+3.1a2" +MOZPV = "3.1a2" + + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/firefox-${MOZPV}-source.tar.bz2 \ + file://jsautocfg.h \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://random_to_urandom.diff;patch=1 \ +" + +S = "${WORKDIR}/" + +DEFAULT_PREFERENCE = "-1" + +inherit mozilla +require firefox.inc + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_configure_prepend() { + sed -i -e s:'head -1':'head -n1':g client.mk + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ + -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ + ${S}/security/coreconf/Linux.mk +} + +do_stage() { + install -d ${STAGING_INCDIR}/firefox-${MOZPV} + cd dist/sdk/include + rm -rf obsolete + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/ + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h +} + diff --git a/packages/mysql/files/fix_host_path.patch b/packages/mysql/files/fix_host_path.patch new file mode 100644 index 0000000000..4f69cd5198 --- /dev/null +++ b/packages/mysql/files/fix_host_path.patch @@ -0,0 +1,37 @@ +--- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500 ++++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500 +@@ -456,9 +456,9 @@ else + fi + fi + +-AC_SUBST(HOSTNAME) +-AC_SUBST(PERL) +-AC_SUBST(PERL5) ++AC_SUBST(HOSTNAME,/bin/hostname) ++AC_SUBST(PERL,$(bindir)/perl) ++AC_SUBST(PERL5,$(bindir)/perl) + + # for build ndb docs + +@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") + + # Check if a pid is valid + AC_PATH_PROG(KILL, kill, kill) ++AC_SUBST(KILL,/bin/kill) + AC_MSG_CHECKING("for kill switches") +-if $ac_cv_path_KILL -0 $$ ++if $KILL -0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" + elif kill -s 0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" + else + AC_MSG_WARN([kill -0 to check for pid seems to fail]) +- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" + fi + AC_SUBST(CHECK_PID) + AC_MSG_RESULT("$CHECK_PID") diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb index 15a342653b..8d7f4057f6 100644 --- a/packages/mysql/mysql_4.1.22.bb +++ b/packages/mysql/mysql_4.1.22.bb @@ -3,10 +3,11 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r0" +PR = "r2" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ + file://fix_host_path.patch;patch=1 \ file://my.cnf \ file://mysqld.sh" diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb index ca9e4fbade..edfcde03d2 100644 --- a/packages/openmax/libomxil-bellagio_0.9.0.bb +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim LICENSE = "LGPLv2" DEPENDS = "libmad alsa-lib ffmpeg" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" diff --git a/packages/pcmciautils/pcmciautils-015/.mtn2git_empty b/packages/pcmciautils/pcmciautils-015/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pcmciautils/pcmciautils-015/.mtn2git_empty diff --git a/packages/pcmciautils/pcmciautils-015/ccdv.patch b/packages/pcmciautils/pcmciautils-015/ccdv.patch new file mode 100644 index 0000000000..460e3938aa --- /dev/null +++ b/packages/pcmciautils/pcmciautils-015/ccdv.patch @@ -0,0 +1,34 @@ +From: Olivier Blin <blino@mandriva.com> +Date: Wed, 13 Aug 2008 20:30:14 +0000 (+0200) +Subject: fix parallel build of ccdv +X-Git-Url: http://git.kernel.org/?p=linux%2Fpcmcia%2Fpcmciautils.git;a=commitdiff_plain;h=ff72508f29567028597d8816bdf8b55c3c61a314 + +fix parallel build of ccdv + +Parallel build was broken because ccdv was not necessarily built +before the object files were built (occured with make -j4). + +Signed-off-by: Olivier Blin <blino@mandriva.com> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + +diff --git a/Makefile b/Makefile +index cc30ae4..e1d7c85 100644 +--- a/Makefile ++++ b/Makefile +@@ -208,11 +208,12 @@ UDEV_RULES += udev/rules-end + + all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules + +-ccdv: ++ccdv: build/ccdv ++build/ccdv: build/ccdv.c + @echo "Building ccdv" +- @$(HOSTCC) -O1 build/ccdv.c -o build/ccdv ++ @$(HOSTCC) -O1 $< -o $@ + +-.c.o: ++%.o : %.c ccdv + $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< + + %.c %.h : %.y diff --git a/packages/pcmciautils/pcmciautils-015/makefile_fix.patch b/packages/pcmciautils/pcmciautils-015/makefile_fix.patch new file mode 100644 index 0000000000..f5bb64b9bd --- /dev/null +++ b/packages/pcmciautils/pcmciautils-015/makefile_fix.patch @@ -0,0 +1,88 @@ +Hardcoded paths are bad... + +Index: pcmciautils-014/Makefile +=================================================================== +--- pcmciautils-014.orig/Makefile 2006-06-01 11:07:52.000000000 +0200 ++++ pcmciautils-014/Makefile 2006-10-29 13:50:25.000000000 +0100 +@@ -69,7 +69,7 @@ + mandir = ${prefix}/usr/share/man + srcdir = . + +-INSTALL = /usr/bin/install -c ++INSTALL = install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} +--- pcmciautils-014/Makefile~ 2007-05-25 19:40:39.000000000 +0200 ++++ pcmciautils-014/Makefile 2007-05-25 19:40:39.000000000 +0200 +@@ -258,28 +258,29 @@ + + install-hotplug: + $(INSTALL) -d $(DESTDIR)$(hotplugdir) +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc + + uninstall-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc + + install-socket-hotplug: +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + uninstall-socket-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + install-socket-tools: +- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) ++ $(INSTALL) -d $(DESTDIR)$(sbindir) ++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) + + uninstall-socket-tools: + - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) + + install-tools: + $(INSTALL) -d $(DESTDIR)$(sbindir) +- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) +- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) ++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) ++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) + $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) + + uninstall-tools: +@@ -289,18 +290,20 @@ + + install-config: + $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) +- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts ++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + + uninstall-config: + # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts + + install-udev: +- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules ++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) ++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + uninstall-udev: + - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + install-man: ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + +--- pcmciautils-014/Makefile~ 2007-05-25 19:43:01.000000000 +0200 ++++ pcmciautils-014/Makefile 2007-05-25 19:43:01.000000000 +0200 +@@ -304,7 +304,7 @@ + + install-man: + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 +- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 ++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + + uninstall-man: diff --git a/packages/pcmciautils/pcmciautils-015/version_workaround.patch b/packages/pcmciautils/pcmciautils-015/version_workaround.patch new file mode 100644 index 0000000000..962aa4e246 --- /dev/null +++ b/packages/pcmciautils/pcmciautils-015/version_workaround.patch @@ -0,0 +1,16 @@ +PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly +under arm gcc 3.4.x so we work around it. + +Index: pcmciautils-013/src/pccardctl.c +=================================================================== +--- pcmciautils-013.orig/src/pccardctl.c 2006-03-26 11:56:41.000000000 +0100 ++++ pcmciautils-013/src/pccardctl.c 2006-05-09 22:11:09.000000000 +0100 +@@ -350,7 +350,7 @@ + } + + static void print_header(void) { +- printf("pcmciautils %s\n", PCMCIAUTILS_VERSION); ++ printf("pcmciautils 014\n"); + printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n"); + printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n"); + } diff --git a/packages/pcmciautils/pcmciautils_015.bb b/packages/pcmciautils/pcmciautils_015.bb new file mode 100644 index 0000000000..44a3d59dc6 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_015.bb @@ -0,0 +1,8 @@ +require pcmciautils.inc + +PR = "r0" + +SRC_URI += "file://makefile_fix.patch;patch=1 \ + file://version_workaround.patch;patch=1 \ + file://ccdv.patch;patch=1 \ + " diff --git a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb index f7c6c3db42..7348e87ca3 100644 --- a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb +++ b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb @@ -1,3 +1,5 @@ +PR = "r1" + require phoneme-advanced.inc BUILDREV = "b87" diff --git a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb index aa3b5e7424..675d7b7b9a 100644 --- a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb +++ b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb @@ -1,3 +1,5 @@ +PR = "r1" + require phoneme-advanced.inc BUILDREV = "b87" diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc index 416874178c..a6b2951517 100644 --- a/packages/phoneme/phoneme-advanced.inc +++ b/packages/phoneme/phoneme-advanced.inc @@ -41,9 +41,9 @@ do_install() { unzip cdc/install/${PN}.zip -d ${D}/${libdir_jvm} - # Additional link named cvm + # Additional link named cvm-${PME_PROFILE} install -d ${D}/${bindir} - ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm + ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm-${PME_PROFILE} } do_configure() { diff --git a/packages/php/php-5.1.4/acinclude-xml2-config.patch b/packages/php/php-5.1.4/acinclude-xml2-config.patch deleted file mode 100644 index 84d180ea8c..0000000000 --- a/packages/php/php-5.1.4/acinclude-xml2-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 -@@ -2359,12 +2359,9 @@ - AC_DEFUN([PHP_SETUP_LIBXML], [ - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" -+ - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch deleted file mode 100644 index d198c8e36d..0000000000 --- a/packages/php/php-5.1.4/autotools.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 ---- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 -+++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 -@@ -818,10 +818,10 @@ - OVERALL_TARGET=[]ifelse($1,,php,$1) - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post= -+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post= -+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_lo=lo - - case $with_pic in -@@ -1670,6 +1670,7 @@ - have_fopen_cookie=yes - - dnl even newer glibcs have a different seeker definition... -+AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, - AC_TRY_RUN([ - #define _GNU_SOURCE - #include <stdio.h> -@@ -1702,10 +1703,11 @@ - cookie_io_functions_use_off64_t=yes - ], [ - cookie_io_functions_use_off64_t=no --], [ -- cookie_io_functions_use_off64_t=no --]) -- -+], -+[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], -+[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) -+ -+ - else - - dnl older glibc versions (up to 2.1.2 ?) -diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in ---- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 -+++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 -@@ -209,6 +209,7 @@ - - sinclude(Zend/Zend.m4) - sinclude(TSRM/tsrm.m4) -+sinclude(TSRM/threads.m4) - - - divert(2) -diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 ---- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 -+++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 -@@ -3,7 +3,6 @@ - divert(1) - - AC_PREREQ(2.13) --AC_INIT(config.m4) - - PHP_CONFIG_NICE(config.nice) - -@@ -69,8 +68,6 @@ - PHP_PROG_RE2C - PHP_PROG_AWK - --sinclude(config.m4) -- - enable_static=no - enable_shared=yes - -diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 ---- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 -+++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 -@@ -86,7 +86,7 @@ - pthreads_working=no - ], [ - dnl For cross compiling running this test is of no use. NetWare supports pthreads -- pthreads_working=no -+ pthreads_working=yes - case $host_alias in - *netware*) - pthreads_working=yes -diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4 ---- php-5.1.4~/TSRM/tsrm.m4 2005-05-29 19:16:40.000000000 -0400 -+++ php-5.1.4/TSRM/tsrm.m4 2006-08-16 20:39:19.000000000 -0400 -@@ -68,7 +68,6 @@ - ]) - - sinclude(threads.m4) --sinclude(TSRM/threads.m4) - - AC_DEFUN([TSRM_CHECK_PTHREADS],[ - diff --git a/packages/php/php-native.inc b/packages/php/php-native.inc new file mode 100644 index 0000000000..84f9a1a0ee --- /dev/null +++ b/packages/php/php-native.inc @@ -0,0 +1,15 @@ +require php.inc + +DEPENDS = "zlib-native libxml2-native" + +inherit autotools native pkgconfig +export LIBS=" -lxml2 " +export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}" + +EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ + --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE} \ + --without-libpng --without-libjpeg \ + --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ + " + +FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" diff --git a/packages/php/php-native_5.2.6.bb b/packages/php/php-native_5.2.6.bb index d165f7a4a7..97064a6510 100644 --- a/packages/php/php-native_5.2.6.bb +++ b/packages/php/php-native_5.2.6.bb @@ -1,13 +1,3 @@ -require php_${PV}.bb +require php-native.inc -SECTION = "console/network" -DEPENDS = "zlib-native libxml2-native mysql-native" -PR = "r1" - -S = "${WORKDIR}/php-${PV}" - -inherit autotools native pkgconfig -export LIBS=" -lxml2 " -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" - -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" +PR = "r2" diff --git a/packages/php/php.inc b/packages/php/php.inc index e2ab04f486..e9d49a3269 100644 --- a/packages/php/php.inc +++ b/packages/php/php.inc @@ -2,24 +2,15 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package pro HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql mysql-native virtual/libiconv php-native" SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ file://acinclude-xml2-config.patch;patch=1" +S = "${WORKDIR}/php-${PV}" + inherit autotools CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ - --with-mysql \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ - --without-libpng --without-libjpeg \ - --with-config-file-path=${sysconfdir}/php4" - -EXTRA_OECONF += " --without-pear" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php" -#DEPENDS += " php-native" acpaths = "" diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb deleted file mode 100644 index e639bf5acf..0000000000 --- a/packages/php/php_5.1.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -require php.inc - -PR = "r3" - -SRC_URI += "file://autotools.patch;patch=1" - -inherit autotools - -export THREADS="pthread" -export LIBS=" -lpthread " - -EXTRA_OECONF = "--without-iconv \ - --enable-discard-path \ - --enable-sockets \ - --enable-memory-limit \ - --enable-wddx \ - --with-zlib" - -EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} " -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php" -#DEPENDS += " php-native" - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' - find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} diff --git a/packages/php/php_5.2.6.bb b/packages/php/php_5.2.6.bb index 6281cfe04e..17073e1eaf 100644 --- a/packages/php/php_5.2.6.bb +++ b/packages/php/php_5.2.6.bb @@ -1,6 +1,8 @@ require php.inc -PR = "r1" +DEPENDS = "zlib libxml2 virtual/libiconv php-native" + +PR = "r2" SRC_URI += "file://pear-makefile.patch;patch=1 " @@ -10,56 +12,70 @@ export LIBS=" -lpthread " EXTRA_OECONF = " --without-iconv \ --enable-discard-path \ --enable-sockets \ + --enable-pcntl \ --enable-memory-limit \ --enable-wddx \ --enable-embedded-mysqli \ --enable-magic-quotes \ - --with-zlib \ - --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ - --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ -" - -EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}" + --with-zlib --with-zlib-dir = ${STAGING_LIBDIR}/.. \ + --with-libxml-dir = ${STAGING_BINDIR_CROSS} \ +# --with-mysql = "${STAGING_DIR_TARGET}${layout_exec_prefix}" \ +# --with-mysqli = "${STAGING_BINDIR_NATIVE}/mysql_config" \ + " export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN="/usr/bin/php" +export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN = "${bindir}/php" do_configure_append() { find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' } +# fixme +do_install_append() { + mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir} + rm -rf ${D}/${STAGING_DIR_NATIVE} + rm -rf ${D}/.registry + rm -rf ${D}/.channels + rm -rf ${D}/.[a-z]* +} + PACKAGES = "${PN}-dbg \ ${PN}-cli \ ${PN}-pear \ ${PN}-dev \ + ${PN}-doc \ ${PN} \ " -FILES_${PN}-dbg =+"/usr/bin/.debug" +FILES_${PN}-dbg =+ "${bindir}/.debug" + +FILES_${PN}-doc += "${libdir}/php/doc" + +FILES_${PN}-cli = "${bindir}/php" -FILES_${PN}-cli ="/usr/bin/php" +FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \ + ${libdir}/php/PEAR \ + ${libdir}/php/PEAR.php \ + ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \ + ${libdir}/php/.channels ${libdir}/php/.channels/.alias \ + ${libdir}/php/.channels\__uri.reg \ + ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \ + ${libdir}/php/.registry \ + ${libdir}/php/Archive/Tar.php \ + ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \ + ${sysconfdir}/pear.conf" -FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ - /usr/lib/php/PEAR \ - /usr/lib/php/PEAR.php \ - /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \ - /usr/lib/php/.channels /usr/lib/php/.channels/.alias \ - /usr/lib/php/.channels\__uri.reg \ - /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \ - /usr/lib/php/.registry \ - /usr/lib/php/Archive/Tar.php \ - /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \ - /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \ - /usr/lib/php/.lock" -FILES_${PN}-dev ="/usr/include/php /usr/include/build \ - /usr/bin/phpize /usr/bin/php-config" +FILES_${PN}-dev = "${includedir}/php ${libdir}/build \ + ${bindir}/phpize ${bindir}/php-config \ + ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \ + ${libdir}/php/test " -FILES_${PN} ="/usr/lib/php" -FILES_${PN} +="/usr/bin" +FILES_${PN} = "${libdir}/php" +FILES_${PN} += "${bindir}" -RDEPENDS_${PN}-pear =${PN} -RDEPENDS_${PN}-cli =${PN} -RDEPENDS_${PN}-dev =${PN} +RDEPENDS_${PN}-pear = ${PN} +RDEPENDS_${PN}-cli = ${PN} +RDEPENDS_${PN}-dev = ${PN} diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc index 6eb29233fc..d608d8adea 100644 --- a/packages/pidgin/pidgin.inc +++ b/packages/pidgin/pidgin.inc @@ -2,7 +2,7 @@ SECTION = "x11/network" DESCRIPTION = "multi-protocol instant messaging client" LICENSE = "GPL" -DEPENDS = "startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus" +DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus" RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" EXTRA_OECONF = " \ @@ -22,30 +22,30 @@ EXTRA_OECONF = " \ OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg" - +PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data" LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*" -FILES_libpurple-dev = "${libdir}/libpurple* \ - ${libdir}/purple-2/*.la " +FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple*" +FILES_libpurple-dev = "${libdir}/libpurple*.la \ + ${libdir}/libpurple*.so \ + ${libdir}/purple-2/*.la \ + ${libdir}/purple-2/libjabber.so \ + ${libdir}/purple-2/liboscar.so \ + ${datadir}/aclocal" FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ ${libdir}/purple-2/.debug" -FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*" -FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*" -FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so" -FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*" +FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" +FILES_libgnt-dev = "${libdir}/gnt/*.la" +FILES_libgnt-dbg = "${libdir}/gnt/.debug \ +FILES_finch = "${bindir}/finch" FILES_finch-dev = "${libdir}/finch/*.la" FILES_finch-dbg = "${bindir}/.debug/finch \ ${libdir}/finch/.debug" -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers ${datadir}/icons" -FILES_${PN}-dev += "${libdir}/pidgin/*.la" +FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/applications" +FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" +FILES_${PN}-dev += "${libdir}/${PN}/*.la" inherit autotools gettext pkgconfig gconf diff --git a/packages/pidgin/pidgin_2.0.2.bb b/packages/pidgin/pidgin_2.0.2.bb deleted file mode 100644 index 2cc02c5072..0000000000 --- a/packages/pidgin/pidgin_2.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - " - -PR = "r1" diff --git a/packages/pidgin/pidgin_2.1.1.bb b/packages/pidgin/pidgin_2.1.1.bb deleted file mode 100644 index 5531880669..0000000000 --- a/packages/pidgin/pidgin_2.1.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding.patch;patch=1 \ - " - -PR = "r0" diff --git a/packages/pidgin/pidgin_2.2.1.bb b/packages/pidgin/pidgin_2.2.1.bb deleted file mode 100644 index 5531880669..0000000000 --- a/packages/pidgin/pidgin_2.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding.patch;patch=1 \ - " - -PR = "r0" diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb index 80d15f677f..65fbc53ffa 100644 --- a/packages/pidgin/pidgin_2.5.0.bb +++ b/packages/pidgin/pidgin_2.5.0.bb @@ -1,5 +1,7 @@ require pidgin.inc +PR = "r2" + SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch;patch=1 \ file://gconf-no-errors.patch;patch=1 \ @@ -11,6 +13,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ EXTRA_OECONF += " --disable-gtkspell \ --disable-meanwhile \ --disable-nm \ + --disable-screensaver \ " - -PR = "r0" diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds index 7a51a247ef..c5ce2997cc 100644 --- a/packages/slugos-init/files/leds +++ b/packages/slugos-init/files/leds @@ -180,12 +180,22 @@ sysled(){ # does nothing if there is no beep executable, is very # quiet in the presence of errors beep(){ - local arg + local arg devices module arg= test "$1" = beep && shift if test -x /bin/beep then - test -c /dev/buzzer && arg="-e /dev/buzzer" + devices=`ls -d /sys/class/input/event*` + for device in $devices + do + module=`egrep PHYSDEVDRIVER $device'/uevent' | cut -d '=' -f 2` + if test "$module" = "ixp4xx-beeper"; + then + devnode=`echo "$device" | cut -d '/' -f 5` + arg="-e /dev/input/"$devnode + break + fi + done /bin/beep $arg "$@" 2>/dev/null fi return 0 diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.4.bb index 2e728ed2a9..400abc8904 100644 --- a/packages/vnc/x11vnc_0.9.3.bb +++ b/packages/vnc/x11vnc_0.9.4.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Export your X session on-the-fly via VNC" -SECTION = "x11/utils" HOMEPAGE = "http://www.karlrunge.com/x11vnc/" AUTHOR = "Karl Runge" +SECTION = "x11/utils" LICENSE = "GPL" DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" +PR = "r0" + SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" inherit autotools - diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb index c9e2ebfd9b..8036af6b78 100644 --- a/packages/zbedic/libbedic_1.1.bb +++ b/packages/zbedic/libbedic_1.1.bb @@ -1,11 +1,13 @@ -DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" -SECTION = "opie/applications" +DESCRIPTION = "Library for bedic dictionary" +HOMEPAGE = "http://bedic.sourceforge.net/" +AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>" +SECTION = "opie/libs" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "sqlite3" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/zbedic/misc" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz" @@ -16,7 +18,6 @@ inherit palmtop # pass VERSION as a string \\"${PV}.0\\" export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS} -DVERSION=\\"${PV}.0\\"" -# no sharedlib, only as staticlib do_configure() { qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib CONFIG+=sharedlib -after \ TARGET=bedic \ @@ -38,5 +39,4 @@ do_stage() { oe_libinstall -a libbedic ${STAGING_LIBDIR} } -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir}" +FILES_${PN}-dev = "${includedir} ${libdir}" |