diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-07-04 09:47:33 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-04 09:47:33 +0000 |
| commit | 4529f12ab4c495e6d4790814f31a46b33ceca1e7 (patch) | |
| tree | b028ea541efeea1aa1481326aae00c611d1fa2d8 | |
| parent | f95b30588c16453d5f98e17b9b800b4d1e399b66 (diff) | |
| parent | d1f207a2c3388bbbd8a6ff976603e679478533b2 (diff) | |
merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
and b160064c666a513a6ec76f7fd0ddbd5ee1d7a985
54 files changed, 1031 insertions, 1437 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 89a10705ca..67e2aef263 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,8 +78,8 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.3" -include conf/distro/preferred-opie-versions.inc +#OPIE_VERSION = "1.2.3" // use cvsdate for now +#include conf/distro/preferred-opie-versions.inc #<> #<> We want pcmciautils, not pcmcia-cs diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index fab57cae38..e1baea775d 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,7 +14,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" #ship in rootfs: diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 9ed313334b..359f8296d8 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -21,7 +21,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" @@ -41,7 +42,6 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" # These modules are now compiled into the kernel: #HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index be281d72bf..f6aaddd55e 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,9 +1,16 @@ -export IMAGE_BASENAME = "Ångström Bootmanager Image" +#Angstrom bootmanager image +LICENSE = MIT +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends angstrom-bootmanager" + +export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager" +export IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk -DEPENDS += "task-bootstrap angstrom-bootmanager" -LICENSE = "MIT" + diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb new file mode 100644 index 0000000000..b2b5565eb6 --- /dev/null +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -0,0 +1,14 @@ +#Angstrom bootstrap image +LICENSE = MIT +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends" + +export IMAGE_BASENAME = "bootstrap-image" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "${RDEPENDS}" + +inherit image_ipk + diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb new file mode 100644 index 0000000000..df7f90987e --- /dev/null +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -0,0 +1,22 @@ +#Angstrom GPE image +LICENSE = MIT +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +PR = "r0" + +export IMAGE_BASENAME = "gpe-image" + +DEPENDS = "task-angstrom" +RDEPENDS = "\ + angstrom-base-depends \ + angstrom-x11-base-depends \ + angsgrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export IPKG_INSTALL = "${RDEPENDS}" + +#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " + +inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index c7323314db..ec989659f1 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -3,7 +3,8 @@ PR = "r0" ALLOW_EMPTY = "1" PACKAGES = "\ - angstrom-X-base-depends \ + angstrom-base-depends \ + angstrom-x11-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ @@ -13,7 +14,22 @@ PACKAGES = "\ angstrom-task-printing \ angstrom-task-sectest" -RDEPENDS_angstrom-X-base-depends := "\ +RDEPENDS_angstrom-base-depends = "\ + base-files \ + base-passwd tinylogin \ + busybox \ + udev \ + sysvinit initscripts sysvinit-pidof \ + netbase \ + angstrom-version \ + " + +RRECOMMENDS_angstrom-base-depends = "\ + ${BOOTMODULES_RRECOMMENDS} \ + " + + +RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb index df78fbdcd0..5089ce23a4 100644 --- a/packages/e17/e-wm_0.16.999.027.bb +++ b/packages/e17/e-wm_0.16.999.027.bb @@ -3,20 +3,12 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" PR = "r3" -inherit e +inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://Xsession.d/98enlightenment" -# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" -# file://disable-splash.patch;patch=1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" - - S = "${WORKDIR}/enlightenment-${PV}" PROFILE = "LOWRES_PDA" @@ -35,10 +27,6 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" -# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" } do_install_append() { @@ -46,7 +34,7 @@ do_install_append() { install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d } -#pkg_postinst() { -# enlightenment_remote -menu-autoscroll-margin-set 5 -# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 -#}
\ No newline at end of file +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/opie-datebook/files/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-datebook/files/.mtn2git_empty +++ b/packages/fluxbox/fluxbox/.mtn2git_empty diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox/apps.gpe.akita index 7aca442752..7aca442752 100644 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe +++ b/packages/fluxbox/fluxbox/apps.gpe.akita diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default new file mode 100644 index 0000000000..d7a0a83f22 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.default @@ -0,0 +1,7 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session index f6e03ede7e..f6e03ede7e 100644 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session +++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session index 16b7a2703a..16b7a2703a 100644 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session +++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch index c9836923d8..c9836923d8 100644 --- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch +++ b/packages/fluxbox/fluxbox/gpe-init.patch diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default index f94aaf7cdd..f94aaf7cdd 100644 --- a/packages/fluxbox/fluxbox-gpe/style.gpe-default +++ b/packages/fluxbox/fluxbox/style.gpe-default diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index 9cf8da0217..cf69b090c4 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -5,44 +5,50 @@ # Filename: fluxbox-gpe_1.0rc.bb # Date: 01-Jul-06 -DESCRIPTION = "The Fluxbox WindowManager for use with GPE" +DESCRIPTION = "The Fluxbox WindowManager" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" -RCONFLICTS = "fluxbox" +REALPV = "1.0rc" +PR = "r1" ###################################################################################### -PR = "r3" -S = "${WORKDIR}/fluxbox-${PV}" +S = "${WORKDIR}/fluxbox-${REALPV}" ###################################################################################### -SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ - file://gpe-init.patch;patch=1\ +SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \ + file://gpe-init.patch;patch=1 \ file://apps.gpe.* \ file://style.gpe-default \ file://fluxbox-gpe-session \ - file://fluxbox-gpe.session" + file://fluxbox-gpe.session" ###################################################################################### -PACKAGES += "${PN}-styles" +PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" DESCRIPTION_${PN}-styles = "The default styles for fluxbox" +DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" +RDEPENDS_${PN}-gpe = "${PN}" ###################################################################################### FILES_${PN} = "/usr/bin \ /usr/share/fluxbox/init \ /usr/share/fluxbox/keys \ - /usr/share/fluxbox/menu \ - /usr/share/fluxbox/apps.gpe* \ - /usr/share/fluxbox/session \ - /usr/share/fluxbox/styles/gpe-default" + /usr/share/fluxbox/menu " + +FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \ + /usr/share/fluxbox/styles/gpe-default \ + /usr/share/fluxbox/session \ + /usr/bin/fluxbox-gpe-session" FILES_${PN}-styles = "/usr/share/fluxbox/styles" +FILES_${PN}-doc = "/usr/share/man" + ###################################################################################### inherit autotools @@ -67,11 +73,10 @@ do_install_append() { ###################################################################################### -pkg_postinst_${PN}() { - update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 +pkg_postinst_${PN}-gpe() { + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 } -pkg_postrm_${PN}() { - update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session +pkg_postrm_${PN}-gpe() { + update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session } - diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 19e37660b2..4e3805b676 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 93c58aca53..044383cb84 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ include gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r0" +PR = "r1" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 74ad11033f..32e22e16f8 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -63,8 +63,13 @@ python __anonymous () { import bb, re if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) + } do_configure () { diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 793aa4bb76..6e332dceca 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 62bacda147..02e984358f 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "GPL" BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" -PR = "r1" +PR = "r2" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/hping/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-wellenreiter/files/.mtn2git_empty +++ b/packages/hping/.mtn2git_empty diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hping/files/.mtn2git_empty diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch new file mode 100644 index 0000000000..90795ab0e0 --- /dev/null +++ b/packages/hping/files/hping2_configure.patch @@ -0,0 +1,75 @@ +Allow the byteorder and target os type to be specified via +environment variables when running the configured shell script, don't +try and run the resultant binary after building it, don't set various +compiler related environment varibles - we'll let OE set those. + +diff -dur hping2-rc3-orig/configure hping2-rc3/configure +--- hping2-rc3-orig/configure 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/configure 2005-12-03 19:05:58.000000000 +1100 +@@ -13,16 +13,19 @@ + exit 0 + fi + +-CC=${CC:=cc} ++if [ "x$BYTEORDER" = "x" ]; then ++ CC=${CC:=cc} + +-echo build byteorder.c... +-$CC byteorder.c -o byteorder || exit 1 ++ echo build byteorder.c... ++ $CC byteorder.c -o byteorder || exit 1 ++ ++ BYTEORDER=`./byteorder -m` ++fi + + INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:` + if [ "$INSTALL_MANPATH" = "" ]; then + INSTALL_MANPATH="/usr/local/man" + fi +-BYTEORDER=`./byteorder -m` + + echo create byteorder.h... + cat > byteorder.h <<EOF +@@ -38,7 +41,9 @@ + #endif /* __BYTEORDER_H */ + EOF + +-CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` ++if [ "x$CONFIGOSTYPE" = "x" ]; then ++ CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` ++fi + if [ ! "$CONFIGOSTYPE" ]; then + CONFIGOSTYPE=UNKNOWN + fi +diff -dur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in +--- hping2-rc3-orig/Makefile.in 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/Makefile.in 2005-12-03 19:05:41.000000000 +1100 +@@ -6,17 +6,6 @@ + # $date: Sun Jul 25 17:56:15 MET DST 1999$ + # $rev: 3$ + +-CC= gcc +-AR=/usr/bin/ar +-RANLIB=/usr/bin/ranlib +-CCOPT= -O2 -Wall @PCAP_INCLUDE@ +-DEBUG= -g +-#uncomment the following if you need libpcap based build under linux +-#(not raccomanded) +-COMPILE_TIME= @FORCE_LIBPCAP@ +-INSTALL_MANPATH=@MANPATH@ +-@PCAP@ +- + OBJ= main.o getifname.o getlhs.o \ + linux_sockpacket.o parseoptions.o datafiller.o \ + datahandler.o gethostname.o \ +@@ -44,10 +33,6 @@ + + hping2: byteorder.h $(OBJ) + $(CC) -o hping2 $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@ +- @echo +- ./hping2 -v +- @echo "use \`make strip' to strip hping2 binary" +- @echo "use \`make install' to install hping2" + + byteorder.h: + ./configure diff --git a/packages/hping/files/hping2_debian.patch b/packages/hping/files/hping2_debian.patch new file mode 100644 index 0000000000..4edc893896 --- /dev/null +++ b/packages/hping/files/hping2_debian.patch @@ -0,0 +1,168 @@ +The following minor changes were taken from the debian hping2 package: + +--- hping2-2.rc3.orig/antigetopt.c ++++ hping2-2.rc3/antigetopt.c +@@ -140,7 +140,7 @@ + #define UNK_LONG_ERRSTRING "unrecognized option `--%s'\n" + #define ARG_SHORT_ERRSTRING "option requires an argument -- %c\n" + #define ARG_LONG_ERRSTRING "option `--%s' requires an argument\n" +-#define AMB_ERRSTRING "option `--%s' is ambiguos\n" ++#define AMB_ERRSTRING "option `--%s' is ambiguous\n" + #define IERR_ERRSTRING "internal error. ago_gnu_error() called with " \ + "a bad error code (%d)\n" + void ago_gnu_error(char *pname, int error) +--- hping2-2.rc3.orig/bytesex.h ++++ hping2-2.rc3/bytesex.h +@@ -7,16 +7,11 @@ + #ifndef ARS_BYTESEX_H + #define ARS_BYTESEX_H + +-#if defined(__i386__) \ +- || defined(__alpha__) \ +- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) ++#include <endian.h> ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define BYTE_ORDER_LITTLE_ENDIAN +-#elif defined(__mc68000__) \ +- || defined (__sparc__) \ +- || defined (__sparc) \ +- || defined (__PPC__) \ +- || defined (__BIG_ENDIAN__) \ +- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define BYTE_ORDER_BIG_ENDIAN + #else + # error can not find the byte order for this architecture, fix bytesex.h +--- hping2-2.rc3.orig/getlhs.c ++++ hping2-2.rc3/getlhs.c +@@ -55,6 +55,12 @@ + case DLT_IEEE802_11: + linkhdr_size = 14; + break; ++ case DLT_IEEE802_11: ++ linkhdr_size = 14; ++ break; ++ case DLT_TOKEN_RING: ++ linkhdr_size = 20; ++ break; + case DLT_ATM_RFC1483: + #ifdef DLT_CIP + case DLT_CIP: +@@ -105,6 +111,15 @@ + } else if ( strstr(ifname, "wlan") ) { + linkhdr_size = WLANHDR_SIZE; + return 0; ++ } else if (strstr(ifname, "atm")) { ++ linkhdr_size = 0; ++ return 0; ++ } else if ( strstr(ifname, "wlan") ) { ++ linkhdr_size = WLANHDR_SIZE; ++ return 0; ++ } else if ( strstr(ifname, "tr") ) { ++ linkhdr_size = TRHDR_SIZE; ++ return 0; + } + else + return -1; +--- hping2-2.rc3.orig/listen.c ++++ hping2-2.rc3/listen.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <sys/types.h> +--- hping2-2.rc3.orig/main.c ++++ hping2-2.rc3/main.c +@@ -26,6 +26,7 @@ + #include <time.h> + #include <sys/time.h> + #include <sys/types.h> ++#include <time.h> + + #include "hping2.h" + +--- hping2-2.rc3.orig/resolve.c ++++ hping2-2.rc3/resolve.c +@@ -12,6 +12,7 @@ + #include <sys/types.h> + #include <netdb.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <sys/socket.h> + #include <netinet/in.h> +--- hping2-2.rc3.orig/sendicmp.c ++++ hping2-2.rc3/sendicmp.c +@@ -19,6 +19,7 @@ + #include <string.h> + #include <signal.h> + #include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendtcp.c ++++ hping2-2.rc3/sendtcp.c +@@ -15,6 +15,8 @@ + #include <sys/time.h> + #include <unistd.h> + #include <signal.h> ++#include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendudp.c ++++ hping2-2.rc3/sendudp.c +@@ -15,6 +15,8 @@ + #include <sys/time.h> + #include <unistd.h> + #include <signal.h> ++#include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/statistics.c ++++ hping2-2.rc3/statistics.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "hping2.h" + #include "globals.h" +@@ -33,7 +34,7 @@ + lossrate = 100; + + fprintf(stderr, "\n--- %s hping statistic ---\n", targetname); +- fprintf(stderr, "%d packets tramitted, %d packets received, " ++ fprintf(stderr, "%d packets transmitted, %d packets received, " + "%d%% packet loss\n", sent_pkt, recv_pkt, lossrate); + if (out_of_sequence_pkt) + fprintf(stderr, "%d out of sequence packets received\n", +--- hping2-2.rc3.orig/usage.c ++++ hping2-2.rc3/usage.c +@@ -12,6 +12,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + void show_usage(void) + { +--- hping2-2.rc3.orig/version.c ++++ hping2-2.rc3/version.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "release.h" + #include "hping2.h" diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb new file mode 100644 index 0000000000..912f7c420e --- /dev/null +++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "hping is a command-line oriented TCP/IP packet \ +assembler/analyzer. The interface is inspired to the ping(8) \ +unix command, but hping isn't only able to send ICMP echo requests. \ +It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute \ +mode, the ability to send files between a covered channel, and many \ +other features." +HOMEPAGE = "http://www.hping.org/" +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \ + file://hping2_debian.patch;patch=1 \ + file://hping2_configure.patch;patch=1" +S="${WORKDIR}/hping2-rc3" + +# +# We've patched configure to accept byte order and ostype as env +# variables Pass those values in to stop it trying to figure it out +# by itself. +# NOTE: The configure script is not an autoconf script. +# +do_configure() { + # endianness fun.. inspired by openssl.inc + . ${CONFIG_SITE} + BYTEORDER="UNKNOWN" + if test "x$ac_cv_c_bigendian" = "xyes"; then + BYTEORDER="__BIG_ENDIAN_BITFIELD" + elif test "x$ac_cv_c_littleendian" = "xyes"; then + BYTEORDER="__LITTLE_ENDIAN_BITFIELD" + else + oefatal do_configure cannot determine endianess + fi + BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure +} + +# +# Instead of patching the install we do things manually here +# +do_install() { + install -m 0755 -d ${D}${sbindir} ${D}/${mandir} ${D}${docdir}/hping2 + install -m 0755 hping2 ${D}/${sbindir} + install -m 0644 docs/hping2.8 ${D}/${mandir} + install -m 0644 docs/HPING2-HOWTO.txt docs/HPING2-IS-OPEN \ + docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt \ + docs/AS-BACKDOOR docs/APD.txt ${D}${docdir}/hping2 +} diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc index ec49ee2d54..e6568833cf 100644 --- a/packages/iqnotes/iqnotes.inc +++ b/packages/iqnotes/iqnotes.inc @@ -5,7 +5,6 @@ Data can be crypted by strong AES algorithm." SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "virtual/libqpe" MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" HOMEPAGE = "http://iqnotes.berlios.de" AUTHOR = "Peter Vrabel <kybu@kybu.org>" diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb index fd42188079..7123f68bb2 100644 --- a/packages/iqnotes/iqnotes_2.0.2.bb +++ b/packages/iqnotes/iqnotes_2.0.2.bb @@ -1,6 +1,6 @@ -include iqnotes.inc +require iqnotes.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \ file://md5.diff;patch=1 \ diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb index 6309d8ba1a..e3288505eb 100644 --- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb +++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb @@ -1,8 +1,8 @@ -include iqnotes.inc +require iqnotes.inc #upstream version UPV = "2.1.0rc1" -PR = "r1" +PR = "r2" SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ file://pro.patch;patch=1" diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb index 9710e71109..b743544903 100644 --- a/packages/irk/irk-belkin_0.11.bb +++ b/packages/irk/irk-belkin_0.11.bb @@ -1,9 +1,9 @@ -include irk.inc +require irk.inc DESCRIPTION += "(version with Belkin support)" RCONFLICTS = "irk-targus" RREPLACES = "irk-targus" -PR = "r2" +PR = "r3" SRC_URI = "http://kopsisengineering.com/irk-current.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index d7ba4a70a8..1b130776a8 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -1,4 +1,5 @@ -include irk.inc +require irk.inc +PR = "r2" DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" diff --git a/packages/irk/irk.inc b/packages/irk/irk.inc index c988cdafd3..b00583c22b 100644 --- a/packages/irk/irk.inc +++ b/packages/irk/irk.inc @@ -3,13 +3,13 @@ SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" -DEPENDS = "virtual/libqpe lirc" +DEPENDS = "lirc" S = "${WORKDIR}/irk" inherit palmtop -EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" +EXTRA_QMAKEVARS_POST += "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" do_install() { install -d ${D}${sysconfdir}/ diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.44.bb index a2650eec85..1288ea6e75 100644 --- a/packages/libcwd/libcwd_0.99.40.bb +++ b/packages/libcwd/libcwd_0.99.44.bb @@ -12,6 +12,10 @@ SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar. inherit autotools +do_configure() { + oe_runconf +} + PARALLEL_MAKE = "" PACKAGES =+ "${PN}-config ${PN}-mt" diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 5db9de0d6e..194f0dc7c6 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -4,14 +4,14 @@ LICENSE = "GPL" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'jornada7xx' +#COMPATIBLE_MACHINE = "jornada7xx" SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ - file://Kconfig-Keyboard-Jornada720.patch;patch=0\ + file://Kconfig-Keyboard-Jornada720.patch;patch=0 \ file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 355db4d3ea..a917f76d05 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -5,9 +5,9 @@ PRIORITY = "optional" LICENSE = "GPL" #Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV PV = "4.2.0-cvs-${SRCDATE}" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" +SRC_URI = "cvs://anonymous@mileage.cvs.sourceforge.net/cvsroot/mileage;module=mileage" S = "${WORKDIR}/mileage" inherit palmtop diff --git a/packages/mplayer/files/pld-onlyarm5.patch b/packages/mplayer/files/pld-onlyarm5.patch new file mode 100644 index 0000000000..3b8c576439 --- /dev/null +++ b/packages/mplayer/files/pld-onlyarm5.patch @@ -0,0 +1,405 @@ +--- MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S.orig 2006-07-03 09:53:33.000000000 +0100 ++++ MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S 2006-07-03 10:06:58.000000000 +0100 +@@ -16,6 +16,13 @@ + @ License along with this library; if not, write to the Free Software + @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + @ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif + + .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 + mov \Rd0, \Rn0, lsr #(\shift * 8) +@@ -74,7 +81,7 @@ + put_pixels16_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11, lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -85,7 +92,7 @@ + ldmia r1, {r4-r7} + add r1, r1, r2 + stmia r0, {r4-r7} +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + add r0, r0, r2 + bne 1b +@@ -95,7 +102,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 1, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -106,7 +113,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 2, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -117,7 +124,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 3, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -136,7 +143,7 @@ + put_pixels8_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r5,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -147,7 +154,7 @@ + ldmia r1, {r4-r5} + add r1, r1, r2 + subs r3, r3, #1 +- pld [r1] ++ PLD ( pld [r1] ) + stmia r0, {r4-r5} + add r0, r0, r2 + bne 1b +@@ -157,7 +164,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -168,7 +175,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -179,7 +186,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -198,7 +205,7 @@ + put_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -210,7 +217,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -223,7 +230,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -236,7 +243,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -248,7 +255,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -267,7 +274,7 @@ + put_no_rnd_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -279,7 +286,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -292,7 +299,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -305,7 +312,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -317,7 +324,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -338,7 +345,7 @@ + put_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -352,13 +359,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -369,18 +376,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -392,18 +399,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -415,18 +422,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -447,7 +454,7 @@ + put_no_rnd_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -461,13 +468,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -478,18 +485,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -501,18 +508,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -524,18 +531,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -562,7 +569,7 @@ + ldmia r1, {r8-r10} + .endif + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + .if \align == 0 + ADJ_ALIGN_DOUBLEWORD_D 1, r4, r5, r6, r7, r8 + .elseif \align == 1 +@@ -624,7 +631,7 @@ + put_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 +@@ -661,7 +668,7 @@ + put_no_rnd_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 9c66221f57..071b403695 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses lame" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ @@ -15,12 +15,13 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://w100-video_out.patch;patch=1 \ file://w100-mplayer.patch;patch=1 \ file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1" + file://libmpcodecs-ogg-include.patch;patch=1 \ + file://pld-onlyarm5.patch;patch=1" MAINTAINER="Graeme Gregory <dp@xora.org.uk>" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r0" +PR = "r1" PARALLEL_MAKE = "" @@ -46,17 +47,126 @@ EXTRA_OECONF = " \ --disable-linux-devfs \ --disable-lirc \ --disable-lircc \ + --disable-joystick \ + --disable-vm \ + --disable-xf86keysym \ --disable-tv \ + --disable-tv-v4l \ + --disable-tv-v4l2 \ + --disable-tv-bsdbt848 \ --enable-rtc \ + --enable-network \ + --disable-winsock2 \ --disable-smb \ + --disable-live \ + --disable-dvdread \ + --disable-mpdvdkit \ + --disable-cdparanoia \ + --disable-freetype \ + --enable-fontconfig \ + --disable-unrarlib \ + --disable-menu \ + --enable-sortsub \ + --disable-fribidi \ + --disable-enca \ + --disable-macosx \ + --disable-macosx-finder-support \ + --disable-macosx-bundle \ + --disable-ftp \ + --disable-vstream \ + \ + --enable-gif \ + --enable-png \ + --enable-jpeg \ + --disable-libcdio \ + --enable-liblzo \ --disable-win32 \ + --disable-dshow \ + --disable-qtx \ + --disable-xanim \ + --disable-real \ + --disable-xvid \ + --disable-x264 \ + --disable-divx4linux \ + --disable-opendivx \ + \ + --disable-libavutil_so \ + --disable-libavcodec_so \ + --disable-libavformat_so \ + --disable-libpostproc_so \ + --disable-libfame \ \ --enable-tremor-low \ + \ + --disable-speex \ + --disable-theora \ + --disable-external-faad \ + --disable-faac \ + --disable-ladspa \ + --disable-libdv \ + --enable-mad \ + --disable-toolame \ + --disable-twolame \ + --disable-xmms \ --disable-mp3lib \ + --disable-libdts \ + --enable-libmpeg2 \ + --disable-musepack \ + --disable-amr_nb \ + --disable-amr_nb-fixed \ + --disable-amr_wb \ \ - --disable-x11 \ + --disable-internal-vidix \ + --disable-external-vidix \ + --disable-gl \ + --disable-dga \ + --disable-vesa \ + --disable-svga \ --enable-sdl \ - --enable-fbdev " + --disable-aa \ + --disable-caca \ + --disable-ggi \ + --disable-ggiwmh \ + --disable-directx \ + --disable-dxr2 \ + --disable-dxr3 \ + --disable-dvb \ + --disable-dvbhead \ + --disable-mga \ + --disable-xmga \ + --disable-xv \ + --disable-xvmc \ + --disable-vm \ + --disable-xinerama \ + --disable-x11 \ + --enable-fbdev \ + --disable-mlib \ + --disable-3dfx \ + --disable-tdfxfb \ + --disable-s3fb \ + --disable-directfb \ + --disable-zr \ + --disable-bl \ + --disable-tdfxvid \ + --disable-tga \ + --disable-pnm \ + --disable-md5sum \ + \ + --enable-alsa \ + --enable-ossaudio \ + --disable-arts \ + --disable-esd \ + --disable-polyp \ + --disable-jack \ + --disable-openal \ + --disable-nas \ + --disable-sgiaudio \ + --disable-sunaudio \ + --disable-win32waveout \ + --enable-select \ + \ + --disable-runtime-cpudetection \ + " EXTRA_OECONF_append_c7x0 = " --enable-w100 " diff --git a/packages/opie-datebook/files/bug1707fix.patch b/packages/opie-datebook/files/bug1707fix.patch deleted file mode 100644 index ce91c74e9f..0000000000 --- a/packages/opie-datebook/files/bug1707fix.patch +++ /dev/null @@ -1,1281 +0,0 @@ -Index: datebook/dateentry.ui -=================================================================== -RCS file: /cvs/opie/core/pim/datebook/dateentry.ui,v -retrieving revision 1.10 -retrieving revision 1.11 -diff -u -u -r1.10 -r1.11 ---- datebook/dateentry.ui 11 Aug 2005 10:10:40 -0000 1.10 -+++ datebook/dateentry.ui 21 Sep 2005 21:15:13 -0000 1.11 -@@ -18,7 +18,7 @@ - ** Contact info@trolltech.com if any conditions of this licensing are - ** not clear to you. - ** --** $Id: dateentry.ui,v 1.10 2005/08/11 10:10:40 llornkcor Exp $ -+** $Id: dateentry.ui,v 1.11 2005/09/21 21:15:13 llornkcor Exp $ - ** - *********************************************************************</comment> - <widget> -@@ -32,20 +32,14 @@ - <rect> - <x>0</x> - <y>0</y> -- <width>286</width> -- <height>396</height> -+ <width>242</width> -+ <height>339</height> - </rect> - </property> - <property stdset="1"> - <name>caption</name> - <string>New Event</string> - </property> -- <property> -- <name>layoutMargin</name> -- </property> -- <property> -- <name>layoutSpacing</name> -- </property> - <grid> - <property stdset="1"> - <name>margin</name> -@@ -53,740 +47,500 @@ - </property> - <property stdset="1"> - <name>spacing</name> -- <number>2</number> -+ <number>0</number> - </property> -+ <widget row="1" column="0" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TextLabel2</cstring> -+ </property> -+ <property stdset="1"> -+ <name>frameShape</name> -+ <enum>MShape</enum> -+ </property> -+ <property stdset="1"> -+ <name>frameShadow</name> -+ <enum>MShadow</enum> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Location</string> -+ </property> -+ </widget> -+ <widget row="2" column="0" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TextLabel2_2</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Category</string> -+ </property> -+ <property> -+ <name>buddy</name> -+ <cstring>comboPriority</cstring> -+ </property> -+ </widget> -+ <widget row="0" column="1" rowspan="1" colspan="3" > -+ <class>QComboBox</class> -+ <item> -+ <property> -+ <name>text</name> -+ <string></string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Meeting</string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Lunch</string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Dinner</string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Travel</string> -+ </property> -+ </item> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>comboDescription</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>0</vsizetype> -+ </sizepolicy> -+ </property> -+ <property stdset="1"> -+ <name>editable</name> -+ <bool>true</bool> -+ </property> -+ <property stdset="1"> -+ <name>currentItem</name> -+ <number>0</number> -+ </property> -+ <property stdset="1"> -+ <name>duplicatesEnabled</name> -+ <bool>false</bool> -+ </property> -+ </widget> - <widget row="0" column="0" > -- <class>QLayoutWidget</class> -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TextLabel1</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Description </string> -+ </property> -+ </widget> -+ <widget row="1" column="1" rowspan="1" colspan="3" > -+ <class>QComboBox</class> -+ <item> -+ <property> -+ <name>text</name> -+ <string></string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Office</string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Home</string> -+ </property> -+ </item> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>comboLocation</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>0</vsizetype> -+ </sizepolicy> -+ </property> -+ <property stdset="1"> -+ <name>editable</name> -+ <bool>true</bool> -+ </property> -+ <property stdset="1"> -+ <name>currentItem</name> -+ <number>0</number> -+ </property> -+ <property stdset="1"> -+ <name>duplicatesEnabled</name> -+ <bool>false</bool> -+ </property> -+ </widget> -+ <widget row="2" column="1" rowspan="1" colspan="3" > -+ <class>CategorySelect</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>comboCategory</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>1</vsizetype> -+ </sizepolicy> -+ </property> -+ </widget> -+ <widget row="3" column="0" rowspan="2" colspan="1" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TextLabel3</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Start - End </string> -+ </property> -+ </widget> -+ <widget row="3" column="1" > -+ <class>QPushButton</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>buttonStart</cstring> -+ </property> -+ <property stdset="1"> -+ <name>minimumSize</name> -+ <size> -+ <width>70</width> -+ <height>0</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>maximumSize</name> -+ <size> -+ <width>70</width> -+ <height>32767</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Jan 02 00</string> -+ </property> -+ </widget> -+ <widget row="4" column="1" > -+ <class>QLineEdit</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>comboStart</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>0</vsizetype> -+ </sizepolicy> -+ </property> -+ <property stdset="1"> -+ <name>minimumSize</name> -+ <size> -+ <width>70</width> -+ <height>0</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>maximumSize</name> -+ <size> -+ <width>70</width> -+ <height>32767</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>alignment</name> -+ <set>AlignHCenter</set> -+ </property> -+ <property> -+ <name>hAlign</name> -+ </property> -+ </widget> -+ <spacer row="3" column="2" rowspan="2" colspan="1" > -+ <property> -+ <name>name</name> -+ <cstring>Spacer1_2</cstring> -+ </property> -+ <property stdset="1"> -+ <name>orientation</name> -+ <enum>Horizontal</enum> -+ </property> -+ <property stdset="1"> -+ <name>sizeType</name> -+ <enum>Expanding</enum> -+ </property> -+ <property> -+ <name>sizeHint</name> -+ <size> -+ <width>20</width> -+ <height>20</height> -+ </size> -+ </property> -+ </spacer> -+ <widget row="5" column="1" rowspan="1" colspan="3" > -+ <class>TimePicker</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>timePickerStart</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>1</vsizetype> -+ </sizepolicy> -+ </property> -+ </widget> -+ <widget row="3" column="3" > -+ <class>QPushButton</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>buttonEnd</cstring> -+ </property> -+ <property stdset="1"> -+ <name>minimumSize</name> -+ <size> -+ <width>70</width> -+ <height>0</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>maximumSize</name> -+ <size> -+ <width>70</width> -+ <height>32767</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Jan 02 00</string> -+ </property> -+ </widget> -+ <widget row="4" column="3" > -+ <class>QLineEdit</class> - <property stdset="1"> - <name>name</name> -- <cstring>Layout19</cstring> -+ <cstring>comboEnd</cstring> - </property> -- <vbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>0</vsizetype> -+ </sizepolicy> -+ </property> -+ <property stdset="1"> -+ <name>minimumSize</name> -+ <size> -+ <width>70</width> -+ <height>0</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>maximumSize</name> -+ <size> -+ <width>70</width> -+ <height>32767</height> -+ </size> -+ </property> -+ <property stdset="1"> -+ <name>alignment</name> -+ <set>AlignHCenter</set> -+ </property> -+ <property> -+ <name>hAlign</name> -+ </property> -+ </widget> -+ <widget row="5" column="0" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TimePickerLabel</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Start time</string> -+ </property> -+ </widget> -+ <widget row="6" column="0" > -+ <class>QCheckBox</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>checkAllDay</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>All day</string> -+ </property> -+ </widget> -+ <widget row="7" column="0" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>TextLabel3_2_2</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Time zone</string> -+ </property> -+ </widget> -+ <widget row="7" column="1" rowspan="1" colspan="3" > -+ <class>TimeZoneSelector</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>timezone</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>1</vsizetype> -+ </sizepolicy> -+ </property> -+ </widget> -+ <widget row="8" column="0" > -+ <class>QCheckBox</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>checkAlarm</cstring> -+ </property> -+ <property stdset="1"> -+ <name>enabled</name> -+ <bool>true</bool> -+ </property> -+ <property stdset="1"> -+ <name>autoMask</name> -+ <bool>false</bool> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>&Alarm</string> -+ </property> -+ <property stdset="1"> -+ <name>checked</name> -+ <bool>false</bool> -+ </property> -+ </widget> -+ <widget row="8" column="1" rowspan="1" colspan="2" > -+ <class>QSpinBox</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>spinAlarm</cstring> -+ </property> -+ <property stdset="1"> -+ <name>enabled</name> -+ <bool>false</bool> -+ </property> -+ <property stdset="1"> -+ <name>suffix</name> -+ <string> minutes</string> -+ </property> -+ <property stdset="1"> -+ <name>maxValue</name> -+ <number>180</number> -+ </property> -+ <property stdset="1"> -+ <name>minValue</name> -+ <number>0</number> -+ </property> -+ <property stdset="1"> -+ <name>lineStep</name> -+ <number>5</number> -+ </property> -+ <property stdset="1"> -+ <name>value</name> -+ <number>5</number> -+ </property> -+ </widget> -+ <widget row="8" column="3" > -+ <class>QComboBox</class> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Silent</string> - </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -+ </item> -+ <item> -+ <property> -+ <name>text</name> -+ <string>Loud</string> - </property> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout1</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TextLabel1</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Description </string> -- </property> -- </widget> -- <widget> -- <class>QComboBox</class> -- <item> -- <property> -- <name>text</name> -- <string></string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Meeting</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Lunch</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Dinner</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Travel</string> -- </property> -- </item> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboDescription</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>0</vsizetype> -- </sizepolicy> -- </property> -- <property stdset="1"> -- <name>editable</name> -- <bool>true</bool> -- </property> -- <property stdset="1"> -- <name>currentItem</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>duplicatesEnabled</name> -- <bool>false</bool> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout2</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TextLabel2</cstring> -- </property> -- <property stdset="1"> -- <name>frameShape</name> -- <enum>MShape</enum> -- </property> -- <property stdset="1"> -- <name>frameShadow</name> -- <enum>MShadow</enum> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Location</string> -- </property> -- </widget> -- <widget> -- <class>QComboBox</class> -- <item> -- <property> -- <name>text</name> -- <string></string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Office</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Home</string> -- </property> -- </item> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboLocation</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>0</vsizetype> -- </sizepolicy> -- </property> -- <property stdset="1"> -- <name>editable</name> -- <bool>true</bool> -- </property> -- <property stdset="1"> -- <name>currentItem</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>duplicatesEnabled</name> -- <bool>false</bool> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout3</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TextLabel2_2</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Category</string> -- </property> -- <property> -- <name>buddy</name> -- <cstring>comboPriority</cstring> -- </property> -- </widget> -- <widget> -- <class>CategorySelect</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboCategory</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>1</vsizetype> -- </sizepolicy> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout18</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout17</cstring> -- </property> -- <vbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TextLabel3</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Start - End </string> -- </property> -- </widget> -- </vbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout4</cstring> -- </property> -- <vbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QPushButton</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>buttonStart</cstring> -- </property> -- <property stdset="1"> -- <name>minimumSize</name> -- <size> -- <width>70</width> -- <height>0</height> -- </size> -- </property> -- <property stdset="1"> -- <name>maximumSize</name> -- <size> -- <width>70</width> -- <height>32767</height> -- </size> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Jan 02 00</string> -- </property> -- </widget> -- <widget> -- <class>QLineEdit</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboStart</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>0</vsizetype> -- </sizepolicy> -- </property> -- <property stdset="1"> -- <name>minimumSize</name> -- <size> -- <width>70</width> -- <height>0</height> -- </size> -- </property> -- <property stdset="1"> -- <name>maximumSize</name> -- <size> -- <width>70</width> -- <height>32767</height> -- </size> -- </property> -- <property stdset="1"> -- <name>alignment</name> -- <set>AlignHCenter</set> -- </property> -- <property> -- <name>hAlign</name> -- </property> -- </widget> -- </vbox> -- </widget> -- <spacer> -- <property> -- <name>name</name> -- <cstring>Spacer12</cstring> -- </property> -- <property stdset="1"> -- <name>orientation</name> -- <enum>Horizontal</enum> -- </property> -- <property stdset="1"> -- <name>sizeType</name> -- <enum>Expanding</enum> -- </property> -- <property> -- <name>sizeHint</name> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout5</cstring> -- </property> -- <vbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QPushButton</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>buttonEnd</cstring> -- </property> -- <property stdset="1"> -- <name>minimumSize</name> -- <size> -- <width>70</width> -- <height>0</height> -- </size> -- </property> -- <property stdset="1"> -- <name>maximumSize</name> -- <size> -- <width>70</width> -- <height>32767</height> -- </size> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Jan 02 00</string> -- </property> -- </widget> -- <widget> -- <class>QLineEdit</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboEnd</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>0</vsizetype> -- </sizepolicy> -- </property> -- <property stdset="1"> -- <name>minimumSize</name> -- <size> -- <width>70</width> -- <height>0</height> -- </size> -- </property> -- <property stdset="1"> -- <name>maximumSize</name> -- <size> -- <width>70</width> -- <height>32767</height> -- </size> -- </property> -- <property stdset="1"> -- <name>alignment</name> -- <set>AlignHCenter</set> -- </property> -- <property> -- <name>hAlign</name> -- </property> -- </widget> -- </vbox> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout7</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TimePickerLabel</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Start time</string> -- </property> -- </widget> -- <widget> -- <class>TimePicker</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>timePickerStart</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>1</vsizetype> -- </sizepolicy> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QCheckBox</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>checkAllDay</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>All day</string> -- </property> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout8</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>TextLabel3_2_2</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Time zone</string> -- </property> -- </widget> -- <widget> -- <class>TimeZoneSelector</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>timezone</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>1</vsizetype> -- </sizepolicy> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout9</cstring> -- </property> -- <property> -- <name>layoutSpacing</name> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>1</number> -- </property> -- <widget> -- <class>QCheckBox</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>checkAlarm</cstring> -- </property> -- <property stdset="1"> -- <name>enabled</name> -- <bool>true</bool> -- </property> -- <property stdset="1"> -- <name>autoMask</name> -- <bool>false</bool> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>&Alarm</string> -- </property> -- <property stdset="1"> -- <name>checked</name> -- <bool>false</bool> -- </property> -- </widget> -- <widget> -- <class>QSpinBox</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>spinAlarm</cstring> -- </property> -- <property stdset="1"> -- <name>enabled</name> -- <bool>false</bool> -- </property> -- <property stdset="1"> -- <name>suffix</name> -- <string></string> -- </property> -- <property stdset="1"> -- <name>maxValue</name> -- <number>180</number> -- </property> -- <property stdset="1"> -- <name>minValue</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>lineStep</name> -- <number>1</number> -- </property> -- <property stdset="1"> -- <name>value</name> -- <number>5</number> -- </property> -- </widget> -- <widget> -- <class>QComboBox</class> -- <item> -- <property> -- <name>text</name> -- <string>minutes</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>hours</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>days</string> -- </property> -- </item> -- <property stdset="1"> -- <name>name</name> -- <cstring>ComboInterval</cstring> -- </property> -- <property stdset="1"> -- <name>enabled</name> -- <bool>false</bool> -- </property> -- <property stdset="1"> -- <name>currentItem</name> -- <number>0</number> -- </property> -- </widget> -- <widget> -- <class>QComboBox</class> -- <item> -- <property> -- <name>text</name> -- <string>Silent</string> -- </property> -- </item> -- <item> -- <property> -- <name>text</name> -- <string>Loud</string> -- </property> -- </item> -- <property stdset="1"> -- <name>name</name> -- <cstring>comboSound</cstring> -- </property> -- <property stdset="1"> -- <name>enabled</name> -- <bool>false</bool> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QLayoutWidget</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>Layout11</cstring> -- </property> -- <hbox> -- <property stdset="1"> -- <name>margin</name> -- <number>0</number> -- </property> -- <property stdset="1"> -- <name>spacing</name> -- <number>6</number> -- </property> -- <widget> -- <class>QLabel</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>lblRepeat</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Repeat</string> -- </property> -- </widget> -- <widget> -- <class>QToolButton</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>cmdRepeat</cstring> -- </property> -- <property stdset="1"> -- <name>sizePolicy</name> -- <sizepolicy> -- <hsizetype>3</hsizetype> -- <vsizetype>0</vsizetype> -- </sizepolicy> -- </property> -- <property stdset="1"> -- <name>focusPolicy</name> -- <enum>TabFocus</enum> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>No Repeat...</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget> -- <class>QToolButton</class> -- <property stdset="1"> -- <name>name</name> -- <cstring>editNote</cstring> -- </property> -- <property stdset="1"> -- <name>text</name> -- <string>Note...</string> -- </property> -- </widget> -- </vbox> -+ </item> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>comboSound</cstring> -+ </property> -+ <property stdset="1"> -+ <name>enabled</name> -+ <bool>false</bool> -+ </property> -+ </widget> -+ <widget row="9" column="0" > -+ <class>QLabel</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>lblRepeat</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Repeat</string> -+ </property> -+ </widget> -+ <widget row="9" column="1" rowspan="1" colspan="3" > -+ <class>QToolButton</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>cmdRepeat</cstring> -+ </property> -+ <property stdset="1"> -+ <name>sizePolicy</name> -+ <sizepolicy> -+ <hsizetype>3</hsizetype> -+ <vsizetype>0</vsizetype> -+ </sizepolicy> -+ </property> -+ <property stdset="1"> -+ <name>focusPolicy</name> -+ <enum>TabFocus</enum> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>No Repeat...</string> -+ </property> -+ </widget> -+ <widget row="10" column="0" rowspan="1" colspan="4" > -+ <class>QToolButton</class> -+ <property stdset="1"> -+ <name>name</name> -+ <cstring>editNote</cstring> -+ </property> -+ <property stdset="1"> -+ <name>text</name> -+ <string>Note...</string> -+ </property> - </widget> - </grid> - </widget> -@@ -893,12 +647,6 @@ - <receiver>comboStart</receiver> - <slot>setDisabled(bool)</slot> - </connection> -- <connection> -- <sender>checkAlarm</sender> -- <signal>toggled(bool)</signal> -- <receiver>ComboInterval</receiver> -- <slot>setEnabled(bool)</slot> -- </connection> - <slot access="public">endDateChanged( const QString & )</slot> - <slot access="public">endDateChanged( int, int, int )</slot> - <slot access="public">endTimeChanged( const QString & )</slot> diff --git a/packages/opie-datebook/opie-datebook_1.2.2.bb b/packages/opie-datebook/opie-datebook_1.2.2.bb index 83493f01a3..7c2b74a550 100644 --- a/packages/opie-datebook/opie-datebook_1.2.2.bb +++ b/packages/opie-datebook/opie-datebook_1.2.2.bb @@ -2,5 +2,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://bug1707fix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch deleted file mode 100644 index b85d46cb08..0000000000 --- a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch +++ /dev/null @@ -1,43 +0,0 @@ - -This patch is backport from OPIE CVS. -Submitted upstream by Marcin Juszkiewicz <openembedded@hrw.one.pl> -Date: 2005-09-16 - -Index: packetview.cpp -=================================================================== -RCS file: /cvs/opie/noncore/net/wellenreiter/gui/packetview.cpp,v -retrieving revision 1.9 -diff -u -r1.9 packetview.cpp ---- wellenreiter/gui/packetview.cpp 24 Aug 2004 11:53:44 -0000 1.9 -+++ wellenreiter/gui/packetview.cpp 16 Sep 2005 17:41:03 -0000 -@@ -20,6 +20,7 @@ - #include <opie2/odebug.h> - #include <opie2/olistview.h> - #include <opie2/oapplication.h> -+#include <qpe/config.h> - - /* QT */ - #include <qfont.h> -@@ -38,6 +39,9 @@ - PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) - :QFrame( parent, name, f ) - { -+ Config c( "qpe" ); -+ c.setGroup( "Appearance" ); -+ - _number = new QSpinBox( this ); - _number->setPrefix( "Pkt# " ); - _label = new QLabel( this ); -@@ -47,11 +51,10 @@ - _list->setColumnAlignment( 0, Qt::AlignCenter ); - _list->setColumnAlignment( 1, Qt::AlignLeft ); - _list->setAllColumnsShowFocus( true ); -- _list->setFont( QFont( "Fixed", 8 ) ); - - _hex = new QTextView( this ); - _hex->setMargin( 0 ); -- _hex->setFont( QFont( "Fixed", 8 ) ); -+ _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) ); - - QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); - QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb index 8d06318bb5..b2e3975f7a 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0916_wellenreiter-fontfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index ba8bc7e584..ea3ff24593 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -2,7 +2,7 @@ sleep 2 if [ -x /usr/bin/bl ]; then - bl toggle + bl off fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` @@ -15,6 +15,6 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "" cat /dev/fb0) | nc www.handhelds.org 80 if [ -x /usr/bin/bl ]; then - bl toggle + bl on fi diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 7bef893e59..9ba295a7a5 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r4" +PR = "r5" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index f744833d57..e303b40841 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,25 +1,18 @@ -DEFAULT_PREFERENCE = "-1" -SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." -PR = "r2" +SECTION = "GPL" +LICENSE = "LGPL" PROVIDES = "tslib" +PR = "r3" DEFAULT_PREFERENCE = "-1" -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" - SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ file://tslib.sh" - S = "${WORKDIR}/tslib" -LICENSE = "LGPL" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" inherit autotools -PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" EXTRA_OECONF = "--enable-shared" do_stage () { @@ -36,6 +29,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" +PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" + RDEPENDS_libts-maemo = "tslib-maemo-conf" RPROVIDES_tslib-maemo-conf = "tslib-conf" diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_20060703.bb index bd3478191e..f4ff493b57 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_20060703.bb @@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PV = "0.0+cvs${SRCDATE}" -PR = "r39" +RV := "${PV}" +PV = "0.1+cvs-${RV}" +PR = "r0" -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ file://ts.conf \ file://ts-2.6.conf \ diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index 7e77fb2348..fd12180ac6 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" DEPENDS = "sqlite" -PR = "r1" +PR = "r2" SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \ file://${FILESDIR}/${palmtopdir}" @@ -12,6 +12,12 @@ S = "${WORKDIR}/txdrug-tar" inherit palmtop +EXTRA_QMAKEVARS_POST += "LIBS+=-lsqlite TARGET=txdrug" + +do_configure_prepend() { + rm -f Makefile && qmake -project +} + do_install() { install -d ${D}${palmtopdir} cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ diff --git a/packages/tximage/tximage-0.2/gcc4.patch b/packages/tximage/tximage-0.2/gcc4.patch new file mode 100644 index 0000000000..d327754d1b --- /dev/null +++ b/packages/tximage/tximage-0.2/gcc4.patch @@ -0,0 +1,15 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- tximage-0.2/imageviewer.h~gcc4 ++++ tximage-0.2/imageviewer.h +@@ -32,6 +32,7 @@ + #include "imagereader.h" + + class ImageWidget; ++class ImageViewer; + class QString; + class QImage; + class QScrollView; diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb index 892ada0c6b..37d0ea6dc6 100644 --- a/packages/tximage/tximage_0.2.bb +++ b/packages/tximage/tximage_0.2.bb @@ -4,10 +4,11 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" HOMEPAGE = "http://community.zaurus.com/projects/tximage/" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openzaurus.org/mirror/tximage-${PV}.tar.gz \ - file://gcc3.patch;patch=1" + file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1" inherit palmtop diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 27dbb79eef..e02bc4cf7b 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -1,2 +1,14 @@ +PR = "r1" + include app-common.inc DEPENDS = "libx11 libxt libxmu" + +inherit update-alternatives + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" + + + diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.0.bb index d7218a241d..4290258b61 100644 --- a/packages/zbedic/zbedic_1.0.bb +++ b/packages/zbedic/zbedic_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ file://opie-icons.patch;patch=1 \ @@ -18,11 +18,11 @@ S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" -do_configure() { - cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ - INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ - LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic +do_configure_prepend() { + rm -f Makefile + qmake -project } do_install() { diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb new file mode 100644 index 0000000000..7cd0261827 --- /dev/null +++ b/packages/zip/zip-native_2.32.bb @@ -0,0 +1,9 @@ +SECTION = "console/utils" +inherit native +include zip_${PV}.bb +S = "${WORKDIR}/zip-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} +} diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc new file mode 100644 index 0000000000..b66b4b217f --- /dev/null +++ b/packages/zip/zip.inc @@ -0,0 +1,16 @@ +SECTION = "console/utils" +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" +LICENSE = "Info-ZIP" +EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ + 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ + 'BINFLAGS=0755' 'INSTALL_D=install -d'" + +do_compile() { + oe_runmake -f unix/Makefile generic +} + +do_install() { + oe_runmake -f unix/Makefile prefix=${D}${prefix} \ + BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ + install +} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb index 6c588a55e5..d10bb4312e 100644 --- a/packages/zip/zip_2.31.bb +++ b/packages/zip/zip_2.31.bb @@ -1,17 +1,2 @@ -SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz" -LICENSE = "Info-ZIP" -EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ - 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ - 'BINFLAGS=0755' 'INSTALL_D=install -d'" - -do_compile() { - oe_runmake -f unix/Makefile generic -} - -do_install() { - oe_runmake -f unix/Makefile prefix=${D}${prefix} \ - BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ - install -} - +include zip.inc +PR="r0" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb new file mode 100644 index 0000000000..d10bb4312e --- /dev/null +++ b/packages/zip/zip_2.32.bb @@ -0,0 +1,2 @@ +include zip.inc +PR="r0" |