diff options
Diffstat (limited to 'packages')
35 files changed, 426 insertions, 175 deletions
diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb deleted file mode 100644 index bfd68eb3e2..0000000000 --- a/packages/ffmpeg/ffmpeg_cvs.bb +++ /dev/null @@ -1,84 +0,0 @@ -#Remove the dash after cvs below when 0.4.9 changes in PV -PV = "0.4.9-pre1+cvs-${SRCDATE}" -DESCRIPTION = "ffmpeg" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib libvorbis faac liba52 lame" -LICENSE = "GPL" -PR = "r1" -S = "${WORKDIR}/ffmpeg" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "cvs://anonymous@mplayerhq.hu/cvsroot/ffmpeg;module=ffmpeg \ - file://configure.patch;patch=0 \ - file://common.patch;patch=1 \ - file://soname.patch;patch=1 \ - " - -TARGET_LDFLAGS_append = " -lm -la52 " - -EXTRA_OECONF=" \ - --enable-mp3lame \ - --enable-vorbis \ - --enable-faac \ - --enable-a52 \ - --enable-a52bin \ - --enable-pp \ -# --enable-shared-pp \ - --enable-shared \ - --disable-amr_nb \ - --enable-amr_nb-fixed \ - --disable-amr_wb \ - --enable-pthreads \ - --enable-gpl \ - --enable-zlib \ - \ - --disable-audio-beos \ - --disable-v4l \ - --disable-dv1394 \ - --disable-debug \ - --disable-ffserver \ - --disable-ffplay \ - \ - --cross-prefix=${TARGET_PREFIX} \ - --extra-cflags=\$(TARGET_CFLAGS) \ - --extra-ldflags=\$(TARGET_LDFLAGS) \ - --extra-libs=\$(TARGET_LDFLAGS) \ - \ - --cpu=${PACKAGE_ARCH} \ - --prefix=${D}${prefix} \ - --mandir=${D}${prefix}/share/man \ -" - -PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev" -FILES_${PN} = "${bindir}" -FILES_${PN}-dev = "${includedir}" -FILES_libavcodec = "${libdir}/libavcodec*.so.*" -FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a" -FILES_libavformat = "${libdir}/libavformat*.so.*" -FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a" - -# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff.. -PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" - - -do_configure_prepend() { - export CC="${CC}" -} - -do_stage() { - oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR} - oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/ffmpeg - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h - install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h - install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h - install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h - install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h - install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h - install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h - install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h -} diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb new file mode 100644 index 0000000000..4098d721f9 --- /dev/null +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -0,0 +1,127 @@ +DESCRIPTION = "ffmpeg" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib libvorbis faac liba52 lame" +PV = "0.4.9+svn${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "svn://svn.mplayerhq.hu/ffmpeg/;module=trunk" + +S = "${WORKDIR}/trunk" + +inherit autotools + +TARGET_LDFLAGS_append = " -lm -la52 " + +EXTRA_OECONF = " \ + --enable-mp3lame \ + --enable-vorbis \ + --enable-faad \ + --enable-a52 \ + --enable-a52bin \ + --enable-pp \ + --enable-shared \ + --enable-pthreads \ + --enable-gpl \ + \ + --disable-audio-beos \ + --disable-v4l \ + --disable-dv1394 \ + --disable-debug \ + --disable-ffserver \ + --disable-ffplay \ + \ + --cross-prefix=${TARGET_PREFIX} \ + \ + --cpu=${PACKAGE_ARCH} \ +" + + +# We do this because the install program is called with -s +# which causes it to call "strip" and it then mangles cross compiled stuff.. +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" + +do_configure_prepend() { + export CC="${CC}" +} + +oe_runconf () { + if [ -x ${S}/configure ] ; then + cfgcmd="${S}/configure \ + --prefix=${prefix} \ + --mandir=${mandir} \ + ${EXTRA_OECONF} \ + $@" + oenote "Running $cfgcmd..." + $cfgcmd || oefatal "oe_runconf failed" + else + oefatal "no configure script found" + fi + +} + +do_stage() { + oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR} + oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR} + oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR} + oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/ffmpeg + install -m 0644 ${S}/libavcodec/avcodec.h \ + ${STAGING_INCDIR}/ffmpeg/avcodec.h + + install -m 0644 ${S}/libavformat/avformat.h \ + ${STAGING_INCDIR}/ffmpeg/avformat.h + install -m 0644 ${S}/libavformat/avio.h \ + ${STAGING_INCDIR}/ffmpeg/avio.h + install -m 0644 ${S}/libavformat/rtp.h \ + ${STAGING_INCDIR}/ffmpeg/rtp.h + install -m 0644 ${S}/libavformat/rtsp.h \ + ${STAGING_INCDIR}/ffmpeg/rtsp.h + install -m 0644 ${S}/libavformat/rtspcodes.h \ + ${STAGING_INCDIR}/ffmpeg/rtspcodes.h + + install -m 0644 ${S}/libavutil/avutil.h \ + ${STAGING_INCDIR}/ffmpeg/avutil.h + install -m 0644 ${S}/libavutil/bswap.h \ + ${STAGING_INCDIR}/ffmpeg/bswap.h + install -m 0644 ${S}/libavutil/common.h \ + ${STAGING_INCDIR}/ffmpeg/common.h + install -m 0644 ${S}/libavutil/crc.h \ + ${STAGING_INCDIR}/ffmpeg/crc.h + install -m 0644 ${S}/libavutil/integer.h \ + ${STAGING_INCDIR}/ffmpeg/integer.h + install -m 0644 ${S}/libavutil/intfloat_readwrite.h \ + ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h + install -m 0644 ${S}/libavutil/mathematics.h \ + ${STAGING_INCDIR}/ffmpeg/mathematics.h + install -m 0644 ${S}/libavutil/rational.h \ + ${STAGING_INCDIR}/ffmpeg/rational.h +} + +PACKAGES += "libavcodec libavcodec-dev \ + libavformat libavformat-dev \ + libavutil libavutil-dev \ + libpostproc libpostproc-dev" + +FILES_${PN} = "${bindir}" +FILES_${PN}-dev = "${includedir}" +FILES_${PN}-doc = "${mandir}" + +FILES_libavcodec = "${libdir}/libavcodec*.so.*" +FILES_libavcodec-dev = "${libdir}/libavcodec*.so \ + ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a" + +FILES_libavformat = "${libdir}/libavformat*.so.*" +FILES_libavformat-dev = "${libdir}/libavformat*.so \ + ${libdir}/libavformat*.la ${libdir}/libavformat*.a" + +FILES_libavutil = "${libdir}/libavutil*.so.*" +FILES_libavutil-dev = "${libdir}/libavutil*.so \ + ${libdir}/libavutil*.la ${libdir}/libavutil*.a" + +FILES_libpostproc = "${libdir}/libpostproc*.so.*" +FILES_libpostproc-dev = "${libdir}/libpostproc*.so \ + ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index dc5c022580..369ea5153d 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -8,7 +8,7 @@ RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpe PV = "0.19+svn${SRCDATE}" PR = "r0" -SRC_URI = "${GPE_SVN}" +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}" S = "${WORKDIR}/gpe-mini-browser" diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb index 5623ebbf16..c017cafc9a 100644 --- a/packages/gpm/gpm_1.20.1.bb +++ b/packages/gpm/gpm_1.20.1.bb @@ -1,21 +1,25 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "ncurses" DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ for the console and xterm, with sample clients included \ (emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "ncurses" -PR="r1" -PARALLEL_MAKE="" +PR = "r2" +PARALLEL_MAKE = "" SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://no-docs.patch;patch=1 \ file://init" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" export LIBS = "-lm" + do_configure_prepend () { cp aclocal.m4 acinclude.m4 } @@ -29,18 +33,5 @@ do_install () { oe_runmake 'ROOT=${D}' install install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D gpm defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D gpm remove + cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 } diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index c47caaefd3..112a49f206 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -764,7 +764,7 @@ CONFIG_I2C_CHARDEV=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m +CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -988,8 +988,8 @@ CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_PCM_OSS is not set +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch new file mode 100644 index 0000000000..73923555d4 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch @@ -0,0 +1,204 @@ +--- linux-2.6.17-linuxsh/drivers/input/keyboard/hp680_keyb.c 2006-12-06 21:56:06.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c 2007-01-10 21:00:34.000000000 +0000 +@@ -5,6 +5,7 @@ + * + * Copyright (C) 2005 Andriy Skulysh + * Copyright (C) 2006 Paul Mundt ++ * Copyright (C) 2007 Kristoffer Ericson + * + * Splited from drivers/input/keyboard/hp600_keyb.c + * +@@ -20,6 +21,10 @@ + #include <asm/io.h> + #include "scan_keyb.h" + ++#define PCCR 0xa4000104 ++#define PDCR 0xa4000106 ++#define PECR 0xa4000108 ++#define PFCR 0xa400010a + #define PCDR 0xa4000124 + #define PDDR 0xa4000126 + #define PEDR 0xa4000128 +@@ -30,6 +35,24 @@ + #define PKDR 0xa4000132 + #define PLDR 0xa4000134 + ++/*************************************************************** ++HP Jornada 680(SWEDISH version) keyboard ++[!] indicates Special Characters ++ ++_______________________________________________________________________ ++| ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 POWER| ++| 1 2 3 4 5 6 7 8 9 0 + ` BKPSPACE| ++|* Q W E R T Y U I O P ! ^ ENTER| ++| TAB A S D F G H J K L ! ! ' ENTER| ++| SHIFT Z X C V B N M , . - UP SHIFT| ++| CTRL WIN ALT ? =======SPACE======== ALTG DEL LEF DO RI ] ++----------------------------------------------------------------------- ++ ++ ++****************************************************************/ ++ ++ ++ + /**************************************************************** + HP Jornada 690(Japanese version) keyboard scan matrix + +@@ -71,31 +94,56 @@ + ****************************************************************/ + + static const unsigned char hp680_japanese_table[] = { +- /* PTD1 */ ++/* ++ /* PTD1 */ ++ /* ? ? ? ? Esc ? ? ? */ + 0x3a, 0x70, 0x29, 0x00, 0x01, 0x00, 0x00, 0x00, ++ /* F1 F2 F3 F8 F7 F6 F4 F5 */ + 0x3b, 0x3c, 0x3d, 0x42, 0x41, 0x40, 0x3e, 0x3f, +- /* PTD5 */ ++ ++ /* PTD5 */ ++ /* / : Enter ? Z ? ? ? */ + 0x35, 0x28, 0x1c, 0x00, 0x2c, 0x00, 0x00, 0x00, ++ /* X C V . , M B N */ + 0x2d, 0x2e, 0x2f, 0x34, 0x33, 0x32, 0x30, 0x31, +- /* PTD7 */ +- 0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +- 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b, +- /* PTE0 */ ++ ++ /* PTD7 */ ++ /* Down Right ? ? ? ? ? ? */ ++ 0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ /* ? ? ? Left ? ? Alt ? */ ++ 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b, ++ ++ /* PTE0 */ ++ /* ? ? ? ? Win ? ? ? */ + 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, ++ /* Ctrl ? Space Del _ ? ? ? */ + 0x1d, 0x00, 0x39, 0x53, 0x73, 0xf9, 0x00, 0x00, +- /* PTE1 */ ++ ++ /* PTE1 */ ++ /* ; [ ] ? A ? ? ? */ + 0x27, 0x1b, 0x2b, 0x00, 0x1e, 0x00, 0x00, 0x00, ++ /* S D F L K J G H */ + 0x1f, 0x20, 0x21, 0x26, 0x25, 0x24, 0x22, 0x23, +- /* PTE3 */ +- 0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00, +- 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +- /* PTE6 */ ++ ++ /* PTE3 */ ++ /* Up \ ShiftR ? Q ? ? ? */ ++ 0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00, ++ /* ? ShiftL ? ? ? ? ? ? */ ++ 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ ++ /* PTE6 */ ++ /* P @ BS ? Q ? ? ? */ + 0x19, 0x1a, 0x0e, 0x00, 0x10, 0x00, 0x00, 0x00, ++ /* W E R O I U T Y */ + 0x11, 0x12, 0x13, 0x18, 0x17, 0x16, 0x14, 0x15, +- /* PTE7 */ +- 0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, +- 0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, +- /* **** */ ++ ++ /* PTE7 */ ++ /* 0 + = ? 1 ? ? ? */ ++ 0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, ++ /* 2 3 4 9 8 7 5 6 */ ++ 0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, ++ ++ /* **** */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; +@@ -103,37 +151,72 @@ + static int hp680_japanese_scan_kbd(unsigned char *s) + { + int i; +- unsigned char matrix_switch[] = { +- 0xfd, 0xff, /* PTD1 */ +- 0xdf, 0xff, /* PTD5 */ +- 0x7f, 0xff, /* PTD7 */ +- 0xff, 0xfe, /* PTE0 */ +- 0xff, 0xfd, /* PTE1 */ +- 0xff, 0xf7, /* PTE3 */ +- 0xff, 0xbf, /* PTE6 */ +- 0xff, 0x7f, /* PTE7 */ ++ unsigned short ec_static,dc_static; /* = UINT16_t */ ++ unsigned char matrix_switch[] = { ++ 0xfd, 0xff, /* PTD1 PD(1) */ ++ 0xdf, 0xff, /* PTD5 PD(5) */ ++ 0x7f, 0xff, /* PTD7 PD(7) */ ++ 0xff, 0xfe, /* PTE0 PE(0) */ ++ 0xff, 0xfd, /* PTE1 PE(1) */ ++ 0xff, 0xf7, /* PTE3 PE(3) */ ++ 0xff, 0xbf, /* PTE6 PE(6) */ ++ 0xff, 0x7f, /* PTE7 PE(7) */ + }, *t=matrix_switch; ++ /* PD(x) : ++ 1. 0xcc0c & (1~(1 << (2*(x)+1))))) ++ 2. (0xf0cf & 0xfffff) */ ++ /* PE(x) : ++ 1. 0xcc0c & 0xffff ++ 2. 0xf0cf & (1~(1 << (2*(x)+1))))) */ ++ unsigned short matrix_PDE[] = { ++ 0xcc04, 0xf0cf, /* PD(1) */ ++ 0xc40c, 0xf0cf, /* PD(5) */ ++ 0x4c0c, 0xf0cf, /* PD(7) */ ++ 0xcc0c, 0xf0cd, /* PE(0) */ ++ 0xcc0c, 0xf0c7, /* PE(1) */ ++ 0xcc0c, 0xf04f, /* PE(3) */ ++ 0xcc0c, 0xd0cf, /* PE(6) */ ++ 0xcc0c, 0x70cf, /* PE(7) */ ++ } ++ , *y=matrix_PDE; ++ /* Save these control reg bits */ ++ dc_static = (ctrl_inw(PDCR) & (~0xcc0c)); ++ ec_static = (ctrl_inw(PECR) & (~0xf0cf)); + + for(i=0; i<8; i++) { +- ctrl_outb(*t++, PDDR); ++ /* disable output for all but the one we want to scan */ ++ ctrl_outw((dc_static | *y++), PDCR); ++ ctrl_outw((ec_static | *y++), PECR); ++ udelay(5); ++ ++ /* Get scanline row */ ++ ctrl_outb(*t++, PDDR); + ctrl_outb(*t++, PEDR); ++ udelay(50); ++ ++ /* Read data */ + *s++=ctrl_inb(PCDR); + *s++=ctrl_inb(PFDR); + } +- ++ /* Scan no lines */ + ctrl_outb(0xff, PDDR); + ctrl_outb(0xff, PEDR); ++ ++ /* Enable all scanlines */ ++ ctrl_outw((dc_static | (0x5555 & 0xcc0c)),PDCR); ++ ctrl_outw((ec_static | (0x5555 & 0xf0cf)),PECR); ++ /* Ignore extra keys and events */ + + *s++=ctrl_inb(PGDR); + *s++=ctrl_inb(PHDR); +- ++ + return 0; + } + + static struct scan_keyboard hp680_kbd = { + .scan = hp680_japanese_scan_kbd, + .table = hp680_japanese_table, +- .length = 18, ++ .length = 16, + }; + + static int __init hp680_kbd_init_hw(void) diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb index 1c22e230e1..4fdeb52fc4 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -11,7 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://LinuxSH-2.6.17.patch;patch=0 \ file://unexpected-int-fix.patch;patch=0 \ file://keymap-fix.patch;patch=0 \ - file://io.h-fix.patch;patch=0" + file://io.h-fix.patch;patch=0 \ + file://keyboard-fix-deadkeys.patch;patch=0" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb index 6b7eddb03b..72ddfb5613 100644 --- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb +++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb @@ -7,6 +7,8 @@ RPROVIDES = "gconf" PR = "r3" +DEFAULT_PREFERENCE = "-1" + SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \ file://gconf-update.patch;patch=1;pnum=0 \ file://free-entry-fix.diff;patch=1 \ diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb index 2515356b39..3d18717d63 100644 --- a/packages/mediatomb/mediatomb_svn.bb +++ b/packages/mediatomb/mediatomb_svn.bb @@ -19,14 +19,14 @@ EXTRA_OECONF = "--disable-mysql \ --enable-taglib \ --enable-libexif \ --disable-largefile \ - --with-sqlite3-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-sqlite3-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-magic-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-magic-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-exif-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-exif-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-zlib-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-zlib-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-js-h=${STAGING_DIR}/${TARGET_SYS}/include/js \ - --with-js-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-taglib-cfg=${STAGING_DIR}/${BUILD_SYS}/bin/taglib-config" + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-taglib-cfg=${STAGING_BINDIR_CROSS}/taglib-config" diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 0c8d118cff..81f9ff68ed 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -5,7 +5,7 @@ SECTION = "libs" PROVIDES = "openobex-apps" DEPENDS = "libusb bluez-libs" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1" \ @@ -30,3 +30,5 @@ PACKAGES += "openobex-apps" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/openobex-config" FILES_${PN}-apps = "${bindir}/*" +DEBIAN_NOAUTONAME_${PN} = "1" +DEBIAN_NOAUTONAME_${PN}-apps = "1" diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc index 894577b1a4..01f8247f50 100644 --- a/packages/opie-icon-reload/opie-icon-reload.inc +++ b/packages/opie-icon-reload/opie-icon-reload.inc @@ -1,8 +1,10 @@ -SECTION = "opie/settings" DESCRIPTION = "Reload .desktop files on the fly" +SECTION = "opie/settings" PRIORITY = "optional" LICENSE = "GPL" +PACKAGE_ARCH = "all" + SRC_URI = "file://icon-reload.desktop \ file://icon-reload.sh \ file://reload.png" diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb deleted file mode 100644 index 9d87f74817..0000000000 --- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "opie/settings" -DESCRIPTION = "Reload .desktop files on the fly" -PRIORITY = "optional" -LICENSE = "GPL" - -PR = "r3" - -SRC_URI = "file://icon-reload.desktop \ - file://icon-reload.sh \ - file://reload.png" - -FILES_${PN} += "/opt" - -do_install() { - install -d ${D}${palmtopdir}/apps/Settings - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/pics - - install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings - install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin - install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics -} - diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb deleted file mode 100644 index 7c49fdd77b..0000000000 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${PN}.inc - -#Remove the dash below when 1.2.1 changes -PV = "1.2.2+cvs-${SRCDATE}" - diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb index 5fdc9332cf..8f79f4667e 100644 --- a/packages/ossie/ossie-c-wavloader_svn.bb +++ b/packages/ossie/ossie-c-wavloader_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Waveform Loader" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf expat" diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb index 93a41b6c3c..ddfab221de 100644 --- a/packages/ossie/ossie-channeldemo_svn.bb +++ b/packages/ossie/ossie-channeldemo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo channel component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb index d2777ecc10..c83ec256e8 100644 --- a/packages/ossie/ossie-demo_svn.bb +++ b/packages/ossie/ossie-demo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo waveform" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-channeldemo ossie-rxdemo" RDEPENDS = "ossie-channeldemo ossie-rxdemo" diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb index 39adc0a74c..f2a563624c 100644 --- a/packages/ossie/ossie-gpp-device_svn.bb +++ b/packages/ossie/ossie-gpp-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE General Purpose Processor device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb index ca561fe0a1..5efca0b229 100644 --- a/packages/ossie/ossie-interpolator_svn.bb +++ b/packages/ossie/ossie-interpolator_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Interpolator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb index c6ac6afe73..4090b671d6 100644 --- a/packages/ossie/ossie-modulator_svn.bb +++ b/packages/ossie/ossie-modulator_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Modulator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb index 5a941550db..0e4a4611d2 100644 --- a/packages/ossie/ossie-nodebooter_svn.bb +++ b/packages/ossie/ossie-nodebooter_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Node Booter" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb index a3ddc23185..7e9854641a 100644 --- a/packages/ossie/ossie-randombits_svn.bb +++ b/packages/ossie/ossie-randombits_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Random bit generator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb index 34619b3845..8a0d4355d9 100644 --- a/packages/ossie/ossie-rxdemo_svn.bb +++ b/packages/ossie/ossie-rxdemo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo receiver component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb index 5d3643bfde..a8fa03052f 100644 --- a/packages/ossie/ossie-sigproc_svn.bb +++ b/packages/ossie/ossie-sigproc_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Signal Processing routines" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" @@ -15,6 +16,8 @@ inherit autotools pkgconfig EXTRA_OECONF_append_arm = " --enable-fpm=arm" +CXXFLAGS_powerpc = "-lstdc++" + do_stage () { autotools_stage_all } diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb index 2af60db834..111a96f493 100644 --- a/packages/ossie/ossie-soundout-device_svn.bb +++ b/packages/ossie/ossie-soundout-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE sound playback device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "alsa-lib ossiecf ossie-standardinterfaces" @@ -15,6 +16,8 @@ prefix="/home/sca" inherit autotools +EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl" + FILES_${PN} += "/home/sca/xml/soundCard/*xml" BROKEN = "1" diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb index 7482430ec8..c00bcd5c6b 100644 --- a/packages/ossie/ossie-standardinterfaces_svn.bb +++ b/packages/ossie/ossie-standardinterfaces_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Standard port interfaces" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" @@ -13,6 +14,10 @@ SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/standardInterfaces/trunk;module= inherit autotools pkgconfig +EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl" + +CXXFLAGS_powerpc += "-lstdc++" + do_stage () { autotools_stage_all } diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb index 1597f5ec94..89ffe27a84 100644 --- a/packages/ossie/ossie-tx-random-data_svn.bb +++ b/packages/ossie/ossie-tx-random-data_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE transmit random bits waveform" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device" RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device" diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb index 943b53a464..3f29c2c4f2 100644 --- a/packages/ossie/ossie-usrp-device_svn.bb +++ b/packages/ossie/ossie-usrp-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE General Purpose Processor device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf usrp ossie-standardinterfaces" diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb index b3fca8fe9b..c3af96c2a3 100644 --- a/packages/ossie/ossie-usrp-tx-control_svn.bb +++ b/packages/ossie/ossie-usrp-tx-control_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE USRP TX side control component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces" diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb index 76317ac8bd..2c7b27ef7c 100644 --- a/packages/ossie/ossiecf_svn.bb +++ b/packages/ossie/ossiecf_svn.bb @@ -1,10 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE Core Framework" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" - DEPENDS = "xerces-c omniorb libtool-cross" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" S="${WORKDIR}/ossie" diff --git a/packages/parted/parted_1.8.0.bb b/packages/parted/parted_1.8.0.bb index 8681055855..bff27a62e8 100644 --- a/packages/parted/parted_1.8.0.bb +++ b/packages/parted/parted_1.8.0.bb @@ -5,7 +5,8 @@ SECTION = "console/tools" DEPENDS = "readline e2fsprogs-libs" PR = "r0" -SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ + file://memory_allocation.patch;patch=0" EXTRA_OECONF = "--disable-Werror" #export CFLAGS = "-mstructure-size-boundary=8" diff --git a/packages/tslib/tslib/magician/.mtn2git_empty b/packages/tslib/tslib/magician/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tslib/tslib/magician/.mtn2git_empty +++ /dev/null diff --git a/packages/tslib/tslib/magician/tslib.sh b/packages/tslib/tslib/magician/tslib.sh deleted file mode 100644 index 586d5c7deb..0000000000 --- a/packages/tslib/tslib/magician/tslib.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TSLIB_TSDEVICE=/dev/input/touchscreen0 -TSLIB_CONFFILE=/etc/ts.conf - -export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/ttf-fonts/ttf-dejavu_2.12.bb b/packages/ttf-fonts/ttf-dejavu_2.13.bb index c1b743aa1b..c1b743aa1b 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.12.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.13.bb diff --git a/packages/usrp/files/fix_compile_h.patch b/packages/usrp/files/fix_compile_h.patch new file mode 100644 index 0000000000..02ba7e44a0 --- /dev/null +++ b/packages/usrp/files/fix_compile_h.patch @@ -0,0 +1,13 @@ +Index: gnuradio/trunk/usrp/host/lib/fusb_linux.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3534) ++++ gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3886) +@@ -28,5 +28,7 @@ + #include <usb.h> // libusb header + #include <stdexcept> ++#ifdef HAVE_LINUX_COMPILER_H + #include <linux/compiler.h> ++#endif + #include <linux/usbdevice_fs.h> // interface to kernel portion of user mode usb driver + #include <sys/ioctl.h> + diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb index 5fc6969f8c..ade37baf60 100644 --- a/packages/usrp/usrp_0.12.bb +++ b/packages/usrp/usrp_0.12.bb @@ -7,13 +7,16 @@ RDEPENDS = "python-core" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ - file://usb11.patch;patch=1" \ + file://usb11.patch;patch=1 \ + file://fix_compile_h.patch;patch=1;pnum=3 \ file://install_test.patch;patch=1" S = "${WORKDIR}/usrp-${PV}" inherit autotools pkgconfig +CXXFLAGS_powerpc += "-lstdc++" + export BUILD_SYS := "${BUILD_SYS}" export HOST_SYS := "${HOST_SYS}" |