From e2b26e9a1e62ad6dd4f2c9cc6dcebbf96e661524 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 18 Oct 2007 18:10:16 +0000 Subject: packages/linux/linux-x86-2.6.20/i486-defconfig : Make x86 kernel "generic" by building most things as modules Bump PR --- packages/linux/linux-x86-2.6.20/i486-defconfig | 1920 ++++++++++++++++++------ packages/linux/linux-x86_2.6.20.bb | 2 +- 2 files changed, 1489 insertions(+), 433 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-x86-2.6.20/i486-defconfig b/packages/linux/linux-x86-2.6.20/i486-defconfig index d0c170f9eb..e90380faac 100644 --- a/packages/linux/linux-x86-2.6.20/i486-defconfig +++ b/packages/linux/linux-x86-2.6.20/i486-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20 -# Wed Jul 4 16:53:32 2007 +# Sun Jun 3 12:26:50 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -113,11 +113,11 @@ CONFIG_X86_PC=y # CONFIG_X86_ES7000 is not set # CONFIG_PARAVIRT is not set # CONFIG_M386 is not set -# CONFIG_M486 is not set +CONFIG_M486=y # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set -CONFIG_M686=y +# CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set # CONFIG_MPENTIUMM is not set @@ -135,23 +135,22 @@ CONFIG_M686=y # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set -# CONFIG_X86_GENERIC is not set +CONFIG_X86_GENERIC=y CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_GOOD_APIC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_INTEL_USERCOPY=y CONFIG_HPET_TIMER=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y @@ -248,12 +247,20 @@ CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y -# CONFIG_ACPI_CONTAINER is not set +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m # # APM (Advanced Power Management) BIOS Support # -# CONFIG_APM is not set +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +# CONFIG_APM_DO_ENABLE is not set +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_RTC_IS_GMT is not set +# CONFIG_APM_ALLOW_INTS is not set +# CONFIG_APM_REAL_MODE_POWER_OFF is not set # # CPU Frequency scaling @@ -271,24 +278,54 @@ CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y -# CONFIG_PCIEPORTBUS is not set +CONFIG_PCIEPORTBUS=y +# CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_PCIEAER=y # CONFIG_PCI_MSI is not set CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set -# CONFIG_SCx200 is not set +CONFIG_SCx200=m +CONFIG_SCx200HR_TIMER=m CONFIG_K8_NB=y # # PCCARD (PCMCIA/CardBus) support # -# CONFIG_PCCARD is not set +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=m # # PCI Hotplug Support # -# CONFIG_HOTPLUG_PCI is not set +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set # # Executable file formats @@ -399,7 +436,12 @@ CONFIG_IP_NF_QUEUE=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set -# CONFIG_IEEE80211 is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set CONFIG_WIRELESS_EXT=y # @@ -422,7 +464,105 @@ CONFIG_FW_LOADER=m # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +# CONFIG_MTD_PARTITIONS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +CONFIG_FTL=m +CONFIG_NFTL=m +# CONFIG_NFTL_RW is not set +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=y + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_RAM=y +CONFIG_MTD_ROM=y +CONFIG_MTD_ABSENT=y +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_SC520CDP is not set +# CONFIG_MTD_TS5500 is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +# CONFIG_MTD_SCB2_FLASH is not set +# CONFIG_MTD_L440GX is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLOCK2MTD=y + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_DISKONCHIP=y +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_CAFE=y +CONFIG_MTD_NAND_CS553X=y + +# +# OneNAND Flash Device Drivers +# +CONFIG_MTD_ONENAND=m +# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_OTP is not set # # Parallel port support @@ -432,9 +572,11 @@ CONFIG_PARPORT_PC=y # CONFIG_PARPORT_SERIAL is not set # CONFIG_PARPORT_PC_FIFO is not set # CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_PC_PCMCIA is not set # CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_AX88796=m # CONFIG_PARPORT_1284 is not set +CONFIG_PARPORT_NOT_PC=y # # Plug and Play support @@ -451,27 +593,65 @@ CONFIG_PNPACPI=y # Block devices # CONFIG_BLK_DEV_FD=y -# CONFIG_PARIDE is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set +CONFIG_PARIDE=m +CONFIG_PARIDE_PARPORT=y + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +# CONFIG_PARIDE_EPATC8 is not set +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set -# CONFIG_BLK_DEV_LOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_INITRD is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m # # Misc devices # # CONFIG_IBM_ASM is not set # CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m # CONFIG_MSI_LAPTOP is not set # @@ -487,6 +667,7 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y +# CONFIG_BLK_DEV_IDECS is not set CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -510,31 +691,34 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_ATIIXP is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_CS5535 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_SC1200 is not set +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=y +CONFIG_BLK_DEV_ATIIXP=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_CS5535=y +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +CONFIG_BLK_DEV_JMICRON=y +CONFIG_BLK_DEV_SC1200=y CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SIS5513 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set +CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_NS87415=y +CONFIG_BLK_DEV_PDC202XX_OLD=y +# CONFIG_PDC202XX_BURST is not set +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SIS5513=y +CONFIG_BLK_DEV_SLC90E66=y +CONFIG_BLK_DEV_TRM290=y +CONFIG_BLK_DEV_VIA82CXXX=y # CONFIG_IDE_ARM is not set CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set @@ -546,19 +730,20 @@ CONFIG_IDEDMA_AUTO=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y -# CONFIG_SCSI_TGT is not set -# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=y -# CONFIG_CHR_DEV_SCH is not set +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -571,62 +756,165 @@ CONFIG_CHR_DEV_SG=y # # SCSI Transports # -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC94XX is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_ARCMSR is not set +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=5000 +CONFIG_AIC7XXX_DEBUG_ENABLE=y +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=5000 +# CONFIG_AIC79XX_ENABLE_RD_STRM is not set +CONFIG_AIC79XX_DEBUG_ENABLE=y +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +CONFIG_AIC94XX_DEBUG=y +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m # CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_SRP is not set +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set # # Serial ATA (prod) and Parallel ATA (experimental) drivers # -# CONFIG_ATA is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_SATA_AHCI=y +CONFIG_SATA_SVW=y +CONFIG_ATA_PIIX=y +CONFIG_SATA_MV=y +CONFIG_SATA_NV=y +CONFIG_PDC_ADMA=y +CONFIG_SATA_QSTOR=y +CONFIG_SATA_PROMISE=y +CONFIG_SATA_SX4=y +CONFIG_SATA_SIL=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_SIS=y +CONFIG_SATA_ULI=y +CONFIG_SATA_VIA=y +CONFIG_SATA_VITESSE=y +CONFIG_SATA_INTEL_COMBINED=y +CONFIG_PATA_ALI=y +CONFIG_PATA_AMD=y +CONFIG_PATA_ARTOP=y +CONFIG_PATA_ATIIXP=y +CONFIG_PATA_CMD64X=y +CONFIG_PATA_CS5520=y +CONFIG_PATA_CS5530=y +CONFIG_PATA_CS5535=y +CONFIG_PATA_CYPRESS=y +CONFIG_PATA_EFAR=y +CONFIG_ATA_GENERIC=y +CONFIG_PATA_HPT366=y +CONFIG_PATA_HPT37X=y +CONFIG_PATA_HPT3X2N=y +CONFIG_PATA_HPT3X3=y +CONFIG_PATA_IT821X=y +CONFIG_PATA_JMICRON=y +CONFIG_PATA_TRIFLEX=y +CONFIG_PATA_MARVELL=y +CONFIG_PATA_MPIIX=y +CONFIG_PATA_OLDPIIX=y +CONFIG_PATA_NETCELL=y +CONFIG_PATA_NS87410=y +CONFIG_PATA_OPTI=y +CONFIG_PATA_OPTIDMA=y +# CONFIG_PATA_PCMCIA is not set +CONFIG_PATA_PDC_OLD=y +CONFIG_PATA_RADISYS=y +CONFIG_PATA_RZ1000=y +CONFIG_PATA_SC1200=y +CONFIG_PATA_SERVERWORKS=y +CONFIG_PATA_PDC2027X=y +CONFIG_PATA_SIL680=y +CONFIG_PATA_SIS=y +CONFIG_PATA_VIA=y +CONFIG_PATA_WINBOND=y # # Multi-device support (RAID and LVM) # -# CONFIG_MD is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m # # Fusion MPT device support @@ -646,25 +934,24 @@ CONFIG_IEEE1394=y # # CONFIG_IEEE1394_VERBOSEDEBUG is not set # CONFIG_IEEE1394_OUI_DB is not set -# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # CONFIG_IEEE1394_EXPORT_FULL_API is not set # # Device Drivers # - -# -# Texas Instruments PCILynx requires I2C -# +CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_OHCI1394=y # # Protocol Drivers # -# CONFIG_IEEE1394_VIDEO1394 is not set -# CONFIG_IEEE1394_SBP2 is not set -# CONFIG_IEEE1394_ETH1394 is not set -# CONFIG_IEEE1394_DV1394 is not set +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=y # @@ -677,10 +964,10 @@ CONFIG_IEEE1394_RAWIO=y # CONFIG_NETDEVICES=y CONFIG_DUMMY=m -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_NET_SB1000 is not set +CONFIG_BONDING=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_NET_SB1000=m # # ARCnet devices @@ -690,7 +977,22 @@ CONFIG_DUMMY=m # # PHY device support # -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_FIXED_PHY=m +# CONFIG_FIXED_MII_10_FDX is not set +# CONFIG_FIXED_MII_100_FDX is not set # # Ethernet (10 or 100Mbit) @@ -700,57 +1002,82 @@ CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m # # Tulip family network device support # -# CONFIG_NET_TULIP is not set +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_PCMCIA_XIRCOM is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=y +CONFIG_PCNET32=m # CONFIG_PCNET32_NAPI is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_DGRS=m +CONFIG_EEPRO100=m CONFIG_E100=m -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set +CONFIG_FEALNX=m +CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m -# CONFIG_8139CP is not set +CONFIG_8139CP=m CONFIG_8139TOO=y CONFIG_8139TOO_PIO=y # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_NET_POCKET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m # # Ethernet (1000 Mbit) # -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SIS190 is not set -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set -# CONFIG_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2 is not set -# CONFIG_QLA3XXX is not set +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_NAPI is not set +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +CONFIG_SIS190=m +CONFIG_SKGE=m +CONFIG_SKY2=m +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) @@ -777,24 +1104,60 @@ CONFIG_NET_RADIO=y # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set # # Wireless 802.11b ISA/PCI cards support # -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_AIRO is not set -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set +CONFIG_IPW2100=m +# CONFIG_IPW2100_MONITOR is not set +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +# CONFIG_IPW2200_MONITOR is not set +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +# CONFIG_PCI_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_PCMCIA_HERMES is not set +# CONFIG_PCMCIA_SPECTRUM is not set +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_ATMEL is not set +# CONFIG_PCMCIA_WL3501 is not set # # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support # # CONFIG_PRISM54 is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_HOSTAP is not set +CONFIG_USB_ZD1201=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +# CONFIG_HOSTAP_CS is not set CONFIG_NET_WIRELESS=y +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + # # Wan interfaces # @@ -802,8 +1165,17 @@ CONFIG_NET_WIRELESS=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -# CONFIG_PPP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set @@ -813,7 +1185,46 @@ CONFIG_NET_WIRELESS=y # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set +# CONFIG_ISDN_CAPI_MIDDLEWARE is not set +CONFIG_ISDN_CAPI_CAPI20=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +# CONFIG_ISDN_DRV_AVMB1_AVM_CS is not set +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +# CONFIG_ISDN_DIVAS_BRIPCI is not set +# CONFIG_ISDN_DIVAS_PRIPCI is not set +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m # # Telephony Support @@ -824,7 +1235,7 @@ CONFIG_NET_WIRELESS=y # Input device support # CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_FF_MEMLESS=y # # Userland interfaces @@ -885,6 +1296,7 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_CONSOLE is not set CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_CS is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -911,7 +1323,11 @@ CONFIG_PRINTER=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -# CONFIG_HW_RANDOM is not set +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m # CONFIG_NVRAM is not set CONFIG_RTC=m # CONFIG_GEN_RTC is not set @@ -920,93 +1336,451 @@ CONFIG_RTC=m # CONFIG_APPLICOM is not set # CONFIG_SONYPI is not set CONFIG_AGP=y -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y -# CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SIS is not set -# CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_VIA is not set -# CONFIG_AGP_EFFICEON is not set +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m CONFIG_DRM=y # CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I830 is not set -# CONFIG_DRM_I915 is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_SAVAGE is not set -# CONFIG_MWAVE is not set -# CONFIG_PC8736x_GPIO is not set -# CONFIG_NSC_GPIO is not set -# CONFIG_CS5535_GPIO is not set +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +CONFIG_MWAVE=m +# CONFIG_SCx200_GPIO is not set +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set # CONFIG_HPET is not set -# CONFIG_HANGCHECK_TIMER is not set +CONFIG_HANGCHECK_TIMER=m # # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set +CONFIG_TELCLOCK=m # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_I810=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_ISA=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m +CONFIG_SCx200_ACB=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_STUB=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +CONFIG_I2C_VOODOO3=m +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m + +# +# SPI Protocol Masters +# # # Dallas's 1-wire bus # -# CONFIG_W1 is not set +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set # # Hardware Monitoring support # CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_K8TEMP is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_HDAPS is not set +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m # CONFIG_HWMON_DEBUG_CHIP is not set # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +# CONFIG_VIDEO_BT848_DVB is not set +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +# CONFIG_VIDEO_SAA7134_OSS is not set +# CONFIG_VIDEO_SAA7134_DVB is not set +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +# CONFIG_VIDEO_CX88_DVB is not set +CONFIG_VIDEO_CAFE_CCIC=m + +# +# V4L USB devices +# +CONFIG_VIDEO_PVRUSB2=m +# CONFIG_VIDEO_PVRUSB2_29XXX is not set +# CONFIG_VIDEO_PVRUSB2_24XXX is not set +CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set + +# +# Radio Adapters +# +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_USB_DSBR=m # # Digital Video Broadcasting Devices # -# CONFIG_DVB is not set -# CONFIG_USB_DABUSB is not set +CONFIG_DVB=y +CONFIG_DVB_CORE=m +# CONFIG_DVB_CORE_ATTACH is not set + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +CONFIG_DVB_FE_CUSTOMISE=y + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUNER_MT2060=m +CONFIG_DVB_TUNER_LGH06XF=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_VIDEOBUF=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_USB_DABUSB=m # # Graphics support # CONFIG_FIRMWARE_EDID=y CONFIG_FB=y +CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set @@ -1015,26 +1789,51 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=y CONFIG_FB_VESA=y -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I810 is not set -# CONFIG_FB_INTEL is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_CYBLA is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_HGA=m +# CONFIG_FB_HGA_ACCEL is not set +CONFIG_FB_S1D13XXX=m +CONFIG_FB_NVIDIA=m +# CONFIG_FB_NVIDIA_I2C is not set +CONFIG_FB_RIVA=m +# CONFIG_FB_RIVA_I2C is not set +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_I810=m +# CONFIG_FB_I810_GTF is not set +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set +# CONFIG_FB_MATROX_G is not set +CONFIG_FB_MATROX_I2C=m +# CONFIG_FB_MATROX_MULTIHEAD is not set +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY=m +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set +CONFIG_FB_SAVAGE=m +# CONFIG_FB_SAVAGE_I2C is not set +# CONFIG_FB_SAVAGE_ACCEL is not set +CONFIG_FB_SIS=m +# CONFIG_FB_SIS_300 is not set +# CONFIG_FB_SIS_315 is not set +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +CONFIG_FB_VOODOO1=m +CONFIG_FB_CYBLA=m +CONFIG_FB_TRIDENT=m +# CONFIG_FB_TRIDENT_ACCEL is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_GX=m +# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_VIRTUAL=m # # Console display driver support @@ -1064,9 +1863,11 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y # # Sound @@ -1079,7 +1880,8 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y -CONFIG_SND_RAWMIDI=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=y # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y @@ -1087,7 +1889,8 @@ CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y -# CONFIG_SND_RTCTIMER is not set +CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y @@ -1097,86 +1900,132 @@ CONFIG_SND_VERBOSE_PROCFS=y # # Generic devices # +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m CONFIG_SND_AC97_CODEC=y -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_MTS64 is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m # # PCI devices # -# CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS300 is not set -# CONFIG_SND_ALS4000 is not set -# CONFIG_SND_ALI5451 is not set -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AZT3328 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CS5535AUDIO is not set -# CONFIG_SND_DARLA20 is not set -# CONFIG_SND_GINA20 is not set -# CONFIG_SND_LAYLA20 is not set -# CONFIG_SND_DARLA24 is not set -# CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set -# CONFIG_SND_MONA is not set -# CONFIG_SND_MIA is not set -# CONFIG_SND_ECHO3G is not set -# CONFIG_SND_INDIGO is not set -# CONFIG_SND_INDIGOIO is not set -# CONFIG_SND_INDIGODJ is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set -# CONFIG_SND_ENS1370 is not set -CONFIG_SND_ENS1371=y -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_HDA_INTEL is not set -# CONFIG_SND_HDSP is not set -# CONFIG_SND_HDSPM is not set -# CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +# CONFIG_SND_FM801_TEA575X_BOOL is not set +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=y -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_KORG1212 is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_PCXHR is not set -# CONFIG_SND_RIPTIDE is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -# CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m # CONFIG_SND_AC97_POWER_SAVE is not set # # USB devices # -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_USX2Y is not set +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set # # Open Sound System # -# CONFIG_SOUND_PRIME is not set +CONFIG_SOUND_PRIME=y +CONFIG_SOUND_BT878=m +CONFIG_SOUND_ES1371=m +CONFIG_SOUND_ICH=m +CONFIG_SOUND_TRIDENT=m +CONFIG_SOUND_MSNDCLAS=m +CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" +CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" +CONFIG_SOUND_MSNDPIN=m +CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" +CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" +CONFIG_SOUND_VIA82CXXX=m +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +CONFIG_SOUND_CS4232=m +CONFIG_SOUND_SSCAPE=m +CONFIG_SOUND_VMIDI=m +CONFIG_SOUND_TRIX=m +CONFIG_SOUND_MSS=m +CONFIG_SOUND_MPU401=m +CONFIG_SOUND_PAS=m +CONFIG_SOUND_PSS=m +# CONFIG_PSS_MIXER is not set +CONFIG_SOUND_SB=m +CONFIG_SOUND_YM3812=m +CONFIG_SOUND_UART6850=m +CONFIG_SOUND_AEDSP16=m +# CONFIG_SC6600 is not set +# CONFIG_AEDSP16_MSS is not set +# CONFIG_AEDSP16_SBPRO is not set +# CONFIG_AEDSP16_MPU401 is not set +CONFIG_SOUND_TVMIXER=m +CONFIG_SOUND_KAHLUA=m CONFIG_AC97_BUS=y # @@ -1209,16 +2058,20 @@ CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_OHCI_HCD is not set +CONFIG_USB_ISP116X_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y -# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_U132_HCD is not set +CONFIG_USB_SL811_HCD=y +# CONFIG_USB_SL811_CS is not set # # USB Device Class drivers # -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=y +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -1229,86 +2082,166 @@ CONFIG_USB_PRINTER=y # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_KARMA is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_LIBUSUAL is not set # # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_TOUCHSCREEN is not set -# CONFIG_USB_YEALINK is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set +CONFIG_USB_HIDINPUT_POWERBOOK=y +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_THRUSTMASTER_FF=y +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +CONFIG_USB_ACECAD=m +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +CONFIG_USB_TOUCHSCREEN=m +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_USB_TOUCHSCREEN_ITM=y +CONFIG_USB_TOUCHSCREEN_ETURBO=y +CONFIG_USB_TOUCHSCREEN_GUNZE=y +CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y +CONFIG_USB_YEALINK=m +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m +CONFIG_USB_KEYSPAN_REMOTE=m +CONFIG_USB_APPLETOUCH=m # # USB Imaging devices # -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET_MII is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_NET_ZAURUS=m CONFIG_USB_MON=y # # USB port drivers # -# CONFIG_USB_USS720 is not set +CONFIG_USB_USS720=m # # USB Serial Converter support # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_DEBUG=m +CONFIG_USB_EZUSB=y # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_TEST is not set +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_TEST=m # # USB DSL modem support @@ -1317,17 +2250,42 @@ CONFIG_USB_CYTHERM=m # # USB Gadget Support # -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m # # MMC/SD Card support # -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_SDHCI=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m # # LED drivers @@ -1336,16 +2294,45 @@ CONFIG_USB_CYTHERM=m # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_ISER=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) # -# CONFIG_EDAC is not set +CONFIG_EDAC=m + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_POLL=y # # Real Time Clock @@ -1364,24 +2351,35 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y # # RTC drivers # +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_TEST=m +CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -# CONFIG_DMA_ENGINE is not set +CONFIG_DMA_ENGINE=y # # DMA Clients # +CONFIG_NET_DMA=y # # DMA Devices # +CONFIG_INTEL_IOATDMA=m # # Virtualization @@ -1404,7 +2402,7 @@ CONFIG_JBD=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1416,7 +2414,7 @@ CONFIG_INOTIFY_USER=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=y -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems @@ -1449,53 +2447,107 @@ CONFIG_TMPFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems # -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # # Network File Systems # CONFIG_NFS_FS=y -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=y -# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set -# CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_RPCSEC_GSS_SPKM3=m +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +CONFIG_RXRPC=m +CONFIG_9P_FS=m # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set # # Native Language Support @@ -1503,54 +2555,56 @@ CONFIG_MSDOS_PARTITION=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m # # Distributed Lock Manager # -# CONFIG_DLM is not set +CONFIG_DLM=m +CONFIG_DLM_TCP=y +# CONFIG_DLM_SCTP is not set +# CONFIG_DLM_DEBUG is not set # # Instrumentation Support # -CONFIG_PROFILING=y -CONFIG_OPROFILE=y +# CONFIG_PROFILING is not set # CONFIG_KPROBES is not set # @@ -1581,15 +2635,15 @@ CONFIG_DOUBLEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m @@ -1597,16 +2651,16 @@ CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m -# CONFIG_CRYPTO_TWOFISH_586 is not set +CONFIG_CRYPTO_TWOFISH_586=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m -# CONFIG_CRYPTO_AES_586 is not set +CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m @@ -1616,7 +2670,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m # # Hardware crypto devices @@ -1635,8 +2689,10 @@ CONFIG_CRC16=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_DEC16=y CONFIG_PLIST=y CONFIG_IOMAP_COPY=y CONFIG_GENERIC_HARDIRQS=y diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index 288c1c1166..cc2c9e1c1e 100644 --- a/packages/linux/linux-x86_2.6.20.bb +++ b/packages/linux/linux-x86_2.6.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " -- cgit v1.2.3 From bdfa9b99d1fd89d1e122da3dd4f50148b28e3726 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 19 Oct 2007 06:48:02 +0000 Subject: libtelepathy: add 0.2.0 --- packages/telepathy/libtelepathy_0.2.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/telepathy/libtelepathy_0.2.0.bb (limited to 'packages') diff --git a/packages/telepathy/libtelepathy_0.2.0.bb b/packages/telepathy/libtelepathy_0.2.0.bb new file mode 100644 index 0000000000..d30b301d38 --- /dev/null +++ b/packages/telepathy/libtelepathy_0.2.0.bb @@ -0,0 +1,15 @@ +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From a961c8fef8e8c47c665c7a00485e564e5e241211 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 19 Oct 2007 06:48:20 +0000 Subject: telepathy-glib: add 0.6.0 --- packages/telepathy/telepathy-glib_0.6.0.bb | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/telepathy/telepathy-glib_0.6.0.bb (limited to 'packages') diff --git a/packages/telepathy/telepathy-glib_0.6.0.bb b/packages/telepathy/telepathy-glib_0.6.0.bb new file mode 100644 index 0000000000..f6b6a6c6b3 --- /dev/null +++ b/packages/telepathy/telepathy-glib_0.6.0.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Telepathy framework - GLib library" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus python-native dbus-native" +LICENSE = "LGPL" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz " + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + # + # copied autotools_stage_all because telepathy-glib has one lib only built as static + # so it can not be oe_libinstalled + # + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + if [ -d ${STAGE_TEMP}/${includedir} ]; then + cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + fi + if [ -d ${STAGE_TEMP}/${libdir} ] + then + for i in ${STAGE_TEMP}/${libdir}/*.la + do + if [ ! -f "$i" ]; then + cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + break + fi + done + oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR} + fi + if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then + install -d ${STAGING_DATADIR}/aclocal + cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal + fi + rm -rf ${STAGE_TEMP} +} -- cgit v1.2.3 From e62838f3f0f5da1d279407cb11919132e607782a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 19 Oct 2007 06:48:36 +0000 Subject: telepathy-mission-control: add 4.45 --- .../telepathy/telepathy-mission-control_4.45.bb | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 packages/telepathy/telepathy-mission-control_4.45.bb (limited to 'packages') diff --git a/packages/telepathy/telepathy-mission-control_4.45.bb b/packages/telepathy/telepathy-mission-control_4.45.bb new file mode 100644 index 0000000000..2215d0a515 --- /dev/null +++ b/packages/telepathy/telepathy-mission-control_4.45.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Telepathy Mission Control" +HOMEPAGE = "http://mission-control.sourceforge.net/" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "libtelepathy dbus-glib gconf" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz" + +inherit autotools pkgconfig + +PACKAGES =+ " \ + libmissioncontrol \ + libmissioncontrol-config \ + libmissioncontrol-server \ + libmissioncontrol-dev \ + libmissioncontrol-config-dev \ + libmissioncontrol-server-dev \ + libmissioncontrol-dbg \ + libmissioncontrol-config-dbg \ + libmissioncontrol-server-dbg \ +" + +FILES_${PN} += "${datadir}/dbus*" + +FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" +FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" + +FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ + ${includedir}/libmissioncontrol/ \ + ${libdir}/pkgconfig/libmissioncontrol.pc" +FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" +FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" + +FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" +FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From e3ef6b69fc7c0f87d18b3e8522264300761af31a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 19 Oct 2007 07:04:25 +0000 Subject: telepathy: add telepathy-python 0.14.0 --- packages/telepathy/telepathy-python_0.14.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/telepathy/telepathy-python_0.14.0.bb (limited to 'packages') diff --git a/packages/telepathy/telepathy-python_0.14.0.bb b/packages/telepathy/telepathy-python_0.14.0.bb new file mode 100644 index 0000000000..5eec5b1fba --- /dev/null +++ b/packages/telepathy/telepathy-python_0.14.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Telepathy framework - Python package" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +LICENSE = "LGPL" +RDEPENDS_${PN} += "dbus-python" + +SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " + +inherit distutils -- cgit v1.2.3 From a5e4d1c0e7afd1b126ec8e742848862d7f235951 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 19 Oct 2007 07:24:51 +0000 Subject: empathy: add 0.14 --- packages/telepathy/empathy_0.14.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/telepathy/empathy_0.14.bb (limited to 'packages') diff --git a/packages/telepathy/empathy_0.14.bb b/packages/telepathy/empathy_0.14.bb new file mode 100644 index 0000000000..1da9949575 --- /dev/null +++ b/packages/telepathy/empathy_0.14.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Empathy: a Telepathy based IM client" +HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" +LICENSE = "GPL" +DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" +RDEPENDS = "telepathy-mission-control" +RRECOMMENDS = "telepathy-gabble" + +PR="r0" + +inherit gnome + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/${PV}/empathy-${PV}.tar.bz2" + +FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/telepathy/managers/*.chandler \ + ${datadir}/icons" -- cgit v1.2.3 From 7509ea476c56b22ac6ef571907dc7d8a3c884ebb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 19 Oct 2007 10:07:41 +0000 Subject: gypsy: merge (with cleanups) from poky --- packages/gypsy/.mtn2git_empty | 0 packages/gypsy/files/.mtn2git_empty | 0 packages/gypsy/files/fixups.patch | 14 ++++++++++++++ packages/gypsy/gypsy.inc | 12 ++++++++++++ packages/gypsy/gypsy_svn.bb | 10 ++++++++++ 5 files changed, 36 insertions(+) create mode 100644 packages/gypsy/.mtn2git_empty create mode 100644 packages/gypsy/files/.mtn2git_empty create mode 100644 packages/gypsy/files/fixups.patch create mode 100644 packages/gypsy/gypsy.inc create mode 100644 packages/gypsy/gypsy_svn.bb (limited to 'packages') diff --git a/packages/gypsy/.mtn2git_empty b/packages/gypsy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gypsy/files/.mtn2git_empty b/packages/gypsy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gypsy/files/fixups.patch b/packages/gypsy/files/fixups.patch new file mode 100644 index 0000000000..1f64d58513 --- /dev/null +++ b/packages/gypsy/files/fixups.patch @@ -0,0 +1,14 @@ +--- + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gypsy/docs/reference/Makefile.am +=================================================================== +--- gypsy.orig/docs/reference/Makefile.am 2007-10-04 23:04:44.000000000 +0100 ++++ gypsy/docs/reference/Makefile.am 2007-10-04 23:04:53.000000000 +0100 +@@ -82,4 +82,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += ++# EXTRA_DIST = diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc new file mode 100644 index 0000000000..6d78943bd5 --- /dev/null +++ b/packages/gypsy/gypsy.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "GPS Controlling Daemon" +LICENSE = "GPL" +SECTION = "x11" +DEPENDS = "glib-2.0 dbus bluez-libs" + +inherit autotools pkgconfig + +do_configure_prepend () { + touch ${S}/gtk-doc.make +} + +FILES_${PN} += "${datadir}/dbus-1/services/" diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb new file mode 100644 index 0000000000..116d39bb4f --- /dev/null +++ b/packages/gypsy/gypsy_svn.bb @@ -0,0 +1,10 @@ +require gypsy.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ + file://fixups.patch;patch=1" + +PV = "0.0+svnr${SRCREV}" +S = "${WORKDIR}/${PN}" + -- cgit v1.2.3 From 49438670f171d6ce647b05638eaaff251738dcb7 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Fri, 19 Oct 2007 11:06:38 +0000 Subject: packages/xorg-xserver/xserver-xorg_1.3.0.0.bb : Fix a typo that broke xserver-xorg during install Bump PR --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 1a0b4b0ba0..8ee6c3e04e 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -42,5 +42,5 @@ do_stage() { do_install_append () { install -d ${D}/etc/X11 - install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ + install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ } diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index a05360a65d..37ed418144 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r2" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1" -- cgit v1.2.3 From 2337e3499a5c966f57e0973eef98fe46b47a5214 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:21:07 +0000 Subject: check: stage pkgconfig data (from Poky) --- packages/check/check_0.9.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/check/check_0.9.2.bb b/packages/check/check_0.9.2.bb index ec7a91d206..92a8e62324 100644 --- a/packages/check/check_0.9.2.bb +++ b/packages/check/check_0.9.2.bb @@ -3,12 +3,12 @@ LICENSE = "LGPL" PRIORITY = "optional" SECTION = "devel" -PR="r1" +PR="r2" SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz" S = "${WORKDIR}/check-${PV}" -inherit autotools +inherit autotools pkgconfig EXTRA_OECONF += "--enable-plain-docdir" -- cgit v1.2.3 From d887ef68f604fb7d30187543a3abbdad26094d05 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:35:55 +0000 Subject: exmap-console: switch to SRCREV (from Poky) --- packages/exmap-console/exmap-console_svn.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb index 7c21222d84..3d809703a5 100644 --- a/packages/exmap-console/exmap-console_svn.bb +++ b/packages/exmap-console/exmap-console_svn.bb @@ -1,7 +1,6 @@ require exmap-console.inc -PV = "0.4+svn${SRCDATE}" -PR = "r14" +PV = "0.4+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" -- cgit v1.2.3 From cd6e181a4571f1f498b6207685d48f18fdd96548 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:36:39 +0000 Subject: exmap-console require glib-2.0 (from Poky) --- packages/exmap-console/exmap-console.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc index ac56f2e1b9..6744aed49f 100644 --- a/packages/exmap-console/exmap-console.inc +++ b/packages/exmap-console/exmap-console.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Console based version of exmap, a memory usage analysis tool" HOMEPAGE = "http://projects.o-hand.com/exmap-console" SECTION = "devel" LICENSE = "GPL" -DEPENDS = "virtual/kernel readline glib-2.0" +DEPENDS = "virtual/kernel readline" SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" -- cgit v1.2.3 From e83465d44394cf6e9a816d1d18a550d7194a5ba2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:45:24 +0000 Subject: gnutls: drop autoconf 2.59 hack (synced from Poky) --- packages/gnutls/gnutls.inc | 5 --- packages/gnutls/gnutls/onceonly.m4 | 63 -------------------------------------- 2 files changed, 68 deletions(-) delete mode 100644 packages/gnutls/gnutls/onceonly.m4 (limited to 'packages') diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index ed96e3f588..ab5ba1d1d0 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -6,17 +6,12 @@ LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ file://gnutls-openssl.patch;patch=1 \ - file://onceonly.m4 \ file://gnutls-texinfo-euro.patch;patch=1" inherit autotools binconfig pkgconfig EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" -do_configure_prepend() { - cp ${WORKDIR}/onceonly.m4 ${S}/m4/ -} - do_stage() { oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} diff --git a/packages/gnutls/gnutls/onceonly.m4 b/packages/gnutls/gnutls/onceonly.m4 deleted file mode 100644 index f6fec37cbf..0000000000 --- a/packages/gnutls/gnutls/onceonly.m4 +++ /dev/null @@ -1,63 +0,0 @@ -# onceonly.m4 serial 3 -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl This file defines some "once only" variants of standard autoconf macros. -dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS -dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS -dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS -dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC -dnl The advantage is that the check for each of the headers/functions/decls -dnl will be put only once into the 'configure' file. It keeps the size of -dnl the 'configure' file down, and avoids redundant output when 'configure' -dnl is run. -dnl The drawback is that the checks cannot be conditionalized. If you write -dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi -dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to -dnl empty, and the check will be inserted before the body of the AC_DEFUNed -dnl function. - -dnl Autoconf version 2.57 or newer is recommended. -AC_PREREQ(2.54) - -# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of -# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). -AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ - : - AC_FOREACH([gl_HEADER_NAME], [$1], [ - AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), - [-./], [___])), [ - AC_CHECK_HEADERS(gl_HEADER_NAME) - ]) - AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, - [-./], [___]))) - ]) -]) - -# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of -# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). -AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ - : - AC_FOREACH([gl_FUNC_NAME], [$1], [ - AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ - AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) - ]) - AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) - ]) -]) - -# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of -# AC_CHECK_DECLS(DECL1, DECL2, ...). -AC_DEFUN([AC_CHECK_DECLS_ONCE], [ - : - AC_FOREACH([gl_DECL_NAME], [$1], [ - AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ - AC_CHECK_DECLS(defn([gl_DECL_NAME])) - ]) - AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) - ]) -]) -- cgit v1.2.3 From 314c3efd39c022c69af9c44d16d53bfbe1a3d62d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:47:59 +0000 Subject: gtk-clearlooks-engine: fix debug packaging (from Poky) --- packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb index b3bf0b6c59..6b07f78074 100644 --- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb +++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb @@ -2,6 +2,7 @@ SECTION = "x11/base" DESCRIPTION = "Clearlooks theme engine for GTK" LICENSE = "GPL2" DEPENDS = "gtk+" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/clearlooks/clearlooks-0.6.2.tar.bz2" @@ -10,6 +11,7 @@ S = "${WORKDIR}/clearlooks-${PV}" PACKAGES += "gtk-theme-clearlooks" FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so" FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug/*" FILES_gtk-theme-clearlooks = "${datadir}/icons ${datadir}/themes" inherit autotools -- cgit v1.2.3 From f92a6be553f5508d975f0cc66856bcead692a12d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:52:10 +0000 Subject: gtkhtml2: change to SRCREV (from Poky) --- packages/gtkhtml2/gtkhtml2_svn.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gtkhtml2/gtkhtml2_svn.bb b/packages/gtkhtml2/gtkhtml2_svn.bb index 1f19550c90..1745412f5c 100644 --- a/packages/gtkhtml2/gtkhtml2_svn.bb +++ b/packages/gtkhtml2/gtkhtml2_svn.bb @@ -2,8 +2,7 @@ SECTION = "libs" DEPENDS = "gtk+ glib-2.0 libxml2" DESCRIPTION = "A GTK+ HTML rendering library." LICENSE = "GPL" -PV = "2.11.0+svn${SRCDATE}" -PR = "r4" +PV = "2.11.0+svnr${SRCREV}" SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0 \ -- cgit v1.2.3 From 6c9f027f7955baf8bb1b4c62223b3cb789d5ffaf Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 11:55:20 +0000 Subject: hostap-utils: promote 0.4.7 to be default --- packages/hostap/hostap-utils_0.4.7.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/hostap/hostap-utils_0.4.7.bb b/packages/hostap/hostap-utils_0.4.7.bb index 75fd8449fe..9fe362b19f 100644 --- a/packages/hostap/hostap-utils_0.4.7.bb +++ b/packages/hostap/hostap-utils_0.4.7.bb @@ -1,3 +1 @@ require hostap-utils.inc - -DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From ad443e2d15dbaaa6be29948b8a2a9ede2b6a380a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 12:15:09 +0000 Subject: keymaps: start after psplash (from Poky) --- packages/keymaps/keymaps_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index 0508facaa6..813ba41011 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r14" +PR = "r15" inherit update-rc.d @@ -20,7 +20,7 @@ SRC_URI_append_h2200 = " file://keymap-*.map" SRC_URI_append_htcuniversal = " file://keymap-*.map" INITSCRIPT_NAME = "keymap" -INITSCRIPT_PARAMS = "start 00 S ." +INITSCRIPT_PARAMS = "start 01 S ." do_install () { install -d ${D}${sysconfdir}/init.d/ -- cgit v1.2.3 From 61571ed5a6f1aa47b90e3d2b137db0bb70af8ae1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 12:51:39 +0000 Subject: zlib: cleanup --- packages/zlib/files/.mtn2git_empty | 0 packages/zlib/files/autotools.patch | 651 ++++++++++++++++++ packages/zlib/files/visibility.patch | 1034 +++++++++++++++++++++++++++++ packages/zlib/zlib-1.2.3/.mtn2git_empty | 0 packages/zlib/zlib-1.2.3/autotools.patch | 651 ------------------ packages/zlib/zlib-1.2.3/visibility.patch | 1034 ----------------------------- packages/zlib/zlib-native_1.2.3.bb | 1 - 7 files changed, 1685 insertions(+), 1686 deletions(-) create mode 100644 packages/zlib/files/.mtn2git_empty create mode 100644 packages/zlib/files/autotools.patch create mode 100644 packages/zlib/files/visibility.patch delete mode 100644 packages/zlib/zlib-1.2.3/.mtn2git_empty delete mode 100644 packages/zlib/zlib-1.2.3/autotools.patch delete mode 100644 packages/zlib/zlib-1.2.3/visibility.patch (limited to 'packages') diff --git a/packages/zlib/files/.mtn2git_empty b/packages/zlib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zlib/files/autotools.patch b/packages/zlib/files/autotools.patch new file mode 100644 index 0000000000..d1dc8dd8d4 --- /dev/null +++ b/packages/zlib/files/autotools.patch @@ -0,0 +1,651 @@ +diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure +--- zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 ++++ zlib-1.2.3new/configure 1970-01-01 01:00:00.000000000 +0100 +@@ -1,459 +0,0 @@ +-#!/bin/sh +-# configure script for zlib. This script is needed only if +-# you wish to build a shared library and your system supports them, +-# of if you need special compiler, flags or install directory. +-# Otherwise, you can just use directly "make test; make install" +-# +-# To create a shared library, use "configure --shared"; by default a static +-# library is created. If the primitive shared library support provided here +-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz +-# +-# To impose specific compiler or flags or install directory, use for example: +-# prefix=$HOME CC=cc CFLAGS="-O4" ./configure +-# or for csh/tcsh users: +-# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) +-# LDSHARED is the command to be used to create a shared library +- +-# Incorrect settings of CC or CFLAGS may prevent creating a shared library. +-# If you have problems, try without defining CC and CFLAGS before reporting +-# an error. +- +-LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" +-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` +-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +-AR=${AR-"ar rc"} +-RANLIB=${RANLIB-"ranlib"} +-prefix=${prefix-/usr/local} +-exec_prefix=${exec_prefix-'${prefix}'} +-libdir=${libdir-'${exec_prefix}/lib'} +-includedir=${includedir-'${prefix}/include'} +-mandir=${mandir-'${prefix}/share/man'} +-shared_ext='.so' +-shared=0 +-gcc=0 +-old_cc="$CC" +-old_cflags="$CFLAGS" +- +-while test $# -ge 1 +-do +-case "$1" in +- -h* | --h*) +- echo 'usage:' +- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- exit 0;; +- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --p*) prefix="$2"; shift; shift;; +- -e* | --e*) exec_prefix="$2"; shift; shift;; +- -l* | --l*) libdir="$2"; shift; shift;; +- -i* | --i*) includedir="$2"; shift; shift;; +- -s* | --s*) shared=1; shift;; +- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; +- esac +-done +- +-test=ztest$$ +-cat > $test.c </dev/null; then +- CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} +- CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; +- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 +- # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; +- HP-UX*) +- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' +- SHAREDLIB=libz$shared_ext +- SHAREDLIBV=libz.$VER$shared_ext +- SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; +- esac +-else +- # find system name and corresponding cc options +- CC=${CC-cc} +- case `(uname -sr || echo unknown) 2>/dev/null` in +- HP-UX*) SFLAGS=${CFLAGS-"-O +z"} +- CFLAGS=${CFLAGS-"-O"} +-# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} +- LDSHARED=${LDSHARED-"ld -b"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} +- CFLAGS=${CFLAGS-"-ansi -O2"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; +- OSF1*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- QNX*) SFLAGS=${CFLAGS-"-4 -O"} +- CFLAGS=${CFLAGS-"-4 -O"} +- LDSHARED=${LDSHARED-"cc"} +- RANLIB=${RANLIB-"true"} +- AR="cc -A";; +- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} +- CFLAGS=${CFLAGS-"-O3"} +- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; +- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} +- CFLAGS=${CFLAGS-"-O2"} +- LDSHARED=${LDSHARED-"ld"};; +- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} +- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} +- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; +- UNIX_System_V\ 4.2.0) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- UNIX_SV\ 4.2MP) +- SFLAGS=${CFLAGS-"-Kconform_pic -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- OpenUNIX\ 5) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- AIX*) # Courtesy of dbakker@arrayasolutions.com +- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- LDSHARED=${LDSHARED-"xlc -G"};; +- # send working options for other systems to support@gzip.org +- *) SFLAGS=${CFLAGS-"-O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- esac +-fi +- +-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} +-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} +-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} +- +-if test $shared -eq 1; then +- echo Checking for shared library support... +- # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && +- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then +- CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. +- elif test -z "$old_cc" -a -z "$old_cflags"; then +- echo No shared library support. +- shared=0; +- else +- echo 'No shared library support; try without defining CC and CFLAGS' +- shared=0; +- fi +-fi +-if test $shared -eq 0; then +- LDSHARED="$CC" +- echo Building static library $LIBS version $VER with $CC. +-else +- LDFLAGS="-L. ${SHAREDLIBV}" +-fi +- +-cat > $test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- echo "Checking for unistd.h... Yes." +-else +- cp -p zconf.in.h zconf.h +- echo "Checking for unistd.h... No." +-fi +- +-cat > $test.c < +-#include +-#include "zconf.h" +- +-int main() +-{ +-#ifndef STDC +- choke me +-#endif +- +- return 0; +-} +-EOF +- +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" +- +- cat > $test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return 0; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for vsnprintf() in stdio.h... Yes." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsnprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" +- echo "Checking for return value of vsnprintf()... No." +- echo " WARNING: apparently vsnprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_vsnprintf" +- echo "Checking for vsnprintf() in stdio.h... No." +- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsprintf(buf, fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsprintf_void" +- echo "Checking for return value of vsprintf()... No." +- echo " WARNING: apparently vsprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-else +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- snprintf(buf, sizeof(buf), "%s", "foo"); +- return 0; +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for snprintf() in stdio.h... Yes." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return snprintf(buf, sizeof(buf), "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of snprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_snprintf_void" +- echo "Checking for return value of snprintf()... No." +- echo " WARNING: apparently snprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_snprintf" +- echo "Checking for snprintf() in stdio.h... No." +- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return sprintf(buf, "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of sprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_sprintf_void" +- echo "Checking for return value of sprintf()... No." +- echo " WARNING: apparently sprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-fi +- +-cat >$test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for errno.h... Yes." +-else +- echo "Checking for errno.h... No." +- CFLAGS="$CFLAGS -DNO_ERRNO_H" +-fi +- +-cat > $test.c < +-#include +-#include +-caddr_t hello() { +- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); +-} +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- CFLAGS="$CFLAGS -DUSE_MMAP" +- echo Checking for mmap support... Yes. +-else +- echo Checking for mmap support... No. +-fi +- +-CPP=${CPP-"$CC -E"} +-case $CFLAGS in +- *ASMV*) +- if test "`nm $test.o | grep _hello`" = ""; then +- CPP="$CPP -DNO_UNDERLINE" +- echo Checking for underline in external names... No. +- else +- echo Checking for underline in external names... Yes. +- fi;; +-esac +- +-rm -f $test.[co] $test $test$shared_ext +- +-# udpate Makefile +-sed < Makefile.in " +-/^CC *=/s#=.*#=$CC# +-/^CFLAGS *=/s#=.*#=$CFLAGS# +-/^CPP *=/s#=.*#=$CPP# +-/^LDSHARED *=/s#=.*#=$LDSHARED# +-/^LIBS *=/s#=.*#=$LIBS# +-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# +-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# +-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# +-/^AR *=/s#=.*#=$AR# +-/^RANLIB *=/s#=.*#=$RANLIB# +-/^EXE *=/s#=.*#=$EXE# +-/^prefix *=/s#=.*#=$prefix# +-/^exec_prefix *=/s#=.*#=$exec_prefix# +-/^libdir *=/s#=.*#=$libdir# +-/^includedir *=/s#=.*#=$includedir# +-/^mandir *=/s#=.*#=$mandir# +-/^LDFLAGS *=/s#=.*#=$LDFLAGS# +-" > Makefile +diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac +--- zlib-1.2.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/configure.ac 2006-08-07 20:38:31.612402750 +0200 +@@ -0,0 +1,14 @@ ++AC_INIT(zlib,1.2.3) ++AC_CONFIG_SRCDIR(adler32.c) ++AM_INIT_AUTOMAKE(zlibs,1.2.3) ++ ++AC_PREREQ([2.59]) ++ ++AC_PROG_CC([gcc]) ++AC_PROG_LIBTOOL ++ ++AC_HEADER_STDC ++ ++AC_CONFIG_FILES([Makefile]) ++ ++AC_OUTPUT +diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am +--- zlib-1.2.3/Makefile.am 2006/10/14 05:35:40 1.1 ++++ zlib-1.2.3new/Makefile.am 2006/10/14 05:36:49 +@@ -0,0 +1,8 @@ ++lib_LTLIBRARIES = libz.la ++ ++libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ ++ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c ++ ++libz_la_LDFLAGS = -version-number 1:2:3 ++ ++include_HEADERS = zconf.h zlib.h +diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in +--- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 ++++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,154 +0,0 @@ +-# Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. +-# For conditions of distribution and use, see copyright notice in zlib.h +- +-# To compile and test, type: +-# ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s +- +-# To use the asm code, type: +-# cp contrib/asm?86/match.S ./match.S +-# make LOC=-DASMV OBJA=match.o +- +-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: +-# make install +-# To install in $HOME instead of /usr/local, use: +-# make install prefix=$HOME +- +-CC=cc +- +-CFLAGS=-O +-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +-#CFLAGS=-g -DDEBUG +-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +-# -Wstrict-prototypes -Wmissing-prototypes +- +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- +-LIBS=libz.a +-SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBM=libz.so.1 +- +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh +-EXE= +- +-prefix = /usr/local +-exec_prefix = ${prefix} +-libdir = ${exec_prefix}/lib +-includedir = ${prefix}/include +-mandir = ${prefix}/share/man +-man3dir = ${mandir}/man3 +- +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o +- +-OBJA = +-# to use the asm code: make OBJA=match.o +- +-TEST_OBJS = example.o minigzip.o +- +-all: example$(EXE) minigzip$(EXE) +- +-check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ +- echo ' *** zlib test OK ***'; \ +- else \ +- echo ' *** zlib test FAILED ***'; \ +- fi +- +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) +- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 +- +-match.o: match.S +- $(CPP) match.S > _match.s +- $(CC) -c _match.s +- mv _match.o match.o +- rm -f _match.s +- +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) +- rm -f $(SHAREDLIB) $(SHAREDLIBM) +- ln -s $@ $(SHAREDLIB) +- ln -s $@ $(SHAREDLIBM) +- +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) +- +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) +- +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ +- fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 +-# The ranlib in install is needed on NeXTSTEP which checks file times +-# ldconfig is for Linux +- +-uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ +- fi +- cd $(man3dir); rm -f zlib.3 +- +-mostlyclean: clean +-clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- libz.* foo.gz so_locations \ +- _match.s maketree contrib/infback9/*.o +- +-maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store +- +-tags: +- etags *.[ch] +- +-depend: +- makedepend -- $(CFLAGS) -- *.[ch] +- +-# DO NOT DELETE THIS LINE -- make depend depends on it. +- +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h +-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h +-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h diff --git a/packages/zlib/files/visibility.patch b/packages/zlib/files/visibility.patch new file mode 100644 index 0000000000..a4e7ae907a --- /dev/null +++ b/packages/zlib/files/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 + +-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-1.2.3/.mtn2git_empty b/packages/zlib/zlib-1.2.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zlib/zlib-1.2.3/autotools.patch b/packages/zlib/zlib-1.2.3/autotools.patch deleted file mode 100644 index d1dc8dd8d4..0000000000 --- a/packages/zlib/zlib-1.2.3/autotools.patch +++ /dev/null @@ -1,651 +0,0 @@ -diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure ---- zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 -+++ zlib-1.2.3new/configure 1970-01-01 01:00:00.000000000 +0100 -@@ -1,459 +0,0 @@ --#!/bin/sh --# configure script for zlib. This script is needed only if --# you wish to build a shared library and your system supports them, --# of if you need special compiler, flags or install directory. --# Otherwise, you can just use directly "make test; make install" --# --# To create a shared library, use "configure --shared"; by default a static --# library is created. If the primitive shared library support provided here --# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz --# --# To impose specific compiler or flags or install directory, use for example: --# prefix=$HOME CC=cc CFLAGS="-O4" ./configure --# or for csh/tcsh users: --# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) --# LDSHARED is the command to be used to create a shared library -- --# Incorrect settings of CC or CFLAGS may prevent creating a shared library. --# If you have problems, try without defining CC and CFLAGS before reporting --# an error. -- --LIBS=libz.a --LDFLAGS="-L. ${LIBS}" --VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` --VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` --VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` --AR=${AR-"ar rc"} --RANLIB=${RANLIB-"ranlib"} --prefix=${prefix-/usr/local} --exec_prefix=${exec_prefix-'${prefix}'} --libdir=${libdir-'${exec_prefix}/lib'} --includedir=${includedir-'${prefix}/include'} --mandir=${mandir-'${prefix}/share/man'} --shared_ext='.so' --shared=0 --gcc=0 --old_cc="$CC" --old_cflags="$CFLAGS" -- --while test $# -ge 1 --do --case "$1" in -- -h* | --h*) -- echo 'usage:' -- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' -- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' -- exit 0;; -- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; -- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; -- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; -- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; -- -p* | --p*) prefix="$2"; shift; shift;; -- -e* | --e*) exec_prefix="$2"; shift; shift;; -- -l* | --l*) libdir="$2"; shift; shift;; -- -i* | --i*) includedir="$2"; shift; shift;; -- -s* | --s*) shared=1; shift;; -- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; -- esac --done -- --test=ztest$$ --cat > $test.c </dev/null; then -- CC="$cc" -- SFLAGS=${CFLAGS-"-fPIC -O3"} -- CFLAGS="$cflags" -- case `(uname -s || echo unknown) 2>/dev/null` in -- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -- CYGWIN* | Cygwin* | cygwin* | OS/2* ) -- EXE='.exe';; -- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 -- # (alain.bonnefoy@icbt.com) -- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; -- HP-UX*) -- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} -- case `(uname -m || echo unknown) 2>/dev/null` in -- ia64) -- shared_ext='.so' -- SHAREDLIB='libz.so';; -- *) -- shared_ext='.sl' -- SHAREDLIB='libz.sl';; -- esac;; -- Darwin*) shared_ext='.dylib' -- SHAREDLIB=libz$shared_ext -- SHAREDLIBV=libz.$VER$shared_ext -- SHAREDLIBM=libz.$VER1$shared_ext -- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; -- *) LDSHARED=${LDSHARED-"$cc -shared"};; -- esac --else -- # find system name and corresponding cc options -- CC=${CC-cc} -- case `(uname -sr || echo unknown) 2>/dev/null` in -- HP-UX*) SFLAGS=${CFLAGS-"-O +z"} -- CFLAGS=${CFLAGS-"-O"} --# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} -- LDSHARED=${LDSHARED-"ld -b"} -- case `(uname -m || echo unknown) 2>/dev/null` in -- ia64) -- shared_ext='.so' -- SHAREDLIB='libz.so';; -- *) -- shared_ext='.sl' -- SHAREDLIB='libz.sl';; -- esac;; -- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} -- CFLAGS=${CFLAGS-"-ansi -O2"} -- LDSHARED=${LDSHARED-"cc -shared"};; -- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} -- CFLAGS=${CFLAGS-"-O -std1"} -- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; -- OSF1*) SFLAGS=${CFLAGS-"-O -std1"} -- CFLAGS=${CFLAGS-"-O -std1"} -- LDSHARED=${LDSHARED-"cc -shared"};; -- QNX*) SFLAGS=${CFLAGS-"-4 -O"} -- CFLAGS=${CFLAGS-"-4 -O"} -- LDSHARED=${LDSHARED-"cc"} -- RANLIB=${RANLIB-"true"} -- AR="cc -A";; -- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} -- CFLAGS=${CFLAGS-"-O3"} -- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; -- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} -- CFLAGS=${CFLAGS-"-fast -xcg89"} -- LDSHARED=${LDSHARED-"cc -G"};; -- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} -- CFLAGS=${CFLAGS-"-O2"} -- LDSHARED=${LDSHARED-"ld"};; -- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} -- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} -- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; -- UNIX_System_V\ 4.2.0) -- SFLAGS=${CFLAGS-"-KPIC -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- UNIX_SV\ 4.2MP) -- SFLAGS=${CFLAGS-"-Kconform_pic -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- OpenUNIX\ 5) -- SFLAGS=${CFLAGS-"-KPIC -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- AIX*) # Courtesy of dbakker@arrayasolutions.com -- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} -- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} -- LDSHARED=${LDSHARED-"xlc -G"};; -- # send working options for other systems to support@gzip.org -- *) SFLAGS=${CFLAGS-"-O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -shared"};; -- esac --fi -- --SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} --SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} --SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} -- --if test $shared -eq 1; then -- echo Checking for shared library support... -- # we must test in two steps (cc then ld), required at least on SunOS 4.x -- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && -- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then -- CFLAGS="$SFLAGS" -- LIBS="$SHAREDLIBV" -- echo Building shared library $SHAREDLIBV with $CC. -- elif test -z "$old_cc" -a -z "$old_cflags"; then -- echo No shared library support. -- shared=0; -- else -- echo 'No shared library support; try without defining CC and CFLAGS' -- shared=0; -- fi --fi --if test $shared -eq 0; then -- LDSHARED="$CC" -- echo Building static library $LIBS version $VER with $CC. --else -- LDFLAGS="-L. ${SHAREDLIBV}" --fi -- --cat > $test.c < --int main() { return 0; } --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h -- echo "Checking for unistd.h... Yes." --else -- cp -p zconf.in.h zconf.h -- echo "Checking for unistd.h... No." --fi -- --cat > $test.c < --#include --#include "zconf.h" -- --int main() --{ --#ifndef STDC -- choke me --#endif -- -- return 0; --} --EOF -- --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" -- -- cat > $test.c < --#include -- --int mytest(char *fmt, ...) --{ -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- vsnprintf(buf, sizeof(buf), fmt, ap); -- va_end(ap); -- return 0; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then -- echo "Checking for vsnprintf() in stdio.h... Yes." -- -- cat >$test.c < --#include -- --int mytest(char *fmt, ...) --{ -- int n; -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- n = vsnprintf(buf, sizeof(buf), fmt, ap); -- va_end(ap); -- return n; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of vsnprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" -- echo "Checking for return value of vsnprintf()... No." -- echo " WARNING: apparently vsnprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- else -- CFLAGS="$CFLAGS -DNO_vsnprintf" -- echo "Checking for vsnprintf() in stdio.h... No." -- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" -- echo " can build but will be open to possible buffer-overflow security" -- echo " vulnerabilities." -- -- cat >$test.c < --#include -- --int mytest(char *fmt, ...) --{ -- int n; -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- n = vsprintf(buf, fmt, ap); -- va_end(ap); -- return n; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of vsprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_vsprintf_void" -- echo "Checking for return value of vsprintf()... No." -- echo " WARNING: apparently vsprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- fi --else -- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" -- -- cat >$test.c < -- --int mytest() --{ -- char buf[20]; -- -- snprintf(buf, sizeof(buf), "%s", "foo"); -- return 0; --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then -- echo "Checking for snprintf() in stdio.h... Yes." -- -- cat >$test.c < -- --int mytest() --{ -- char buf[20]; -- -- return snprintf(buf, sizeof(buf), "%s", "foo"); --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of snprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_snprintf_void" -- echo "Checking for return value of snprintf()... No." -- echo " WARNING: apparently snprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- else -- CFLAGS="$CFLAGS -DNO_snprintf" -- echo "Checking for snprintf() in stdio.h... No." -- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" -- echo " can build but will be open to possible buffer-overflow security" -- echo " vulnerabilities." -- -- cat >$test.c < -- --int mytest() --{ -- char buf[20]; -- -- return sprintf(buf, "%s", "foo"); --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of sprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_sprintf_void" -- echo "Checking for return value of sprintf()... No." -- echo " WARNING: apparently sprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- fi --fi -- --cat >$test.c < --int main() { return 0; } --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for errno.h... Yes." --else -- echo "Checking for errno.h... No." -- CFLAGS="$CFLAGS -DNO_ERRNO_H" --fi -- --cat > $test.c < --#include --#include --caddr_t hello() { -- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); --} --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- CFLAGS="$CFLAGS -DUSE_MMAP" -- echo Checking for mmap support... Yes. --else -- echo Checking for mmap support... No. --fi -- --CPP=${CPP-"$CC -E"} --case $CFLAGS in -- *ASMV*) -- if test "`nm $test.o | grep _hello`" = ""; then -- CPP="$CPP -DNO_UNDERLINE" -- echo Checking for underline in external names... No. -- else -- echo Checking for underline in external names... Yes. -- fi;; --esac -- --rm -f $test.[co] $test $test$shared_ext -- --# udpate Makefile --sed < Makefile.in " --/^CC *=/s#=.*#=$CC# --/^CFLAGS *=/s#=.*#=$CFLAGS# --/^CPP *=/s#=.*#=$CPP# --/^LDSHARED *=/s#=.*#=$LDSHARED# --/^LIBS *=/s#=.*#=$LIBS# --/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# --/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# --/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# --/^AR *=/s#=.*#=$AR# --/^RANLIB *=/s#=.*#=$RANLIB# --/^EXE *=/s#=.*#=$EXE# --/^prefix *=/s#=.*#=$prefix# --/^exec_prefix *=/s#=.*#=$exec_prefix# --/^libdir *=/s#=.*#=$libdir# --/^includedir *=/s#=.*#=$includedir# --/^mandir *=/s#=.*#=$mandir# --/^LDFLAGS *=/s#=.*#=$LDFLAGS# --" > Makefile -diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac ---- zlib-1.2.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3new/configure.ac 2006-08-07 20:38:31.612402750 +0200 -@@ -0,0 +1,14 @@ -+AC_INIT(zlib,1.2.3) -+AC_CONFIG_SRCDIR(adler32.c) -+AM_INIT_AUTOMAKE(zlibs,1.2.3) -+ -+AC_PREREQ([2.59]) -+ -+AC_PROG_CC([gcc]) -+AC_PROG_LIBTOOL -+ -+AC_HEADER_STDC -+ -+AC_CONFIG_FILES([Makefile]) -+ -+AC_OUTPUT -diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am ---- zlib-1.2.3/Makefile.am 2006/10/14 05:35:40 1.1 -+++ zlib-1.2.3new/Makefile.am 2006/10/14 05:36:49 -@@ -0,0 +1,8 @@ -+lib_LTLIBRARIES = libz.la -+ -+libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ -+ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c -+ -+libz_la_LDFLAGS = -version-number 1:2:3 -+ -+include_HEADERS = zconf.h zlib.h -diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in ---- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 -+++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,154 +0,0 @@ --# Makefile for zlib --# Copyright (C) 1995-2005 Jean-loup Gailly. --# For conditions of distribution and use, see copyright notice in zlib.h -- --# To compile and test, type: --# ./configure; make test --# The call of configure is optional if you don't have special requirements --# If you wish to build zlib as a shared library, use: ./configure -s -- --# To use the asm code, type: --# cp contrib/asm?86/match.S ./match.S --# make LOC=-DASMV OBJA=match.o -- --# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: --# make install --# To install in $HOME instead of /usr/local, use: --# make install prefix=$HOME -- --CC=cc -- --CFLAGS=-O --#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 --#CFLAGS=-g -DDEBUG --#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ --# -Wstrict-prototypes -Wmissing-prototypes -- --LDFLAGS=libz.a --LDSHARED=$(CC) --CPP=$(CC) -E -- --LIBS=libz.a --SHAREDLIB=libz.so --SHAREDLIBV=libz.so.1.2.3 --SHAREDLIBM=libz.so.1 -- --AR=ar rc --RANLIB=ranlib --TAR=tar --SHELL=/bin/sh --EXE= -- --prefix = /usr/local --exec_prefix = ${prefix} --libdir = ${exec_prefix}/lib --includedir = ${prefix}/include --mandir = ${prefix}/share/man --man3dir = ${mandir}/man3 -- --OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ -- zutil.o inflate.o infback.o inftrees.o inffast.o -- --OBJA = --# to use the asm code: make OBJA=match.o -- --TEST_OBJS = example.o minigzip.o -- --all: example$(EXE) minigzip$(EXE) -- --check: test --test: all -- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ -- echo hello world | ./minigzip | ./minigzip -d || \ -- echo ' *** minigzip test FAILED ***' ; \ -- if ./example; then \ -- echo ' *** zlib test OK ***'; \ -- else \ -- echo ' *** zlib test FAILED ***'; \ -- fi -- --libz.a: $(OBJS) $(OBJA) -- $(AR) $@ $(OBJS) $(OBJA) -- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 -- --match.o: match.S -- $(CPP) match.S > _match.s -- $(CC) -c _match.s -- mv _match.o match.o -- rm -f _match.s -- --$(SHAREDLIBV): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) -- rm -f $(SHAREDLIB) $(SHAREDLIBM) -- ln -s $@ $(SHAREDLIB) -- ln -s $@ $(SHAREDLIBM) -- --example$(EXE): example.o $(LIBS) -- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -- --minigzip$(EXE): minigzip.o $(LIBS) -- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -- --install: $(LIBS) -- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi -- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi -- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi -- cp zlib.h zconf.h $(includedir) -- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h -- cp $(LIBS) $(libdir) -- cd $(libdir); chmod 755 $(LIBS) -- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -- cd $(libdir); if test -f $(SHAREDLIBV); then \ -- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ -- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ -- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ -- (ldconfig || true) >/dev/null 2>&1; \ -- fi -- cp zlib.3 $(man3dir) -- chmod 644 $(man3dir)/zlib.3 --# The ranlib in install is needed on NeXTSTEP which checks file times --# ldconfig is for Linux -- --uninstall: -- cd $(includedir); \ -- cd $(libdir); rm -f libz.a; \ -- if test -f $(SHAREDLIBV); then \ -- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ -- fi -- cd $(man3dir); rm -f zlib.3 -- --mostlyclean: clean --clean: -- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ -- libz.* foo.gz so_locations \ -- _match.s maketree contrib/infback9/*.o -- --maintainer-clean: distclean --distclean: clean -- cp -p Makefile.in Makefile -- cp -p zconf.in.h zconf.h -- rm -f .DS_Store -- --tags: -- etags *.[ch] -- --depend: -- makedepend -- $(CFLAGS) -- *.[ch] -- --# DO NOT DELETE THIS LINE -- make depend depends on it. -- --adler32.o: zlib.h zconf.h --compress.o: zlib.h zconf.h --crc32.o: crc32.h zlib.h zconf.h --deflate.o: deflate.h zutil.h zlib.h zconf.h --example.o: zlib.h zconf.h --gzio.o: zutil.h zlib.h zconf.h --inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h --inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h --infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h --inftrees.o: zutil.h zlib.h zconf.h inftrees.h --minigzip.o: zlib.h zconf.h --trees.o: deflate.h zutil.h zlib.h zconf.h trees.h --uncompr.o: zlib.h zconf.h --zutil.o: zutil.h zlib.h zconf.h diff --git a/packages/zlib/zlib-1.2.3/visibility.patch b/packages/zlib/zlib-1.2.3/visibility.patch deleted file mode 100644 index a4e7ae907a..0000000000 --- a/packages/zlib/zlib-1.2.3/visibility.patch +++ /dev/null @@ -1,1034 +0,0 @@ - -# -# 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 - --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 index 9a73bc6fcb..8ad4a8c03c 100644 --- a/packages/zlib/zlib-native_1.2.3.bb +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -11,4 +11,3 @@ do_stage() { DEPENDS = "libtool-native" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -- cgit v1.2.3 From 2325656e46c8824a42ae9d1f638641db25267846 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 13:34:11 +0000 Subject: libxpm: add dependency on libsm (from Poky) --- packages/xorg-lib/libxpm_3.5.6.bb | 4 ++-- packages/xorg-lib/libxpm_3.5.7.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb index 4e0a6eaacd..75c10bf2c9 100644 --- a/packages/xorg-lib/libxpm_3.5.6.bb +++ b/packages/xorg-lib/libxpm_3.5.6.bb @@ -2,8 +2,8 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" -DEPENDS += "libxt libxext" -PR = "r1" +DEPENDS += "libxext libsm libxt" +PR = "r3" PE = "1" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxpm_3.5.7.bb b/packages/xorg-lib/libxpm_3.5.7.bb index e4ecc28cb3..caf8b365ee 100644 --- a/packages/xorg-lib/libxpm_3.5.7.bb +++ b/packages/xorg-lib/libxpm_3.5.7.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" -DEPENDS += "libxt libxext" +DEPENDS += "libxt libxext libsm" PR = "r0" PE = "1" -- cgit v1.2.3 From 45e700bbce820167b85b7afb3cf51e390e932e2f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 13:55:49 +0000 Subject: wv: cleanup, added missing fields (from Poky) --- packages/wv/wv_1.2.0.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb index f7b948f0af..5b0a484a67 100644 --- a/packages/wv/wv_1.2.0.bb +++ b/packages/wv/wv_1.2.0.bb @@ -1,14 +1,17 @@ +DESCRIPTION = "Programs for accessing Microsoft Word documents" +HOMEPAGE = "http://wvware.sourceforge.net/" LICENSE = "GPLv2" - DEPENDS = "libgsf" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz" -SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/wvware/wv-${PV}.tar.gz" +inherit autotools pkgconfig S = "${WORKDIR}/${PN}-${PV}" -inherit autotools pkgconfig +EXTRA_OECONF = "" do_stage () { - autotools_stage_all + autotools_stage_all } - -- cgit v1.2.3 From 2ab094529f4304fff4a593b42f00e7d91793fef8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 14:29:08 +0000 Subject: libfakekey: switch to SRCREV (from Poky) --- packages/libfakekey/libfakekey_svn.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb index f4c7afb856..26f282ca08 100644 --- a/packages/libfakekey/libfakekey_svn.bb +++ b/packages/libfakekey/libfakekey_svn.bb @@ -1,9 +1,8 @@ -DESCRIPTION = "Library to generate fake keys for Matchbox keyboard" +DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" DEPENDS = "libxtst" SECTION = "x11/wm" -PR="r2" -PV = "0.2+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" @@ -12,8 +11,7 @@ S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext do_stage () { - install -d ${STAGING_INCDIR}/fakekey - install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey - oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/fakekey + install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey + oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} } - -- cgit v1.2.3 From 2e7fa393fef83d989f199c8b4b1ffa14e15b7497 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 14:29:47 +0000 Subject: sysfsutils: split libsysfs to separate package (with dev and dbg ones) (from Poky) --- packages/sysfsutils/sysfsutils_2.0.0.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/sysfsutils/sysfsutils_2.0.0.bb b/packages/sysfsutils/sysfsutils_2.0.0.bb index c4192cabb4..2fbb0865c9 100644 --- a/packages/sysfsutils/sysfsutils_2.0.0.bb +++ b/packages/sysfsutils/sysfsutils_2.0.0.bb @@ -1,8 +1,7 @@ DESCRIPTION = "System Utilities Based on Sysfs" HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" LICENSE = "GPLv2" -PROVIDES = "libsysfs" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" S = "${WORKDIR}/sysfsutils-${PV}" @@ -18,6 +17,8 @@ do_stage () { install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs } -PACKAGES_prepend = "libsysfs " +PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev " FILES_libsysfs = "${libdir}/*.so.*" - +FILES_libsysfs-dev = "${libdir}/* ${includedir}" +FILES_libsysfs-dbg = "${libdir}/.debug" +FILES_${PN}-dbg = "${bindir}/.debug" -- cgit v1.2.3 From a2b5df05188b7610ac12279db136fad0919713dd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 14:49:47 +0000 Subject: sato-icon-theme: sync with Poky --- packages/sato-icon-theme/sato-icon-theme.inc | 21 +++++++++++++++++++++ packages/sato-icon-theme/sato-icon-theme_0.1.bb | 19 +------------------ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 packages/sato-icon-theme/sato-icon-theme.inc (limited to 'packages') diff --git a/packages/sato-icon-theme/sato-icon-theme.inc b/packages/sato-icon-theme/sato-icon-theme.inc new file mode 100644 index 0000000000..3c3699dc8d --- /dev/null +++ b/packages/sato-icon-theme/sato-icon-theme.inc @@ -0,0 +1,21 @@ +require sato-icon-theme.inc + +SECTION = "x11" +DESCRIPTION = "Sato Icon Theme" +LICENSE = "CC-BY-SA3" +DEPENDS = "" + +SRC_URI = "http://pokylinux.org/releases/sato/sato-icon-theme-0.1.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}" + +PACKAGE_ARCH = "all" + +pkg_postinst_${PN} () { + if [ "x$D" != "x" ]; then + exit 1 + fi + gtk-update-icon-cache -q /usr/share/icons/Sato +} diff --git a/packages/sato-icon-theme/sato-icon-theme_0.1.bb b/packages/sato-icon-theme/sato-icon-theme_0.1.bb index 0919f5dde6..0a29175aa8 100644 --- a/packages/sato-icon-theme/sato-icon-theme_0.1.bb +++ b/packages/sato-icon-theme/sato-icon-theme_0.1.bb @@ -1,20 +1,3 @@ -SECTION = "x11" -DESCRIPTION = "Sato Icon Theme" -LICENSE = "CC-BY-SA3" -DEPENDS = "" - -PACKAGE_ARCH = "all" +require sato-icon-theme.inc SRC_URI = "http://pokylinux.org/releases/sato/sato-icon-theme-${PV}.tar.gz" - -inherit autotools pkgconfig - -pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - gtk-update-icon-cache -q /usr/share/icons/Sato -} - -FILES_${PN} += "${datadir}" - -- cgit v1.2.3 From 1c151193d9c86cec2e6d7d3a4c1f276f013a9bec Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 19 Oct 2007 15:18:18 +0000 Subject: packages/openmoko2/openmoko-appearance_svn.bb : add appearance an application to edit appearence params --- packages/openmoko2/openmoko-appearance_svn.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/openmoko2/openmoko-appearance_svn.bb (limited to 'packages') diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb new file mode 100644 index 0000000000..e9b7d0a69f --- /dev/null +++ b/packages/openmoko2/openmoko-appearance_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Appearance Editor" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 gconf gtk+" +RDEPENDS = "libedata-cal openmoko-today2-folders" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 gtk-icon-cache -- cgit v1.2.3 From 51c54fb7c96ee033fcf1c4a22262a744979abfa7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 15:24:26 +0000 Subject: libxml2: drop useless note --- packages/libxml/libxml2_2.6.29.bb | 3 --- 1 file changed, 3 deletions(-) (limited to 'packages') diff --git a/packages/libxml/libxml2_2.6.29.bb b/packages/libxml/libxml2_2.6.29.bb index 224f3e3b96..12fb6ca08e 100644 --- a/packages/libxml/libxml2_2.6.29.bb +++ b/packages/libxml/libxml2_2.6.29.bb @@ -1,6 +1,3 @@ -# NOTE! This is an update file and will go away when upstream updates -# TODO: send this to upstream - DESCRIPTION = "GNOME XML Parser library" SECTION = "libs" PRIORITY = "optional" -- cgit v1.2.3 From ba71ba95ecdd529e22e40553fb49f678ffad4dbb Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 15:37:02 +0000 Subject: libfakekey: bump PV to 0.2 --- packages/libfakekey/libfakekey_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb index 26f282ca08..af7c9bbaad 100644 --- a/packages/libfakekey/libfakekey_svn.bb +++ b/packages/libfakekey/libfakekey_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" DEPENDS = "libxtst" SECTION = "x11/wm" -PV = "0.0+svnr${SRCREV}" +PV = "0.2+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" -- cgit v1.2.3 From 8847985657a073f785a671b0cdabb6bbdc288db5 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 19 Oct 2007 17:04:30 +0000 Subject: linphone: Make sure 1.5.0 does not use -Werror which is going to break. --- packages/gpephone/linphone_1.5.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 92e08e6183..5ce1c0b58c 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "SIP-based IP phone" HOMEPAGE = "http://www.linphone.org/?lang=us" LICENSE = "GPLv2" DEPENDS = "libosip2 speex libogg alsa-lib readline" -PR = "r1" +PR = "r2" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \ file://linphone-1.5.0.patch;patch=1 \ @@ -18,7 +18,7 @@ EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --with-osip=${STAGING_DIR}/${HOST_SYS} \ --with-readline=${STAGING_DIR}/${HOST_SYS} \ --disable-truespeech --disable-manual \ - --disable-glibtest --disable-glib" + --disable-glibtest --disable-glib --disable-strict" do_configure () { export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" -- cgit v1.2.3