diff options
31 files changed, 1474 insertions, 27 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1df713f2eb..a6a137d4de 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -139,6 +139,7 @@ STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" +STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 122f2de435..c5e42a2bed 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.4" +KERNEL_VERSION ?= "2.6" include conf/machine/zaurus-clamshell.conf include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf diff --git a/packages/apex/.mtn2git_empty b/packages/apex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apex/.mtn2git_empty diff --git a/packages/apex/apex_1.2.19.bb b/packages/apex/apex_1.2.19.bb new file mode 100644 index 0000000000..2b022e94e7 --- /dev/null +++ b/packages/apex/apex_1.2.19.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" || die "oe_runmake failed" +} + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + oe_runmake oldconfig +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + install -m 0755 src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin +} diff --git a/packages/apex/nslu2/.mtn2git_empty b/packages/apex/nslu2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apex/nslu2/.mtn2git_empty diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig new file mode 100644 index 0000000000..138ed749a4 --- /dev/null +++ b/packages/apex/nslu2/defconfig @@ -0,0 +1,88 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Tue May 17 09:42:40 2005 +# +CONFIG_ARM=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_EXPERIMENTAL is not set + +# +# General Setup +# +CONFIG_CROSS_COMPILE="/usr/armv5b-softfloat-linux/gcc-3.4.2-glibc-2.3.3/bin/armv5b-softfloat-linux-" +# CONFIG_SMALL is not set +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_DISABLE_MMU_AT_BOOT=y +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x00800000 +CONFIG_ENV_STARTUP="" +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_AVILA2347 is not set + +# +# Platform Setup +# +CONFIG_USE_RAMDISK=y +CONFIG_RAMDISK_LMA=0x01000000 +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +# CONFIG_CMD_ERASEENV is not set +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_INFO=y +CONFIG_CMD_GO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_NOR_CFI=y +CONFIG_USES_NOR_CFI=y + +# +# Environment +# +CONFIG_NOR_BOOT=y +# CONFIG_NAND_BOOT is not set +CONFIG_AUTOBOOT=y +CONFIG_AUTOBOOT_DELAY=10 +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_REGION="nor:128k+64k" +CONFIG_ENV_STARTUP_KERNEL_COPY=y +CONFIG_ENV_REGION_KERNEL="nor:0x60010+0xffff0" +CONFIG_ENV_STARTUP_RAMDISK_COPY=y +CONFIG_ENV_REGION_RAMDISK="nor:0x160010+0x69fff0" +# CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE is not set +CONFIG_USES_NOR_BOOTFLASH=y +CONFIG_BIGENDIAN=y diff --git a/packages/gpe-filemanager/gpe-filemanager_0.23.bb b/packages/gpe-filemanager/gpe-filemanager_0.23.bb new file mode 100644 index 0000000000..2beee83596 --- /dev/null +++ b/packages/gpe-filemanager/gpe-filemanager_0.23.bb @@ -0,0 +1,12 @@ + +inherit gpe + +PR = "r0" +LICENSE = "GPL" +DESCRIPTION = "GPE file manager" +DEPENDS = "libgpewidget gnome-vfs dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +RRECOMMENDS = "gnome-vfs-plugin-file" + +FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index e7863ff28d..8c735b7a5e 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r49" +PR = "r47" SRC_URI = "file://halt \ file://ramdisk \ @@ -30,17 +30,13 @@ SRC_URI = "file://halt \ file://umountnfs.sh \ file://sysfs.sh \ file://device_table.txt \ - file://populate-volatile.sh \ - file://volatiles \ file://corgikeymap-2.6.map \ - file://tosakeymap-2.6.map \ - file://akitakeymap.map" + file://tosakeymap-2.6.map" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" SRC_URI_append_c7x0 = " file://keymap" SRC_URI_append_tosa = " file://keymap" -SRC_URI_append_akita = " file://keymap" def read_kernel_version(d): import bb @@ -86,8 +82,6 @@ do_install () { install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi @@ -113,12 +107,6 @@ do_install () { ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap fi - if [ "${MACHINE}" == "akita" ]; then - install -m 0644 ${WORKDIR}/akitakeymap.map ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - fi - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner install -m 0755 ${WORKDIR}/devices ${D}${sysconfdir}/init.d/devices install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs @@ -152,7 +140,6 @@ do_install () { ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs - ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh if [ "${TARGET_ARCH}" = "arm" ]; then ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment diff --git a/packages/lineak/.mtn2git_empty b/packages/lineak/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lineak/.mtn2git_empty diff --git a/packages/lineak/files/.mtn2git_empty b/packages/lineak/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lineak/files/.mtn2git_empty diff --git a/packages/lineak/files/add-zaurus-remote-support.patch b/packages/lineak/files/add-zaurus-remote-support.patch new file mode 100644 index 0000000000..a5cfe9f474 --- /dev/null +++ b/packages/lineak/files/add-zaurus-remote-support.patch @@ -0,0 +1,26 @@ +--- lineakd-0.8.3/lineakd/lineakkb.def 2005-03-02 04:15:39.000000000 -0800 ++++ lineakd-0.8.3/lineakd/lineakkb.def.new 2005-07-14 20:50:40.000000000 -0700 +@@ -1166,6 +1166,23 @@ + + #### END CodeGen Keyboards #### + ++#### Sharp Zaurus Remotes #### ++ ++[CE-RH2] ++ brandname = "Sharp" ++ modelname = "Sharp CE-RH2" ++ [KEYS] ++ AudioPlay|Pause = 72 ++ AudioRaiseVolume = 126 ++ AudioLowerVolume = 127 ++ AudioMute = 128 ++ AudioStop = 76 ++ AudioPrev = 124 ++ AudioNext = 116 ++ [END KEYS] ++[END CE-RH2] ++ ++#### END Sharp Zaurus Remotes #### + + #### Compaq keyboards #### + diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb new file mode 100644 index 0000000000..7b04db572d --- /dev/null +++ b/packages/lineak/lineak_0.8.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "lineakd" +SECTION = "gpe/multimedia" +HOMEPAGE = "http://lineak.sourceforge.net" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +DEPENDS = "x11 xext" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \ + file://add-zaurus-remote-support.patch;patch=1" + +inherit autotools + +do_install () { + oe_runmake 'mandir=${D}/usr/share/man' 'pkglibdir=${D}/usr/lib' 'sysconfdir=${D}/etc' 'DESTDIR=${D}' install +} + +PACKAGES += "${PN}-lib" + +FILES_${PN}-lib += " \ + ${libdir}/liblineak*" + diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb index a4be0b995e..e3dc282017 100644 --- a/packages/linux/linux-omap1_2.6.12-rc2.bb +++ b/packages/linux/linux-omap1_2.6.12-rc2.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" @@ -12,7 +12,7 @@ S = "${WORKDIR}/linux-2.6.12-rc2" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" -KERNEL_CCSUFFIX = "-3.3.3" +KERNEL_CCSUFFIX = "-3.3.4" #DEPENDS = "uboot" diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fe94202c9d..fc519ecfbc 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index e17bfdfe6a..444fb5b7ea 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -1,15 +1,14 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" HOMEPAGE = "http://openwrt.org" +DEPENDS = "lzma-native" LICENSE = "GPL" PR = "r2" -DEPENDS = "lzma-native" - SRC_URI = "http://www.fi.kernel.org/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \ - http://downloads.openwrt.org/kernel-binary-wl-0.2.tar.gz \ - http://downloads.openwrt.org/kernel-source-et-0.6.tar.gz \ + http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz \ + http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz \ file://000-linux-mips-2_4_30.patch;patch=1 \ file://001-Makefile;patch=1 \ file://002-Rules_make;patch=1 \ diff --git a/packages/modutils/files/gcc4.patch b/packages/modutils/files/gcc4.patch index 187a677158..e204898f05 100644 --- a/packages/modutils/files/gcc4.patch +++ b/packages/modutils/files/gcc4.patch @@ -51,3 +51,16 @@ xrealloc(a_hdr, a_hdr->total_size); p = (char *)a_hdr + a_hdr->symbol_off; memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size); +--- modutils-2.4.27/obj/obj_mips.c.orig 2003-04-05 00:47:17.000000000 +0200 ++++ modutils-2.4.27/obj/obj_mips.c 2005-07-21 12:51:48.000000000 +0200 +@@ -244,7 +244,9 @@ + archdata_sec->header.sh_size = 0; + sec = obj_find_section(f, "__dbe_table"); + if (sec) { +- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); ++/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/ ++ archdata_sec->contents = xmalloc(sizeof(*ad)); ++ ad = (struct archdata *) (archdata_sec->contents); + memset(ad, 0, sizeof(*ad)); + archdata_sec->header.sh_size = sizeof(*ad); + ad->__start___dbe_table = sec->header.sh_addr; diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb index c990b354f3..2b301d7d09 100644 --- a/packages/modutils/modutils-cross_2.4.27.bb +++ b/packages/modutils/modutils-cross_2.4.27.bb @@ -1,6 +1,6 @@ SECTION = "base" include modutils_${PV}.bb -PR = "r5" +PR = "r6" inherit cross S = "${WORKDIR}/modutils-${PV}" DEPENDS = "" diff --git a/packages/sdcc/.mtn2git_empty b/packages/sdcc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sdcc/.mtn2git_empty diff --git a/packages/sdcc/sdcc-native_2.5.0.bb b/packages/sdcc/sdcc-native_2.5.0.bb new file mode 100644 index 0000000000..2a05d5e628 --- /dev/null +++ b/packages/sdcc/sdcc-native_2.5.0.bb @@ -0,0 +1,10 @@ +include sdcc_${PV}.bb + +inherit native + +# yes, we usually don't want to do this in order to prevent staging pollution, +# however sdcc behaves pretty nice here, so we can do an exception here (ML). +do_stage() { + oe_runmake install +} + diff --git a/packages/sdcc/sdcc_2.5.0.bb b/packages/sdcc/sdcc_2.5.0.bb new file mode 100644 index 0000000000..65eaf02d44 --- /dev/null +++ b/packages/sdcc/sdcc_2.5.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION= "SDCC - Small Device C Compiler" +LICENSE = "GPL" +SECTION = "devel" +HOMEPAGE = "http://sdcc.sourceforge.net" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz" +S = "${WORKDIR}/sdcc" + +PARALLEL_MAKE = "" + +inherit autotools + +do_configure() { + gnu-configize + oe_runconf +} + diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb index 569bf8dad2..d7b285e8ec 100644 --- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb @@ -1,6 +1,8 @@ -SECTION = "base" -PN_BASE = "squashfs-tools" include ${PN_BASE}_${PV}.bb + +DEPENDS = "lzma-native" +PN_BASE = "squashfs-tools" + inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb index f99cdb798e..ccc6b33697 100644 --- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb @@ -1,7 +1,9 @@ -SECTION = "base" DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +DEPENDS = "lzma" +SECTION = "base" LICENSE = "GPLv2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \ file://flags.patch;patch=1 \ diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch new file mode 100644 index 0000000000..ba24b5a1d7 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls-extra.patch @@ -0,0 +1,37 @@ +--- sylpheed-2.0.0beta6/src/ssl.c.orig 2005-07-20 15:45:12.882201824 +0100 ++++ sylpheed-2.0.0beta6/src/ssl.c 2005-07-20 16:10:04.006516472 +0100 +@@ -54,9 +54,9 @@ + debug_print(_("SSLv23 not available\n")); + } else { + debug_print(_("SSLv23 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -65,9 +65,9 @@ + debug_print(_("TLSv1 not available\n")); + } else { + debug_print(_("TLSv1 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -151,8 +151,8 @@ + g_free(str); + } + +- verify_result = SSL_get_verify_result(sockinfo->ssl); +- if (verify_result == X509_V_OK) ++ verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/ ++ if (verify_result == 1) + debug_print("SSL verify OK\n"); + else + g_warning("%s: SSL certificate verify failed (%ld: %s)\n", diff --git a/packages/usrp/.mtn2git_empty b/packages/usrp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/usrp/.mtn2git_empty diff --git a/packages/usrp/files/.mtn2git_empty b/packages/usrp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/usrp/files/.mtn2git_empty diff --git a/packages/usrp/files/usb11.patch b/packages/usrp/files/usb11.patch new file mode 100644 index 0000000000..a0f1f548a6 --- /dev/null +++ b/packages/usrp/files/usb11.patch @@ -0,0 +1,96 @@ +diff -ur usrp-0.8/firmware/include/fpga_regs_standard.h usrp-0.8-usb11/firmware/include/fpga_regs_standard.h +--- usrp-0.8/firmware/include/fpga_regs_standard.h 2004-12-10 23:25:42.000000000 -0500 ++++ usrp-0.8-usb11/firmware/include/fpga_regs_standard.h 2005-04-18 15:48:58.000000000 -0400 +@@ -103,6 +103,7 @@ + // 3 chan 1 Q + + #define FR_TX_MUX 39 ++#define FR_USB_PACKET_SIZE 40 + + #endif /* INCLUDED_FPGA_REGS_STANDARD_H */ + +diff -ur usrp-0.8/firmware/src/common/usrp_common.c usrp-0.8-usb11/firmware/src/common/usrp_common.c +--- usrp-0.8/firmware/src/common/usrp_common.c 2004-03-28 17:28:58.000000000 -0500 ++++ usrp-0.8-usb11/firmware/src/common/usrp_common.c 2005-04-17 12:10:26.000000000 -0400 +@@ -101,9 +101,13 @@ + // set autoin length for EP6 + // FIXME should be f(enumeration) + +- EP6AUTOINLENH = (512) >> 8; SYNCDELAY; // this is the length for high speed +- EP6AUTOINLENL = (512) & 0xff; SYNCDELAY; +- ++ if (USBCS & bmHSM) { ++ EP6AUTOINLENH = (512) >> 8; SYNCDELAY; // this is the length for high speed ++ EP6AUTOINLENL = (512) & 0xff; SYNCDELAY; ++ } else { ++ EP6AUTOINLENH = (64) >> 8; SYNCDELAY; // this is the length for full speed ++ EP6AUTOINLENL = (64) & 0xff; SYNCDELAY; ++ } + init_board (); + } + +diff -ur usrp-0.8/firmware/src/usrp2/usb_descriptors.a51 usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51 +--- usrp-0.8/firmware/src/usrp2/usb_descriptors.a51 2004-12-08 16:11:24.000000000 -0500 ++++ usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51 2005-04-14 11:51:07.000000000 -0400 +@@ -236,7 +236,7 @@ + .db DSCR_CONFIG + .db <(_full_speed_config_descr_end - _full_speed_config_descr) ; LSB + .db >(_full_speed_config_descr_end - _full_speed_config_descr) ; MSB +- .db 1 ; bNumInterfaces ++ .db 3 ; bNumInterfaces + .db 1 ; bConfigurationValue + .db 0 ; iConfiguration + .db 0x80 | bmSELF_POWERED ; bmAttributes +@@ -253,7 +253,53 @@ + .db 0xff ; bInterfaceSubClass (vendor specific) + .db 0xff ; bInterfaceProtocol (vendor specific) + .db SI_COMMAND_AND_STATUS ; iInterface (description) ++ ++ ;; interface descriptor 1 (transmit path, ep2 OUT BULK) ++ ++ .db DSCR_INTRFC_LEN ++ .db DSCR_INTRFC ++ .db 1 ; bInterfaceNumber (zero based) ++ .db 0 ; bAlternateSetting ++ .db 1 ; bNumEndpoints ++ .db 0xff ; bInterfaceClass (vendor specific) ++ .db 0xff ; bInterfaceSubClass (vendor specific) ++ .db 0xff ; bInterfaceProtocol (vendor specific) ++ .db SI_TX_PATH ; iInterface (description) ++ ++ ;; interface 1's end point ++ ++ .db DSCR_ENDPNT_LEN ++ .db DSCR_ENDPNT ++ .db 0x02 ; bEndpointAddress (ep 2 OUT) ++ .db ET_BULK ; bmAttributes ++ .db <64 ; wMaxPacketSize (LSB) ++ .db >64 ; wMaxPacketSize (MSB) ++ .db 0 ; bInterval (iso only) ++ ++ ;; interface descriptor 2 (receive path, ep6 IN BULK) ++ ++ .db DSCR_INTRFC_LEN ++ .db DSCR_INTRFC ++ .db 2 ; bInterfaceNumber (zero based) ++ .db 0 ; bAlternateSetting ++ .db 1 ; bNumEndpoints ++ .db 0xff ; bInterfaceClass (vendor specific) ++ .db 0xff ; bInterfaceSubClass (vendor specific) ++ .db 0xff ; bInterfaceProtocol (vendor specific) ++ .db SI_RX_PATH ; iInterface (description) ++ ++ ;; interface 2's end point ++ ++ .db DSCR_ENDPNT_LEN ++ .db DSCR_ENDPNT ++ .db 0x86 ; bEndpointAddress (ep 6 IN) ++ .db ET_BULK ; bmAttributes ++ .db <64 ; wMaxPacketSize (LSB) ++ .db >64 ; wMaxPacketSize (MSB) ++ .db 0 ; bInterval (iso only) ++ + ++ + _full_speed_config_descr_end: + diff --git a/packages/usrp/usrp_0.8.bb b/packages/usrp/usrp_0.8.bb new file mode 100644 index 0000000000..1b9966f1ce --- /dev/null +++ b/packages/usrp/usrp_0.8.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Support software for the Universal Software Radio Peripheral (USRP)" +LICENSE = "GPL" +MAINTAINER = "Philip Balister philip@balister.org" +HOMEPAGE = "http://comsec.com/wiki?UniversalSoftwareRadioPeripheral" +SECTION = "devel" +DEPENDS = "swig-native sdcc-native libusb" +PR = "r0" + +SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ + file://usb11.patch;patch=1" +S = "${WORKDIR}/usrp-${PV}" + +inherit autotools + +do_stage () { + oe_libinstall -so -C host/lib/.libs/ libusrp ${STAGING_LIBDIR} + + install -m 644 host/lib/usrp0.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_basic.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_bytesex.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_config.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_daughterboards.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_prims.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_slots.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_standard.h ${STAGING_INCDIR} + + install -m 644 firmware/include/usrp_i2c_addr.h ${STAGING_INCDIR} +} + +PACKAGES += "python-pyursp" +FILES_python-pyursp = "${libdir}/python*" diff --git a/packages/zlib/zlib-1.2.3/.mtn2git_empty b/packages/zlib/zlib-1.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zlib/zlib-1.2.3/.mtn2git_empty diff --git a/packages/zlib/zlib-1.2.3/visibility.patch b/packages/zlib/zlib-1.2.3/visibility.patch new file mode 100644 index 0000000000..a4e7ae907a --- /dev/null +++ b/packages/zlib/zlib-1.2.3/visibility.patch @@ -0,0 +1,1034 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- zlib-1.2.3-orig/adler32.c~visibility ++++ zlib-1.2.3-orig/adler32.c +@@ -54,7 +54,7 @@ + #endif + + /* ========================================================================= */ +-uLong ZEXPORT adler32(adler, buf, len) ++ZEXPORT uLong adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +--- zlib-1.2.3-orig/compress.c~visibility ++++ zlib-1.2.3-orig/compress.c +@@ -19,7 +19,7 @@ + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. + */ +-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) ++ZEXPORT int compress2 (dest, destLen, source, sourceLen, level) + Bytef *dest; + uLongf *destLen; + const Bytef *source; +@@ -59,7 +59,7 @@ + + /* =========================================================================== + */ +-int ZEXPORT compress (dest, destLen, source, sourceLen) ++ZEXPORT int compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; +@@ -72,7 +72,7 @@ + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ +-uLong ZEXPORT compressBound (sourceLen) ++ZEXPORT uLong compressBound (sourceLen) + uLong sourceLen; + { + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; +--- zlib-1.2.3-orig/crc32.c~visibility ++++ zlib-1.2.3-orig/crc32.c +@@ -202,7 +202,7 @@ + /* ========================================================================= + * This function can be used by asm versions of crc32() + */ +-const unsigned long FAR * ZEXPORT get_crc_table() ++ZEXPORT const unsigned long FAR * get_crc_table() + { + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) +@@ -216,7 +216,7 @@ + #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + + /* ========================================================================= */ +-unsigned long ZEXPORT crc32(crc, buf, len) ++ZEXPORT unsigned long crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +--- zlib-1.2.3-orig/deflate.c~visibility ++++ zlib-1.2.3-orig/deflate.c +@@ -201,7 +201,7 @@ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + + /* ========================================================================= */ +-int ZEXPORT deflateInit_(strm, level, version, stream_size) ++ZEXPORT int deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; +@@ -213,7 +213,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, ++ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; +@@ -312,7 +312,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) ++ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +@@ -354,7 +354,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateReset (strm) ++ZEXPORT int deflateReset (strm) + z_streamp strm; + { + deflate_state *s; +@@ -401,7 +401,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflatePrime (strm, bits, value) ++ZEXPORT int deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; +@@ -413,7 +413,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateParams(strm, level, strategy) ++ZEXPORT int deflateParams(strm, level, strategy) + z_streamp strm; + int level; + int strategy; +@@ -486,7 +486,7 @@ + * But even the conservative upper bound of about 14% expansion does not + * seem onerous for output buffer allocation. + */ +-uLong ZEXPORT deflateBound(strm, sourceLen) ++ZEXPORT uLong deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; + { +@@ -549,7 +549,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflate (strm, flush) ++ZEXPORT int deflate (strm, flush) + z_streamp strm; + int flush; + { +@@ -856,7 +856,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateEnd (strm) ++ZEXPORT int deflateEnd (strm) + z_streamp strm; + { + int status; +@@ -891,7 +891,7 @@ + * To simplify the source, this is not supported for 16-bit MSDOS (which + * doesn't have enough memory anyway to duplicate compression states). + */ +-int ZEXPORT deflateCopy (dest, source) ++ZEXPORT int deflateCopy (dest, source) + z_streamp dest; + z_streamp source; + { +--- zlib-1.2.3-orig/gzio.c~visibility ++++ zlib-1.2.3-orig/gzio.c +@@ -205,7 +205,7 @@ + /* =========================================================================== + Opens a gzip (.gz) file for reading or writing. + */ +-gzFile ZEXPORT gzopen (path, mode) ++ZEXPORT gzFile gzopen (path, mode) + const char *path; + const char *mode; + { +@@ -216,7 +216,7 @@ + Associate a gzFile with the file descriptor fd. fd is not dup'ed here + to mimic the behavio(u)r of fdopen. + */ +-gzFile ZEXPORT gzdopen (fd, mode) ++ZEXPORT gzFile gzdopen (fd, mode) + int fd; + const char *mode; + { +@@ -231,7 +231,7 @@ + /* =========================================================================== + * Update the compression level and strategy + */ +-int ZEXPORT gzsetparams (file, level, strategy) ++ZEXPORT int gzsetparams (file, level, strategy) + gzFile file; + int level; + int strategy; +@@ -391,7 +391,7 @@ + Reads the given number of uncompressed bytes from the compressed file. + gzread returns the number of bytes actually read (0 for end of file). + */ +-int ZEXPORT gzread (file, buf, len) ++ZEXPORT int gzread (file, buf, len) + gzFile file; + voidp buf; + unsigned len; +@@ -500,7 +500,7 @@ + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. + */ +-int ZEXPORT gzgetc(file) ++ZEXPORT int gzgetc(file) + gzFile file; + { + unsigned char c; +@@ -512,7 +512,7 @@ + /* =========================================================================== + Push one byte back onto the stream. + */ +-int ZEXPORT gzungetc(c, file) ++ZEXPORT int gzungetc(c, file) + int c; + gzFile file; + { +@@ -537,7 +537,7 @@ + + The current implementation is not optimized at all. + */ +-char * ZEXPORT gzgets(file, buf, len) ++ZEXPORT char * gzgets(file, buf, len) + gzFile file; + char *buf; + int len; +@@ -556,7 +556,7 @@ + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of bytes actually written (0 in case of error). + */ +-int ZEXPORT gzwrite (file, buf, len) ++ZEXPORT int gzwrite (file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +@@ -600,7 +600,7 @@ + #ifdef STDC + #include <stdarg.h> + +-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) ++ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...) + { + char buf[Z_PRINTF_BUFSIZE]; + va_list va; +@@ -634,7 +634,7 @@ + } + #else /* not ANSI C */ + +-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, ++ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; +@@ -675,7 +675,7 @@ + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. + */ +-int ZEXPORT gzputc(file, c) ++ZEXPORT int gzputc(file, c) + gzFile file; + int c; + { +@@ -690,7 +690,7 @@ + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. + */ +-int ZEXPORT gzputs(file, s) ++ZEXPORT int gzputs(file, s) + gzFile file; + const char *s; + { +@@ -743,7 +743,7 @@ + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; + } + +-int ZEXPORT gzflush (file, flush) ++ZEXPORT int gzflush (file, flush) + gzFile file; + int flush; + { +@@ -764,7 +764,7 @@ + SEEK_END is not implemented, returns error. + In this version of the library, gzseek can be extremely slow. + */ +-z_off_t ZEXPORT gzseek (file, offset, whence) ++ZEXPORT z_off_t gzseek (file, offset, whence) + gzFile file; + z_off_t offset; + int whence; +@@ -854,7 +854,7 @@ + /* =========================================================================== + Rewinds input file. + */ +-int ZEXPORT gzrewind (file) ++ZEXPORT int gzrewind (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -878,7 +878,7 @@ + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + */ +-z_off_t ZEXPORT gztell (file) ++ZEXPORT z_off_t gztell (file) + gzFile file; + { + return gzseek(file, 0L, SEEK_CUR); +@@ -888,7 +888,7 @@ + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. + */ +-int ZEXPORT gzeof (file) ++ZEXPORT int gzeof (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -950,7 +950,7 @@ + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. + */ +-int ZEXPORT gzclose (file) ++ZEXPORT int gzclose (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +@@ -984,7 +984,7 @@ + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. + */ +-const char * ZEXPORT gzerror (file, errnum) ++ZEXPORT const char * gzerror (file, errnum) + gzFile file; + int *errnum; + { +@@ -1014,7 +1014,7 @@ + /* =========================================================================== + Clear the error and end-of-file flags, and do the same for the real file. + */ +-void ZEXPORT gzclearerr (file) ++ZEXPORT void gzclearerr (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; +--- zlib-1.2.3-orig/infback.c~visibility ++++ zlib-1.2.3-orig/infback.c +@@ -25,7 +25,7 @@ + windowBits is in the range 8..15, and window is a user-supplied + window and output buffer that is 2**windowBits bytes. + */ +-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) ++ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size) + z_streamp strm; + int windowBits; + unsigned char FAR *window; +@@ -238,7 +238,7 @@ + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ +-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) ++ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc) + z_streamp strm; + in_func in; + void FAR *in_desc; +@@ -611,7 +611,7 @@ + return ret; + } + +-int ZEXPORT inflateBackEnd(strm) ++ZEXPORT int inflateBackEnd(strm) + z_streamp strm; + { + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) +--- zlib-1.2.3-orig/inflate.c~visibility ++++ zlib-1.2.3-orig/inflate.c +@@ -100,7 +100,7 @@ + local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, + unsigned len)); + +-int ZEXPORT inflateReset(strm) ++ZEXPORT int inflateReset(strm) + z_streamp strm; + { + struct inflate_state FAR *state; +@@ -141,7 +141,7 @@ + return Z_OK; + } + +-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) ++ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size) + z_streamp strm; + int windowBits; + const char *version; +@@ -184,7 +184,7 @@ + return inflateReset(strm); + } + +-int ZEXPORT inflateInit_(strm, version, stream_size) ++ZEXPORT int inflateInit_(strm, version, stream_size) + z_streamp strm; + const char *version; + int stream_size; +@@ -551,7 +551,7 @@ + will return Z_BUF_ERROR if it has not reached the end of the stream. + */ + +-int ZEXPORT inflate(strm, flush) ++ZEXPORT int inflate(strm, flush) + z_streamp strm; + int flush; + { +@@ -1152,7 +1152,7 @@ + return ret; + } + +-int ZEXPORT inflateEnd(strm) ++ZEXPORT int inflateEnd(strm) + z_streamp strm; + { + struct inflate_state FAR *state; +@@ -1166,7 +1166,7 @@ + return Z_OK; + } + +-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) ++ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +@@ -1259,7 +1259,7 @@ + return next; + } + +-int ZEXPORT inflateSync(strm) ++ZEXPORT int inflateSync(strm) + z_streamp strm; + { + unsigned len; /* number of bytes to look at or looked at */ +@@ -1310,7 +1310,7 @@ + block. When decompressing, PPP checks that at the end of input packet, + inflate is waiting for these length bytes. + */ +-int ZEXPORT inflateSyncPoint(strm) ++ZEXPORT int inflateSyncPoint(strm) + z_streamp strm; + { + struct inflate_state FAR *state; +@@ -1320,7 +1320,7 @@ + return state->mode == STORED && state->bits == 0; + } + +-int ZEXPORT inflateCopy(dest, source) ++ZEXPORT int inflateCopy(dest, source) + z_streamp dest; + z_streamp source; + { +--- zlib-1.2.3-orig/uncompr.c~visibility ++++ zlib-1.2.3-orig/uncompr.c +@@ -23,7 +23,7 @@ + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. + */ +-int ZEXPORT uncompress (dest, destLen, source, sourceLen) ++ZEXPORT int uncompress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; +--- zlib-1.2.3-orig/zconf.in.h~visibility ++++ zlib-1.2.3-orig/zconf.in.h +@@ -204,11 +204,9 @@ + */ + # ifdef ZLIB_DLL + # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +-# ifdef ZLIB_INTERNAL +-# define ZEXTERN extern __declspec(dllexport) +-# else +-# define ZEXTERN extern __declspec(dllimport) +-# endif ++# define ZDLLLOCAL __declspec(dllimport) ++# define ZDLLPUBLIC __declspec(dllexport) ++# define ZEXTERN extern + # endif + # endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, +@@ -229,30 +227,45 @@ + # define ZEXPORTVA FAR CDECL + # endif + # endif +-#endif +- +-#if defined (__BEOS__) ++#elif defined (__BEOS__) + # ifdef ZLIB_DLL +-# ifdef ZLIB_INTERNAL +-# define ZEXPORT __declspec(dllexport) +-# define ZEXPORTVA __declspec(dllexport) +-# else +-# define ZEXPORT __declspec(dllimport) +-# define ZEXPORTVA __declspec(dllimport) +-# endif ++# define ZDLLIMPORT __declspec(dllimport) ++# define ZDLLPUBLIC __declspec(dllexport) ++# define ZDLLLOCAL ++# endif ++#else ++# define ZDLLIMPORT ++# ifdef GCC_HASCLASSVISIBILITY ++# define ZDLLLOCAL __attribute__ ((visibility("hidden"))) ++# define ZDLLPUBLIC __attribute__ ((visibility("default"))) ++# else ++# define ZDLLLOCAL ++# define ZDLLPUBLIC + # endif + #endif + + #ifndef ZEXTERN + # define ZEXTERN extern + #endif +-#ifndef ZEXPORT +-# define ZEXPORT +-#endif +-#ifndef ZEXPORTVA +-# define ZEXPORTVA ++#ifdef ZLIB_INTERNAL ++# ifndef ZLIB_DLL ++# define ZEXPORT ++# define ZEXPORTVA ++# endif ++# ifndef ZEXPORT ++# define ZEXPORT ZDLLPUBLIC ++# endif ++# ifndef ZEXPORTVA ++# define ZEXPORTVA ZDLLPUBLIC ++# endif ++#else ++# ifndef ZEXPORT ++# define ZEXPORT ZDLLIMPORT ++# endif ++# ifndef ZEXPORTVA ++# define ZEXPORTVA ZDLLIMPORT ++# endif + #endif +- + #ifndef FAR + # define FAR + #endif +--- zlib-1.2.3-orig/zlib.h~visibility ++++ zlib-1.2.3-orig/zlib.h +@@ -209,7 +209,7 @@ + + /* basic functions */ + +-ZEXTERN const char * ZEXPORT zlibVersion OF((void)); ++ZEXTERN ZEXPORT const char * zlibVersion OF((void)); + /* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is + not compatible with the zlib.h header file used by the application. +@@ -217,7 +217,7 @@ + */ + + /* +-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); ++ZEXTERN ZEXPORT int deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. +@@ -239,7 +239,7 @@ + */ + + +-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); ++ZEXTERN ZEXPORT int deflate OF((z_streamp strm, int flush)); + /* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce some +@@ -325,7 +325,7 @@ + */ + + +-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); ++ZEXTERN ZEXPORT int deflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any +@@ -340,7 +340,7 @@ + + + /* +-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by +@@ -360,7 +360,7 @@ + */ + + +-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); ++ZEXTERN ZEXPORT int inflate OF((z_streamp strm, int flush)); + /* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce +@@ -459,7 +459,7 @@ + */ + + +-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any +@@ -477,7 +477,7 @@ + */ + + /* +-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, ++ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, +@@ -535,7 +535,7 @@ + not perform any compression: this will be done by deflate(). + */ + +-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, ++ZEXTERN ZEXPORT int deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); + /* +@@ -574,7 +574,7 @@ + perform any compression: this will be done by deflate(). + */ + +-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, ++ZEXTERN ZEXPORT int deflateCopy OF((z_streamp dest, + z_streamp source)); + /* + Sets the destination stream as a complete copy of the source stream. +@@ -592,7 +592,7 @@ + destination. + */ + +-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); ++ZEXTERN ZEXPORT int deflateReset OF((z_streamp strm)); + /* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. +@@ -603,7 +603,7 @@ + stream state was inconsistent (such as zalloc or state being NULL). + */ + +-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, ++ZEXTERN ZEXPORT int deflateParams OF((z_streamp strm, + int level, + int strategy)); + /* +@@ -641,7 +641,7 @@ + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, ++ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm, + uLong sourceLen)); + /* + deflateBound() returns an upper bound on the compressed size after +@@ -650,7 +650,7 @@ + for deflation in a single pass, and so would be called before deflate(). + */ + +-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, ++ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm, + int bits, + int value)); + /* +@@ -691,7 +691,7 @@ + */ + + /* +-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, ++ZEXTERN ZEXPORT int inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The +@@ -733,7 +733,7 @@ + and avail_out are unchanged.) + */ + +-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, ++ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); + /* +@@ -755,7 +755,7 @@ + inflate(). + */ + +-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateSync OF((z_streamp strm)); + /* + Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all +@@ -770,7 +770,7 @@ + until success or end of the input data. + */ + +-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, ++ZEXTERN ZEXPORT int inflateCopy OF((z_streamp dest, + z_streamp source)); + /* + Sets the destination stream as a complete copy of the source stream. +@@ -786,7 +786,7 @@ + destination. + */ + +-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateReset OF((z_streamp strm)); + /* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. +@@ -853,7 +853,7 @@ + */ + + /* +-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, ++ZEXTERN ZEXPORT int inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() +@@ -877,7 +877,7 @@ + typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); + typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, ++ZEXTERN ZEXPORT int inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); + /* +@@ -946,7 +946,7 @@ + that inflateBack() cannot return Z_OK. + */ + +-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateBackEnd OF((z_streamp strm)); + /* + All memory allocated by inflateBackInit() is freed. + +@@ -954,7 +954,7 @@ + state was inconsistent. + */ + +-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); ++ZEXTERN ZEXPORT uLong zlibCompileFlags OF((void)); + /* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: +@@ -1006,7 +1006,7 @@ + utility functions can easily be modified if you need special options. + */ + +-ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, ++ZEXTERN ZEXPORT int compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Compresses the source buffer into the destination buffer. sourceLen is +@@ -1021,7 +1021,7 @@ + buffer. + */ + +-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, ++ZEXTERN ZEXPORT int compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); + /* +@@ -1037,14 +1037,14 @@ + Z_STREAM_ERROR if the level parameter is invalid. + */ + +-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); ++ZEXTERN ZEXPORT uLong compressBound OF((uLong sourceLen)); + /* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before + a compress() or compress2() call to allocate the destination buffer. + */ + +-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, ++ZEXTERN ZEXPORT int uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Decompresses the source buffer into the destination buffer. sourceLen is +@@ -1065,7 +1065,7 @@ + + typedef voidp gzFile; + +-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); ++ZEXTERN ZEXPORT gzFile gzopen OF((const char *path, const char *mode)); + /* + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb") but can also include a compression level +@@ -1082,7 +1082,7 @@ + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). */ + +-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); ++ZEXTERN ZEXPORT gzFile gzdopen OF((int fd, const char *mode)); + /* + gzdopen() associates a gzFile with the file descriptor fd. File + descriptors are obtained from calls like open, dup, creat, pipe or +@@ -1095,7 +1095,7 @@ + the (de)compression state. + */ + +-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); ++ZEXTERN ZEXPORT int gzsetparams OF((gzFile file, int level, int strategy)); + /* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. +@@ -1103,7 +1103,7 @@ + opened for writing. + */ + +-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); ++ZEXTERN ZEXPORT int gzread OF((gzFile file, voidp buf, unsigned len)); + /* + Reads the given number of uncompressed bytes from the compressed file. + If the input file was not in gzip format, gzread copies the given number +@@ -1111,7 +1111,7 @@ + gzread returns the number of uncompressed bytes actually read (0 for + end of file, -1 for error). */ + +-ZEXTERN int ZEXPORT gzwrite OF((gzFile file, ++ZEXTERN ZEXPORT int gzwrite OF((gzFile file, + voidpc buf, unsigned len)); + /* + Writes the given number of uncompressed bytes into the compressed file. +@@ -1119,7 +1119,7 @@ + (0 in case of error). + */ + +-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); ++ZEXTERN ZEXPORTVA int gzprintf OF((gzFile file, const char *format, ...)); + /* + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of +@@ -1132,14 +1132,14 @@ + because the secure snprintf() or vsnprintf() functions were not available. + */ + +-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); ++ZEXTERN ZEXPORT int gzputs OF((gzFile file, const char *s)); + /* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. + */ + +-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); ++ZEXTERN ZEXPORT char * gzgets OF((gzFile file, char *buf, int len)); + /* + Reads bytes from the compressed file until len-1 characters are read, or + a newline character is read and transferred to buf, or an end-of-file +@@ -1148,19 +1148,19 @@ + gzgets returns buf, or Z_NULL in case of error. + */ + +-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); ++ZEXTERN ZEXPORT int gzputc OF((gzFile file, int c)); + /* + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. + */ + +-ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); ++ZEXTERN ZEXPORT int gzgetc OF((gzFile file)); + /* + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. + */ + +-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); ++ZEXTERN ZEXPORT int gzungetc OF((int c, gzFile file)); + /* + Push one character back onto the stream to be read again later. + Only one character of push-back is allowed. gzungetc() returns the +@@ -1170,7 +1170,7 @@ + or gzrewind(). + */ + +-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); ++ZEXTERN ZEXPORT int gzflush OF((gzFile file, int flush)); + /* + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. The return value is the zlib +@@ -1180,7 +1180,7 @@ + degrade compression. + */ + +-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, ++ZEXTERN ZEXPORT z_off_t gzseek OF((gzFile file, + z_off_t offset, int whence)); + /* + Sets the starting position for the next gzread or gzwrite on the +@@ -1198,14 +1198,14 @@ + would be before the current position. + */ + +-ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); ++ZEXTERN ZEXPORT int gzrewind OF((gzFile file)); + /* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) + */ + +-ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); ++ZEXTERN ZEXPORT z_off_t gztell OF((gzFile file)); + /* + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the +@@ -1214,26 +1214,26 @@ + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) + */ + +-ZEXTERN int ZEXPORT gzeof OF((gzFile file)); ++ZEXTERN ZEXPORT int gzeof OF((gzFile file)); + /* + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. + */ + +-ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); ++ZEXTERN ZEXPORT int gzdirect OF((gzFile file)); + /* + Returns 1 if file is being read directly without decompression, otherwise + zero. + */ + +-ZEXTERN int ZEXPORT gzclose OF((gzFile file)); ++ZEXTERN ZEXPORT int gzclose OF((gzFile file)); + /* + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. The return value is the zlib + error number (see function gzerror below). + */ + +-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); ++ZEXTERN ZEXPORT const char * gzerror OF((gzFile file, int *errnum)); + /* + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an +@@ -1242,7 +1242,7 @@ + to get the exact error code. + */ + +-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); ++ZEXTERN ZEXPORT void gzclearerr OF((gzFile file)); + /* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip +@@ -1257,7 +1257,7 @@ + compression library. + */ + +-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); ++ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len)); + /* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is NULL, this function returns +@@ -1282,7 +1282,7 @@ + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. + */ + +-ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); ++ZEXTERN ZEXPORT uLong crc32 OF((uLong crc, const Bytef *buf, uInt len)); + /* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial +@@ -1314,17 +1314,17 @@ + /* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, ++ZEXTERN ZEXPORT int deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, ++ZEXTERN ZEXPORT int inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, ++ZEXTERN ZEXPORT int deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, ++ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, ++ZEXTERN ZEXPORT int inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +@@ -1346,9 +1346,9 @@ + struct internal_state {int dummy;}; /* hack for buggy compilers */ + #endif + +-ZEXTERN const char * ZEXPORT zError OF((int)); +-ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); +-ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); ++ZEXTERN ZEXPORT const char * zError OF((int)); ++ZEXTERN ZEXPORT int inflateSyncPoint OF((z_streamp z)); ++ZEXTERN ZEXPORT const uLongf * get_crc_table OF((void)); + + #ifdef __cplusplus + } +--- zlib-1.2.3-orig/zutil.c~visibility ++++ zlib-1.2.3-orig/zutil.c +@@ -24,12 +24,12 @@ + ""}; + + +-const char * ZEXPORT zlibVersion() ++ZEXPORT const char * zlibVersion() + { + return ZLIB_VERSION; + } + +-uLong ZEXPORT zlibCompileFlags() ++ZEXPORT uLong zlibCompileFlags() + { + uLong flags; + +@@ -130,7 +130,7 @@ + /* exported to allow conversion of error code to string for compress() and + * uncompress() + */ +-const char * ZEXPORT zError(err) ++ZEXPORT const char * zError(err) + int err; + { + return ERR_MSG(err); diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb new file mode 100644 index 0000000000..14e1be63e1 --- /dev/null +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -0,0 +1,5 @@ +SECTION = "libs" +include zlib_${PV}.bb +inherit native +DEPENDS = "" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb new file mode 100644 index 0000000000..1d342f51d1 --- /dev/null +++ b/packages/zlib/zlib_1.2.3.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Zlib Compression Library" +SECTION = "libs" +PRIORITY = "required" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +HOMEPAGE = "http://www.gzip.org/zlib/" +LICENSE = "zlib" + +SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ + file://visibility.patch;patch=1" + +S = "${WORKDIR}/zlib-${PV}" + +export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" +LDFLAGS_append = " -L. -lz" +CFLAGS_prepend = "-fPIC -DZLIB_DLL " +AR_append = " rc" +EXTRA_OEMAKE = "" + +do_compile() { + ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} + oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a +} + +do_stage() { + install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h + install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + oe_libinstall -a -so libz ${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}${prefix} ${D}${includedir} ${D}${libdir} + oe_runmake "prefix=${D}${prefix}" \ + "exec_prefix=${D}${exec_prefix}" \ + "man3dir=${D}${mandir}/man3" \ + "includedir=${D}${includedir}" \ + "libdir=${D}${libdir}" install +} |