diff options
22 files changed, 206 insertions, 38 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7c42165401..d6cc495ef0 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -18,7 +18,8 @@ SRCREV_pn-eglibc ?= "3531" SRCREV_pn-eglibc-initial ?= "3531" SRCREV_pn-eglibc-intermediate ?= "3531" SRCREV_pn-ezxd ?= "2074" -SRCREV_pn-elf2flt="1786" +SRCREV_pn-elf2flt ?= "1786" +SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" @@ -37,7 +38,7 @@ SRCREV_pn-libmokopanelui2 ?= "3226" SRCREV_pn-libmokoui2 ?= "3229" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" -SRCREV_pn-linux-bfin ?= "3745" +SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-openmoko ?= "2937" SRCREV_pn-llvm-gcc4 ?= "374" diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf index 95ba519d3b..3cf0a7fab2 100644 --- a/conf/machine/em-x270.conf +++ b/conf/machine/em-x270.conf @@ -21,10 +21,10 @@ require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "128" IMAGE_CMD_jffs2 = " \ -/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \ - --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - --eraseblock=0x20000 --pad --faketime -n; \ -/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + mkfs.jffs2 --root=${IMAGE_ROOTFS} \ + --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + --eraseblock=0x20000 --pad --faketime -n; \ + sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 0x20000 -p; \ cd ${DEPLOY_DIR_IMAGE}; \ diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb index ddc4131dae..b6ec8f81f9 100644 --- a/packages/apache2/apache2_2.2.3.bb +++ b/packages/apache2/apache2_2.2.3.bb @@ -10,7 +10,8 @@ SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \ file://apr-sockets-patch;patch=1 \ file://configure-patch;patch=1 \ file://server-makefile-patch;patch=1 \ - file://configure-fix-cross-compile-ptr-check.patch;patch=1" + file://configure-fix-cross-compile-ptr-check.patch;patch=1 \ + file://init" # # over-ride needed since apache unpacks into httpd @@ -93,7 +94,7 @@ do_configure() { do_install_append() { install -d ${D}/${sysconfdir}/init.d - cat ${FILESDIR}/../files/init | \ + cat ${WORKDIR}/init | \ sed -e 's,/usr/sbin/,${sbindir}/,g' \ -e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/lib,${libdir}/,g' \ diff --git a/packages/gnome/epiphany_2.19.6.bb b/packages/gnome/epiphany_2.19.6.bb deleted file mode 100644 index 570f8ba4f5..0000000000 --- a/packages/gnome/epiphany_2.19.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "GNOME default webbrowser" -DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes libstartup-notification" -RDEPENDS = "gnome-vfs-plugin-http" - -PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--with-engine=webkit" - - -FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" - - diff --git a/packages/gnome/epiphany_svn.bb b/packages/gnome/epiphany_svn.bb new file mode 100644 index 0000000000..97fd82b653 --- /dev/null +++ b/packages/gnome/epiphany_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +PV = "2.20.1+svnr${SRCREV}" +PR = "r0" + +inherit gnome + +SRC_URI = "svn://svn.gnome.org/svn/epiphany;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gpephone/libchenabler/.mtn2git_empty b/packages/gpephone/libchenabler/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpephone/libchenabler/.mtn2git_empty diff --git a/packages/gpephone/libchenabler/po.patch b/packages/gpephone/libchenabler/po.patch new file mode 100644 index 0000000000..0f880f5f49 --- /dev/null +++ b/packages/gpephone/libchenabler/po.patch @@ -0,0 +1,9 @@ +--- libchenabler-0.1/configure.ac~ 2007-11-08 12:01:26.000000000 +0100 ++++ libchenabler-0.1/configure.ac 2007-11-08 12:01:26.000000000 +0100 +@@ -31,5 +31,6 @@ + src/Makefile + database/Makefile + libvochenabler.pc ++po/Makefile.in + ]) + AC_OUTPUT diff --git a/packages/gpephone/libchenabler_0.1.bb b/packages/gpephone/libchenabler_0.1.bb index 740ed21c65..4c06e2fbd3 100644 --- a/packages/gpephone/libchenabler_0.1.bb +++ b/packages/gpephone/libchenabler_0.1.bb @@ -3,14 +3,20 @@ DESCRIPTION = "LiPS voice call library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 sqlite3 librecord" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "gz" inherit gpephone pkgconfig autotools +SRC_URI += "file://po.patch;patch=1" FILES_${PN} += " ${datadir}/vochistory" +do_configure_prepend () { + mkdir "${S}/po" + touch "${S}/po/POTFILES.in" +} + do_stage () { autotools_stage_all } diff --git a/packages/gpephone/libgemwidget/disable-tests.patch b/packages/gpephone/libgemwidget/disable-tests.patch new file mode 100644 index 0000000000..a0665979a7 --- /dev/null +++ b/packages/gpephone/libgemwidget/disable-tests.patch @@ -0,0 +1,8 @@ +--- libgemwidget-1.0/Makefile.am~ 2007-11-08 00:12:10.000000000 +0100 ++++ libgemwidget-1.0/Makefile.am 2007-11-08 00:12:10.000000000 +0100 +@@ -1,4 +1,4 @@ +-SUBDIRS = src include pixmaps test po ++SUBDIRS = src include pixmaps po + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libgemwidget.pc diff --git a/packages/gpephone/libgemwidget_1.0.bb b/packages/gpephone/libgemwidget_1.0.bb new file mode 100644 index 0000000000..80e4e4fecb --- /dev/null +++ b/packages/gpephone/libgemwidget_1.0.bb @@ -0,0 +1,17 @@ +LICENSE = "LiPS" +DESCRIPTION = "Extended widget library for GPE phone environment." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +SRC_URI += " file://disable-tests.patch;patch=1" + +FILES_${PN} += "${datadir}/gem" + +do_stage () { + autotools_stage_all +} diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb index 39162d2179..2e8dca925e 100644 --- a/packages/icu/icu_3.6.bb +++ b/packages/icu/icu_3.6.bb @@ -2,7 +2,7 @@ require icu-3.6.inc DEPENDS += "icu-native" -PR = "r1" +PR = "r2" do_configure_append() { for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do @@ -13,6 +13,9 @@ do_configure_append() { sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true } +do_install_append() { + chmod +x ${D}${libdir}/lib* +} PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" diff --git a/packages/notecase/notecase-1.6.9/.mtn2git_empty b/packages/notecase/notecase-1.6.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/notecase/notecase-1.6.9/.mtn2git_empty diff --git a/packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch b/packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch new file mode 100644 index 0000000000..7b54e6232d --- /dev/null +++ b/packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch @@ -0,0 +1,38 @@ +--- tmp/Makefile 2007-05-08 12:25:10.000000000 +0200 ++++ Makefile 2007-11-03 10:46:51.000000000 +0100 +@@ -131,7 +131,7 @@ + ifdef WINDIR + LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz + else +- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl ++ NLD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE) + endif + + # +@@ -190,7 +190,7 @@ + LIBS += hildon-libs hildon-fm libosso + endif + +-GTKCFLAGS=`pkg-config --cflags $(LIBS)` -I/target/include -I/sw/include ++GTKCFLAGS=`pkg-config --cflags $(LIBS)` + GTKLIBS=`pkg-config --libs $(LIBS)` + + # +@@ -201,7 +201,7 @@ + $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) + else + notecase$(EXE): updatesrc $(OBJS) +- $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null ++ $(NLD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) + endif + + # +@@ -421,7 +421,7 @@ + $(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS) + + $(OBJ)/libz.a: +- @cd ./src/lib/zlib/; $(MAKE); cp ./libz.a ../../../$(OBJ)/ ++ @cd ./src/lib/zlib/; cp ./libz.a ../../../$(OBJ)/ + + $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h + $(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o $(GTKCFLAGS) diff --git a/packages/notecase/notecase.inc b/packages/notecase/notecase.inc new file mode 100644 index 0000000000..951930d27b --- /dev/null +++ b/packages/notecase/notecase.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Hierarchical note manager (aka. outliner)" +AUTHOR = "Miroslav Rajcic <miroslav.rajcic@inet.hr>" +HOMEPAGE = "http://notecase.sourceforge.net/" +SECTION = "x11/utils" +LICENSE = "BSD" +DEPENDS = "zlib gtk+ gnome-vfs" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \ + file://no-hardcoded-cxx.patch;patch=1" + +do_compile_prepend() { + cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/ +} diff --git a/packages/notecase/notecase_1.2.6.bb b/packages/notecase/notecase_1.2.6.bb index 7a38480f22..7cd2cd7987 100644 --- a/packages/notecase/notecase_1.2.6.bb +++ b/packages/notecase/notecase_1.2.6.bb @@ -1,17 +1,4 @@ -DESCRIPTION = "NoteCase is a hierarchical note manager (aka. outliner)." " -LICENSE = "BSD" - -DEPENDS = "zlib gtk+ gnome-vfs" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \ - file://no-hardcoded-cxx.patch;patch=1" - -inherit pkgconfig - -do_compile_prepend() { - cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/ -} - +require notecase.inc do_install() { install -d ${D}${bindir} diff --git a/packages/notecase/notecase_1.6.9.bb b/packages/notecase/notecase_1.6.9.bb new file mode 100644 index 0000000000..73ea27b7db --- /dev/null +++ b/packages/notecase/notecase_1.6.9.bb @@ -0,0 +1,17 @@ +require notecase.inc + +PR = "r1" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/doc + install -d ${D}${datadir}/doc/notecase + install -d ${D}${datadir}/icons + install -m 644 ${S}/docs/notecase.desktop ${D}${datadir}/applications + install -m 644 ${S}/docs/help.ncd ${D}${datadir}/doc/notecase/help.ncd + install -m 644 ${S}/res/notecase.xpm ${D}${datadir}/icons/notecase.xpm + install -m 755 ${S}/bin/notecase ${D}${bindir}/ +} + +FILES_${PN} += "${datadir}" diff --git a/packages/quasar/.mtn2git_empty b/packages/quasar/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/quasar/.mtn2git_empty diff --git a/packages/quasar/files/.mtn2git_empty b/packages/quasar/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/quasar/files/.mtn2git_empty diff --git a/packages/quasar/files/cross-compile.patch b/packages/quasar/files/cross-compile.patch new file mode 100644 index 0000000000..5d3aca4756 --- /dev/null +++ b/packages/quasar/files/cross-compile.patch @@ -0,0 +1,31 @@ +--- tmp/quasar-qt.pro 2007-10-29 00:18:03.000000000 +0100 ++++ quasar-qt.pro 2007-11-04 09:11:58.000000000 +0100 +@@ -3,13 +3,13 @@ + TARGET = quasar + TEMPLATE = app + +-#CONFIG = qt warn_on +-CONFIG = qt warn_on debug ++CONFIG = qt warn_on release ++#CONFIG = qt warn_on debug + + # for native compilation with ccache: +-TMAKE_CC = ccache gcc +-TMAKE_CXX = ccache g++ +-TMAKE_LINK = ccache g++ ++#TMAKE_CC = ccache gcc ++#TMAKE_CXX = ccache g++ ++#TMAKE_LINK = ccache g++ + + # for native compilation with pdaxii13's zgcc: + #TMAKE_CC = gcc +@@ -26,7 +26,8 @@ + TMAKE_CFLAGS = $$TMAKE_CFLAGS $$SQLITE_FLAGS -DQUASAR -O3 + TMAKE_CXXFLAGS = $$TMAKE_CXXFLAGS $$SQLITE_FLAGS -DQUASAR -O3 + +-LIBS = -liconv -lz -lstdc++ ++#LIBS = -liconv -lz -lstdc++ ++LIBS = -lz + + INCLUDEPATH = \ + . \ diff --git a/packages/quasar/quasar_0.9beta3.bb b/packages/quasar/quasar_0.9beta3.bb new file mode 100644 index 0000000000..08b394a3be --- /dev/null +++ b/packages/quasar/quasar_0.9beta3.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Quasar mediaplayer" +HOMEPAGE = "http://katastrophos.net/andre/blog/software/quasar-media-player/" +AUTHOR = "Andre Beckedorf" +LICENSE = "GPL" +SECTION = "multimedia" +RDEPENDS = "mplayer" +PV = "0.8+0.9beta3" +S = "${WORKDIR}/v0.9_beta3" + +SRC_URI = "http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2\ + file://cross-compile.patch;patch=1" + +inherit qmake qt3x11 + +QMAKE_PROFILES = "quasar-qt.pro" + +do_install() { + install -d ${D}${bindir} + install -m 0755 quasar ${D}${bindir} + install -d ${D}${datadir}/applications + install -m 0755 ${S}/distro/skeletons/pdaXrom/usr/share/applications/quasar.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0755 ${S}/distro/images/quasar.png ${D}${datadir}/pixmaps/ + install -d ${D}${datadir}/quasar/skins + install -d ${D}${datadir}/quasar/skins/default + install -m 0755 ${S}/distro/skins/default/* ${D}${datadir}/quasar/skins/default/ +} + diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb index b164363612..d27a855c9d 100644 --- a/packages/tasks/task-native-sdk.bb +++ b/packages/tasks/task-native-sdk.bb @@ -4,6 +4,7 @@ DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex b RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \ flex flex-dev bison gawk sed grep autoconf automake make \ patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev" +PR = "r1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb index 35dada5b72..11b0c506dc 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" +DEPENDS = "qmake-native" PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ |