aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini32
-rw-r--r--conf/distro/chinook-compat.conf6
-rwxr-xr-xcontrib/angstrom/build-feeds.sh2
-rw-r--r--packages/libsdl/libsdl-directfb_1.2.11.bb27
-rw-r--r--packages/ncurses/ncurses_5.4.bb4
-rw-r--r--packages/proftpd/proftpd_1.3.2.bb8
-rw-r--r--packages/python/python-coherence_0.6.0.bb15
-rw-r--r--packages/python/python-coherence_0.6.2.bb7
-rw-r--r--packages/wt/wt3-2.99.0/ext.patch7
-rw-r--r--packages/wt/wt3-2.99.0/src.patch18
-rw-r--r--packages/wt/wt3-2.99.0/wgooglemap.patch15
-rw-r--r--packages/wt/wt3_2.99.0.bb41
-rw-r--r--packages/zope/zope_3.3.1.bb6
13 files changed, 167 insertions, 21 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 947173c2bf..9cca8c60cb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5430,6 +5430,10 @@ sha256=7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3
md5=6505c9d18ef6b5ce13fe2a668eb5724b
sha256=f7ff9bf972139b303616018a6937aa4c6df4e93c935ffd004b30845e2ad41ea6
+[http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/f9d938ede196.tar.gz]
+md5=c8f78d48ac83987bc2adebeebcd354e9
+sha256=89952cf8bbe1bcce91c2c1fcf9a071991a890b3f8a783dee741cdb23c8ac763a
+
[http://downloads.sourceforge.net/faac/faac-1.24.tar.gz]
md5=e72dc74db17b42b06155613489077ad7
sha256=a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e
@@ -10110,6 +10114,14 @@ sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c
md5=641ec45fe377529c7fd914f77b11b44f
sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
+[http://icedtea.classpath.org/download/source/icedtea6-1.3.1.tar.gz]
+md5=6865c25cbc087e4142031a846b71ae56
+sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d
+
+[http://icedtea.classpath.org/download/source/icedtea6-1.4.tar.gz]
+md5=6428ca1b0c38111cca230f5b69460b03
+sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739
+
[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
@@ -16838,6 +16850,14 @@ sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
md5=7df692e3186109cc00db6825b777201e
sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
+[http://download.java.net/openjdk/jdk6/promoted/b12/openjdk-6-src-b12-28_aug_2008.tar.gz]
+md5=b53e1ef643909ce82721ee4c970d958b
+sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
+
+[http://download.java.net/openjdk/jdk6/promoted/b14/openjdk-6-src-b14-25_nov_2008.tar.gz]
+md5=9f9773a822156dd3d576d83d794364ce
+sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480
+
[http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
md5=670931f67b2e4ac46c6e0cd15418f2fa
sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
@@ -18370,6 +18390,10 @@ sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5
md5=f490bca772b16472962c7b9f23b1e97d
sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc
+[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2.tar.gz]
+md5=756f762883cc8eed03d99dc3b1c56a8e
+sha256=5e00c20d74bbf98fb8bcc63bd4aecfd08480a87ec731dae8955bd9fca6a01bb3
+
[http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz]
md5=60a89c2c907fb5ff2293ce3dfbcdace6
sha256=4124e24726369b42ed0a7aff33e5c572de5e4a0f46edd4e1e81125412c4bdf24
@@ -19686,6 +19710,10 @@ sha256=24ee0f94226879038fe1d117c251900400376e942b4c82368d46f9466bb57243
md5=61b724a4e1a48d0735fb18d4f68c0506
sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1
+[ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip]
+md5=613eed8201d37be201805e5048ebb0c3
+sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d
+
[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz]
md5=5ac4e1b5ff4f2fdada81c007ac599cb9
sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
@@ -23030,6 +23058,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
md5=2f4c34f1e092451d3c4d2e7f8c250015
sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
+[http://downloads.sourceforge.net/witty/wt-2.99.0.tar.gz]
+md5=3d35c181dfab7dfd3fe898738dffb421
+sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
+
[http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
md5=b6319d5e75611fe2210453b5feb82c0c
sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e0757a7abd..7bb9e4b0bb 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -78,6 +78,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.20"
PREFERRED_VERSION_glibc = "2.5"
PREFERRED_VERSION_glibc-initial = "2.5"
+PREFERRED_VERSION_libtool-native = "1.5.10"
+PREFERRED_VERSION_libtool-cross = "1.5.10"
PREFERRED_VERSION_libtool = "1.5.6"
require conf/distro/include/sane-srcrevs.inc
@@ -122,7 +124,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
# This is a hack to avoid building mesa which crashes the compiler
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
-PREFERRED_VERSION_libsdl-directfb = "1.2.9"
+PREFERRED_VERSION_libsdl-directfb = "1.2.11"
PREFERRED_VERSION_libsdl-image = "1.2.3"
PREFERRED_VERSION_libsdl-mixer = "1.2.6"
@@ -157,6 +159,8 @@ PREFERRED_VERSION_pixman = "0.9.6"
PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_VERSION_avahi = "0.6.20"
+
PREFERRED_VERSION_libsoup = "2.2.7"
PREFERRED_VERSION_libglade = "2.4.2"
PREFERRED_VERSION_gnutls = "1.4.5"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index af66e229da..7e5f1b6f83 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -241,6 +241,7 @@ do
povray \
prboom \
prelink \
+ proftpd \
pushover \
python \
python-pybluez \
@@ -308,6 +309,7 @@ do
wireshark \
wpa-gui \
wt \
+ wt3 \
x11vnc \
xf86-input-evdev \
xf86-input-keyboard \
diff --git a/packages/libsdl/libsdl-directfb_1.2.11.bb b/packages/libsdl/libsdl-directfb_1.2.11.bb
new file mode 100644
index 0000000000..3f44f9df3f
--- /dev/null
+++ b/packages/libsdl/libsdl-directfb_1.2.11.bb
@@ -0,0 +1,27 @@
+require libsdl.inc
+
+DEPENDS = "alsa-lib directfb"
+# extra-keys.patch is missing
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+SRC_URI = "\
+ http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+ file://acinclude.m4 \
+ file://configure_tweak.patch;patch=1 \
+ file://pagesize.patch;patch=1 \
+ file://kernel-asm-page.patch;patch=1 \
+ file://sdl-cdfix.patch;patch=1 \
+ file://fixmfour.patch;patch=1 \
+"
+
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
+ --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
+ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
+ --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
+ --enable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
+ --disable-video-xbios --disable-video-gem --disable-video-dummy \
+ --disable-video-opengl --enable-input-events --enable-pthreads \
+ --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 4f54029457..56076140fa 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r17"
+PR = "r18"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://makefile_tweak.patch;patch=1 \
@@ -6,3 +6,5 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
S = "${WORKDIR}/ncurses-${PV}"
require ncurses.inc
+
+LEAD_SONAME = "libncurses.so.5"
diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb
new file mode 100644
index 0000000000..13442b1412
--- /dev/null
+++ b/packages/proftpd/proftpd_1.3.2.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \
+ "
+
diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb
deleted file mode 100644
index bf9d964f99..0000000000
--- a/packages/python/python-coherence_0.6.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
-SECTION = "devel/python"
-LICENSE = "MIT"
-HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r5"
-
-inherit setuptools
-
-SRC_URI = "http://coherence.beebits.net/download/Coherence-${PV}.tar.gz"
-S = "${WORKDIR}/Coherence-${PV}"
-
-FILES_${PN} += "${datadir}"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
-
-
diff --git a/packages/python/python-coherence_0.6.2.bb b/packages/python/python-coherence_0.6.2.bb
index 7d25f0868e..54eed59574 100644
--- a/packages/python/python-coherence_0.6.2.bb
+++ b/packages/python/python-coherence_0.6.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
SECTION = "devel/python"
LICENSE = "MIT"
HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r0"
+PR = "r1"
inherit setuptools
@@ -12,6 +12,9 @@ S = "${WORKDIR}/Coherence-${PV}"
FILES_${PN} += "${datadir}"
DEPENDS = "libxml2 libxml2-native"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
+RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
+ python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \
+ python-zopeinterface python-modules python-pygobject python-gdata \
+ python-divmodaxiom"
diff --git a/packages/wt/wt3-2.99.0/ext.patch b/packages/wt/wt3-2.99.0/ext.patch
new file mode 100644
index 0000000000..89246ebbf6
--- /dev/null
+++ b/packages/wt/wt3-2.99.0/ext.patch
@@ -0,0 +1,7 @@
+--- wt-2.99.0/src/Wt/Ext/CMakeLists.txt 2009-03-11 21:30:10.000000000 +0100
++++ wt-2.99.0/src/Wt/Ext/CMakeLists.txt.new 2009-03-11 21:31:33.000000000 +0100
+@@ -1,2 +1,3 @@
+-INSTALL_FILES(/include/Wt/Ext "...+[^Ch~]$")
++# avoid CMake* getting included
++INSTALL_FILES(/include/Wt/Ext "^[A-Z][a-z].*[^Ch~]$")
+ INSTALL_FILES(/include/Wt/Ext ExtDllDefs.h)
diff --git a/packages/wt/wt3-2.99.0/src.patch b/packages/wt/wt3-2.99.0/src.patch
new file mode 100644
index 0000000000..a3ac249af0
--- /dev/null
+++ b/packages/wt/wt3-2.99.0/src.patch
@@ -0,0 +1,18 @@
+--- wt-2.99.0/src/CMakeLists.txt 2009-03-06 16:36:30.000000000 +0100
++++ wt-2.99.0/src/CMakeLists.txt.new 2009-03-11 21:39:06.000000000 +0100
+@@ -33,8 +33,13 @@
+
+ LINK_DIRECTORIES(${BOOST_LIB_DIRS})
+
+-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C)
+-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION)
++IF(CMAKE_CROSSCOMPILING)
++ ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C)
++ GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION)
++ELSE(CMAKE_CROSSCOMPILING)
++ SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring)
++ENDIF(CMAKE_CROSSCOMPILING)
++
+
+ MACRO (FILE_TO_STRING infile outfile var)
+ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile}
diff --git a/packages/wt/wt3-2.99.0/wgooglemap.patch b/packages/wt/wt3-2.99.0/wgooglemap.patch
new file mode 100644
index 0000000000..071597fba6
--- /dev/null
+++ b/packages/wt/wt3-2.99.0/wgooglemap.patch
@@ -0,0 +1,15 @@
+--- wt-2.99.0/src/Wt/WGoogleMap.C.orig 2009-03-12 09:52:56.000000000 +0100
++++ wt-2.99.0/src/Wt/WGoogleMap.C 2009-03-12 10:13:21.000000000 +0100
+@@ -18,6 +18,12 @@
+ #include <sstream>
+ #include <utility>
+ #include <iostream>
++
++#if not defined(_GLIBCXX_HAVE__SINL) && not defined(acosl)
++#define cosl cos
++#define acosl acos
++#define sinl sin
++#endif
+
+ using std::string;
+ using std::vector;
diff --git a/packages/wt/wt3_2.99.0.bb b/packages/wt/wt3_2.99.0.bb
new file mode 100644
index 0000000000..fea28494ca
--- /dev/null
+++ b/packages/wt/wt3_2.99.0.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "A C++ Web Toolkit"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.webtoolkit.eu/wt"
+DEPENDS = "boost zlib openssl"
+PR = "r0"
+
+# package wt3 is for wt 2.99 and wt 3.*
+# the api of these versions is incompatible with 2.*
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
+ file://src.patch;patch=1 \
+ file://ext.patch;patch=1 \
+ file://wgooglemap.patch;patch=1"
+
+CXXFLAGS += "-Dsinl=sin -Dcosl=cos -Dasinl=asin"
+
+FILES_${PN} += "${datadir}/Wt"
+FILES_${PN}-dev += "${datadir}/cmake-2.*"
+
+S = "${WORKDIR}/wt-${PV}"
+
+inherit cmake
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+
+do_configure_append() {
+ ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C
+}
+
+do_stage() {
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install
+ cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+ cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+ cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR}
+ rm -rf ${STAGE_TEMP}
+}
+
diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index cd854250b6..05df3dd48d 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
DEPENDS = "python"
RDEPENDS = "python-core python-shell"
LICENSE = "ZPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
S = "${WORKDIR}/Zope-${PV}"
@@ -43,5 +43,7 @@ ${libdir}/${PYTHON_DIR}/zope/i18nmessageid/.debug \
${libdir}/${PYTHON_DIR}/ZODB/.debug"
FILES_python-zopeinterface-dbg += "${libdir}/${PYTHON_DIR}/zope/interface/.debug "
-FILES_python-zopeinterface = "${libdir}/${PYTHON_DIR}/zope/interface/*.* ${libdir}/${PYTHON_DIR}/zope/interface/common"
+FILES_python-zopeinterface = " ${libdir}/${PYTHON_DIR}/zope/__init__.py* \
+ ${libdir}/${PYTHON_DIR}/zope/interface/*.* \
+ ${libdir}/${PYTHON_DIR}/zope/interface/common"