diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/dbus/dbus-1.0.2/fix-waitpid.patch | 11 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.2.bb | 4 | ||||
| -rw-r--r-- | packages/libsndfile/libsndfile1_1.0.16.bb | 6 | ||||
| -rw-r--r-- | packages/linux/ep93xx-kernel/dynamic-phys-offset-2.6.20-rc7.diff | 199 | ||||
| -rw-r--r-- | packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb | 56 | ||||
| -rw-r--r-- | packages/linux/linux-hackndev-2.6/palmz72/defconfig | 71 | ||||
| -rw-r--r-- | packages/linux/linux-hackndev-2.6_svn.bb | 2 | ||||
| -rw-r--r-- | packages/tapioca/libjingle-tapioca_0.3.10.bb | 14 | ||||
| -rw-r--r-- | packages/tapioca/libjingle-tapioca_svn.bb | 17 | ||||
| -rw-r--r-- | packages/tapioca/tapioca-xmpp_0.3.9.bb (renamed from packages/tapioca/tapioca-xmpp_0.3.0.bb) | 1 | ||||
| -rw-r--r-- | packages/tapioca/tapioca_0.3.9.bb (renamed from packages/tapioca/tapioca_0.3.0.bb) | 1 | ||||
| -rw-r--r-- | packages/tapioca/tapiocaui_0.3.9.1.bb (renamed from packages/tapioca/tapiocaui_0.3.0.bb) | 6 |
12 files changed, 343 insertions, 45 deletions
diff --git a/packages/dbus/dbus-1.0.2/fix-waitpid.patch b/packages/dbus/dbus-1.0.2/fix-waitpid.patch new file mode 100644 index 0000000000..80c431809c --- /dev/null +++ b/packages/dbus/dbus-1.0.2/fix-waitpid.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-launch.c 2007-02-05 18:43:24.000000000 +0100 ++++ dbus-1.0.2/tools/dbus-launch.c 2007-02-05 18:43:37.675251000 +0100 +@@ -622,7 +622,7 @@ + + exit_with_session = FALSE; + config_file = NULL; +- ++ signal(SIGCHLD, SIG_DFL); + prev_arg = NULL; + i = 1; + while (i < argc) diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index 0198fa62c8..a660eb1586 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -1,3 +1,5 @@ require dbus.inc -PR = "r1" +SRC_URI += " file://fix-waitpid.patch;patch=1" + +PR = "r2" diff --git a/packages/libsndfile/libsndfile1_1.0.16.bb b/packages/libsndfile/libsndfile1_1.0.16.bb index 5dbec09411..165ef6d38f 100644 --- a/packages/libsndfile/libsndfile1_1.0.16.bb +++ b/packages/libsndfile/libsndfile1_1.0.16.bb @@ -3,17 +3,15 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile" AUTHOR = "Erik de Castro Lopo" SECTION = "libs/multimedia" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz" S = "${WORKDIR}/libsndfile-${PV}" -inherit autotools pkgconfig +inherit autotools lib_package pkgconfig do_stage() { oe_libinstall -a -so -C src libsndfile ${STAGING_LIBDIR} install -m 0644 ${S}/src/sndfile.h ${STAGING_INCDIR}/ } -#FIXME package the rest -FILES_${PN} = "${libdir}/libsndfile.so*" diff --git a/packages/linux/ep93xx-kernel/dynamic-phys-offset-2.6.20-rc7.diff b/packages/linux/ep93xx-kernel/dynamic-phys-offset-2.6.20-rc7.diff new file mode 100644 index 0000000000..1f59be644e --- /dev/null +++ b/packages/linux/ep93xx-kernel/dynamic-phys-offset-2.6.20-rc7.diff @@ -0,0 +1,199 @@ +On the Cirrus Logic ep93xx, system RAM isn't one nice physically +contiguous region as it is on most SoCs, but it is spread out over +between one and four memory banks. + +What's worse, RAM doesn't necessarily start at any fixed physical +memory location. The start of RAM (PHYS_OFFSET) is not only board- +specific, but on some boards also depends on jumper settings (whether +async or sync boot mode is selected.) + +The attached patch adds the RUNTIME_PHYS_OFFSET config option, which, +if selected, turns PHYS_OFFSET into a variable which is determined and +set by __create_page_tables by looking at the current pc. This allows +booting a single kernel image on all the different flavors of ep93xx +boards, reducing user confusion and hopefully pleasing our kautobuild +admin :-) If the option isn't selected, there's zero impact. + +Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> +=================================================================== +20070202 modified to apply cleanly to linux-2.6.20-rc7 - NZG +=================================================================== +diff -Naur linux-2.6.20-rc7/arch/arm/Kconfig linux-2.6.20-rc7-e1.0/arch/arm/Kconfig +--- linux-2.6.20-rc7/arch/arm/Kconfig 2007-02-02 10:26:21.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/Kconfig 2007-02-02 16:23:05.000000000 -0600 +@@ -113,6 +113,9 @@ + help + The base address of exception vectors. + ++config RUNTIME_PHYS_OFFSET ++ bool ++ + source "init/Kconfig" + + menu "System Type" +@@ -187,6 +190,7 @@ + bool "EP93xx-based" + select ARM_AMBA + select ARM_VIC ++ select RUNTIME_PHYS_OFFSET + help + This enables support for the Cirrus EP93xx series of CPUs. + +diff -Naur linux-2.6.20-rc7/arch/arm/boot/compressed/Makefile linux-2.6.20-rc7-e1.0/arch/arm/boot/compressed/Makefile +--- linux-2.6.20-rc7/arch/arm/boot/compressed/Makefile 2006-11-29 15:57:37.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/boot/compressed/Makefile 2007-02-02 16:23:05.000000000 -0600 +@@ -78,13 +78,10 @@ + EXTRA_CFLAGS := -fpic + EXTRA_AFLAGS := + +-# Supply ZRELADDR, INITRD_PHYS and PARAMS_PHYS to the decompressor via +-# linker symbols. We only define initrd_phys and params_phys if the +-# machine class defined the corresponding makefile variable. ++# Supply ZRELADDR and PARAMS_PHYS to the decompressor via linker ++# symbols. We only define params_phys if the machine class defined ++# the corresponding makefile variable. + LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) +-ifneq ($(INITRD_PHYS),) +-LDFLAGS_vmlinux += --defsym initrd_phys=$(INITRD_PHYS) +-endif + ifneq ($(PARAMS_PHYS),) + LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS) + endif +diff -Naur linux-2.6.20-rc7/arch/arm/boot/compressed/head.S linux-2.6.20-rc7-e1.0/arch/arm/boot/compressed/head.S +--- linux-2.6.20-rc7/arch/arm/boot/compressed/head.S 2006-11-29 15:57:37.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/boot/compressed/head.S 2007-02-02 16:23:05.000000000 -0600 +@@ -156,6 +156,11 @@ + .text + adr r0, LC0 + ldmia r0, {r1, r2, r3, r4, r5, r6, ip, sp} ++#ifdef CONFIG_RUNTIME_PHYS_OFFSET ++ and r10, pc, #0xf0000000 @ fix up zreladdr ++ add r4, r4, r10 ++#endif ++ + subs r0, r0, r1 @ calculate the delta offset + + @ if delta is zero, we are +diff -Naur linux-2.6.20-rc7/arch/arm/kernel/head.S linux-2.6.20-rc7-e1.0/arch/arm/kernel/head.S +--- linux-2.6.20-rc7/arch/arm/kernel/head.S 2007-02-02 10:26:21.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/kernel/head.S 2007-02-02 16:36:21.000000000 -0600 +@@ -43,8 +43,8 @@ + .globl swapper_pg_dir + .equ swapper_pg_dir, KERNEL_RAM_VADDR - 0x4000 + +- .macro pgtbl, rd +- ldr \rd, =(KERNEL_RAM_PADDR - 0x4000) ++ .macro pgtbl, rd, phys_offset ++ add \rd, \phys_offset, #(TEXT_OFFSET - 0x4000) + .endm + + #ifdef CONFIG_XIP_KERNEL +@@ -206,10 +206,22 @@ + * Returns: + * r0, r3, r6, r7 corrupted + * r4 = physical page table address ++ * r5 = PHYS_OFFSET + */ + .type __create_page_tables, %function + __create_page_tables: +- pgtbl r4 @ page table address ++#ifdef CONFIG_RUNTIME_PHYS_OFFSET ++ adr r5, stext ++ sub r5, r5, #TEXT_OFFSET @ r5 = phys_offset ++ ++ ldr r4, =(phys_offset - PAGE_OFFSET) ++ add r4, r4, r5 ++ str r5, [r4] @ save phys_offset ++#else ++ mov r5, #PHYS_OFFSET @ r5 = phys_offset ++#endif ++ ++ pgtbl r4, r5 @ r4 = page table address + + /* + * Clear the 16K level 1 swapper page table +@@ -255,8 +267,7 @@ + * Then map first 1MB of ram in case it contains our boot params. + */ + add r0, r4, #PAGE_OFFSET >> 18 +- orr r6, r7, #(PHYS_OFFSET & 0xff000000) +- orr r6, r6, #(PHYS_OFFSET & 0x00e00000) ++ orr r6, r7, r5 + str r6, [r0] + + #ifdef CONFIG_XIP_KERNEL +diff -Naur linux-2.6.20-rc7/arch/arm/kernel/setup.c linux-2.6.20-rc7-e1.0/arch/arm/kernel/setup.c +--- linux-2.6.20-rc7/arch/arm/kernel/setup.c 2007-02-02 10:26:21.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/kernel/setup.c 2007-02-02 16:23:05.000000000 -0600 +@@ -59,6 +59,16 @@ + extern int root_mountflags; + extern void _stext, _text, _etext, __data_start, _edata, _end; + ++#ifdef CONFIG_RUNTIME_PHYS_OFFSET ++/* ++ * The assignment is here solely to prevent this variable from ending ++ * up in bss. As the early startup code writes to it, we don't want it ++ * to be zeroed again later. ++ */ ++unsigned long phys_offset = 0xdeadbeef; ++EXPORT_SYMBOL(phys_offset); ++#endif ++ + unsigned int processor_id; + unsigned int __machine_arch_type; + EXPORT_SYMBOL(__machine_arch_type); +@@ -749,7 +759,7 @@ + { tag_size(tag_core), ATAG_CORE }, + { 1, PAGE_SIZE, 0xff }, + { tag_size(tag_mem32), ATAG_MEM }, +- { MEM_SIZE, PHYS_OFFSET }, ++ { MEM_SIZE, 0 }, + { 0, ATAG_NONE } + }; + +@@ -770,6 +780,8 @@ + struct machine_desc *mdesc; + char *from = default_command_line; + ++ init_tags.mem.start = PHYS_OFFSET; ++ + setup_processor(); + mdesc = setup_machine(machine_arch_type); + machine_name = mdesc->name; +diff -Naur linux-2.6.20-rc7/arch/arm/mach-ep93xx/Makefile.boot linux-2.6.20-rc7-e1.0/arch/arm/mach-ep93xx/Makefile.boot +--- linux-2.6.20-rc7/arch/arm/mach-ep93xx/Makefile.boot 2006-11-29 15:57:37.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/arch/arm/mach-ep93xx/Makefile.boot 2007-02-02 16:23:05.000000000 -0600 +@@ -1,2 +1 @@ + zreladdr-y := 0x00008000 +-params_phys-y := 0x00000100 +diff -Naur linux-2.6.20-rc7/include/asm-arm/arch-ep93xx/memory.h linux-2.6.20-rc7-e1.0/include/asm-arm/arch-ep93xx/memory.h +--- linux-2.6.20-rc7/include/asm-arm/arch-ep93xx/memory.h 2006-11-29 15:57:37.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/include/asm-arm/arch-ep93xx/memory.h 2007-02-02 16:23:05.000000000 -0600 +@@ -5,7 +5,9 @@ + #ifndef __ASM_ARCH_MEMORY_H + #define __ASM_ARCH_MEMORY_H + ++#ifndef CONFIG_RUNTIME_PHYS_OFFSET + #define PHYS_OFFSET UL(0x00000000) ++#endif + + #define __bus_to_virt(x) __phys_to_virt(x) + #define __virt_to_bus(x) __virt_to_phys(x) +diff -Naur linux-2.6.20-rc7/include/asm-arm/memory.h linux-2.6.20-rc7-e1.0/include/asm-arm/memory.h +--- linux-2.6.20-rc7/include/asm-arm/memory.h 2007-02-02 10:26:27.000000000 -0600 ++++ linux-2.6.20-rc7-e1.0/include/asm-arm/memory.h 2007-02-02 16:23:05.000000000 -0600 +@@ -73,6 +73,14 @@ + */ + #define IOREMAP_MAX_ORDER 24 + ++/* ++ * PHYS_OFFSET determined at run time? ++ */ ++#if defined(CONFIG_RUNTIME_PHYS_OFFSET) && !defined(__ASSEMBLY__) ++extern unsigned long phys_offset; ++#define PHYS_OFFSET (phys_offset) ++#endif ++ + #else /* CONFIG_MMU */ + + /* diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb new file mode 100644 index 0000000000..81c359f7fa --- /dev/null +++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r1" + +COMPATIBLE_MACHINE = "ep93xx" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.20-rc7.bz2;patch=1 \ + file://dynamic-phys-offset-2.6.20-rc7.diff;patch=1 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.19" + +inherit kernel + +KERNEL_IMAGETYPE = "zImage" + + + +do_configure() { + rm -f ${S}/.config + + if [ ! -e ${WORKDIR}/defconfig ]; then + die "No default configuration for ${MACHINE} available." + fi + + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig + + +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + + diff --git a/packages/linux/linux-hackndev-2.6/palmz72/defconfig b/packages/linux/linux-hackndev-2.6/palmz72/defconfig index db628a2424..c31d272ac6 100644 --- a/packages/linux/linux-hackndev-2.6/palmz72/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmz72/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17-hnd0 -# Thu Jan 18 12:36:38 2007 +# Sat Feb 3 23:56:17 2007 # CONFIG_ARM=y CONFIG_MMU=y @@ -143,23 +143,24 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_XSCALE_PALMTREO650 is not set # CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set # CONFIG_MACH_TUNGE2 is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set # CONFIG_MACH_XSCALE_PALMTX is not set CONFIG_MACH_PALMZ72=y -CONFIG_PALMZ72_AC97=y CONFIG_PALMZ72_PM=y +CONFIG_PALMZ72_BATTERY=m CONFIG_GPIOED=m CONFIG_GPIOEDNG=m # CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_MACH_ZIRE31 is not set # CONFIG_PXA_SHARPSL is not set CONFIG_PXA27x=y CONFIG_PXA_RTC_EPOCH=1970 # CONFIG_SA1100_H3100 is not set # CONFIG_SA1100_H3600 is not set # CONFIG_SA1100_H3800 is not set -# CONFIG_GPIO_KEYS is not set # # Linux As Bootloader @@ -253,7 +254,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -335,7 +335,7 @@ CONFIG_TCP_CONG_BIC=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=y +CONFIG_IRDA=m # # IrDA protocols @@ -359,7 +359,7 @@ CONFIG_IRDA=y # # SIR device drivers # -CONFIG_IRTTY_SIR=y +CONFIG_IRTTY_SIR=m # # Dongle support @@ -378,24 +378,23 @@ CONFIG_IRTTY_SIR=y # # FIR device drivers # -CONFIG_PXA_FICP=y -CONFIG_BT=y +CONFIG_PXA_FICP=m +CONFIG_BT=m # CONFIG_BT_L2CAP is not set # CONFIG_BT_SCO is not set # # Bluetooth device drivers # -CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART=m # CONFIG_BT_HCIUART_H4 is not set # CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=y +CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set -# CONFIG_IEEE80211_CRYPT_WEP is not set -# CONFIG_IEEE80211_CRYPT_CCMP is not set -CONFIG_IEEE80211_SOFTMAC=y +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set CONFIG_WIRELESS_EXT=y @@ -540,6 +539,10 @@ CONFIG_PPP=y # CONFIG_INPUT=y +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=320 @@ -559,10 +562,20 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_KEYBOARD_PXA27x=y # CONFIG_KEYBOARD_PALMIR is not set -CONFIG_KEYBOARD_PALMWK=y +CONFIG_KEYBOARD_PALMWK=m # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_TOUCHSCREEN_WM97XX=y +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set # CONFIG_INPUT_MISC is not set # @@ -1068,7 +1081,31 @@ CONFIG_FRAME_POINTER=y # # Cryptographic options # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index 7ef5ad581e..427923af2c 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r1" +PR = "r2" COMPATIBLE_MACHINE = "(palmtx|palmld|palmz72)" diff --git a/packages/tapioca/libjingle-tapioca_0.3.10.bb b/packages/tapioca/libjingle-tapioca_0.3.10.bb new file mode 100644 index 0000000000..9ea27e691b --- /dev/null +++ b/packages/tapioca/libjingle-tapioca_0.3.10.bb @@ -0,0 +1,14 @@ +LICENSE = "BERKLEY" +DEPENDS = "openssl ortp speex expat" +PROVIDES = "libjingle" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/libjingle-${PV}.tar.gz" + +S = "${WORKDIR}/libjingle-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/tapioca/libjingle-tapioca_svn.bb b/packages/tapioca/libjingle-tapioca_svn.bb deleted file mode 100644 index de3fc0271b..0000000000 --- a/packages/tapioca/libjingle-tapioca_svn.bb +++ /dev/null @@ -1,17 +0,0 @@ -PR = "r0" -LICENSE = "BERKLEY" -DEPENDS = "openssl ortp speex expat" -PROVIDES = "libjingle" -CVSDATE = "20060322" -SRCDATE = "${CVSDATE}" -PV = "0.3.0+tapiocasvn${SRCDATE}" - -inherit autotools pkgconfig - -SRC_URI = "svn://svn.sourceforge.net/svnroot/tapioca-voip/trunk;module=libjingle;proto=https" - -S = "${WORKDIR}/libjingle" - -do_stage () { - autotools_stage_all -} diff --git a/packages/tapioca/tapioca-xmpp_0.3.0.bb b/packages/tapioca/tapioca-xmpp_0.3.9.bb index bd85743b00..1d9e02f7d6 100644 --- a/packages/tapioca/tapioca-xmpp_0.3.0.bb +++ b/packages/tapioca/tapioca-xmpp_0.3.9.bb @@ -1,4 +1,3 @@ -PR = "r1" HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca" LICENSE = "LGPL" DEPENDS = "glib-2.0 dbus libjingle openssl tapioca" diff --git a/packages/tapioca/tapioca_0.3.0.bb b/packages/tapioca/tapioca_0.3.9.bb index f0f3b00ced..2487826998 100644 --- a/packages/tapioca/tapioca_0.3.0.bb +++ b/packages/tapioca/tapioca_0.3.9.bb @@ -1,4 +1,3 @@ -PR = "r1" HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca" LICENSE = "LGPL" DEPENDS = "glib-2.0 dbus" diff --git a/packages/tapioca/tapiocaui_0.3.0.bb b/packages/tapioca/tapiocaui_0.3.9.1.bb index 7781324b8d..5cbae99477 100644 --- a/packages/tapioca/tapiocaui_0.3.0.bb +++ b/packages/tapioca/tapiocaui_0.3.9.1.bb @@ -2,10 +2,10 @@ HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 dbus gconf tapioca-xmpp tapioca farsight gst-plugins-farsight" RDEPENDS = "tapioca-xmpp" -PR = "r1" - -inherit autotools pkgconfig +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/${P}.tar.gz" +inherit autotools pkgconfig + FILES_${PN} += "${datadir}/dbus*" |