diff options
55 files changed, 230 insertions, 613 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index f6d1ec0d8e..9a4d373de0 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -31,7 +31,7 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" +MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \ kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd" diff --git a/packages/acpid/acpid-1.0.4/gcc40.patch b/packages/acpid/acpid-1.0.4/gcc40.patch deleted file mode 100644 index dbe090ba41..0000000000 --- a/packages/acpid/acpid-1.0.4/gcc40.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: acpid-1.0.3/ud_socket.c -=================================================================== ---- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 -+++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700 -@@ -58,7 +58,7 @@ - while (1) { - int newsock = 0; - struct sockaddr_un cliaddr; -- int len = sizeof(struct sockaddr_un); -+ socklen_t len = sizeof(struct sockaddr_un); - - newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); - if (newsock < 0) { diff --git a/packages/acpid/acpid-1.0.3/.mtn2git_empty b/packages/acpid/acpid/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/acpid/acpid-1.0.3/.mtn2git_empty +++ b/packages/acpid/acpid/.mtn2git_empty diff --git a/packages/acpid/acpid-1.0.3/gcc40.patch b/packages/acpid/acpid/gcc40.patch index dbe090ba41..5320cee0bb 100644 --- a/packages/acpid/acpid-1.0.3/gcc40.patch +++ b/packages/acpid/acpid/gcc40.patch @@ -1,3 +1,5 @@ +upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341 + Index: acpid-1.0.3/ud_socket.c =================================================================== --- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 diff --git a/packages/acpid/acpid-1.0.4/.mtn2git_empty b/packages/amule/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/acpid/acpid-1.0.4/.mtn2git_empty +++ b/packages/amule/.mtn2git_empty diff --git a/packages/amule/amule_2.1.3.bb b/packages/amule/amule_2.1.3.bb new file mode 100644 index 0000000000..b160203ffd --- /dev/null +++ b/packages/amule/amule_2.1.3.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "aMule is an eMule-like client for the eD2k \ +and Kademlia networks, supporting multiple platforms." +HOMEPAGE = "http://www.amule.org" +LICENSE = "GPL" +SECTION = "web" +PRIORITY = "optional" +DEPENDS = "wxbase" + + +SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \ + file://parser.patch;patch=1" + +S = "${WORKDIR}/aMule-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-amulecmd \ + --enable-webserver \ + --disable-monolithic \ + --enable-amule-daemon \ + --disable-nls" +# --enable-optimize" + +FILES_${PN} += " \ + ${libdir}/xchat" diff --git a/packages/wxbase/.mtn2git_empty b/packages/amule/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wxbase/.mtn2git_empty +++ b/packages/amule/files/.mtn2git_empty diff --git a/packages/amule/files/parser.patch b/packages/amule/files/parser.patch new file mode 100644 index 0000000000..ee77c42380 --- /dev/null +++ b/packages/amule/files/parser.patch @@ -0,0 +1,20 @@ +diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp +--- aMule-2.1.0_orig/src/Parser.cpp 2005-12-20 05:13:25.000000000 +0100 ++++ aMule-2.1.0/src/Parser.cpp 2006-01-29 15:16:45.000000000 +0100 +@@ -203,14 +203,14 @@ + # define YYMALLOC malloc + # if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE + # define YYFREE free + # if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void free (void *); /* INFRINGES ON USER NAME SPACE */ ++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifdef __cplusplus diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.20.bb index 5ba5751f2d..8a90efe85c 100644 --- a/packages/djvulibre/djvulibre_3.5.19.bb +++ b/packages/djvulibre/djvulibre_3.5.20.bb @@ -1,27 +1,23 @@ DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities." LICENSE = "GPL" - DEPENDS = "jpeg libpng tiff" +PR = "r1" -SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \ +SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \ file://fix-cross-configure.patch;patch=1" - inherit qt4x11 autotools pkgconfig #export QT_LIBS = "${OE_QMAKE_LIBS_QT}" #export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ " EXTRA_OECONF = " --enable-threads \ - --with-qt=${QTDIR} " - -PACKAGES =+ "libdjvulibre" - -FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*" -FILES_${PN} += "${datadir}/djvu" + --with-qt=${PAMLTOPDIR} " do_stage() { autotools_stage_all } - +PACKAGES =+ "libdjvulibre" +FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*" +FILES_${PN} += "${datadir}/djvu" diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch index 42ec190600..921cab6e18 100644 --- a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch +++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch @@ -1,3 +1,7 @@ +upstream: n/a +comment: Use the preprocessor we have just compiled instead the one of +the system. There might be incompabilities between us and them. + Index: gcc-4.1.1/Makefile.in =================================================================== --- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 diff --git a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch index 42ec190600..921cab6e18 100644 --- a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch +++ b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch @@ -1,3 +1,7 @@ +upstream: n/a +comment: Use the preprocessor we have just compiled instead the one of +the system. There might be incompabilities between us and them. + Index: gcc-4.1.1/Makefile.in =================================================================== --- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 diff --git a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch index 6afb10d6ef..0b401defd8 100644 --- a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch +++ b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch @@ -1,3 +1,16 @@ +upstream: n/a +status: evil hack +comment: Including host system headers when cross compiling can lead to weird +issues, in the best case compile issues, in the worst case crashes. E.g. if you +are building a uclibc system, you certainly do not want glibc headers or OSX libc +headers to be picked up. To avoid that this patch is penetalizing certain common +Linux/Unix host directories. + +To send the patch upstream the evil paths should be specified by +a setting or command-line options. Until now this is a evil hack assuming +certain host system paths. E.g. /usr/local/ and other common paths should be +added. + Index: gcc-4.0.2/gcc/c-incpath.c =================================================================== --- gcc-4.0.2.orig/gcc/c-incpath.c 2005-01-23 16:05:27.000000000 +0100 diff --git a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch index 42ec190600..921cab6e18 100644 --- a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch +++ b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch @@ -1,3 +1,7 @@ +upstream: n/a +comment: Use the preprocessor we have just compiled instead the one of +the system. There might be incompabilities between us and them. + Index: gcc-4.1.1/Makefile.in =================================================================== --- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 diff --git a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch index 42ec190600..921cab6e18 100644 --- a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch +++ b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch @@ -1,3 +1,7 @@ +upstream: n/a +comment: Use the preprocessor we have just compiled instead the one of +the system. There might be incompabilities between us and them. + Index: gcc-4.1.1/Makefile.in =================================================================== --- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 diff --git a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch index 023b6a51bc..229db09fb3 100644 --- a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch +++ b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch @@ -1,3 +1,8 @@ +upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004 +status: WONTFIX +comment: Use OEs version of the readelf version. There might be no +host system version (e.g. on OSX) or it is not multiarch. + Index: glibc-2.4/configure =================================================================== --- glibc-2.4.orig/configure 2006-03-06 12:18:56.000000000 +0100 diff --git a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch index c57494f937..7dc699cfad 100644 --- a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch +++ b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch @@ -1,3 +1,8 @@ +upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004 +status: WONTFIX +comment: Use OEs version of the readelf version. There might be no +host system version (e.g. on OSX) or it is not multiarch. + Index: glibc-2.3.2/configure =================================================================== --- glibc-2.3.2.orig/configure 2006-08-05 20:18:11.000000000 +0200 diff --git a/packages/gnome/gnome-desktop.inc b/packages/gnome/gnome-desktop.inc new file mode 100644 index 0000000000..aeabf4f41e --- /dev/null +++ b/packages/gnome/gnome-desktop.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPL" +DEPENDS = "gnome-common libgnomeui" + +EXTRA_OECONF = "--disable-scrollkeeper" + +do_configure_prepend () { + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} +} + +do_stage () { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/gnome-about" diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index b8e098f40c..2bf249ddb6 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -1,17 +1,5 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -PR = "r1" -DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome pkgconfig - -DEPENDS = "gnome-common libgnomeui" +require gnome-desktop.inc -EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} +PR = "r1" -do_stage () { -autotools_stage_all -} +inherit gnome pkgconfig diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 69de709350..fb45b134ae 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -1,25 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r2" -DESCRIPTION = "GNOME library for reading .desktop files" inherit gnome pkgconfig -DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +DEPENDS += "gnome-doc-utils" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" - -EXTRA_OECONF = "--disable-scrollkeeper" - -EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - -FILES_${PN} += "${datadir}/gnome-about" - - -do_stage () { - autotools_stage_all -} diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb index c2888bf2a4..7b9a5932e1 100644 --- a/packages/gnome/gnome-desktop_2.18.3.bb +++ b/packages/gnome/gnome-desktop_2.18.3.bb @@ -1,23 +1,10 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r2" -DESCRIPTION = "GNOME library for reading .desktop files" + inherit gnome pkgconfig -DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui" +DEPENDS += "gnome-doc-utils gnome-vfs" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" - -EXTRA_OECONF = "--disable-scrollkeeper" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - -FILES_${PN} += "${datadir}/gnome-about" - - -do_stage () { - autotools_stage_all -} diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb index c7fd61470d..53b70245ca 100644 --- a/packages/gnome/gnome-desktop_2.7.90.bb +++ b/packages/gnome/gnome-desktop_2.7.90.bb @@ -1,17 +1,12 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r0" -DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome -DEPENDS = "gnome-common libgnomeui" +inherit gnome +EXTRA_OECONF = "" EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - do_stage () { install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/ # install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc new file mode 100644 index 0000000000..ff62257aa8 --- /dev/null +++ b/packages/gnome/gnome-doc-utils.inc @@ -0,0 +1,16 @@ +LICENSE = "GPL LGPL" +DEPENDS = "libxml2 libxslt libxslt-native" + +PR = "r1" + +inherit gnome + +EXTRA_OECONF = "--disable-scrollkeeper" + +do_stage() { + mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ + autotools_stage_all +} + +FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb index 315cdbd160..cfb4788076 100644 --- a/packages/gnome/gnome-doc-utils_0.10.3.bb +++ b/packages/gnome/gnome-doc-utils_0.10.3.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt" +require gnome-doc-utils.inc PR = "r0" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -FILES_${PN} += "${datadir}/xml*" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb index f190a5ae13..2499ac36e4 100644 --- a/packages/gnome/gnome-doc-utils_0.12.0.bb +++ b/packages/gnome/gnome-doc-utils_0.12.0.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL/LGPL" -DEPENDS = "libxml2 libxslt" +require gnome-doc-utils.inc PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -FILES_${PN} += "${datadir}/xml*" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 86a36c4bd7..2499ac36e4 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt" +require gnome-doc-utils.inc PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -FILES_${PN} += "${datadir}/xml*" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc index 7cbf0ce890..a6a1832853 100644 --- a/packages/gtk-webcore/osb-nrcore.inc +++ b/packages/gtk-webcore/osb-nrcore.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://gtk-webcore.sourceforge.net/" PRIORITY = "optional" SECTION = "gpe" LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt" +DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt gperf-native" LEAD_SONAME = "libnrcore.so" diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb index b6a90a54a4..1567e985e2 100644 --- a/packages/icewm/icewm_1.2.20.bb +++ b/packages/icewm/icewm_1.2.20.bb @@ -2,7 +2,8 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r1" +RRECOMMENDS = "ttf-dejavu-sans" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb index 4e7b7125ec..3dfffb1ae8 100644 --- a/packages/icewm/icewm_1.2.30.bb +++ b/packages/icewm/icewm_1.2.30.bb @@ -2,7 +2,8 @@ SECTION = "x11/wm" DESCRIPTION = "IceWM Window Manager" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r0" +RRECOMMENDS = "ttf-dejavu-sans" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch index 94a78110a2..72fa3688a7 100644 --- a/packages/libmrss/files/better-parse-url-r0.patch +++ b/packages/libmrss/files/better-parse-url-r0.patch @@ -1,3 +1,10 @@ +upstream: mailed to bakunin_at_autistici_dot_org by Laibsch +status: pending +comment: API addition to not manually setup the CURL connection and still +be able to get the transfered feed and save it to secondary storage. done +by zecke for the OpenMoko RSS reader. + + Index: libmrss-0.17.2/src/mrss.h =================================================================== --- libmrss-0.17.2.orig/src/mrss.h 2007-04-02 14:42:55.000000000 +0200 diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig index 3cc17679c1..d842308fc9 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig @@ -687,7 +687,7 @@ CONFIG_EEPROM_93CX6=m # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y +CONFIG_SCSI=m CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set @@ -696,11 +696,11 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set -CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set # @@ -715,45 +715,11 @@ CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports # -CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC94XX is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_LOWLEVEL is not set # CONFIG_ATA is not set # CONFIG_MD is not set @@ -796,34 +762,7 @@ CONFIG_CICADA_PHY=y # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_FIXED_PHY is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_TULIP is not set -# CONFIG_HP100 is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set -CONFIG_E100=y -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_SC92031 is not set +# CONFIG_NET_ETHERNET is not set CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set @@ -843,14 +782,7 @@ CONFIG_GIANFAR=y CONFIG_GFAR_NAPI=y # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set -CONFIG_NETDEV_10000=y -# CONFIG_CHELSIO_T1 is not set -# CONFIG_CHELSIO_T3 is not set -# CONFIG_IXGB is not set -# CONFIG_S2IO is not set -# CONFIG_MYRI10GE is not set -# CONFIG_NETXEN_NIC is not set -# CONFIG_MLX4_CORE is not set +# CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set # @@ -1470,7 +1402,7 @@ CONFIG_USB_UHCI_HCD=y # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index be322be927..1116ce3998 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -20,8 +20,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver @@ -0,0 +1,171 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c -+ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com> + * Copyright (C) 2007 Jeremy Laine <jeremy.laine@bolloretelecom.eu> ++ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for @@ -99,21 +99,21 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver + }, + { + .cdev = { -+ .name = "mpc8313:green", ++ .name = "mpc8313:led5", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 32, + }, + { + .cdev = { -+ .name = "mpc8313:yellow", ++ .name = "mpc8313:led6", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 64, + }, + { + .cdev = { -+ .name = "mpc8313:red", ++ .name = "mpc8313:led7", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 128, @@ -186,7 +186,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver +module_init(mpc8313leds_init); +module_exit(mpc8313leds_exit); + -+MODULE_AUTHOR("Leon Woestenberg <leon@sidebranch.com>"); ++MODULE_AUTHOR("Jeremy Laine <jeremy.laine@bolloretelecom.eu>"); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); +MODULE_LICENSE("GPL"); diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch index f1dca9d8e1..5336905a66 100644 --- a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -20,8 +20,8 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver @@ -0,0 +1,171 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c -+ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com> + * Copyright (C) 2007 Jeremy Laine <jeremy.laine@bolloretelecom.eu> ++ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for @@ -99,21 +99,21 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver + }, + { + .cdev = { -+ .name = "mpc8313:green", ++ .name = "mpc8313:led5", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 32, + }, + { + .cdev = { -+ .name = "mpc8313:yellow", ++ .name = "mpc8313:led6", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 64, + }, + { + .cdev = { -+ .name = "mpc8313:red", ++ .name = "mpc8313:led7", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 128, @@ -186,7 +186,7 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver +module_init(mpc8313leds_init); +module_exit(mpc8313leds_exit); + -+MODULE_AUTHOR("Leon Woestenberg <leon@sidebranch.com>"); ++MODULE_AUTHOR("Jeremy Laine <jeremy.laine@bolloretelecom.eu>"); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); +MODULE_LICENSE("GPL"); diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile diff --git a/packages/linux/linux-rp-2.6.24/pxafb.patch b/packages/linux/linux-rp-2.6.24/pxafb.patch index efcfb079b2..7fe693cd91 100644 --- a/packages/linux/linux-rp-2.6.24/pxafb.patch +++ b/packages/linux/linux-rp-2.6.24/pxafb.patch @@ -11,16 +11,3 @@ Index: linux-2.6.23/drivers/video/pxafb.c lccr3 = fbi->reg_lccr3; set_hsync_time(fbi, pcd); fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd); -Index: linux-2.6.23/drivers/video/pxafb.c -=================================================================== ---- linux-2.6.23.orig/drivers/video/pxafb.c 2008-01-25 16:25:21.000000000 -0800 -+++ linux-2.6.23/drivers/video/pxafb.c 2008-01-25 16:32:14.000000000 -0800 -@@ -1194,7 +1194,7 @@ - if ((clkinfo->old == 13000)) - break; - -- pcd = get_pcd(fbi->fb.var.pixclock); -+ pcd = get_pcd(fbi,fbi->fb.var.pixclock); - lccr3 = fbi->reg_lccr3; - set_hsync_time(fbi, pcd); - fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd); diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index f754e6be83..ffc1820229 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_avr32 = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" DEPENDS_append_mpc8323e-rdb = " dtc-native" -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ file://binutils-buildid-arm.patch;patch=1 \ diff --git a/packages/qclockchange/files/.mtn2git_empty b/packages/qclockchange/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qclockchange/files/.mtn2git_empty diff --git a/packages/qclockchange/files/qclockchange.desktop b/packages/qclockchange/files/qclockchange.desktop new file mode 100644 index 0000000000..9463623883 --- /dev/null +++ b/packages/qclockchange/files/qclockchange.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Comment= Changes the CPU frequency +Exec=qclockchange +Icon=qclockchange +Type=Application +Name=Qclockchange diff --git a/packages/qclockchange/files/qclockchange.png b/packages/qclockchange/files/qclockchange.png Binary files differnew file mode 100644 index 0000000000..861fe2eecc --- /dev/null +++ b/packages/qclockchange/files/qclockchange.png diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb deleted file mode 100644 index 0061c830c9..0000000000 --- a/packages/qclockchange/qclockchange_0.1a.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses." -SECTION = "opie/settings" -PRIORITY = "optional" -LICENSE = "GPL" -AUTHOR = "piro <piro400@occn.zaq.ne.jp>" -HOMEPAGE = "http://www.piro.hopto.org/~piro/pukiwiki/pukiwiki.php?%5B%5B%A5%AB%A1%BC%A5%CD%A5%EB%A5%D1%A5%C3%A5%C1%A4%F2%A4%DE%A4%C8%A4%E1%A4%EB%5D%5D" -APPTYPE="binary" -PR = "r1" - -SRC_URI = "http://www.piro.hopto.org/~piro/zaurus/qclockchange-${PV}.tar.gz" - -inherit palmtop - -do_install() { - install -d ${D}${palmtopdir}/bin/ \ - ${D}${palmtopdir}/pics \ - ${D}${palmtopdir}/apps/Settings - - install -m 0755 qclockchange ${D}${palmtopdir}/bin/qclockchange - install -m 0644 ipkg/opt/QtPalmtop/pics/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png - install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop -} diff --git a/packages/qclockchange/qclockchange_0.1b.bb b/packages/qclockchange/qclockchange_0.1b.bb new file mode 100644 index 0000000000..7980618f97 --- /dev/null +++ b/packages/qclockchange/qclockchange_0.1b.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses." +SECTION = "opie/settings" +PRIORITY = "optional" +LICENSE = "GPL" +AUTHOR = "piro <piro400@occn.zaq.ne.jp>" +HOMEPAGE = "http://piro.sytes.net/~piro/zaurus/" +APPTYPE="binary" +PR = "r0" + +SRC_URI = "http://piro.sytes.net/~piro/zaurus/etc/qclockchange-${PV}.tar.gz \ + file://qclockchange.png \ + file://qclockchange.desktop " + +inherit palmtop + +do_install() { + install -d ${D}${palmtopdir}/bin/ \ + ${D}${palmtopdir}/pics \ + ${D}${palmtopdir}/apps/Settings + + install -m 0755 bin/qclockchange ${D}${palmtopdir}/bin/qclockchange + install -m 0644 ${WORKDIR}/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png + install -m 0644 ${WORKDIR}/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop +} diff --git a/packages/sqlite/sqlite3-3.2.2/libtool.patch b/packages/sqlite/sqlite3-3.2.2/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.2.2/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.2.5/libtool.patch b/packages/sqlite/sqlite3-3.2.5/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.2.5/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.2.7/libtool.patch b/packages/sqlite/sqlite3-3.2.7/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.2.7/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.3.12/cross-compile.patch b/packages/sqlite/sqlite3-3.3.12/cross-compile.patch deleted file mode 100644 index 31d4f0d162..0000000000 --- a/packages/sqlite/sqlite3-3.3.12/cross-compile.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 -+++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 -@@ -187,10 +187,11 @@ - default_build_cflags="-g" - if test "$config_BUILD_CC" = ""; then - AC_PROG_CC -- if test "$cross_compiling" = "yes"; then -- AC_MSG_ERROR([unable to find a compiler for building build tools]) -- fi -- BUILD_CC=$CC -+# if test "$cross_compiling" = "yes"; then -+# AC_MSG_ERROR([unable to find a compiler for building build tools]) -+# fi -+# BUILD_CC=$CC -+BUILD_CC=gcc - default_build_cflags=$CFLAGS - else - BUILD_CC=$config_BUILD_CC -@@ -238,6 +239,12 @@ - TARGET_LINK=$config_TARGET_LINK - fi - AC_MSG_RESULT($TARGET_LINK) -+if test "$config_TARGET_LFLAGS" != ""; then -+ TARGET_LFLAGS=$config_TARGET_LFLAGS -+ else -+ TARGET_LFLAGS=$BUILD_LFLAGS -+ fi -+AC_MSG_RESULT($TARGET_LFLAGS) - AC_MSG_CHECKING([switches on the target compiler]) - if test "$config_TARGET_TFLAGS" != ""; then - TARGET_TFLAGS=$config_TARGET_TFLAGS -@@ -592,15 +599,7 @@ - # Figure out what C libraries are required to compile programs - # that use "readline()" library. - # --if test "$config_TARGET_READLINE_LIBS" != ""; then -- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" --else -- CC=$TARGET_CC -- LIBS="" -- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) -- AC_CHECK_LIB([readline], [readline]) -- TARGET_READLINE_LIBS="$LIBS" --fi -+TARGET_READLINE_LIBS="-lreadline" - AC_SUBST(TARGET_READLINE_LIBS) - - ########## -@@ -615,41 +614,8 @@ - ########## - # Figure out where to get the READLINE header files. - # --AC_MSG_CHECKING([readline header files]) --found=no --if test "$config_TARGET_READLINE_INC" != ""; then -- TARGET_READLINE_INC=$config_TARGET_READLINE_INC -- found=yes --fi --if test "$found" = "yes"; then -- AC_MSG_RESULT($TARGET_READLINE_INC) --else -- AC_MSG_RESULT(not specified: still searching...) -- AC_CHECK_HEADER(readline.h, [found=yes]) --fi --if test "$found" = "no"; then -- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do -- AC_CHECK_FILE($dir/include/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include" -- break -- fi -- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include/readline" -- break -- fi -- done --fi --if test "$found" = "yes"; then -- if test "$TARGET_READLINE_LIBS" = ""; then -- TARGET_HAVE_READLINE=0 -- else -- TARGET_HAVE_READLINE=1 -- fi --else -- TARGET_HAVE_READLINE=0 --fi -+TARGET_READLINE_INC="" -+TARGET_HAVE_READLINE=1 - AC_SUBST(TARGET_READLINE_INC) - AC_SUBST(TARGET_HAVE_READLINE) - diff --git a/packages/sqlite/sqlite3-3.3.12/libtool.patch b/packages/sqlite/sqlite3-3.3.12/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.3.12/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.3.13/cross-compile.patch b/packages/sqlite/sqlite3-3.3.13/cross-compile.patch deleted file mode 100644 index 31d4f0d162..0000000000 --- a/packages/sqlite/sqlite3-3.3.13/cross-compile.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 -+++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 -@@ -187,10 +187,11 @@ - default_build_cflags="-g" - if test "$config_BUILD_CC" = ""; then - AC_PROG_CC -- if test "$cross_compiling" = "yes"; then -- AC_MSG_ERROR([unable to find a compiler for building build tools]) -- fi -- BUILD_CC=$CC -+# if test "$cross_compiling" = "yes"; then -+# AC_MSG_ERROR([unable to find a compiler for building build tools]) -+# fi -+# BUILD_CC=$CC -+BUILD_CC=gcc - default_build_cflags=$CFLAGS - else - BUILD_CC=$config_BUILD_CC -@@ -238,6 +239,12 @@ - TARGET_LINK=$config_TARGET_LINK - fi - AC_MSG_RESULT($TARGET_LINK) -+if test "$config_TARGET_LFLAGS" != ""; then -+ TARGET_LFLAGS=$config_TARGET_LFLAGS -+ else -+ TARGET_LFLAGS=$BUILD_LFLAGS -+ fi -+AC_MSG_RESULT($TARGET_LFLAGS) - AC_MSG_CHECKING([switches on the target compiler]) - if test "$config_TARGET_TFLAGS" != ""; then - TARGET_TFLAGS=$config_TARGET_TFLAGS -@@ -592,15 +599,7 @@ - # Figure out what C libraries are required to compile programs - # that use "readline()" library. - # --if test "$config_TARGET_READLINE_LIBS" != ""; then -- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" --else -- CC=$TARGET_CC -- LIBS="" -- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) -- AC_CHECK_LIB([readline], [readline]) -- TARGET_READLINE_LIBS="$LIBS" --fi -+TARGET_READLINE_LIBS="-lreadline" - AC_SUBST(TARGET_READLINE_LIBS) - - ########## -@@ -615,41 +614,8 @@ - ########## - # Figure out where to get the READLINE header files. - # --AC_MSG_CHECKING([readline header files]) --found=no --if test "$config_TARGET_READLINE_INC" != ""; then -- TARGET_READLINE_INC=$config_TARGET_READLINE_INC -- found=yes --fi --if test "$found" = "yes"; then -- AC_MSG_RESULT($TARGET_READLINE_INC) --else -- AC_MSG_RESULT(not specified: still searching...) -- AC_CHECK_HEADER(readline.h, [found=yes]) --fi --if test "$found" = "no"; then -- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do -- AC_CHECK_FILE($dir/include/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include" -- break -- fi -- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include/readline" -- break -- fi -- done --fi --if test "$found" = "yes"; then -- if test "$TARGET_READLINE_LIBS" = ""; then -- TARGET_HAVE_READLINE=0 -- else -- TARGET_HAVE_READLINE=1 -- fi --else -- TARGET_HAVE_READLINE=0 --fi -+TARGET_READLINE_INC="" -+TARGET_HAVE_READLINE=1 - AC_SUBST(TARGET_READLINE_INC) - AC_SUBST(TARGET_HAVE_READLINE) - diff --git a/packages/sqlite/sqlite3-3.3.13/libtool.patch b/packages/sqlite/sqlite3-3.3.13/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.3.13/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.3.17/libtool.patch b/packages/sqlite/sqlite3-3.3.17/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.3.17/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3-3.4.1/libtool.patch b/packages/sqlite/sqlite3-3.4.1/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/sqlite/sqlite3-3.4.1/libtool.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/sqlite/sqlite3_3.5.2.bb b/packages/sqlite/sqlite3_3.5.6.bb index 53fd96c705..53fd96c705 100644 --- a/packages/sqlite/sqlite3_3.5.2.bb +++ b/packages/sqlite/sqlite3_3.5.6.bb diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index bb89ac0c2b..77aa07de00 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r61" +PR = "r62" inherit task @@ -345,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\ kernel-module-ieee80211-crypt-wep \ kernel-module-ecb \ kernel-module-arc4 \ + kernel-module-crypto_algapi \ + kernel-module-cryptomgr \ kernel-module-michael-mic \ kernel-module-aes" diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 4666b4ab8d..5487985fd4 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -50,8 +50,7 @@ RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-butto opie-formatter opie-language opie-launcher-settings \
opie-light-and-power opie-mediummount opie-networksettings \
opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
- opie-systemtime opie-usermanager opie-icon-reload \
- opie-vmemo-settings"
+ opie-systemtime opie-icon-reload opie-vmemo-settings"
RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
opie-mail opie-pimconverter"
diff --git a/packages/wireshark/tshark_0.99.4.bb b/packages/wireshark/tshark_0.99.4.bb new file mode 100644 index 0000000000..7338efdda7 --- /dev/null +++ b/packages/wireshark/tshark_0.99.4.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "tshark is the text based verion of wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.ethereal.com" +SECTION = "network" +LICENSE = "GPL" +DEPENDS = "perl-native gnutls libpcap pcre expat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \ + file://use-our-lemon.patch;patch=1 \ + file://no-host-includes.patch;patch=1" + +S=${WORKDIR}/wireshark-${PV} + +inherit autotools + +EXTRA_OECONF = "--disable-wireshark" + +do_compile_prepend() { + ${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c + oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" +} + diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.2.bb index 07d9199ae1..07d9199ae1 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxwidgets/wxbase_2.6.2.bb diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb index 772ea4e27f..772ea4e27f 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxwidgets/wxbase_2.7+cvs.bb diff --git a/packages/xorg-proto/renderproto_0.9.3.bb b/packages/xorg-proto/renderproto_0.9.3.bb index 3d20b24afd..f1d19df46e 100644 --- a/packages/xorg-proto/renderproto_0.9.3.bb +++ b/packages/xorg-proto/renderproto_0.9.3.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc CONFLICTS = "renderext" PE = "1" + +DEFAULT_PREFERENCE = "-1" |
