From a9c872586c1e2158ec6038da7e923d8e64405077 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 24 Aug 2005 02:12:41 +0000 Subject: unslung-kernel: enabled CONFIG_NET_WIRELESS --- conf/distro/unslung-binary-kernel-packages.conf | 1 + packages/linux/unslung-kernel/defconfig | 13 ++++++++++++- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/conf/distro/unslung-binary-kernel-packages.conf b/conf/distro/unslung-binary-kernel-packages.conf index 3e9059fae8..1dd405bd6e 100644 --- a/conf/distro/unslung-binary-kernel-packages.conf +++ b/conf/distro/unslung-binary-kernel-packages.conf @@ -34,5 +34,6 @@ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/zd1211/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ ${UNSLUNG_EXTRA_BBFILES}" diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 208041c6d6..d9a01070d5 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -596,7 +596,18 @@ CONFIG_PPP_BSDCOMP=m # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_PLX_HERMES is not set +# CONFIG_PCI_HERMES is not set +CONFIG_NET_WIRELESS=y # # Token Ring devices diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 0a7a8f3dd2..4acc6d7a5f 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r2" +PR = "r3" KERNEL_SUFFIX = "unslung" -- cgit v1.2.3 From ddd959ddc62f610a8931ce3d94c8e3c8b965ab0a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 24 Aug 2005 02:14:20 +0000 Subject: zd1211: Added zd1211-4916 (rumoured to work with Unslung). --- packages/zd1211/zd1211-4916/.mtn2git_empty | 0 packages/zd1211/zd1211-4916/copy-break.patch | 11 + .../zd1211/zd1211-4916/explicit-key-change.patch | 24 ++ packages/zd1211/zd1211-4916/get-stats.patch | 77 ++++++ packages/zd1211/zd1211-4916/makefile.patch | 28 ++ packages/zd1211/zd1211-4916/syntax.patch | 20 ++ packages/zd1211/zd1211-4916/usb-endian.patch | 298 +++++++++++++++++++++ packages/zd1211/zd1211-4916/usb-ids.patch | 21 ++ packages/zd1211/zd1211_4916.bb | 35 +++ 9 files changed, 514 insertions(+) create mode 100644 packages/zd1211/zd1211-4916/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-4916/copy-break.patch create mode 100644 packages/zd1211/zd1211-4916/explicit-key-change.patch create mode 100644 packages/zd1211/zd1211-4916/get-stats.patch create mode 100644 packages/zd1211/zd1211-4916/makefile.patch create mode 100644 packages/zd1211/zd1211-4916/syntax.patch create mode 100644 packages/zd1211/zd1211-4916/usb-endian.patch create mode 100644 packages/zd1211/zd1211-4916/usb-ids.patch create mode 100644 packages/zd1211/zd1211_4916.bb diff --git a/packages/zd1211/zd1211-4916/.mtn2git_empty b/packages/zd1211/zd1211-4916/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-4916/copy-break.patch b/packages/zd1211/zd1211-4916/copy-break.patch new file mode 100644 index 0000000000..a08c543550 --- /dev/null +++ b/packages/zd1211/zd1211-4916/copy-break.patch @@ -0,0 +1,11 @@ +--- zd1211-4916-r0/src/zd1205.c.cborig 2005-03-08 14:20:22.846179000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 14:21:09.432096896 -0800 +@@ -267,7 +267,7 @@ + zd1205_SwTcbQ_t free_txq_buf, active_txq_buf; + struct net_device *g_dev; + zd_80211Obj_t dot11Obj = {0}; +-#define RX_COPY_BREAK 0//1518 //we do bridge, don't care IP header alignment ++#define RX_COPY_BREAK MAX_WLAN_SIZE //It doesn't appear that unaligned frames work with TCP/UDP beyond a certain size + #define BEFORE_BEACON 5 + /* Definition of Wireless Extension */ + diff --git a/packages/zd1211/zd1211-4916/explicit-key-change.patch b/packages/zd1211/zd1211-4916/explicit-key-change.patch new file mode 100644 index 0000000000..ef01f3cb3e --- /dev/null +++ b/packages/zd1211/zd1211-4916/explicit-key-change.patch @@ -0,0 +1,24 @@ +--- zd1211-4916-r0/src/zd1205.c.korig 2005-03-04 13:45:07.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 10:43:26.304994072 -0800 +@@ -5528,7 +5528,8 @@ + /* Check if the key is not marked as invalid */ + + if (!(erq->flags & IW_ENCODE_NOKEY)){ +- pSetting->EncryKeyId = index; ++ // Only change the current keyid when explicitly asked ++ // pSetting->EncryKeyId = index; + + + memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen); +--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-08 17:15:24.085747960 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-08 17:05:02.044312632 -0800 +@@ -3423,8 +3423,8 @@ + //update card setting + + if (test_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags)){ +- zd_UpdateCardSetting(&macp->cardSetting); + clear_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags); ++ zd_UpdateCardSetting(&macp->cardSetting); + } + + diff --git a/packages/zd1211/zd1211-4916/get-stats.patch b/packages/zd1211/zd1211-4916/get-stats.patch new file mode 100644 index 0000000000..0525522b43 --- /dev/null +++ b/packages/zd1211/zd1211-4916/get-stats.patch @@ -0,0 +1,77 @@ +--- zd1211-4916-r0/src/zd1205.h.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.h 2005-03-04 13:41:16.879006208 -0800 +@@ -611,6 +611,9 @@ + ***************************************************************************/ + struct driver_stats { + struct net_device_stats net_stats; ++#ifdef CONFIG_NET_WIRELESS ++ struct iw_statistics iw_stats; ++#endif + unsigned long tx_late_col; + unsigned long tx_ok_defrd; + unsigned long tx_one_retry; +--- zd1211-4916-r0/src/zd1205.c.orig 2005-03-03 18:43:48.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-04 13:45:07.134002128 -0800 +@@ -4196,6 +4196,42 @@ + return &(macp->drv_stats.net_stats); + } + ++/** ++ * zd1205wext_iw_get_stats - get driver statistics ++ ++ * @dev: adapter's net_device struct ++ * ++ * This routine is called when the OS wants the adapter's wireless ++ * stats returned. It returns the address of the iw_statistics ++ * stucture for the device. If the statistics are currently being ++ * updated, then they might be incorrect for a short while. However, ++ * since this cannot actually cause damage, no locking is used. ++ */ ++#if WIRELESS_EXT > 12 ++struct iw_statistics * ++zd1205wext_iw_get_stats(struct net_device *dev) ++{ ++ struct zd1205_private *macp = dev->priv; ++ struct iw_statistics *iw_stats = &macp->drv_stats.iw_stats; ++ ++ iw_stats->qual.noise = 161; ++ iw_stats->qual.qual = 0;//macp->rxInfo.rxSignalQuality; ++ iw_stats->qual.level = 0;//macp->rxInfo.rxSignalStrength; ++ iw_stats->qual.updated = 7; ++ ++ iw_stats->discard.nwid = 0; ++ iw_stats->discard.code = 0; ++ iw_stats->discard.fragment = 0; ++ iw_stats->discard.retries = macp->retryFailCnt; ++ iw_stats->discard.misc = macp->DropFirstFragCnt + macp->ErrLongFrmCnt + ++ macp->ErrShortFrmCnt + macp->ErrZeroLenFrmCnt; ++ ++ iw_stats->miss.beacon = 0; ++ ++ return iw_stats; ++} ++#endif ++ + + /** + * zd1205_set_mac - set the MAC address +--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-03 18:43:49.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-04 13:44:31.122476712 -0800 +@@ -1873,6 +1873,9 @@ + #define ZD1211_TX_TIMEOUT (HZ*10) + #define ZD1211_MTU 1500 + extern struct iw_handler_def p80211wext_handler_def; ++#ifdef CONFIG_NET_WIRELESS ++extern struct iw_statistics *zd1205wext_iw_get_stats(struct net_device *); ++#endif + + u8 zd1211_InitSetup(struct net_device *dev, struct zd1205_private *macp) + +@@ -1964,6 +1967,7 @@ + + #if WIRELESS_EXT > 12 + dev->wireless_handlers = (struct iw_handler_def *)&p80211wext_handler_def; ++ dev->get_wireless_stats = &zd1205wext_iw_get_stats; + #endif + + dev->hard_start_xmit = zd1205_xmit_frame; diff --git a/packages/zd1211/zd1211-4916/makefile.patch b/packages/zd1211/zd1211-4916/makefile.patch new file mode 100644 index 0000000000..a01cb085bc --- /dev/null +++ b/packages/zd1211/zd1211-4916/makefile.patch @@ -0,0 +1,28 @@ +--- zd1211-4916-r0/Makefile.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/Makefile 2005-02-18 17:03:09.009560224 -0800 +@@ -11,12 +11,12 @@ + + + # if the kernel is 2.6.x, trun on this +-KERN_26=y +-KERNEL_SOURCE=/usr/src/linux-2.6.7 ++#KERN_26=y ++#KERNEL_SOURCE=/usr/src/linux-2.6.7 + + # if the kernel is 2.4.x, trun on this +-#KERN_24=y +-#KERNEL_SOURCE=/usr/src/linux-2.4.24 ++KERN_24=y ++KERNEL_SOURCE=/usr/src/linux-2.4.24 + + SRC_DIR=src + DEFINES=-D__KERNEL__ -DMODULE=1 +@@ -154,7 +154,7 @@ + all: $(MODULE) + + $(MODULE): $(OBJECTS) +- ld -r $(OBJECTS) -o $(MODULE) ++ $(LD) -r $(OBJECTS) -o $(MODULE) + chmod -x $(MODULE) + + %.o: %.c diff --git a/packages/zd1211/zd1211-4916/syntax.patch b/packages/zd1211/zd1211-4916/syntax.patch new file mode 100644 index 0000000000..969839e8dd --- /dev/null +++ b/packages/zd1211/zd1211-4916/syntax.patch @@ -0,0 +1,20 @@ +--- zd1211-4916-r0/src/zd1205.c.orig 2005-01-28 22:55:14.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-02-18 17:40:39.136488936 -0800 +@@ -5182,6 +5182,7 @@ + + + exit: ++ 1; + //read_unlock(&(macp->isolate_lock)); + + } +--- zd1211-4916-r0/src/zdhci.c.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zdhci.c 2005-02-18 21:01:45.426134088 -0800 +@@ -10,6 +10,7 @@ + #define MAX_CHANNEL_ALLOW 13 + zd_80211Obj_t *pdot11Obj = 0; + U16 CurrScanCH = 1; ++void zd_ChooseAP(void); + + BOOLEAN zd_SendPkt(U8 *pEthHdr, U8 *pBody, U32 bodyLen, void *buf, U8 bEapol, void *pHash) + { diff --git a/packages/zd1211/zd1211-4916/usb-endian.patch b/packages/zd1211/zd1211-4916/usb-endian.patch new file mode 100644 index 0000000000..f2516ff783 --- /dev/null +++ b/packages/zd1211/zd1211-4916/usb-endian.patch @@ -0,0 +1,298 @@ +diff -ur zdold/Makefile zd1211-4916-r0/Makefile +--- zdold/Makefile 2005-02-18 21:58:36.000000000 -0800 ++++ zd1211-4916-r0/Makefile 2005-02-28 17:59:05.000000000 -0800 +@@ -149,7 +149,7 @@ + CFLAGS += -DfNEW_CODE_MAP=1 + CFLAGS += -DfWRITE_WORD_REG=1 + CFLAGS += -DfREAD_MUL_REG=1 +-#CFLAGS += -DENHANCE_RX=1 ++CFLAGS += -DENHANCE_RX=1 + + all: $(MODULE) + +diff -ur zdold/src/zd1211.c zd1211-4916-r0/src/zd1211.c +--- zdold/src/zd1211.c 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-01 14:41:07.003613776 -0800 +@@ -429,16 +429,16 @@ + memset(pRegBuffer, 0x0, size); + + +- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_PROG_FLSH; +- ((PUSB_SET_RF) pRegBuffer)->Value = Value[0]; +- ((PUSB_SET_RF) pRegBuffer)->Index = Value[1]; ++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_PROG_FLSH); ++ ((PUSB_SET_RF) pRegBuffer)->Value = cpu_to_le16(Value[0]); ++ ((PUSB_SET_RF) pRegBuffer)->Index = cpu_to_le16(Value[1]); + + + + + + for (ii = 2; ii < RegCount; ii ++) +- ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = Value[ii]; ++ ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = cpu_to_le16(Value[ii]); + + + bufSize = sizeof(u16) * (1+RegCount); +@@ -513,7 +513,7 @@ + }else + memset(pRegBuffer, 0x0, size); + +- ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = REGID_READ; ++ ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = cpu_to_le16(REGID_READ); + + + +@@ -526,7 +526,7 @@ + else if ((Address[ii] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM) + Address[ii] = ((Address[ii] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET; + //0x9900 //0xF817 +- ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = Address[ii]; ++ ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = cpu_to_le16(Address[ii]); + + } + +@@ -608,7 +608,7 @@ + } + else { + for (ii = 0; ii < (macp->ReadRegCount-2) / 4; ii++){ +- pValue[ii] = *((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1); ++ pValue[ii] = le16_to_cpu(*((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1)); + } + ret = 0; + +@@ -686,7 +686,7 @@ + } + + down(&macp->reg_sem); +- ++ + + + if ((RegCount == 0) || (!macp->bUSBDeveiceAttached) || !test_bit(ZD1211_RUNNING, &macp->flags)) { +@@ -712,7 +712,7 @@ + + + +- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_WRITE; ++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_WRITE); + + if (RegCount > cMIN_MULTI_WRITE_REG_NUM){ + for (i=cMIN_MULTI_WRITE_REG_NUM; iWritePackage[i].Address = Address[i]; +- ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = Value[i]; ++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = cpu_to_le16(Address[i]); ++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = cpu_to_le16(Value[i]); + } + } + +@@ -1726,17 +1726,17 @@ + + + +- ((PUSB_SET_RF)pRegBuffer)->RequestID = REGID_RFOFDMSET; ++ ((PUSB_SET_RF)pRegBuffer)->RequestID = cpu_to_le16(REGID_RFOFDMSET); + + if (bIs3683A) +- ((PUSB_SET_RF)pRegBuffer)->Value = 1; ++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(1); + else +- ((PUSB_SET_RF)pRegBuffer)->Value = 2; ++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(2); + +- ((PUSB_SET_RF)pRegBuffer)->Index = (u16)S_bit_cnt; ++ ((PUSB_SET_RF)pRegBuffer)->Index = cpu_to_le16((u16)S_bit_cnt); + + for (i = 0; i < S_bit_cnt; i ++) +- ((PUSB_SET_RF)pRegBuffer)->Data[i] = InputValue[i]; ++ ((PUSB_SET_RF)pRegBuffer)->Data[i] = cpu_to_le16(InputValue[i]); + + + bufSize = sizeof(u16) * (3+S_bit_cnt); +@@ -2229,7 +2229,7 @@ + + + +- ZD1211DEBUG(4, "actual_length = %x\n", urb->actual_length); ++ ZD1211DEBUG(2, "actual_length = %x\n", urb->actual_length); + + + rx_struct = list_entry(macp->active_rx_list.next, +@@ -2266,7 +2266,7 @@ + if (last_pkt_len <= (macp->wMaxPacketSize - 4)){ + + +- if (((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1] == 0x697E){ ++ if (le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1]) == 0x697E){ + + total_rx_struct = 3; + //ZD1211DEBUG(0, "Got merged Rx Frames!!\n"); +@@ -2288,8 +2288,8 @@ + int CurFrmLen; + + if (total_rx_struct> 1){ +- CurFrmLen = ((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]; +- //ZD1211DEBUG(2, "CurFrmLen = %x\n", CurFrmLen); ++ CurFrmLen = le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]); ++ //ZD1211DEBUG(2, "[RX] CurFrmLen = %x\n", CurFrmLen); + } + + else +@@ -2316,22 +2316,22 @@ + + + +- rfd->CbStatus = RFD_STATUS_COMPLETE; +- rfd->ActualCount = CurFrmLen; ++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE); ++ rfd->ActualCount = cpu_to_le32(CurFrmLen); + + + if (i > 0){ + memcpy(&rfd->RxBuffer[macp->rxOffset], + pRxBuffer + tmpLen, +- rfd->ActualCount); ++ CurFrmLen); + + } + + +- tmpLen += (rfd->ActualCount & ~0x03); ++ tmpLen += (CurFrmLen & ~0x03); + + +- if (rfd->ActualCount & 0x03) ++ if (CurFrmLen & 0x03) + tmpLen += 4; + + } +@@ -2361,8 +2361,8 @@ + + #else + +- rfd->CbStatus = RFD_STATUS_COMPLETE; +- rfd->ActualCount = TotalLength; ++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE); ++ rfd->ActualCount = cpu_to_le32(TotalLength); + zd1205_rx_isr(macp); + #endif + +@@ -2521,8 +2521,8 @@ + // this is USB_READ_REGISTER response + macp->ReadRegCount = (u16)actual_length; + +- intNum = *(u16 *)(macp->IntEPBuffer+2); +- //intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8); ++ //intNum = *(u16 *)(macp->IntEPBuffer+2); ++ intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8); + + if (intNum == (InterruptCtrl | macp->USBCSRAddress)){ + // Handle non-RxTx interrupt +@@ -2549,8 +2549,8 @@ + case EPINT_RetryFial_Event: + { + u8 *pMacAddr = macp->IntEPBuffer + 4; +- u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2)); +- //u8 NewRate = macp->IntEPBuffer[2]; ++ //u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2)); ++ u8 NewRate = (u8)macp->IntEPBuffer[2]; + u16 aid; + + +@@ -2568,7 +2568,7 @@ + //ZD1211DEBUG(2, "NewRate = %x\n", NewRate); + aid = zd_AidLookUp(pMacAddr); + zd_EventNotify(EVENT_TX_COMPLETE, ZD_RETRY_FAILED, 0xff, (U32)aid); +- macp->retryFailCnt += *(u16 *)(macp->IntEPBuffer + 10); ++ macp->retryFailCnt += le16_to_cpu(*(u16 *)(macp->IntEPBuffer + 10)); + break; + + } +@@ -2634,7 +2634,7 @@ + // in current design, no need to use spinlock + + +- intr_status = *(u16 *)(macp->IntEPBuffer3+4); ++ intr_status = le16_to_cpu(*(u16 *)(macp->IntEPBuffer3+4)); + //ZD1211DEBUG(2, "intr_status = %x\n", intr_status); + + if (!intr_status) +@@ -2765,7 +2765,7 @@ + + sw_tcb = macp->activeTxQ->first; + if (sw_tcb) +- sw_tcb->pTcb->CbStatus = CB_STATUS_COMPLETE; ++ sw_tcb->pTcb->CbStatus = cpu_to_le32(CB_STATUS_COMPLETE); + + zd1205_tx_isr(macp); + +@@ -2889,23 +2889,25 @@ + Tbd++; + + //Mac Header +- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount); ++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart), ++ le32_to_cpu(Tbd->TbdCount)); + + ZD1211DEBUG(2, "MAC Header Length = %x\n", Tbd->TbdCount); +- dst += Tbd->TbdCount; ++ dst += le32_to_cpu(Tbd->TbdCount); + +- TotalLength += Tbd->TbdCount; ++ TotalLength += le32_to_cpu(Tbd->TbdCount); + + Tbd++; + + //MAC Body +- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount); ++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart), ++ le32_to_cpu(Tbd->TbdCount)); + + ZD1211DEBUG(2, "Tx DATA Length = %x\n", Tbd->TbdCount); +- dst += Tbd->TbdCount; ++ dst += le32_to_cpu(Tbd->TbdCount); + + +- TotalLength += Tbd->TbdCount; ++ TotalLength += le32_to_cpu(Tbd->TbdCount); + Tbd++; + + ZD1211DEBUG(2, "TotalLength = %x\n", TotalLength); +@@ -2914,7 +2916,7 @@ + + + // write down total length +- *((u16 *)(macp->tx_buff+4)) = (u16)TotalLength + 14; ++ *((u16 *)(macp->tx_buff+4)) = cpu_to_le16((u16)TotalLength + 14); + + ZD1211DEBUG(2, "macp->tx_buff+4 = %x\n", *((u16 *)(macp->tx_buff+4))); + +diff -ur zdold/src/zd1211.h zd1211-4916-r0/src/zd1211.h +--- zdold/src/zd1211.h 2005-01-28 22:55:14.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.h 2005-03-01 14:12:15.023914712 -0800 +@@ -146,7 +146,9 @@ + typedef struct _USB_WRITE_REG { + u16 RequestID; + USB_WRITE_REG_PACKAGE WritePackage[cMAX_MULTI_WRITE_REG_NUM]; +-} USB_WRITE_REG, * PUSB_WRITE_REG; ++} __attribute__((__packed__)); ++ ++typedef struct _USB_WRITE_REG USB_WRITE_REG, * PUSB_WRITE_REG; + + + typedef struct _USB_SET_RF { +diff -ur zdold/src/zdshared.c zd1211-4916-r0/src/zdshared.c +--- zdold/src/zdshared.c 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zdshared.c 2005-03-01 14:43:35.078103032 -0800 +@@ -416,6 +416,7 @@ + U16 len; + Frame_t *pf = pfrmDesc->mpdu; + ++ pf->header[2] = pf->header[3] = 0; // Initialize them to something? + setFrameType(pf, ST_PROBE_REQ); + pf->body = pfrmDesc->buffer; + body = pf->body; diff --git a/packages/zd1211/zd1211-4916/usb-ids.patch b/packages/zd1211/zd1211-4916/usb-ids.patch new file mode 100644 index 0000000000..3bb9b00e35 --- /dev/null +++ b/packages/zd1211/zd1211-4916/usb-ids.patch @@ -0,0 +1,21 @@ +--- zd1211-4916-r0/src/zdusb.h~ 2005-01-29 17:25:15.000000000 +1030 ++++ zd1211-4916-r0/src/zdusb.h 2005-08-24 10:39:06.000000000 +0930 +@@ -10,6 +10,8 @@ + #define PRODUCT_1211 0x1211 + #define VENDOR_ZYXEL 0x0586 //ZyXEL + #define PRODUCT_G220 0x3401 ++#define VENDOR_3COM 0x6891 //3COM ++#define PRODUCT_3CRUSB10075 0xa727 + + + #endif +--- zd1211-4916-r0/src/zdusb.c~ 2005-01-29 17:25:15.000000000 +1030 ++++ zd1211-4916-r0/src/zdusb.c 2005-08-24 10:39:30.000000000 +0930 +@@ -59,6 +59,7 @@ + static struct usb_device_id zd1211_ids [] = { + { USB_DEVICE(VENDOR_ZYDAS, PRODUCT_1211) }, + { USB_DEVICE(VENDOR_ZYXEL, PRODUCT_G220) }, ++ { USB_DEVICE(VENDOR_3COM, PRODUCT_3CRUSB10075) }, + { } /* Terminating entry */ + }; + diff --git a/packages/zd1211/zd1211_4916.bb b/packages/zd1211/zd1211_4916.bb new file mode 100644 index 0000000000..4d49409b5e --- /dev/null +++ b/packages/zd1211/zd1211_4916.bb @@ -0,0 +1,35 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/sf-zd1211-${PV}-src.tar.gz \ + file://makefile.patch;patch=1 \ + file://syntax.patch;patch=1 \ + file://usb-endian.patch;patch=1 \ + file://usb-ids.patch;patch=1 \ + file://get-stats.patch;patch=1 \ + file://explicit-key-change.patch;patch=1 \ + file://copy-break.patch;patch=1" +S = "${WORKDIR}" +LICENSE = "GPL" + +inherit module-base +SECTION = "base" + +do_configure() { + : +} + +CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + ${MAKE_TARGETS} +} + +do_install() { + install -d ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless + install -m 0644 zd1211.o ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless/zd1211.o +} + +FILES_${PN} = "/opt/lib/modules" -- cgit v1.2.3 From a9344c9ee7c39c2f8f116a88837c8263e8dd7582 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 14:18:58 +0000 Subject: gpe-package 0.3: add to repo --- packages/gpe-package/gpe-package_0.3.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/gpe-package/gpe-package_0.3.bb diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb new file mode 100644 index 0000000000..0084b7e3c3 --- /dev/null +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +PR = "r0" +inherit gpe pkgconfig + +DESCRIPTION = "A package manager GUI for GPE" +DEPENDS = "ipkg libgpewidget" +RDEPENDS = "gpe-icons" +SECTION = "gpe" +PRIORITY = "optional" + -- cgit v1.2.3 From f6fd159b63403e8164eda485560fa113ba35935c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 14:21:38 +0000 Subject: conf/distro/preferred-gpe-versions-2.7.inc: updates libschedule -> 0.15 gpe-calendar -> 0.63 gpe-clock -> 0.21 gpe-package -> 0.3 --- conf/distro/preferred-gpe-versions-2.7.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 502e3594fd..484dd4966c 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -25,7 +25,7 @@ PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.103" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.12" -PREFERRED_VERSION_libschedule ?= "0.14" +PREFERRED_VERSION_libschedule ?= "0.15" PREFERRED_VERSION_gpe-icons ?= "0.24" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" @@ -42,7 +42,7 @@ PREFERRED_VERSION_gpe-login ?= "0.81" PREFERRED_VERSION_gpe-session-scripts ?= "0.63" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" -PREFERRED_VERSION_gpe-calendar ?= "0.61" +PREFERRED_VERSION_gpe-calendar ?= "0.63" PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" PREFERRED_VERSION_gpe-contacts ?= "0.41" PREFERRED_VERSION_gpe-today ?= "0.08" @@ -51,7 +51,7 @@ PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-bluetooth ?= "0.42" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" -PREFERRED_VERSION_gpe-clock ?= "0.20" +PREFERRED_VERSION_gpe-clock ?= "0.21" PREFERRED_VERSION_gpe-mininet ?= "0.5" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.7" @@ -63,7 +63,7 @@ PREFERRED_VERSION_xmonobut ?= "0.4" PREFERRED_VERSION_gpe-edit ?= "0.29" PREFERRED_VERSION_gpe-gallery ?= "0.96" PREFERRED_VERSION_gpe-calculator ?= "0.2" -PREFERRED_VERSION_gpe-package ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.3" PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" PREFERRED_VERSION_gpe-terminal ?= "1.1" PREFERRED_VERSION_gpe-watch ?= "0.10" -- cgit v1.2.3 From 3ee0828904266168540bcc2672d20604666c4976 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 24 Aug 2005 16:06:11 +0000 Subject: Fix typo in -mtune value. --- conf/machine/tune-arm926ejs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf index 4e62a749dc..563586c902 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/tune-arm926ejs.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" PACKAGE_ARCH = "armv5te" -- cgit v1.2.3 From 27f7324b91c07cdf890f319d39e99c0b13eda4f0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Aug 2005 16:56:26 +0000 Subject: x11-common: Correct spitz resolution - confirmed on 2.4 and fixes Xserver on 2.6 kernels --- packages/x11/x11-common/etc/X11/Xserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver index e7e6dd1ddb..8492bfe214 100644 --- a/packages/x11/x11-common/etc/X11/Xserver +++ b/packages/x11/x11-common/etc/X11/Xserver @@ -63,7 +63,7 @@ case `module_id` in "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ARGS="$ARGS -rgba rgb" ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; + ARGS="$ARGS -rgba rgb -screen 480x640@270" ;; "Simpad") ARGS="$ARGS -rgba rgb" ;; "Generic OMAP1510/1610/1710") -- cgit v1.2.3 From 2ca9a3237a98beb6ab96ceb9b529da6b65cca154 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:06:06 +0000 Subject: added hostap modules 0.4.4 (development version which works with kernel 2.6.13) --- .../hostap/hostap-modules-0.4.4/.mtn2git_empty | 0 .../hostap/hostap-modules-0.4.4/ipaq_compat.patch | 11 +++ .../hostap/hostap-modules-0.4.4/mtx_compat.diff | 20 ++++++ .../mtx_hostap_deferred_irq.diff | 81 ++++++++++++++++++++++ packages/hostap/hostap-modules_0.4.4.bb | 42 +++++++++++ 5 files changed, 154 insertions(+) create mode 100644 packages/hostap/hostap-modules-0.4.4/.mtn2git_empty create mode 100644 packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch create mode 100644 packages/hostap/hostap-modules-0.4.4/mtx_compat.diff create mode 100644 packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff create mode 100644 packages/hostap/hostap-modules_0.4.4.bb diff --git a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch new file mode 100644 index 0000000000..b139ef38f1 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 +@@ -5,7 +5,7 @@ + #define NEW_MODULE_CODE + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) + + #define HOSTAP_QUEUE struct tq_struct + diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff new file mode 100644 index 0000000000..c2d6662d69 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff @@ -0,0 +1,20 @@ +--- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 ++++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 +@@ -13,7 +13,7 @@ + MOD_INC_USE_COUNT; \ + if (schedule_task((q)) == 0) \ + MOD_DEC_USE_COUNT; +- ++/* + static inline void flush_scheduled_work(void) + { + flush_scheduled_tasks(); +@@ -27,7 +27,7 @@ + tq->routine = routine; + tq->data = data; + } +- ++*/ + #else /* kernel < 2.5.44 */ + + #define HOSTAP_QUEUE struct work_struct diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff new file mode 100644 index 0000000000..e979b72d93 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff @@ -0,0 +1,81 @@ +--- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 ++++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 +@@ -50,6 +50,13 @@ + }; + + ++#define DEFERRED_IRQ_INITIALIZATION ++ ++#ifdef DEFERRED_IRQ_INITIALIZATION ++struct net_device *devb[MAX_PARM_DEVICES]; ++#endif ++ ++ + #ifdef PRISM2_IO_DEBUG + + static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) +@@ -280,6 +287,10 @@ + + pci_set_drvdata(pdev, dev); + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ printk("%s: deferred initialization of IRQs\n", dev_info); ++ devb[cards_found-1] = dev; ++#else + if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, + dev)) { + printk(KERN_WARNING "%s: request_irq failed\n", dev->name); +@@ -295,7 +306,7 @@ + + printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " + "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); +- ++#endif + return hostap_hw_ready(dev); + + fail: +@@ -399,18 +410,43 @@ + }; + + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++static void deferred_init(int num_devices) ++{ ++ int n; ++ for (n=0; nirq, prism2_interrupt, SA_SHIRQ, devb[n]->name, ++ devb[n])) { ++ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); ++ } ++ if (prism2_hw_config(devb[n], 1)) { ++ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) ++; ++ } ++ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> ++irq); ++ } ++} ++#endif ++ + static int __init init_prism2_pci(void) + { + printk(KERN_INFO "%s: %s\n", dev_info, version); + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) +- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { ++ int n; ++ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { + printk("hostap_pci: No devices found, driver not " + "installed.\n"); + pci_unregister_driver(&prism2_pci_drv_id); + return -ENODEV; + } + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ deferred_init(n); ++#endif ++ + return 0; + #else + return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb new file mode 100644 index 0000000000..fd7a3eaff9 --- /dev/null +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ + file://hostap_cs.conf " + +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +# Hack Alert :D +ARCH_mipsel = "mips" +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ + ${D}${sysconfdir}/pcmcia + for i in ${NET_MODULES} + do + install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ + done + install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ + install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf + cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf +} + +PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" +FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules = "/lib/modules/" +RDEPENDS_hostap-modules-cs = "hostap-modules" +RDEPENDS_hostap-modules-pci = "hostap-modules" -- cgit v1.2.3 From 227d9e38b2b3cbb320551706159a285461ef9742 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:16:14 +0000 Subject: updated pcmciautils to 007 --- packages/pcmciautils/pcmciautils_005.bb | 29 ----------------------------- packages/pcmciautils/pcmciautils_007.bb | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 packages/pcmciautils/pcmciautils_005.bb create mode 100644 packages/pcmciautils/pcmciautils_007.bb diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb deleted file mode 100644 index ad8cf7e2f4..0000000000 --- a/packages/pcmciautils/pcmciautils_005.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "2.6 pcmcia utilities" -DEPENDS = "sysfsutils" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_007.bb b/packages/pcmciautils/pcmciautils_007.bb new file mode 100644 index 0000000000..ad8cf7e2f4 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_007.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "2.6 pcmcia utilities" +DEPENDS = "sysfsutils" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" +S = "${WORKDIR}/pcmciautils-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "coldplug" +INITSCRIPT_PARAMS = "defaults" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export hotplugdir = "${sysconfdir}/hotplug" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" -- cgit v1.2.3 From b031c22b002b8d5e57d46ad6f80cd8b4ab44bfb9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:17:50 +0000 Subject: removed old versions of pcmciautils --- packages/pcmciautils/pcmciautils_001.bb | 34 ------------------------------- packages/pcmciautils/pcmciautils_002.bb | 36 --------------------------------- packages/pcmciautils/pcmciautils_003.bb | 29 -------------------------- 3 files changed, 99 deletions(-) delete mode 100644 packages/pcmciautils/pcmciautils_001.bb delete mode 100644 packages/pcmciautils/pcmciautils_002.bb delete mode 100644 packages/pcmciautils/pcmciautils_003.bb diff --git a/packages/pcmciautils/pcmciautils_001.bb b/packages/pcmciautils/pcmciautils_001.bb deleted file mode 100644 index 59e0cdb86f..0000000000 --- a/packages/pcmciautils/pcmciautils_001.bb +++ /dev/null @@ -1,34 +0,0 @@ -DEPENDS += "sysfsutils" -DESCRIPTION = "2.6 pcmcia utilities" -MAINTAINER = "Chris Larson " -SECTION = "base" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" - -EXTRA_OEMAKE = "-e \ - 'STRIP=echo'" - -do_compile () { - oe_runmake build/ccdv - oe_runmake -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_002.bb b/packages/pcmciautils/pcmciautils_002.bb deleted file mode 100644 index 440d925313..0000000000 --- a/packages/pcmciautils/pcmciautils_002.bb +++ /dev/null @@ -1,36 +0,0 @@ -DEPENDS += "sysfsutils virtual/libintl" -DESCRIPTION = "2.6 pcmcia utilities" -MAINTAINER = "Chris Larson " -SECTION = "base" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -EXTRA_OEMAKE = "-e \ - 'STRIP=echo' \ - 'LIB_OBJS=-lc -lsysfs -lintl'" - -do_compile () { - oe_runmake build/ccdv - oe_runmake -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_003.bb b/packages/pcmciautils/pcmciautils_003.bb deleted file mode 100644 index ad8cf7e2f4..0000000000 --- a/packages/pcmciautils/pcmciautils_003.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "2.6 pcmcia utilities" -DEPENDS = "sysfsutils" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" -- cgit v1.2.3 From efab019e257e5bdec759536887d565a0f5a825e6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 18:57:07 +0000 Subject: mkdir the 'patches' directory before calling quilt --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a6a137d4de..04603d393d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -319,7 +319,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from -- cgit v1.2.3 From d3eeeac0ab3f76477ae7cd8a8da18d70cd390e1e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:06:42 +0000 Subject: fix regexp to strip cvs kernel versions, too. (fixes #230) --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 8b2186dec6..2f3a0ce31e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -229,7 +229,7 @@ python populate_packages_prepend () { kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1) kernelver_stripped = kernelver - m = re.match('^(.*-hh.*)\..*$', kernelver) + m = re.match('^(.*-hh.*)[\.\+].*$', kernelver) if m: kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) -- cgit v1.2.3 From 1d298ceb8b72cb6782bf62ef0cd1911cf41ef8fa Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:30:47 +0000 Subject: makes the kernel-module-af-packet package add "alias net-pf-17 af_packet" to /etc/modules.conf (fixes #233). --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 2f3a0ce31e..ff9aeeab78 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -193,6 +193,7 @@ module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" # alias defaults (alphabetically sorted) +module_conf_af_packet = "alias net-pf-17 af_packet" module_conf_bluez = "alias net-pf-31 bluez" module_conf_bnep = "alias bt-proto-4 bnep" module_conf_hci_uart = "alias tty-ldisc-15 hci_uart" -- cgit v1.2.3 From 4df9d82ef3a8f9a66fe18fd65340c289b4de8cc2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:36:56 +0000 Subject: install dexec.h into the staging area --- packages/libdaemon/libdaemon_0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb index 83afaacefe..578c9b7674 100644 --- a/packages/libdaemon/libdaemon_0.6.bb +++ b/packages/libdaemon/libdaemon_0.6.bb @@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen" do_stage () { oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libdaemon - for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do + for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/ done } -- cgit v1.2.3 From 964c5ef136724d6a60d4b3520df768db8a6e6035 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 24 Aug 2005 20:37:06 +0000 Subject: Add cairo 1.0.0 --- packages/cairo/cairo_1.0.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/cairo/cairo_1.0.0.bb diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb new file mode 100644 index 0000000000..aa97a9f4de --- /dev/null +++ b/packages/cairo/cairo_1.0.0.bb @@ -0,0 +1,15 @@ +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "x11 libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" +PR = "r1" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} -- cgit v1.2.3 From d8e136911691c3b6888364b1a793dfb855114b5f Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 24 Aug 2005 20:47:48 +0000 Subject: bugzilla bug 83: list all supported architectures so that tune-xscale can be used --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 9e91dcfbbc..0363bd2f01 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -8,7 +8,7 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ipaqpxa h3900" +IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" -- cgit v1.2.3 From a35f3ba7fbd5fe44358fc52c3c64ed9f0ecbfe15 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:34:15 +0000 Subject: Move qc-usb --- .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 +++++++++++++++++++ packages/qc-usb-messenger/qc-usb-messenger_0.8.bb | 29 ---------------------- packages/qc-usb/qc-usb-messenger_0.8.bb | 29 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger_0.8.bb create mode 100644 packages/qc-usb/qc-usb-messenger_0.8.bb diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix new file mode 100644 index 0000000000..ff3572db8d --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix @@ -0,0 +1,25 @@ +diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c +--- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 ++++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 +@@ -63,9 +63,9 @@ + #endif + + #if !HAVE_VMA +-static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } +-#undef remap_page_range +-#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) ++static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } ++#undef io_remap_page_range ++#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb deleted file mode 100644 index 2720b3af59..0000000000 --- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ - file://qc-messenger-0.8-fix;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' \ - 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ - all -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc -} - diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb new file mode 100644 index 0000000000..2720b3af59 --- /dev/null +++ b/packages/qc-usb/qc-usb-messenger_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ + file://qc-messenger-0.8-fix;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' \ + 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ + all +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc +} + -- cgit v1.2.3 From 149b2582b0f451a828d1a0fa908d7ad0fc9f9470 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:52:45 +0000 Subject: Re-add qc-usb-messenger to openslug feed --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 2febd8d2b3..80c0a5be09 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\ puppy \ pwc \ python \ + qc-usb-messenger \ quilt \ reiserfsprogs reiser4progs \ rsync \ -- cgit v1.2.3 From c0c608e2e2219f4099590cce20c82b28f2e3d512 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:53:46 +0000 Subject: Update DESCRIPTION --- packages/libdvb/libdvb_0.5.5.1.bb | 3 ++- packages/qc-usb-messenger/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 ---------------------- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 packages/qc-usb-messenger/.mtn2git_empty delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb index 62ce3c61e5..9de579917c 100644 --- a/packages/libdvb/libdvb_0.5.5.1.bb +++ b/packages/libdvb/libdvb_0.5.5.1.bb @@ -1,10 +1,11 @@ LICENSE = "GPL" DESCRIPTION = "Linux Digital Video Broadcast library" +DESCRIPTION_libdvb-dev = "Headers for libdvb development" HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html" MAINTAINER = "Oyvind Repvik =KERNEL_VERSION(2,5,3) || defined(pte_offset_map) -@@ -230,7 +230,7 @@ - pos = (unsigned long)src; - while ((long)size > 0) { - physaddr = kvirt_to_pa(pos); -- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) -+ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) - return -EAGAIN; - start += PAGE_SIZE; - pos += PAGE_SIZE; -- cgit v1.2.3 From 0d9a48d586c544d2c1da58356a6d92c68a939f7e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:59:14 +0000 Subject: Update mpd to latest version --- packages/musicpd/mpd_0.11.5.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/musicpd/mpd_0.11.5.bb diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb new file mode 100644 index 0000000000..395d69e79e --- /dev/null +++ b/packages/musicpd/mpd_0.11.5.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Music Player Daemon (mpd)" +HOMEPAGE = "http://www.musicpd.org" +LICENSE = "GPLv2" +MAINTAINER = "Chris Larson " +SECTION = "console/multimedia" +DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz" + +inherit autotools + +# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to +# be built, instead we use the OE built versions which should be installed +# in staging - remove the --with and replace with --enable to use the local +# versions. + +EXTRA_OECONF = "--enable-ogg \ + --with-id3tag-libraries=${STAGING_LIBDIR} \ + --with-id3tag-includes=${STAGING_INCDIR} \ + --with-mad-libraries=${STAGING_LIBDIR} \ + --with-mad-includes=${STAGING_INCDIR} \ + --without-faad" -- cgit v1.2.3 From c2626bcd2980854c6cddce5d2625ae22475732c5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 23:06:37 +0000 Subject: Update libao to latest version --- packages/libao/libao_0.8.6.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/libao/libao_0.8.6.bb diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb new file mode 100644 index 0000000000..8c2601bce8 --- /dev/null +++ b/packages/libao/libao_0.8.6.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL" +DESCRIPTION = "A cross platform audio library" +HOMEPAGE = "http://www.xiph.org/ao/" +SECTION = "libs" +PRIORITY = "optional" +PR = "r0" + +SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-esd --disable-esdtest \ + --disable-alsa --disable-alsa09 \ + --disable-arts --disable-nas" + +do_stage() { + install -d ${STAGING_INCDIR}/ao + install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ + ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ + + oe_libinstall -so -C src libao ${STAGING_LIBDIR} + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN} += "${libdir}/ao/plugins-2/*.so" -- cgit v1.2.3 From e7736de5109c564c46a6bd7403c899fc513f273a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Aug 2005 23:42:40 +0000 Subject: linux-oz-2.6: general cleanup of spitz patches. Disable debugging of common power/battery code --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 065d5d9eb8..2842eea8cb 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r11" +PR = "r12" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -51,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r24.patch;patch=1 \ + ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ @@ -79,14 +79,16 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ + ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ - ${RPSRC}/spitzbase-r5.patch;patch=1 \ + ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \ + ${RPSRC}/spitz_base-r7.patch;patch=1 \ ${RPSRC}/spitzkbd-r1.patch;patch=1 \ - ${RPSRC}/spitzssp-r4.patch;patch=1 \ - ${RPSRC}/spitzbl-r1.patch;patch=1 \ - ${RPSRC}/spitzts-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ - ${RPSRC}/spitz_power-r1.patch;patch=1 \ + ${RPSRC}/spitz_power-r3.patch;patch=1 \ ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ -- cgit v1.2.3 From 58cf0d9868bda6ddc1611d2071afe23aa3b41ad7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 01:22:52 +0000 Subject: Add initscript. Remove/reinstall busybox syslog on install/remove. Should work entirely out of the box now --- packages/syslog-ng/syslog-ng_1.6.8.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index a4c2fde2d2..95e522b936 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,17 +1,29 @@ -PR = "r4" +PR = "r5" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 01:28:06 +0000 Subject: Forgot INITSCRIPT_PARAMS. Duh. --- packages/syslog-ng/syslog-ng_1.6.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 95e522b936..830b2922b8 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 03:06:28 +0000 Subject: Add -f to update-rc.d --- packages/syslog-ng/syslog-ng_1.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 830b2922b8..8e68022273 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -22,7 +22,7 @@ do_install_append() { } pkg_postinst() { - update-rc.d syslog remove + update-rc.d -f syslog remove } pkg_postrm() { -- cgit v1.2.3 From 0898ace54cb976203eefd94af7db6ef2917409f0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 03:08:03 +0000 Subject: Bump PR *sigh* --- packages/syslog-ng/syslog-ng_1.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 8e68022273..bc41020b71 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 11:19:36 +0000 Subject: linux-openzaurus-2.6.13: added lines to autoload the pxaficp_ir module, Irda will now work on boot with this kernel. --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 2842eea8cb..31d5a2cda0 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r12" +PR = "r13" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -155,6 +155,11 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug" # ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"} +############################################################### +# module configs specific to this kernel +# +module_autoload_pxaficp_ir = "pxaficp_ir" + do_configure() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." -- cgit v1.2.3 From d4dc75a5c379b1e4aa38228275eb65d356a09e37 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 11:55:17 +0000 Subject: obexpush: fix opd init script permission --- packages/obexpush/obexpush-native_1.0.0.bb | 4 ++++ packages/obexpush/obexpush_1.0.0.bb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb index 6e63de5c98..64840797cd 100644 --- a/packages/obexpush/obexpush-native_1.0.0.bb +++ b/packages/obexpush/obexpush-native_1.0.0.bb @@ -3,6 +3,10 @@ inherit native FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}" +do_stage() { + : +} + do_install() { : } diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb index b441e7c3a6..a01b6ddee6 100644 --- a/packages/obexpush/obexpush_1.0.0.bb +++ b/packages/obexpush/obexpush_1.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php" SECTION = "console/network" LICENSE = "GPL" DEPENDS = "glib-2.0 openobex bluez-libs" -PR = "r1" +PR = "r2" SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \ file://add-obextool.patch;patch=1 \ @@ -41,6 +41,6 @@ do_install() { install -m 0755 opd/opd ${D}${sbindir} install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd } -- cgit v1.2.3 From 8e035f14cf2640cbace08a04f4482a3925e4624b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 11:55:39 +0000 Subject: initscripts: install keymap also on borzoi --- packages/initscripts/initscripts_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 60346f70d9..4c92d07130 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r56" +PR = "r57" SRC_URI = "file://halt \ file://ramdisk \ @@ -103,7 +103,7 @@ do_install () { fi case ${MACHINE} in - c7x0 | tosa | spitz | akita ) + c7x0 | tosa | spitz | akita | borzoi ) install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} -- cgit v1.2.3 From 7ef5bceaca3086db5e8b0de95fef06ea23732ff0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 25 Aug 2005 12:40:32 +0000 Subject: Update scap script to include a delay of 5 seconds and to toggle the backlight on systems with "bl". --- packages/scap/files/scap.sh | 9 ++++++++- packages/scap/scap_0.1.bb | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index 6fccdd400e..f8e0485333 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -1,5 +1,9 @@ #!/bin/sh +sleep 5 +if [ -x /usr/bin/bl ]; then + bl toggle +fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` @@ -10,4 +14,7 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "Host: www.handhelds.org" echo "" cat /dev/fb0) | nc www.handhelds.org 80 - +if [ -x /usr/bin/bl ]; then + bl toggle +fi + diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 1348e6ed6f..30cf1b3299 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r1" +PR = "r2" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" -- cgit v1.2.3 From 39d1dadfed23f6494fa05317a777b16677dae81c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Aug 2005 12:47:05 +0000 Subject: linux-oz-2.6: More patch rearranging, mainly for spitz. Tedious but neccessary... --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 46 ++++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 31d5a2cda0..f96a086835 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r13" +PR = "r14" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -38,23 +38,36 @@ BASRC = "http://www.orca.cx/zaurus/patches" # Patches submitted upstream are towards top of this list +# Hacks should clearly named and at the bottom SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \ ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \ ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \ + ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ + ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ + ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ + ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ + ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ + ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ + ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \ + ${RPSRC}/sharpsl_ts-r2.patch;patch=1 \ + ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-r0.patch;patch=1 \ + ${RPSRC}/corgi_pm-r0.patch;patch=1 \ + ${RPSRC}/spitzkbd-r1.patch;patch=1 \ + ${RPSRC}/spitzcf-r1.patch;patch=1 \ + ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ - ${RPSRC}/input_power-r2.patch;patch=1 \ - ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ + ${RPSRC}/corgi_irda-r3.patch;patch=1 \ + ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \ - ${RPSRC}/corgi_power1-r1.patch;patch=1 \ - ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ - ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/corgi_snd-r10.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ @@ -79,23 +92,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ - ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \ - ${RPSRC}/spitz_base-r7.patch;patch=1 \ - ${RPSRC}/spitzkbd-r1.patch;patch=1 \ - ${RPSRC}/spitzcf-r1.patch;patch=1 \ - ${RPSRC}/spitz_power-r3.patch;patch=1 \ - ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \ - ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ + ${RPSRC}/spitz_base-r8.patch;patch=1 \ + ${RPSRC}/spitz_pm-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ - ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ + ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ - ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ -- cgit v1.2.3 From 1dd3c7936244c3489305fb38f9e8082416428648 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 12:50:23 +0000 Subject: Add the initscript itself. How did I manage to miss this? *slap* --- packages/syslog-ng/files/.mtn2git_empty | 0 packages/syslog-ng/files/initscript | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 packages/syslog-ng/files/.mtn2git_empty create mode 100644 packages/syslog-ng/files/initscript diff --git a/packages/syslog-ng/files/.mtn2git_empty b/packages/syslog-ng/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/syslog-ng/files/initscript b/packages/syslog-ng/files/initscript new file mode 100644 index 0000000000..b95e8adc20 --- /dev/null +++ b/packages/syslog-ng/files/initscript @@ -0,0 +1,45 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/syslog-ng and type +# > update-rc.d syslog-ng defaults 5 +# + + +syslog_ng=/usr/sbin/syslog-ng +test -x "$syslog_ng" || exit 0 + +case "$1" in + start) + echo -n "Starting syslog-ng:" + start-stop-daemon --start --quiet --exec $syslog_ng + echo "." + ;; + stop) + echo -n "Stopping syslog-ng:" + start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $syslog_ng + ;; + restart) + echo "Stopping syslog-ng:" + start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid + echo -n "Waiting for syslog-ng to die off" + for i in 1 2 3 ; + do + sleep 1 + echo -n "." + done + echo "" + echo -n "Starting syslog-ng:" + start-stop-daemon --start --quiet --exec $syslog_ng + echo "." + ;; + *) + echo "Usage: /etc/init.d/syslog-ng {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 -- cgit v1.2.3 From bc9f8563590e1db082a0801ff22682c58ddcf843 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 13:23:20 +0000 Subject: add opie-autorotateapplet also on borzoi --- packages/meta/opie-collections.inc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 052ddac474..f45f5916e4 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -33,17 +33,22 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished" OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \ opie-style-metal opie-style-web opie-style-phase" -OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \ - openobex-apps libopieobex0 wireless-tools usbutils" -OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \ - bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools " +OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \ + libopieobex0 libopietooth1 \ + opie-bluepin opie-bluetoothapplet opie-bluetoothmanager" +OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \ + opie-bluepin opie-bluetoothapplet opie-bluetoothmanager" + +OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}" +OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}" # # Clamshell models can benefit from the autorotate applet # -OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet" -OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet" -OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet" # Keyboard models can benefit from the VT and logout applets OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet" -- cgit v1.2.3 From 438e4e3b4e48c01d2fb4d9b8901c06ee30951a94 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 14:40:47 +0000 Subject: libopie2: disable the sqlite backend for libopiepim2 --- packages/libopie/libopie2.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 703ae6db34..b19a71c1f9 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -4,7 +4,7 @@ SECTION = "opie/libs" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" -DEPENDS = "libqpe-opie sqlite3 libpcap" +DEPENDS = "libqpe-opie libpcap sqlite3" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" S = "${WORKDIR}/libopie2" @@ -20,7 +20,8 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \ LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"' -EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y' +#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images +EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n' MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui" LIBS = "core2 db2 mm2 net2 pim2 security2 ui2" -- cgit v1.2.3 From 64054157ebfd2ed65e80c5d48cdf120405c2d86c Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 14:53:20 +0000 Subject: Add Topfield patch --- packages/libdvb/files/.mtn2git_empty | 0 packages/libdvb/files/topf2ps.patch | 123 +++++++++++++++++++++++++++++++++++ packages/libdvb/libdvb_0.5.5.1.bb | 6 +- 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 packages/libdvb/files/.mtn2git_empty create mode 100644 packages/libdvb/files/topf2ps.patch diff --git a/packages/libdvb/files/.mtn2git_empty b/packages/libdvb/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libdvb/files/topf2ps.patch b/packages/libdvb/files/topf2ps.patch new file mode 100644 index 0000000000..93503ca92d --- /dev/null +++ b/packages/libdvb/files/topf2ps.patch @@ -0,0 +1,123 @@ +diff -ruN libdvb-0.5.5/Makefile libdvb-0.5.5-topfield/Makefile +--- libdvb-0.5.5/Makefile 2004-09-16 04:56:21.000000000 +1000 ++++ libdvb-0.5.5-topfield/Makefile 2004-12-03 15:53:24.677184191 +1100 +@@ -68,7 +68,7 @@ + make -C libdvbmpeg clean + make -C sample_progs clean + make -C dvb-mpegtools clean +- rm include/*~ ++ -rm -f include/*~ + + dist: + mkdir libdvb-$(VERSION) +diff -ruN libdvb-0.5.5/dvb-mpegtools/Makefile libdvb-0.5.5-topfield/dvb-mpegtools/Makefile +--- libdvb-0.5.5/dvb-mpegtools/Makefile 2004-09-16 04:56:21.000000000 +1000 ++++ libdvb-0.5.5-topfield/dvb-mpegtools/Makefile 2004-12-03 12:38:58.000000000 +1100 +@@ -16,7 +16,7 @@ + pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\ + insert_pat_pmt get_http extract_pes extract_pes_payload\ + change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \ +- change_aspect_221_1 ++ change_aspect_221_1 topf2ps + + .PHONY: depend clean install uninstall + +diff -ruN libdvb-0.5.5/dvb-mpegtools/main.cc libdvb-0.5.5-topfield/dvb-mpegtools/main.cc +--- libdvb-0.5.5/dvb-mpegtools/main.cc 2004-09-16 04:56:21.000000000 +1000 ++++ libdvb-0.5.5-topfield/dvb-mpegtools/main.cc 2004-12-03 12:45:39.000000000 +1100 +@@ -52,7 +52,7 @@ + write(STDOUT_FILENO, buf, count); + } + +-#define PROGS 29 ++#define PROGS 30 + + char *prognames[PROGS+1] = { "streamtype", // 0 + "ts2pes", // 1 +@@ -83,6 +83,7 @@ + "change_aspect_4_3", + "change_aspect_16_9", + "change_aspect_221_1", // 28 ++ "topf2ps", + " " + }; + +@@ -116,6 +117,7 @@ + change_aspect_4_3_, + change_aspect_16_9_, + change_aspect_221_1_, // 28 ++ topf2ps_, + none_, + }; + +@@ -226,6 +228,11 @@ + cerr << "or insert_pat_pmt < (or pipe)" << endl; + break; + ++ case topf2ps_: ++ cerr << "usage: topf2ps " << endl; ++ cerr << "or topf2ps < (or pipe)" << endl; ++ break; ++ + case get_http_: + cerr << "usage: get_http " << endl; + break; +@@ -345,6 +352,10 @@ + } + break; + ++ case topf2ps_: ++ topf_to_ps(fd, STDOUT_FILENO); ++ break; ++ + case insert_pat_pmt_: + insert_pat_pmt( fd, STDOUT_FILENO); + break; +diff -ruN libdvb-0.5.5/include/transform.h libdvb-0.5.5-topfield/include/transform.h +--- libdvb-0.5.5/include/transform.h 2004-09-16 04:56:21.000000000 +1000 ++++ libdvb-0.5.5-topfield/include/transform.h 2004-12-03 12:49:20.000000000 +1100 +@@ -192,6 +192,7 @@ + void kpes_to_ts( p2p *p,uint8_t *buf ,int count ); + void setup_ts2pes( p2p *pa, p2p *pv, uint32_t pida, uint32_t pidv, + void (*pes_write)(uint8_t *buf, int count, void *p)); ++ void topf_to_ps(int fdin, int fdout); + void kts_to_pes( p2p *p, uint8_t *buf); + void pes_repack(p2p *p); + void extract_from_pes(int fdin, int fdout, uint8_t id, int es); +diff -ruN libdvb-0.5.5/libdvbmpeg/transform.c libdvb-0.5.5-topfield/libdvbmpeg/transform.c +--- libdvb-0.5.5/libdvbmpeg/transform.c 2004-09-16 04:56:21.000000000 +1000 ++++ libdvb-0.5.5-topfield/libdvbmpeg/transform.c 2004-12-03 12:50:55.000000000 +1100 +@@ -1247,6 +1247,30 @@ + + } + ++void topf_to_ps( int fdin, int fdout) ++{ ++ ++ uint16_t pida, pidv; ++ uint8_t buf[1880]; ++ int count = 1; ++ ++ if ((count = save_read(fdin, buf, sizeof(buf))) < 0) ++ perror("reading"); ++ ++ if ((count != sizeof(buf)) || (buf[0] != 'T') || (buf[1] != 'F') || ++ (buf[2] != 'r') || (buf[3] != 'c')) { ++ ++ fprintf(stderr, "Couldn't read Topfield header\n"); ++ return; ++ } ++ ++ pida = (buf[24] << 8) + buf[25]; ++ pidv = ((buf[26] & 0x7f) << 8) + buf[27]; ++ ++ fprintf(stderr, "apid %d (0x%02x)\n",pida,pida); ++ fprintf(stderr, "vpid %d (0x%02x)\n",pidv,pidv); ++ ts_to_pes(fdin, pida, pidv, 1); ++} + + #define INN_SIZE 2*IN_SIZE + void insert_pat_pmt( int fdin, int fdout) + + + diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb index 9de579917c..0e0c2b9caf 100644 --- a/packages/libdvb/libdvb_0.5.5.1.bb +++ b/packages/libdvb/libdvb_0.5.5.1.bb @@ -5,9 +5,11 @@ HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 14:58:10 +0000 Subject: Deactivate missing development packages breaking the SDK. --- packages/meta/meta-sdk.bb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 9be1e321bd..b846eebe0c 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -3,9 +3,9 @@ LICENSE = MIT DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \ binutils-cross-sdk gcc-cross-sdk gdb-cross \ libidl libsvg-cairo sed-native \ - meta-gpe \ + meta-gpe gstreamer\ opie-mail" -PR = "r5" +PR = "r7" PACKAGES = "" @@ -51,24 +51,14 @@ libice-dev \ libidl-2-dev \ libipkg-dev \ libjpeg-dev \ -libmailwrapper-dev \ libmb-dev \ libmimedir-dev \ libopenobex-1.0-dev \ -libopiebluez2-dev \ -libopiedb2-dev \ -libopiecore2-dev \ -libopienet2-dev \ -libopiepim2-dev \ -libopieui2-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libpng12-dev \ libpopt-dev \ -libqpe1-dev \ -libqte2-dev \ -libqtaux2-dev \ libreadline-dev \ libschedule-dev \ libsm-dev \ @@ -113,8 +103,21 @@ xextensions-dev \ libxmu-dev \ xproto-dev \ xtrans-dev \ +gstreamer-dev \ " +#libopiebluez2-dev \ +#libopiedb2-dev \ +#libopiecore2-dev \ +#libopienet2-dev \ +#libopiepim2-dev \ +#libopieui2-dev \ +#libqpe1-dev \ +#libqte2-dev \ +#libqtaux2-dev \ +#libmailwrapper-dev \ + + do_populate_sdk() { touch ${DEPLOY_DIR_IPK}/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} -- cgit v1.2.3 From 6b660e1cf6db3d30da70fd404f1479fe78f8e398 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 25 Aug 2005 16:01:03 +0000 Subject: Reduce delay to 2 seconds. --- packages/scap/files/scap.sh | 2 +- packages/scap/scap_0.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index f8e0485333..ba8bc7e584 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -1,6 +1,6 @@ #!/bin/sh -sleep 5 +sleep 2 if [ -x /usr/bin/bl ]; then bl toggle fi diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 30cf1b3299..1b1235531f 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r2" +PR = "r3" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" -- cgit v1.2.3 From dc7bc07d35283af13f89bcc9c1bb4cc1b3f68bcf Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 25 Aug 2005 16:27:13 +0000 Subject: Change text. --- packages/scap/files/scap.desktop | 2 +- packages/scap/scap_0.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/scap/files/scap.desktop b/packages/scap/files/scap.desktop index 6209d8f69c..bba17259bb 100644 --- a/packages/scap/files/scap.desktop +++ b/packages/scap/files/scap.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Online Screenshot +Name=Upload Screenshot Comment=Upload a screenshot to http://handhelds.org/scap Exec=scap Terminal=0 diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 1b1235531f..7bef893e59 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r3" +PR = "r4" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" -- cgit v1.2.3 From c70043e30f03cae08f675034f754b702dbb47807 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 25 Aug 2005 16:52:53 +0000 Subject: New release of gpe-session-scripts. --- .../gpe-session-scripts_0.64.bb | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/gpe-session-scripts/gpe-session-scripts_0.64.bb diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb new file mode 100644 index 0000000000..cf62a9a2d0 --- /dev/null +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb @@ -0,0 +1,31 @@ +LICENSE = "GPL" +PR = "r0" + +inherit gpe + +DESCRIPTION = "GPE session startup scripts" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common" +# more rdepends: keylaunch ipaq-sleep apmd blueprobe +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common" + +SRC_URI += "file://matchbox-session \ + file://disable-composite.xsettings \ + file://remove-x11-common-files.patch;patch=1" + +do_install_append() { + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then + echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar + fi + install -d ${D}${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session + + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite +} + +# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 33a576ad0908d5e3378beeea66a436ca98f17399 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 25 Aug 2005 16:59:09 +0000 Subject: added hostap-daemon 0.4.4 (development version) --- packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty | 0 packages/hostap/hostap-daemon-0.4.4/defconfig | 66 ++++++++++++++++++++++ packages/hostap/hostap-daemon-0.4.4/init | 39 +++++++++++++ .../hostap-daemon-0.4.4/madwifi-bsd-fix.diff | 12 ++++ .../hostap/hostap-daemon-0.4.4/makefile-cross.diff | 26 +++++++++ .../hostap-daemon-0.4.4/mtx-1/.mtn2git_empty | 0 .../hostap/hostap-daemon-0.4.4/mtx-1/defconfig | 66 ++++++++++++++++++++++ packages/hostap/hostap-daemon_0.4.4.bb | 31 ++++++++++ 8 files changed, 240 insertions(+) create mode 100644 packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty create mode 100644 packages/hostap/hostap-daemon-0.4.4/defconfig create mode 100644 packages/hostap/hostap-daemon-0.4.4/init create mode 100644 packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff create mode 100644 packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff create mode 100644 packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty create mode 100644 packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig create mode 100644 packages/hostap/hostap-daemon_0.4.4.bb diff --git a/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hostap/hostap-daemon-0.4.4/defconfig b/packages/hostap/hostap-daemon-0.4.4/defconfig new file mode 100644 index 0000000000..d0e22f2586 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.4.4/defconfig @@ -0,0 +1,66 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# Integrated EAP authenticator +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP authenticator +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP authenticator +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP authenticator +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP authenticator +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP authenticator +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP authenticator +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP authenticator +#CONFIG_EAP_SIM=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# authenticator from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y diff --git a/packages/hostap/hostap-daemon-0.4.4/init b/packages/hostap/hostap-daemon-0.4.4/init new file mode 100644 index 0000000000..b0736c0baa --- /dev/null +++ b/packages/hostap/hostap-daemon-0.4.4/init @@ -0,0 +1,39 @@ +#!/bin/sh +DAEMON=/usr/sbin/hostapd +NAME=httpd +DESC="HOSTAP Daemon" +ARGS="/etc/hostapd.conf" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "starting $DESC: $NAME... " + start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS + echo "done." + ;; + stop) + echo -n "stopping $DESC: $NAME... " + start-stop-daemon -K -n $NAME + echo "done." + ;; + restart) + echo "restarting $DESC: $NAME... " + $0 stop + $0 start + echo "done." + ;; + reload) + echo -n "reloading $DESC: $NAME... " + killall -HUP $(basename ${DAEMON}) + echo "done." + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff b/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff new file mode 100644 index 0000000000..d9dab26a15 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff @@ -0,0 +1,12 @@ +--- driver_madwifi.c.orig 2005-03-18 15:12:53.392793216 +0100 ++++ driver_madwifi.c 2005-03-18 15:13:09.246383104 +0100 +@@ -21,7 +21,8 @@ + #include + #include + +-#include ++#include ++#include + #include + #include + #include diff --git a/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff b/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff new file mode 100644 index 0000000000..25d2ca34bb --- /dev/null +++ b/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff @@ -0,0 +1,26 @@ +--- Makefile.orig 2005-03-18 14:34:27.274376504 +0100 ++++ Makefile 2005-03-18 14:35:56.609795456 +0100 +@@ -1,7 +1,9 @@ +-CC=gcc ++CC?=gcc + DIR_WPA_SUPPLICANT=. + DIR_HOSTAP=. + ++TARGET_PREFIX ?= /usr/local/bin/ ++ + ifndef CFLAGS + CFLAGS = -MMD -O2 -Wall -g + endif +@@ -170,10 +172,10 @@ + fi + + install: all +- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done ++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done + + hostapd: $(OBJS) +- $(CC) -o hostapd $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) + + driver_conf.c: Makefile .config + rm -f driver_conf.c diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig b/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig new file mode 100644 index 0000000000..8c3065c3b9 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig @@ -0,0 +1,66 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# Integrated EAP authenticator +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP authenticator +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP authenticator +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP authenticator +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP authenticator +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP authenticator +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP authenticator +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP authenticator +#CONFIG_EAP_SIM=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# authenticator from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb new file mode 100644 index 0000000000..9363a10d91 --- /dev/null +++ b/packages/hostap/hostap-daemon_0.4.4.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +RDEPENDS = "hostap-modules (${PV}) hostap-utils (${PV})" +DEPENDS_mtx-1_append = "madwifi-modules" + +SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ + file://makefile-cross.diff;patch=1;pnum=0 \ + file://madwifi-bsd-fix.diff;patch=1;pnum=0 \ + file://defconfig \ + file://init" + +S = "${WORKDIR}/hostapd-${PV}" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_compile() { + CFLAGS='${CFLAGS}' CC='${CC}' make +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + make TARGET_PREFIX=${D}${sbindir} install + install -m 0644 hostapd.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +} -- cgit v1.2.3 From 3a605bf40eb097353cfb925c3f770f6729d014c0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 25 Aug 2005 17:00:18 +0000 Subject: added hostap-utils 0.4.0 (development version) --- packages/hostap/hostap-utils_0.4.0.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/hostap/hostap-utils_0.4.0.bb diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb new file mode 100644 index 0000000000..7601129934 --- /dev/null +++ b/packages/hostap/hostap-utils_0.4.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "User mode helpers for the hostap driver" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +RDEPENDS = "hostap-modules (${PV})" +PR = "r1" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ + file://hostap-fw-load.patch;patch=1" +S = "${WORKDIR}/hostap-utils-${PV}" + +BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ + hostap_rid prism2_param prism2_srec split_combined_hex" + +do_install() { + install -d ${D}${sbindir}/ + for f in ${BINARIES} + do + install -m 0755 $f ${D}${sbindir}/ + done +} + -- cgit v1.2.3 From f06e59a89c4c80c714f083e8246e0fc8c15c0776 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 25 Aug 2005 17:13:04 +0000 Subject: Fix bug 257, hotplug and hotplug-doc both provide hotplug --- packages/linux-hotplug/linux-hotplug_20040920.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb index db4cf3f408..ce503a219e 100644 --- a/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -3,12 +3,12 @@ for hotplug Linux support, and lets you plug in new devices \ and use them immediately." HOMEPAGE = "http://linux-hotplug.sourceforge.net/" LICENSE = "GPL" -RPROVIDES = "hotplug" -RCONFLICTS = "hotplug" -RREPLACES = "hotplug" +RPROVIDES_${PN} = "hotplug" +RCONFLICTS_${PN} = "hotplug" +RREPLACES_${PN} = "hotplug" SECTION = "base" RSUGGESTS = "pciutils usbutils" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://userspecified_hcd.patch;patch=1 \ -- cgit v1.2.3 From 4cbbf0366b478815b5d858d5f713ac5f01c2239b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 25 Aug 2005 17:20:16 +0000 Subject: fix older version of linux-hotplug as well --- packages/linux-hotplug/linux-hotplug_20040329.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb index 9f06cd7c55..06d9faee77 100644 --- a/packages/linux-hotplug/linux-hotplug_20040329.bb +++ b/packages/linux-hotplug/linux-hotplug_20040329.bb @@ -3,9 +3,10 @@ DESCRIPTION = "This package contains the scripts necessary \ for hotplug Linux support, and lets you plug in new devices \ and use them immediately." LICENSE = "GPL" -RPROVIDES = "hotplug" -RCONFLICTS = "hotplug" -RREPLACES = "hotplug" +RPROVIDES_${PN} = "hotplug" +RCONFLICTS_${PN} = "hotplug" +RREPLACES_${PN} = "hotplug" +PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \ file://busybox.patch;patch=1 \ -- cgit v1.2.3 From 40beb1b71e8b8703506436d50f5d1f7893ca23b2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 25 Aug 2005 17:25:30 +0000 Subject: updated kdepim/pi to 2.2.3 --- packages/kdepimpi/kdepimpi_2.2.2.bb | 3 --- packages/kdepimpi/kdepimpi_2.2.3.bb | 3 +++ packages/kdepimpi/pwmpi_2.2.2.bb | 3 --- packages/kdepimpi/pwmpi_2.2.3.bb | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/kdepimpi/kdepimpi_2.2.2.bb create mode 100644 packages/kdepimpi/kdepimpi_2.2.3.bb delete mode 100644 packages/kdepimpi/pwmpi_2.2.2.bb create mode 100644 packages/kdepimpi/pwmpi_2.2.3.bb diff --git a/packages/kdepimpi/kdepimpi_2.2.2.bb b/packages/kdepimpi/kdepimpi_2.2.2.bb deleted file mode 100644 index f3dde1a2fd..0000000000 --- a/packages/kdepimpi/kdepimpi_2.2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " - -include kdepimpi-base.inc diff --git a/packages/kdepimpi/kdepimpi_2.2.3.bb b/packages/kdepimpi/kdepimpi_2.2.3.bb new file mode 100644 index 0000000000..f3dde1a2fd --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.2.3.bb @@ -0,0 +1,3 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " + +include kdepimpi-base.inc diff --git a/packages/kdepimpi/pwmpi_2.2.2.bb b/packages/kdepimpi/pwmpi_2.2.2.bb deleted file mode 100644 index 904f640955..0000000000 --- a/packages/kdepimpi/pwmpi_2.2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include kdepimpi_${PV}.bb - -include pwmpi.inc diff --git a/packages/kdepimpi/pwmpi_2.2.3.bb b/packages/kdepimpi/pwmpi_2.2.3.bb new file mode 100644 index 0000000000..904f640955 --- /dev/null +++ b/packages/kdepimpi/pwmpi_2.2.3.bb @@ -0,0 +1,3 @@ +include kdepimpi_${PV}.bb + +include pwmpi.inc -- cgit v1.2.3 From 0b19274db1744fa770a1c4aa5c808c18719b9293 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 25 Aug 2005 18:43:18 +0000 Subject: Move e core dependencies to task-enlightenment-x11-core Add e-image-core to allow for a smaller image e-image should still work as expected, but I haven't tested it yet e-image-core currently doe snot work as you can't login to entrance (keyboard doesn't work). This is propably a missing RDEPENDS --- packages/meta/e-image-core.bb | 18 ++++++++++++++++++ packages/meta/e-image.bb | 19 ++++--------------- packages/meta/meta-e-x11.bb | 22 ++++++++++++++-------- 3 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 packages/meta/e-image-core.bb diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb new file mode 100644 index 0000000000..c7a7630da4 --- /dev/null +++ b/packages/meta/e-image-core.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager" +LICENSE = "MIT" +PR = "r0" + +export IMAGE_BASENAME = "e-image-core" +export IMAGE_LINGUAS = "" + +DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/evas = "evas-x11" +PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" +PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" + +export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11-core xserver-kdrive-fbdev" + +inherit image_ipk diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index d58215d3a7..2183674b6f 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,18 +1,7 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -LICENSE = "MIT" -PR = "r1" +PR = "r2" -export IMAGE_BASENAME = "e-image" -export IMAGE_LINGUAS = "" - -DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/evas = "evas-x11" -PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" -PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" -PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" +include e-image-core.bb -export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev" - -inherit image_ipk +export IMAGE_BASENAME = "e-image" +export IPKG_INSTALL += "task-enlightenment-x11" \ No newline at end of file diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 4ff955e06b..47bec68cac 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" LICENSE = "MIT" -PACKAGES = "task-enlightenment-x11" -PR = "r4" +PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core" +PR = "r5" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -11,14 +11,20 @@ ALLOW_EMPTY = 1 # # X # -DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera bash chkhinge" -RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" +DEPENDS_task-enlightenment-x11-core += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ + ttf-bitstream-vera chkhinge" +RDEPENDS_task-enlightenment-x11-core += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera chkhinge" + +# +# E-core +# +DEPENDS_task-enlightenment-x11-core += "entrance e-wm" +RDEPENDS_task-enlightenment-x11-core += "entrance e-wm" # # E # -DEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire" -RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire" +DEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire" +RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire" -- cgit v1.2.3 From d279eb1b3a8d69cd4ac2dc7be1d0655207d3e62a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 25 Aug 2005 22:13:01 +0000 Subject: gpe-buttonbox : add cvs version --- packages/gpe-buttonbox/.mtn2git_empty | 0 packages/gpe-buttonbox/gpe-buttonbox_cvs.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/gpe-buttonbox/.mtn2git_empty create mode 100644 packages/gpe-buttonbox/gpe-buttonbox_cvs.bb diff --git a/packages/gpe-buttonbox/.mtn2git_empty b/packages/gpe-buttonbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb new file mode 100644 index 0000000000..44c2779c47 --- /dev/null +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +DESCIPTION = "Buttonbox for gpe" + +SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/gpe-buttonbox" + +DEPENDS = "libgpewidget libgpelaunch" + +S = "${WORKDIR}/${PN}" +PV = "0.0+cvs-${CVSDATE}" +PR = "r1" + +inherit autotools + +FILES_${PN} += "${datadir}/gpe" + -- cgit v1.2.3 From b7331fb918e850f33cc0082b2c22c457489f1ad4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 23:36:40 +0000 Subject: add glue package for a sharprom toolchain in usage w/ DISTRO=sharprom-compatible --- conf/distro/sharprom-compatible.conf | 4 +--- packages/sharprom-toolchain/.mtn2git_empty | 0 .../sharprom-toolchain-native_1.0.bb | 24 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 packages/sharprom-toolchain/.mtn2git_empty create mode 100644 packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 6474b7695d..bf07d6b1f0 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -20,8 +20,6 @@ DISTRO_VERSION = "3.1 compatible" DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" -CVSDATE = "20050221" - # # Zaurus # @@ -41,7 +39,7 @@ ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils vi ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial ASSUME_PROVIDED += "virtual/libc linux-libc-headers" -DEPENDS_autoconf-native =+ "sharprom-toolchain" +DEPENDS =+ "sharprom-toolchain-native" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" diff --git a/packages/sharprom-toolchain/.mtn2git_empty b/packages/sharprom-toolchain/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb new file mode 100644 index 0000000000..e60180e6d8 --- /dev/null +++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Precompiled SharpROM toolchain glue package" +LICENSE = "GPL" +SECTION = "base" +# This needs to be extracted to /usr/local/arm : +# SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2" + +inherit native +DEPENDS = "" + +COMPATIBLE_HOST = 'i.86.*-linux' + +do_stage() { + if [ ! -e /usr/local/arm/2.95.3/bin/arm-linux-gcc-2.95 ] + then + die "You need to install the Sharp Toolchain to /usr/local/arm and rename the compiler to arm-linux-gcc-2.95" + fi + if [ ! -e /usr/local/arm/2.95.3/bin/arm-linux-ld-2.11.2 ] + then + die "You need to install the Sharp Toolchain to /usr/local/arm and rename the linker to arm-linux-ld-2.11.2" + fi + ln -sf /usr/local/arm/2.95.3/bin/arm-linux-gcc-2.95 ${STAGING_BINDIR}/arm-linux-gcc + ln -sf /usr/local/arm/2.95.3/bin/arm-linux-ld-2.11.2 ${STAGING_BINDIR}/arm-linux-ld +} + -- cgit v1.2.3 From 1433ea1f97ed4a9b7d0b8a0945e3c7530154a0fb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 23:49:45 +0000 Subject: efl.bbclass: move libfoo.la and libfoo.a into ${PN}-dev --- classes/efl.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index ff6929d757..16c2dba0b8 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -69,8 +69,8 @@ do_stage_append () { } PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" -FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME} = "${libdir}/lib*.so*" FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 7cf581969b6677e61f9e26ecb76e7ee68a44415d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 23:52:46 +0000 Subject: efl: - make the foo.inc files provide virtual/foo - build ecore-fb [and -native] without edb and without curl support for the projected purpose, both dependencies are not needed and this gains us -700MB in a resulting image --- packages/efl/ecore-fb_0.9.9.013.bb | 5 ++-- packages/efl/ecore-native_0.9.9.013.bb | 4 ++- packages/efl/ecore-x11_0.9.9.013.bb | 1 - packages/efl/ecore.inc | 1 + packages/efl/evas-fb_0.9.9.013.bb | 52 +++++++++++++++++----------------- packages/efl/evas-native_0.9.9.013.bb | 2 +- packages/efl/evas.inc | 1 + packages/efl/ewl_0.0.4.004.bb | 1 + 8 files changed, 36 insertions(+), 31 deletions(-) diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb index 87fea43d20..1f3db9ddfe 100644 --- a/packages/efl/ecore-fb_0.9.9.013.bb +++ b/packages/efl/ecore-fb_0.9.9.013.bb @@ -1,6 +1,5 @@ include ecore.inc -PROVIDES += "virtual/ecore" -PR = "r1" +PR = "r2" EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-job \ @@ -16,6 +15,8 @@ EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-ipc \ --enable-ecore-txt \ --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ --enable-ecore-config \ --disable-openssl" diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb index 6968415d34..abfb41d63b 100644 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ b/packages/efl/ecore-native_0.9.9.013.bb @@ -1,3 +1,5 @@ include ecore-fb_${PV}.bb inherit native -DEPENDS = "curl-native eet-native evas-native" +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb index 36a9c06413..b6b452cb71 100644 --- a/packages/efl/ecore-x11_0.9.9.013.bb +++ b/packages/efl/ecore-x11_0.9.9.013.bb @@ -1,5 +1,4 @@ include ecore.inc -PROVIDES += "virtual/ecore" DEPENDS += "evas-x11" PR = "r2" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index ecd5fef642..ccc88b10c3 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -5,6 +5,7 @@ LEAD_SONAME = "libecore.so" LICENSE = "MIT" # can also have openssl, dbus DEPENDS = "virtual/evas curl eet" +PROVIDES = "virtual/ecore" inherit efl diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb index 9286853d5e..492a0badb1 100644 --- a/packages/efl/evas-fb_0.9.9.013.bb +++ b/packages/efl/evas-fb_0.9.9.013.bb @@ -1,31 +1,31 @@ include evas.inc -PROVIDES += "virtual/evas" -PR = "r1" +DEPENDS = "freetype libpng jpeg eet" +PR = "r2" -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --disable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --enable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ +EXTRA_OECONF = "--enable-fb \ + --disable-directfb \ + --disable-buffer \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ --disable-convert-16-rgb-555 \ --disable-convert-16-rgb-444 \ --disable-convert-16-rgb-ipq \ diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb index 3eaa12cf9e..fd94b48ef2 100644 --- a/packages/efl/evas-native_0.9.9.013.bb +++ b/packages/efl/evas-native_0.9.9.013.bb @@ -1,3 +1,3 @@ include evas-fb_${PV}.bb inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native" +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 60f60f3c82..5876c1fd4e 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -5,6 +5,7 @@ your CPU or graphics hardware are too slow." LICENSE = "MIT" # can also depend on valgrind (?) DEPENDS = "freetype libpng jpeg eet edb" +PROVIDES = "virtual/evas" inherit efl diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb index 0ea977fbe0..0205de4216 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.004.bb @@ -1,5 +1,6 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library based on the enlightenment foundation libraries." +# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb DEPENDS = "edb virtual/evas virtual/ecore edje emotion" RDEPENDS += "libewl-themes" LICENSE = "MIT" -- cgit v1.2.3 From 2569d08e4fa8022a5d9df8ef5f3e05a343127adb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 26 Aug 2005 00:35:28 +0000 Subject: linux-oz-2.6: More patch rearranging. Update usb host patches (start pushing to mainline). Add spitz IR support (untested). --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 0bae9c58af..ce910810c9 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r14" +PR = "r15" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -47,11 +47,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ + ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ + ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ + ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \ @@ -61,9 +64,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_pm-r0.patch;patch=1 \ ${RPSRC}/spitzkbd-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ - ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ - ${RPSRC}/pxa_irda-r2.patch;patch=1 \ + ${RPSRC}/pxa_irda-r3.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ @@ -92,14 +94,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/spitz_base-r8.patch;patch=1 \ + ${RPSRC}/spitz_base-r9.patch;patch=1 \ ${RPSRC}/spitz_pm-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ - ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ - ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -158,6 +158,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug" # Enable or disable ELPP via local.conf - default is "no" # ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"} + ############################################################### # module configs specific to this kernel # -- cgit v1.2.3 From b18d365c729f7af14552950135cf6d9abd47203d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 26 Aug 2005 07:49:57 +0000 Subject: linux-oz-2.6: Correct the order of a couple of patches --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index ce910810c9..f639ac23d8 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -48,8 +48,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ - ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ + ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ -- cgit v1.2.3 From 7c2b8a4ba82d520171eb81877c691b094e01cdd3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 10:14:33 +0000 Subject: rrdtool: fix SRC_URI --- packages/rrdtool/rrdtool_1.0.49.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb index bea4ae1a1e..ab482b1131 100644 --- a/packages/rrdtool/rrdtool_1.0.49.bb +++ b/packages/rrdtool/rrdtool_1.0.49.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool" LICENSE = "GPLv2" DEPENDS = "libpng zlib" PR = "r1" -SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-${PV}.tar.gz \ +SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \ file://perl-make-options.diff;patch=1;pnum=0" inherit autotools -- cgit v1.2.3 From a487ca19335b639e2ece5e1195276ec20dfcb12f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 26 Aug 2005 10:15:31 +0000 Subject: linux-oz-2.6: Fix corgi touchscreen and power management issues. Update urls in 2.6.11 kernel --- packages/linux/linux-openzaurus_2.6.11.bb | 10 +++++----- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index ef1a97d2e4..f3204a3030 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -32,19 +32,19 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \ ${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/archive/sharp_multi_pcmcia-r2.patch;patch=1 \ ${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \ ${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \ ${RPSRC}/archive/input_power-r1.patch;patch=1 \ - ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ + ${RPSRC}/archive/corgi_irda-r2.patch;patch=1 \ + ${RPSRC}/archive/corgi_base_extras1-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/archive/corgi_power-r22.patch;patch=1 \ - ${RPSRC}/corgi_power1-r1.patch;patch=1 \ + ${RPSRC}/archive/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \ ${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ - ${RPSRC}/corgi_snd-r6.patch;patch=1 \ + ${RPSRC}/archive/corgi_snd-r6.patch;patch=1 \ ${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r2.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index f639ac23d8..a29faf201f 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r15" +PR = "r16" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -58,9 +58,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \ - ${RPSRC}/sharpsl_ts-r2.patch;patch=1 \ + ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \ ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-r1.patch;patch=1 \ ${RPSRC}/corgi_pm-r0.patch;patch=1 \ ${RPSRC}/spitzkbd-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ @@ -94,7 +94,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/spitz_base-r9.patch;patch=1 \ + ${RPSRC}/spitz_base-r10.patch;patch=1 \ ${RPSRC}/spitz_pm-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ -- cgit v1.2.3 From 97e95c8a6d7a61924dad6c6cc4c313e6cbff016e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:10:06 +0000 Subject: meta-sdk: remove obsolete libxsettings. --- packages/meta/meta-sdk.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index b846eebe0c..d28b6cebc8 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -5,7 +5,7 @@ DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \ libidl libsvg-cairo sed-native \ meta-gpe gstreamer\ opie-mail" -PR = "r7" +PR = "r8" PACKAGES = "" @@ -85,7 +85,6 @@ libxpm-dev \ libxrandr-dev \ libxrender-dev \ libxsettings-client-dev \ -libxsettings-dev \ libxss-dev \ libxt-dev \ libxtst-dev \ -- cgit v1.2.3 From 747ba5684a97326a3049881541ec507b873db454 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:31:02 +0000 Subject: libxsettings-client: Add V 0.14 --- .../libxsettings-client/libxsettings-client_0.14.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/libxsettings-client/libxsettings-client_0.14.bb diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb new file mode 100644 index 0000000000..da6a88b31a --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -0,0 +1,20 @@ +SECTION = "gpe/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS = "libgpewidget libxsettings x11" + +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" +S = ${WORKDIR}/xsettings-client-${PV} + + +headers = "xsettings-client.h xsettings-common.h" +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR} + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + -- cgit v1.2.3 From fb663b93685af48bdfd532dccdf88d893e7bce99 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:37:13 +0000 Subject: libschedule: Add V 0.15. Courtesy by Philippe de Swert. --- packages/libschedule/libschedule_0.15.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/libschedule/libschedule_0.15.bb diff --git a/packages/libschedule/libschedule_0.15.bb b/packages/libschedule/libschedule_0.15.bb new file mode 100644 index 0000000000..e186262cde --- /dev/null +++ b/packages/libschedule/libschedule_0.15.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +PR = "r1" +DESCRIPTION = "RTC alarm handling library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "glib-2.0 sqlite" + +inherit autotools libtool pkgconfig gpe + +headers = "schedule.h" + +do_stage () { + oe_libinstall -so libschedule ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h + done +} + -- cgit v1.2.3 From e35af745a288d02f1aa5e647ec9defa910779c84 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:39:53 +0000 Subject: gpe-announce: Add V 0.13. Contributed by Philippe de Swert. --- packages/gpe-announce/gpe-announce_0.13.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/gpe-announce/gpe-announce_0.13.bb diff --git a/packages/gpe-announce/gpe-announce_0.13.bb b/packages/gpe-announce/gpe-announce_0.13.bb new file mode 100644 index 0000000000..6124b4c4a8 --- /dev/null +++ b/packages/gpe-announce/gpe-announce_0.13.bb @@ -0,0 +1,5 @@ +inherit gpe + +DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" +LICENSE = "GPL" + -- cgit v1.2.3 From 98dbfa8e36b6aeccf407d906ce59da1d1a2417b4 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:42:39 +0000 Subject: gpe-calendar: Add version 0.63, contributed by Philippe de Swert. --- packages/gpe-calendar/gpe-calendar_0.63.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/gpe-calendar/gpe-calendar_0.63.bb diff --git a/packages/gpe-calendar/gpe-calendar_0.63.bb b/packages/gpe-calendar/gpe-calendar_0.63.bb new file mode 100644 index 0000000000..2a2530808b --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.63.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +PR = "r1" + +inherit autotools gpe + +DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE calendar" + -- cgit v1.2.3 From f95d29e62323783cf21dda2861b2b78d86c6f9b0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 13:44:32 +0000 Subject: gpe-clock: Add release 0.21, contributed by Philippe de Swert. --- packages/gpe-clock/gpe-clock_0.21.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/gpe-clock/gpe-clock_0.21.bb diff --git a/packages/gpe-clock/gpe-clock_0.21.bb b/packages/gpe-clock/gpe-clock_0.21.bb new file mode 100644 index 0000000000..f9b8c4dbe1 --- /dev/null +++ b/packages/gpe-clock/gpe-clock_0.21.bb @@ -0,0 +1,10 @@ +inherit gpe + +DESCRIPTION = "GPE panel clock" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce atd" +MAINTAINER = "Phil Blundell " +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + -- cgit v1.2.3 From 8a4dc9207577a7999abffcb90527bbc44382e178 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 26 Aug 2005 16:27:19 +0000 Subject: gpe-nmf: Add version 0.22. --- packages/gpe-nmf/gpe-nmf_0.22.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/gpe-nmf/gpe-nmf_0.22.bb diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb new file mode 100644 index 0000000000..06c115a7cf --- /dev/null +++ b/packages/gpe-nmf/gpe-nmf_0.22.bb @@ -0,0 +1,28 @@ +LICENSE = "GPL" +inherit gpe pkgconfig + +DESCRIPTION = "GPE audio player" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" +RDEPENDS = "esd \ + gst-plugins \ + gst-plugin-audio \ + gst-plugin-audioconvert \ + gst-plugin-audiofile \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-tagedit \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +PARALLEL_MAKE="" + +do_compile() { + oe_runmake PREFIX=${prefix} GST_VERSION="0.8" +} -- cgit v1.2.3 From 5c7723abedc3e2e83ce8a03a8cfd70b4652e83f7 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 26 Aug 2005 18:42:10 +0000 Subject: libao: Fix SRC_URI --- packages/libao/libao_0.8.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb index 8c2601bce8..62275f14fb 100644 --- a/packages/libao/libao_0.8.6.bb +++ b/packages/libao/libao_0.8.6.bb @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" PR = "r0" -SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz" +SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" inherit autotools pkgconfig -- cgit v1.2.3 From 52e2d041671d0fc1268db16543727312465dc7a9 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 26 Aug 2005 18:55:14 +0000 Subject: Add xscreensaver 4.22 - moved 2 of the 4.16 files to files/ to allow use for multiple versions - there are floating point issues with the ifs screensaver (and probaby others) --- packages/xscreensaver/files/.mtn2git_empty | 0 packages/xscreensaver/files/XScreenSaver | 625 +++++++++++++++++++++ packages/xscreensaver/files/fixes.patch | 94 ++++ .../xscreensaver/xscreensaver-4.16/XScreenSaver | 625 --------------------- .../xscreensaver/xscreensaver-4.16/fixes.patch | 94 ---- .../xscreensaver/xscreensaver-4.22/.mtn2git_empty | 0 .../xscreensaver-4.22/configure.in.patch | 15 + packages/xscreensaver/xscreensaver_4.22.bb | 58 ++ 8 files changed, 792 insertions(+), 719 deletions(-) create mode 100644 packages/xscreensaver/files/.mtn2git_empty create mode 100644 packages/xscreensaver/files/XScreenSaver create mode 100644 packages/xscreensaver/files/fixes.patch delete mode 100644 packages/xscreensaver/xscreensaver-4.16/XScreenSaver delete mode 100644 packages/xscreensaver/xscreensaver-4.16/fixes.patch create mode 100644 packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty create mode 100644 packages/xscreensaver/xscreensaver-4.22/configure.in.patch create mode 100644 packages/xscreensaver/xscreensaver_4.22.bb diff --git a/packages/xscreensaver/files/.mtn2git_empty b/packages/xscreensaver/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xscreensaver/files/XScreenSaver b/packages/xscreensaver/files/XScreenSaver new file mode 100644 index 0000000000..fa27d2c536 --- /dev/null +++ b/packages/xscreensaver/files/XScreenSaver @@ -0,0 +1,625 @@ +! +! XScreenSaver +! +! a screen saver and locker for the X window system +! by Jamie Zawinski +! +! version 4.16 +! 12-May-2004 +! +! See "man xscreensaver" for more info. The latest version is always +! available at http://www.jwz.org/xscreensaver/ + + +! These resources, when placed in the system-wide app-defaults directory +! (e.g., /usr/lib/X11/app-defaults/XScreenSaver) will provide the default +! settings for new users. However, if you have a ".xscreensaver" file in +! your home directory, the settings in that file take precedence. + + +! Don't hand this file to "xrdb" -- that isn't how app-defaults files work. +! Though app-defaults files have (mostly) the same syntax as your ~/.Xdefaults +! file, they are used differently, and if you run this file through xrdb, +! you will probably mess things up. + +#error Do not run app-defaults files through xrdb! +#error That does not do what you might expect. +#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead. + +! /* (xrdb prevention kludge: whole file) + +*timeout: 0:10:00 +*cycle: 0:10:00 +*lockTimeout: 0:00:00 +*passwdTimeout: 0:00:30 +*dpmsEnabled: False +*dpmsStandby: 2:00:00 +*dpmsSuspend: 2:00:00 +*dpmsOff: 4:00:00 +*grabDesktopImages: True +*grabVideoFrames: False +*chooseRandomImages: False +*imageDirectory: +*mode: one +*selected: 129 +*nice: 10 +*memoryLimit: 0 +*lock: False +*lockVTs: True +*verbose: False +*timestamp: True +*fade: True +*unfade: False +*fadeSeconds: 0:00:03 +*fadeTicks: 20 +*splash: False +*splashDuration: 0:00:05 +*visualID: default +*captureStderr: True +*ignoreUninstalledPrograms: True + +*overlayTextForeground: #FFFF00 +*overlayTextBackground: #000000 +*overlayStderr: True +*font: *-medium-r-*-140-*-m-* + +! The default is to use these extensions if available (as noted.) +*sgiSaverExtension: True +*mitSaverExtension: False +*xidleExtension: True +*procInterrupts: True + +! Set this to True if you are experiencing longstanding XFree86 bug #421 +! (xscreensaver not covering the whole screen) +GetViewPortIsFullOfLies: False + +! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.) +*demoCommand: xscreensaver-demo + +! This is what the "Prefs" button on the splash screen runs (/bin/sh syntax.) +*prefsCommand: xscreensaver-demo -prefs + +! This is the URL that the "Help" button on the splash screen loads. +*helpURL: http://www.jwz.org/xscreensaver/man.html + +! This is how the "Help" button loads URLs (/bin/sh syntax.) +! The "helpURL" will be substituted for up to two occurrences of "%s". +*loadURL: mozilla '%s' || netscape '%s' +! *loadURL: gnome-url-show '%s' || gnome-moz-remote --newwin '%s' + +! This is what the "Manual" button in xscreensaver-demo runs (/bin/sh syntax.) +*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ + -e /bin/sh -c 'man "%s" ; read foo' +! For GNOME systems: +! *manualCommand: yelp 'man:%s' || gnome-help-browser 'man:%s' + + +! The format used for printing the date and time in the password dialog box +! (see the strftime(3) manual page for details.) +*dateFormat: %d-%b-%y (%a); %I:%M %p +! To show the time only: +! *dateFormat: %I:%M %p +! For 24 hour time: +! *dateFormat: %H:%M + + +! Turning on "installColormap" on 8-bit systems interacts erratically with +! certain jurassic window managers. If your screen turns some color other +! than black, the window manager is buggy, and you need to set this resource +! to false. Or switch WMs. Or join the 21st century and get a 24-bit +! graphics card. +! +*installColormap: True + + +! This is the list of installed screen saver modes. See "man xscreensaver" +! for the syntax used here. +! +! If you want to disable a screensaver, DO NOT remove it from this list: +! instead, mark it as inactive by placing a "-" at the beginning of the line. +! +! You can use the `xscreensaver-demo' program to edit the current list of +! screen savers interactively. +! +*programs: \ + "Qix (solid)" qix -root -solid -segments 100 \n\ + "Qix (transparent)" qix -root -count 4 -solid -transparent \n\ + "Qix (linear)" qix -root -count 5 -solid -transparent \ + -linear -segments 250 -size 100 \n\ +- "Qix (xor)" qix -root -linear -count 5 -size 200 \ + -spread 30 -segments 75 -solid -xor \n\ + \ + "Attraction (balls)" attraction -root -mode balls \n\ + "Attraction (lines)" attraction -root -mode lines -points 3 \ + -segments 200 \n\ +- "Attraction (poly)" attraction -root -mode polygons \n\ + "Attraction (splines)" attraction -root -mode splines -segments \ + 300 \n\ + "Attraction (orbital)" attraction -root -mode lines -radius 300 \ + -orbit -vmult 0.5 \n\ + \ + pyro -root \n\ + rocks -root \n\ + helix -root \n\ + pedal -root \n\ + rorschach -root -offset 7 \n\ + hopalong -root \n\ + greynetic -root \n\ + imsmap -root \n\ + slidescreen -root \n\ + decayscreen -root \n\ + jigsaw -root \n\ + blitspin -root -grab \n\ + slip -root \n\ + distort -root \n\ + spotlight -root \n\ + "Ripples (oily)" ripples -root -oily -light 2 \n\ + "Ripples (stir)" ripples -root -oily -light 2 -stir \n\ + "Ripples (desktop)" ripples -root -water -light 6 \n\ + hypercube -root \n\ +- hyperball -root \n\ + halo -root \n\ + maze -root \n\ + noseguy -root \n\ + flame -root \n\ + lmorph -root \n\ + deco -root \n\ + moire -root \n\ + moire2 -root \n\ + lightning -root \n\ + strange -root \n\ + spiral -root \n\ + laser -root \n\ + grav -root \n\ + "Grav (trails)" grav -root -trail -decay \n\ + drift -root \n\ + ifs -root \n\ + julia -root \n\ + penrose -root \n\ + sierpinski -root \n\ + braid -root \n\ + galaxy -root \n\ + bouboule -root \n\ + swirl -root \n\ + flag -root \n\ + sphere -root \n\ + forest -root \n\ + lisa -root \n\ + lissie -root \n\ + goop -root -max-velocity 0.5 -elasticity \ + 0.9 \n\ + starfish -root \n\ + "Starfish (blob)" starfish -root -blob \n\ + munch -root \n\ + mismunch -root \n\ + fadeplot -root \n\ + coral -root -delay 0 \n\ + mountain -root \n\ + triangle -root -delay 1 \n\ + worm -root \n\ + rotor -root \n\ + ant -root \n\ + demon -root \n\ + loop -root \n\ + vines -root \n\ + kaleidescope -root \n\ + xjack -root \n\ + xlyap -root -randomize \n\ + cynosure -root \n\ + flow -root \n\ + epicycle -root \n\ + interference -root \n\ + truchet -root -randomize \n\ + bsod -root \n\ + crystal -root \n\ + discrete -root \n\ + kumppa -root \n\ + rd-bomb -root \n\ + "RD-Bomb (mobile)" rd-bomb -root -speed 1 -size 0.1 \n\ + sonar -root \n\ + t3d -root \n\ + penetrate -root \n\ + deluxe -root \n\ + compass -root \n\ + squiral -root \n\ + xflame -root \n\ + wander -root \n\ + "Wander (spots)" wander -root -advance 0 -size 10 -circles \ + -length 10000 -reset 100000 \n\ + critical -root \n\ + phosphor -root \n\ + xmatrix -root \n\ + petri -root -size 2 -count 20 \n\ + "Petri 2" petri -root -minlifespeed 0.02 \ + -maxlifespeed 0.03 -minlifespan 1 \ + -maxlifespan 1 -instantdeathchan 0 \ + -minorchan 0 -anychan 0.3 \n\ + shadebobs -root \n\ + ccurve -root \n\ + blaster -root \n\ + bumps -root \n\ + xteevee -root \n\ + xanalogtv -root \n\ + xspirograph -root \n\ + nerverot -root \n\ +- "NerveRot (dense)" nerverot -root -count 1000 \n\ +- "NerveRot (thick)" nerverot -root -count 100 -line-width 4 \ + -max-nerve-radius 0.8 -nervousness 0.5 -db \n\ + xrayswarm -root \n\ +- "Zoom (Fatbits)" zoom -root \n\ + "Zoom (Lenses)" zoom -root -lenses \n\ + rotzoomer -root \n\ +- "RotZoomer (mobile)" rotzoomer -root -move \n\ +- "RotZoomer (sweep)" rotzoomer -root -sweep \n\ + whirlwindwarp -root \n\ + "WhirlyGig" whirlygig -root \n\ + "SpeedMine" speedmine -root \n\ + "SpeedWorm" speedmine -root -worm \n\ + vermiculate -root \n\ + twang -root \n\ + apollonian -root \n\ + euler2d -root \n\ + "Euler2d (dense)" euler2d -root -count 4000 -eulertail 400 \ + -ncolors 230 \n\ +- juggle -root \n\ + polyominoes -root \n\ +- thornbird -root \n\ + fluidballs -root \n\ + anemone -root \n\ + halftone -root \n\ + metaballs -root \n\ + eruption -root \n\ + popsquares -root \n\ + barcode -root \n\ + piecewise -root \n\ + cloudlife -root \n\ + "FontGlide" fontglide -root -page \n\ + "FontGlide (scroller)" fontglide -root -scroll \n\ + apple2 -root \n\ + bubbles -root \n\ + pong -root \n\ + wormhole -root \n\ + pacman -root \n\ + fuzzyflakes -root \n\ +- default-n: webcollage -root \n\ +- default-n: "WebCollage (whacked)" \ + webcollage -root -filter \ + 'vidwhacker -stdin -stdout' \n\ +- default-n: vidwhacker -root \n\ + \ +- GL: gears -root \n\ +- GL: "Gears (planetary)" gears -root -planetary \n\ +- GL: superquadrics -root \n\ +- GL: morph3d -root \n\ +- GL: cage -root \n\ +- GL: moebius -root \n\ +- GL: stairs -root \n\ +- GL: pipes -root \n\ +- GL: sproingies -root \n\ +- GL: rubik -root \n\ +- GL: atlantis -root \n\ +- GL: lament -root \n\ +- GL: bubble3d -root \n\ +- GL: glplanet -root \n\ +- GL: flurry -root -preset random \n\ +- GL: pulsar -root \n\ +- GL: "Pulsar (textures)" \ + pulsar -root -texture -mipmap \ + -texture_quality -light -fog \n\ +- GL: extrusion -root \n\ +- GL: sierpinski3d -root \n\ +- GL: menger -root \n\ +- GL: "GFlux" gflux -root \n\ +- GL: "GFlux (grab)" gflux -root -mode grab \n\ +- GL: stonerview -root \n\ +- GL: starwars -root \n\ +- GL: gltext -root \n\ +- GL: "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root \n\ +- GL: "Molecule" molecule -root \n\ +- GL: "Molecule (lumpy)" molecule -root -no-bonds -no-labels \n\ +- GL: dangerball -root \n\ +- GL: circuit -root \n\ +- GL: engine -root \n\ +- GL: flipscreen3d -root \n\ +- GL: glsnake -root \n\ +- GL: boxed -root \n\ +- GL: "GLForestFire" glforestfire -root \n\ +- GL: "GLForestFire (rain)" glforestfire -root -count 0 \n\ +- GL: sballs -root \n\ +- GL: cubenetic -root \n\ +- GL: spheremonics -root \n\ +- GL: lavalite -root \n\ +- GL: queens -root \n\ +- GL: endgame -root \n\ +- GL: glblur -root \n\ +- GL: atunnel -root \n\ +- GL: flyingtoasters -root \n\ +- GL: bouncingcow -root \n\ +- GL: jigglypuff -root -random \n\ +- GL: klein -root -random \n\ +- GL: "HyperTorus (striped)" hypertorus -root \n\ +- GL: "HyperTorus (solid)" hypertorus -root -solid -transparent \n\ +- GL: glmatrix -root \n\ +- GL: cubestorm -root \n\ +- GL: glknots -root \n\ +- GL: blocktube -root \n\ +- GL: flipflop -root \n\ +- GL: antspotlight -root \n\ +- GL: glslideshow -root \n\ +- GL: polytopes -root \n\ +- GL: gleidescope -root \n\ +- GL: mirrorblob -root \n\ +- GL: "MirrorBlob (color only)" \ + mirrorblob -root -colour -no-texture \n\ +- GL: blinkbox -root \n\ +- GL: noof -root \n\ +- GL: polyhedra -root \n\ + \ +- xdaliclock -root -builtin3 -cycle \n\ +- default-n: xearth -nofork -nostars -ncolors 50 \ + -night 3 -wait 0 -timewarp 400.0 -pos \ + sunrel/38/-30 \n\ +- xplanet -vroot -wait 1 -timewarp 90000 \ + -label -origin moon \n\ +- xmountains -b -M -Z 0 -r 1 \n\ +- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\ +- xaos -root -autopilot -nogui -delay 10000 \ + -maxframerate 30 \ + -incoloring -1 -outcoloring -1 \n\ +- xfishtank -d -s \n\ +- xsnow \n\ +- goban -root \n\ +- electricsheep \n\ +- cosmos -root \n\ +- GL: sphereEversion --root \n\ +- GL: fireflies -root \n\ +- GL: antinspect -root \n\ +- GL: providence -root \n + + + +!============================================================================= +! +! You probably don't want to change anything after this point. +! +!============================================================================= + + +XScreenSaver.pointerPollTime: 0:00:05 +XScreenSaver.initialDelay: 0:00:00 +XScreenSaver.windowCreationTimeout: 0:00:30 +XScreenSaver.bourneShell: /bin/sh + + +! Resources for the password and splash-screen dialog boxes of +! the "xscreensaver" daemon. +! +*Dialog.headingFont: *-times-bold-r-*-*-*-180-*-*-*-iso8859-1 +*Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 +*Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 +*Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 +*Dialog.dateFont: *-courier-medium-r-*-*-*-80-*-*-*-iso8859-1 +*Dialog.foreground: #000000 +*Dialog.background: #D6D6D6 +*Dialog.Button.foreground: #000000 +*Dialog.Button.background: #EAEAEA +!*Dialog.Button.background: #D6D6D6 +!*Dialog.Button.pointBackground: #EAEAEA +!*Dialog.Button.clickBackground: #C3C3C3 +*Dialog.text.foreground: #000000 +*Dialog.text.background: #FFFFFF +*passwd.thermometer.foreground: #FF0000 +*passwd.thermometer.background: #FFFFFF +*Dialog.topShadowColor: #FFFFFF +*Dialog.bottomShadowColor: #666666 +*Dialog.logo.width: 210 +*Dialog.logo.height: 210 +*Dialog.internalBorderWidth: 30 +*Dialog.borderWidth: 1 +*Dialog.shadowThickness: 2 + +*passwd.heading.label: XScreenSaver %s +*passwd.body.label: This display is locked. +*passwd.user.label: User: +*passwd.passwd.label: Password: +*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1 +*passwd.thermometer.width: 8 + +*splash.heading.label: XScreenSaver %s +*splash.body.label: Copyright © 1991-2004 by +*splash.body2.label: Jamie Zawinski +*splash.demo.label: Settings +*splash.help.label: Help + + +! Resources for the Motif dialog boxes of the "xscreensaver-demo" program. +! +*fontList: *-helvetica-medium-r-*-*-*-120-*-*-*-iso8859-1 +*demoDialog*label1.fontList: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1 +*cmdText.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 +*label0.fontList: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 +XScreenSaver*doc.fontList: *-helvetica-medium-r-*-*-*-100-*-*-*-iso8859-1 +! above must be fully qualified to get around *sgiMode. + +*foreground: #000000 +*background: #C0C0C0 +*XmTextField.foreground: #000000 +*XmTextField.background: #FFFFFF +*list.foreground: #000000 +*list.background: #FFFFFF + +*ApplicationShell.title: XScreenSaver +*warning.title: XScreenSaver +*warning_popup.title: XScreenSaver +*allowShellResize: True +*autoUnmanage: False + +*menubar*file.labelString: File +*menubar*file.mnemonic: F +*file.blank.labelString: Blank Screen Now +*file.blank.mnemonic: B +*file.lock.labelString: Lock Screen Now +*file.lock.mnemonic: L +*file.kill.labelString: Kill Daemon +*file.kill.mnemonic: K +*file.restart.labelString: Restart Daemon +*file.restart.mnemonic: R +*file.exit.labelString: Exit +*file.exit.mnemonic: E + +*menubar*edit.labelString: Edit +*menubar*edit.mnemonic: E +*edit.cut.labelString: Cut +*edit.cut.mnemonic: u +*edit.copy.labelString: Copy +*edit.copy.mnemonic: C +*edit.paste.labelString: Paste +*edit.paste.mnemonic: P + +*menubar*help.labelString: Help +*menubar*help.mnemonic: H +*help.about.labelString: About... +*help.about.mnemonic: A +*help.docMenu.labelString: Documentation... +*help.docMenu.mnemonic: D + +*demoTab.marginWidth: 10 +*optionsTab.marginWidth: 10 + +*XmScrolledWindow.topOffset: 10 +*XmScrolledWindow.leftOffset: 10 +*demoTab.topOffset: 4 +*form1.bottomOffset: 10 +*form3.leftOffset: 10 +*form3.rightOffset: 10 +*frame.topOffset: 10 +*frame.bottomOffset: 10 +*enabled.topOffset: 10 +*visLabel.topOffset: 10 +*combo.topOffset: 10 +*form4.bottomOffset: 4 +*hr.bottomOffset: 4 +*XmComboBox.marginWidth: 0 +*XmComboBox.marginHeight: 0 + +*demo.marginWidth: 30 +*demo.marginHeight: 4 +*man.marginWidth: 10 +*man.marginHeight: 4 +*down.leftOffset: 40 +*down.marginWidth: 4 +*down.marginHeight: 4 +*up.marginWidth: 4 +*up.marginHeight: 4 +*frame.traversalOn: False + +*list.automaticSelection: True +*list.visibleItemCount: 20 +*doc.columns: 60 +*combo.columns: 11 + +*demoTab.labelString: Graphics Demos +*optionsTab.labelString: Screensaver Options +*down.labelString: \\/ +*up.labelString: /\\ +*frameLabel.labelString: +*cmdLabel.labelString: Command Line: +*cmdLabel.alignment: ALIGNMENT_BEGINNING +*enabled.labelString: Enabled +*visLabel.labelString: Visual: +*visLabel.alignment: ALIGNMENT_END +*visLabel.leftOffset: 20 +*demo.labelString: Demo +*man.labelString: Documentation... +*done.labelString: Quit + +*preferencesLabel.labelString: XScreenSaver Parameters + +*timeoutLabel.labelString: Saver Timeout +*cycleLabel.labelString: Cycle Timeout +*fadeSecondsLabel.labelString: Fade Duration +*fadeTicksLabel.labelString: Fade Ticks +*lockLabel.labelString: Lock Timeout +*passwdLabel.labelString: Password Timeout +*preferencesForm*XmTextField.columns: 8 + +*verboseToggle.labelString: Verbose +*cmapToggle.labelString: Install Colormap +*fadeToggle.labelString: Fade Colormap +*unfadeToggle.labelString: Unfade Colormap +*lockToggle.labelString: Require Password + + +*OK.marginWidth: 30 +*OK.marginHeight: 4 +*OK.leftOffset: 10 +*OK.bottomOffset: 10 +*Cancel.marginWidth: 30 +*Cancel.marginHeight: 4 +*Cancel.rightOffset: 10 +*Cancel.bottomOffset: 10 + + +!============================================================================= +! +! Pretty names for the hacks that have unusual capitalization. +! +!============================================================================= + +*hacks.imsmap.name: IMSmap +*hacks.slidescreen.name: SlideScreen +*hacks.decayscreen.name: DecayScreen +*hacks.blitspin.name: BlitSpin +*hacks.lmorph.name: LMorph +*hacks.ifs.name: IFS +*hacks.fadeplot.name: FadePlot +*hacks.bsod.name: BSOD +*hacks.rd-bomb.name: RD-Bomb +*hacks.t3d.name: T3D +*hacks.shadebobs.name: ShadeBobs +*hacks.ccurve.name: C Curve +*hacks.xteevee.name: XTeeVee +*hacks.xanalogtv.name: XAnalogTV +*hacks.xspirograph.name: XSpiroGraph +*hacks.nerverot.name: NerveRot +*hacks.webcollage.name: WebCollage +*hacks.vidwhacker.name: VidWhacker +*hacks.morph3d.name: Morph3D +*hacks.bubble3d.name: Bubble3D +*hacks.sierpinski3d.name: Sierpinski3D +*hacks.gflux.name: GFlux +*hacks.xrayswarm.name: XRaySwarm +*hacks.whirlwindwarp.name: WhirlwindWarp +*hacks.rotzoomer.name: RotZoomer +*hacks.stonerview.name: StonerView +*hacks.starwars.name: StarWars +*hacks.dangerball.name: DangerBall +*hacks.whirlygig.name: WhirlyGig +*hacks.speedmine.name: SpeedMine +*hacks.glforestfire.name: GLForestFire +*hacks.sballs.name: SBalls +*hacks.xdaliclock.name: XDaliClock +*hacks.xplanetbg.name: XPlanet +*hacks.xplanet.name: XPlanet +*hacks.xaos.name: XaoS +*hacks.xfishtank.name: XFishTank +*hacks.electricsheep.name: ElectricSheep +*hacks.sphereEversion.name: SphereEversion +*hacks.fluidballs.name: FluidBalls +*hacks.flyingtoasters.name: FlyingToasters +*hacks.bouncingcow.name: BouncingCow +*hacks.jigglypuff.name: JigglyPuff +*hacks.hypertorus.name: HyperTorus +*hacks.cubestorm.name: CubeStorm +*hacks.blocktube.name: BlockTube +*hacks.flipflop.name: FlipFlop +*hacks.antspotlight.name: AntSpotlight +*hacks.fontglide.name: FontGlide +*hacks.mirrorblob.name: MirrorBlob +*hacks.blinkbox.name: BlinkBox +*hacks.fuzzyflakes.name: FuzzyFlakes + +! obsolete, but still used by xscreensaver-demo-Xm. +*hacks.documentation.isInstalled: True + +! (xrdb prevention kludge: whole file) */ diff --git a/packages/xscreensaver/files/fixes.patch b/packages/xscreensaver/files/fixes.patch new file mode 100644 index 0000000000..3d138bc490 --- /dev/null +++ b/packages/xscreensaver/files/fixes.patch @@ -0,0 +1,94 @@ +diff --exclude '*.o' -u xscreensaver-4.16/hacks/bouboule.c xscreensaver-4.16.new/hacks/bouboule.c +--- xscreensaver-4.16/hacks/bouboule.c 2003-10-18 17:29:50.000000000 -0700 ++++ xscreensaver-4.16.new/hacks/bouboule.c 2004-08-06 13:44:21.282983912 -0700 +@@ -105,7 +105,7 @@ + * erase the whole window than to erase each star + */ + +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + #define ADAPT_ERASE 1 /* If 1, then we try ADAPT_CHECKS black XFillArcs, + * and after, ADAPT_CHECKS XFillRectangle. + * We check which method seems better, knowing that +diff --exclude '*.o' -u xscreensaver-4.16/hacks/speedmine.c xscreensaver-4.16.new/hacks/speedmine.c +--- xscreensaver-4.16/hacks/speedmine.c 2003-05-19 21:31:29.000000000 -0700 ++++ xscreensaver-4.16.new/hacks/speedmine.c 2004-08-06 13:46:25.056167528 -0700 +@@ -174,7 +174,7 @@ + /* a forward declaration ... */ + static void change_colors(void); + +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + static int total_nframes = 0; + static int nframes = 0; + static double fps = 0.0; +@@ -189,7 +189,7 @@ + static double get_time(void) { + struct timeval t; + float f; +-#if GETTIMEOFDAY_TWO_ARGS ++#ifdef GETTIMEOFDAY_TWO_ARGS + gettimeofday(&t, NULL); + #else + gettimeofday(&t); +@@ -205,7 +205,7 @@ + * initialises the timing structures + */ + static void init_time(void) { +-#if GETTIMEOFDAY_TWO_ARGS ++#ifdef GETTIMEOFDAY_TWO_ARGS + gettimeofday(&start_time, NULL); + #else + gettimeofday(&start_time); +@@ -1194,7 +1194,7 @@ + render_speedmine (dpy, dbuf); + XCopyArea (dpy, dbuf, window, draw_gc, 0, 0, width, height, 0, 0); + +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + fps_end = get_time(); + nframes++; + total_nframes++; +diff --exclude '*.o' -u xscreensaver-4.16/hacks/xrayswarm.c xscreensaver-4.16.new/hacks/xrayswarm.c +--- xscreensaver-4.16/hacks/xrayswarm.c 2003-07-21 01:05:51.000000000 -0700 ++++ xscreensaver-4.16.new/hacks/xrayswarm.c 2004-08-06 13:47:01.984553560 -0700 +@@ -980,10 +980,10 @@ + } + } + +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + static struct timeval startupTime; + static void initTime(void) { +-#if GETTIMEOFDAY_TWO_ARGS ++#ifdef GETTIMEOFDAY_TWO_ARGS + gettimeofday(&startupTime, NULL); + #else + gettimeofday(&startupTime); +@@ -993,7 +993,7 @@ + static double getTime(void) { + struct timeval t; + float f; +-#if GETTIMEOFDAY_TWO_ARGS ++#ifdef GETTIMEOFDAY_TWO_ARGS + gettimeofday(&t, NULL); + #else + gettimeofday(&t); +@@ -1033,7 +1033,7 @@ + } + + nframes = 0; +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + start = getTime(); + #endif + +@@ -1055,7 +1055,7 @@ + XSync(dpy, False); + screenhack_handle_events (dpy); + } +-#if HAVE_GETTIMEOFDAY ++#ifdef HAVE_GETTIMEOFDAY + end = getTime(); + nframes++; + diff --git a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver b/packages/xscreensaver/xscreensaver-4.16/XScreenSaver deleted file mode 100644 index fa27d2c536..0000000000 --- a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver +++ /dev/null @@ -1,625 +0,0 @@ -! -! XScreenSaver -! -! a screen saver and locker for the X window system -! by Jamie Zawinski -! -! version 4.16 -! 12-May-2004 -! -! See "man xscreensaver" for more info. The latest version is always -! available at http://www.jwz.org/xscreensaver/ - - -! These resources, when placed in the system-wide app-defaults directory -! (e.g., /usr/lib/X11/app-defaults/XScreenSaver) will provide the default -! settings for new users. However, if you have a ".xscreensaver" file in -! your home directory, the settings in that file take precedence. - - -! Don't hand this file to "xrdb" -- that isn't how app-defaults files work. -! Though app-defaults files have (mostly) the same syntax as your ~/.Xdefaults -! file, they are used differently, and if you run this file through xrdb, -! you will probably mess things up. - -#error Do not run app-defaults files through xrdb! -#error That does not do what you might expect. -#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead. - -! /* (xrdb prevention kludge: whole file) - -*timeout: 0:10:00 -*cycle: 0:10:00 -*lockTimeout: 0:00:00 -*passwdTimeout: 0:00:30 -*dpmsEnabled: False -*dpmsStandby: 2:00:00 -*dpmsSuspend: 2:00:00 -*dpmsOff: 4:00:00 -*grabDesktopImages: True -*grabVideoFrames: False -*chooseRandomImages: False -*imageDirectory: -*mode: one -*selected: 129 -*nice: 10 -*memoryLimit: 0 -*lock: False -*lockVTs: True -*verbose: False -*timestamp: True -*fade: True -*unfade: False -*fadeSeconds: 0:00:03 -*fadeTicks: 20 -*splash: False -*splashDuration: 0:00:05 -*visualID: default -*captureStderr: True -*ignoreUninstalledPrograms: True - -*overlayTextForeground: #FFFF00 -*overlayTextBackground: #000000 -*overlayStderr: True -*font: *-medium-r-*-140-*-m-* - -! The default is to use these extensions if available (as noted.) -*sgiSaverExtension: True -*mitSaverExtension: False -*xidleExtension: True -*procInterrupts: True - -! Set this to True if you are experiencing longstanding XFree86 bug #421 -! (xscreensaver not covering the whole screen) -GetViewPortIsFullOfLies: False - -! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.) -*demoCommand: xscreensaver-demo - -! This is what the "Prefs" button on the splash screen runs (/bin/sh syntax.) -*prefsCommand: xscreensaver-demo -prefs - -! This is the URL that the "Help" button on the splash screen loads. -*helpURL: http://www.jwz.org/xscreensaver/man.html - -! This is how the "Help" button loads URLs (/bin/sh syntax.) -! The "helpURL" will be substituted for up to two occurrences of "%s". -*loadURL: mozilla '%s' || netscape '%s' -! *loadURL: gnome-url-show '%s' || gnome-moz-remote --newwin '%s' - -! This is what the "Manual" button in xscreensaver-demo runs (/bin/sh syntax.) -*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ - -e /bin/sh -c 'man "%s" ; read foo' -! For GNOME systems: -! *manualCommand: yelp 'man:%s' || gnome-help-browser 'man:%s' - - -! The format used for printing the date and time in the password dialog box -! (see the strftime(3) manual page for details.) -*dateFormat: %d-%b-%y (%a); %I:%M %p -! To show the time only: -! *dateFormat: %I:%M %p -! For 24 hour time: -! *dateFormat: %H:%M - - -! Turning on "installColormap" on 8-bit systems interacts erratically with -! certain jurassic window managers. If your screen turns some color other -! than black, the window manager is buggy, and you need to set this resource -! to false. Or switch WMs. Or join the 21st century and get a 24-bit -! graphics card. -! -*installColormap: True - - -! This is the list of installed screen saver modes. See "man xscreensaver" -! for the syntax used here. -! -! If you want to disable a screensaver, DO NOT remove it from this list: -! instead, mark it as inactive by placing a "-" at the beginning of the line. -! -! You can use the `xscreensaver-demo' program to edit the current list of -! screen savers interactively. -! -*programs: \ - "Qix (solid)" qix -root -solid -segments 100 \n\ - "Qix (transparent)" qix -root -count 4 -solid -transparent \n\ - "Qix (linear)" qix -root -count 5 -solid -transparent \ - -linear -segments 250 -size 100 \n\ -- "Qix (xor)" qix -root -linear -count 5 -size 200 \ - -spread 30 -segments 75 -solid -xor \n\ - \ - "Attraction (balls)" attraction -root -mode balls \n\ - "Attraction (lines)" attraction -root -mode lines -points 3 \ - -segments 200 \n\ -- "Attraction (poly)" attraction -root -mode polygons \n\ - "Attraction (splines)" attraction -root -mode splines -segments \ - 300 \n\ - "Attraction (orbital)" attraction -root -mode lines -radius 300 \ - -orbit -vmult 0.5 \n\ - \ - pyro -root \n\ - rocks -root \n\ - helix -root \n\ - pedal -root \n\ - rorschach -root -offset 7 \n\ - hopalong -root \n\ - greynetic -root \n\ - imsmap -root \n\ - slidescreen -root \n\ - decayscreen -root \n\ - jigsaw -root \n\ - blitspin -root -grab \n\ - slip -root \n\ - distort -root \n\ - spotlight -root \n\ - "Ripples (oily)" ripples -root -oily -light 2 \n\ - "Ripples (stir)" ripples -root -oily -light 2 -stir \n\ - "Ripples (desktop)" ripples -root -water -light 6 \n\ - hypercube -root \n\ -- hyperball -root \n\ - halo -root \n\ - maze -root \n\ - noseguy -root \n\ - flame -root \n\ - lmorph -root \n\ - deco -root \n\ - moire -root \n\ - moire2 -root \n\ - lightning -root \n\ - strange -root \n\ - spiral -root \n\ - laser -root \n\ - grav -root \n\ - "Grav (trails)" grav -root -trail -decay \n\ - drift -root \n\ - ifs -root \n\ - julia -root \n\ - penrose -root \n\ - sierpinski -root \n\ - braid -root \n\ - galaxy -root \n\ - bouboule -root \n\ - swirl -root \n\ - flag -root \n\ - sphere -root \n\ - forest -root \n\ - lisa -root \n\ - lissie -root \n\ - goop -root -max-velocity 0.5 -elasticity \ - 0.9 \n\ - starfish -root \n\ - "Starfish (blob)" starfish -root -blob \n\ - munch -root \n\ - mismunch -root \n\ - fadeplot -root \n\ - coral -root -delay 0 \n\ - mountain -root \n\ - triangle -root -delay 1 \n\ - worm -root \n\ - rotor -root \n\ - ant -root \n\ - demon -root \n\ - loop -root \n\ - vines -root \n\ - kaleidescope -root \n\ - xjack -root \n\ - xlyap -root -randomize \n\ - cynosure -root \n\ - flow -root \n\ - epicycle -root \n\ - interference -root \n\ - truchet -root -randomize \n\ - bsod -root \n\ - crystal -root \n\ - discrete -root \n\ - kumppa -root \n\ - rd-bomb -root \n\ - "RD-Bomb (mobile)" rd-bomb -root -speed 1 -size 0.1 \n\ - sonar -root \n\ - t3d -root \n\ - penetrate -root \n\ - deluxe -root \n\ - compass -root \n\ - squiral -root \n\ - xflame -root \n\ - wander -root \n\ - "Wander (spots)" wander -root -advance 0 -size 10 -circles \ - -length 10000 -reset 100000 \n\ - critical -root \n\ - phosphor -root \n\ - xmatrix -root \n\ - petri -root -size 2 -count 20 \n\ - "Petri 2" petri -root -minlifespeed 0.02 \ - -maxlifespeed 0.03 -minlifespan 1 \ - -maxlifespan 1 -instantdeathchan 0 \ - -minorchan 0 -anychan 0.3 \n\ - shadebobs -root \n\ - ccurve -root \n\ - blaster -root \n\ - bumps -root \n\ - xteevee -root \n\ - xanalogtv -root \n\ - xspirograph -root \n\ - nerverot -root \n\ -- "NerveRot (dense)" nerverot -root -count 1000 \n\ -- "NerveRot (thick)" nerverot -root -count 100 -line-width 4 \ - -max-nerve-radius 0.8 -nervousness 0.5 -db \n\ - xrayswarm -root \n\ -- "Zoom (Fatbits)" zoom -root \n\ - "Zoom (Lenses)" zoom -root -lenses \n\ - rotzoomer -root \n\ -- "RotZoomer (mobile)" rotzoomer -root -move \n\ -- "RotZoomer (sweep)" rotzoomer -root -sweep \n\ - whirlwindwarp -root \n\ - "WhirlyGig" whirlygig -root \n\ - "SpeedMine" speedmine -root \n\ - "SpeedWorm" speedmine -root -worm \n\ - vermiculate -root \n\ - twang -root \n\ - apollonian -root \n\ - euler2d -root \n\ - "Euler2d (dense)" euler2d -root -count 4000 -eulertail 400 \ - -ncolors 230 \n\ -- juggle -root \n\ - polyominoes -root \n\ -- thornbird -root \n\ - fluidballs -root \n\ - anemone -root \n\ - halftone -root \n\ - metaballs -root \n\ - eruption -root \n\ - popsquares -root \n\ - barcode -root \n\ - piecewise -root \n\ - cloudlife -root \n\ - "FontGlide" fontglide -root -page \n\ - "FontGlide (scroller)" fontglide -root -scroll \n\ - apple2 -root \n\ - bubbles -root \n\ - pong -root \n\ - wormhole -root \n\ - pacman -root \n\ - fuzzyflakes -root \n\ -- default-n: webcollage -root \n\ -- default-n: "WebCollage (whacked)" \ - webcollage -root -filter \ - 'vidwhacker -stdin -stdout' \n\ -- default-n: vidwhacker -root \n\ - \ -- GL: gears -root \n\ -- GL: "Gears (planetary)" gears -root -planetary \n\ -- GL: superquadrics -root \n\ -- GL: morph3d -root \n\ -- GL: cage -root \n\ -- GL: moebius -root \n\ -- GL: stairs -root \n\ -- GL: pipes -root \n\ -- GL: sproingies -root \n\ -- GL: rubik -root \n\ -- GL: atlantis -root \n\ -- GL: lament -root \n\ -- GL: bubble3d -root \n\ -- GL: glplanet -root \n\ -- GL: flurry -root -preset random \n\ -- GL: pulsar -root \n\ -- GL: "Pulsar (textures)" \ - pulsar -root -texture -mipmap \ - -texture_quality -light -fog \n\ -- GL: extrusion -root \n\ -- GL: sierpinski3d -root \n\ -- GL: menger -root \n\ -- GL: "GFlux" gflux -root \n\ -- GL: "GFlux (grab)" gflux -root -mode grab \n\ -- GL: stonerview -root \n\ -- GL: starwars -root \n\ -- GL: gltext -root \n\ -- GL: "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root \n\ -- GL: "Molecule" molecule -root \n\ -- GL: "Molecule (lumpy)" molecule -root -no-bonds -no-labels \n\ -- GL: dangerball -root \n\ -- GL: circuit -root \n\ -- GL: engine -root \n\ -- GL: flipscreen3d -root \n\ -- GL: glsnake -root \n\ -- GL: boxed -root \n\ -- GL: "GLForestFire" glforestfire -root \n\ -- GL: "GLForestFire (rain)" glforestfire -root -count 0 \n\ -- GL: sballs -root \n\ -- GL: cubenetic -root \n\ -- GL: spheremonics -root \n\ -- GL: lavalite -root \n\ -- GL: queens -root \n\ -- GL: endgame -root \n\ -- GL: glblur -root \n\ -- GL: atunnel -root \n\ -- GL: flyingtoasters -root \n\ -- GL: bouncingcow -root \n\ -- GL: jigglypuff -root -random \n\ -- GL: klein -root -random \n\ -- GL: "HyperTorus (striped)" hypertorus -root \n\ -- GL: "HyperTorus (solid)" hypertorus -root -solid -transparent \n\ -- GL: glmatrix -root \n\ -- GL: cubestorm -root \n\ -- GL: glknots -root \n\ -- GL: blocktube -root \n\ -- GL: flipflop -root \n\ -- GL: antspotlight -root \n\ -- GL: glslideshow -root \n\ -- GL: polytopes -root \n\ -- GL: gleidescope -root \n\ -- GL: mirrorblob -root \n\ -- GL: "MirrorBlob (color only)" \ - mirrorblob -root -colour -no-texture \n\ -- GL: blinkbox -root \n\ -- GL: noof -root \n\ -- GL: polyhedra -root \n\ - \ -- xdaliclock -root -builtin3 -cycle \n\ -- default-n: xearth -nofork -nostars -ncolors 50 \ - -night 3 -wait 0 -timewarp 400.0 -pos \ - sunrel/38/-30 \n\ -- xplanet -vroot -wait 1 -timewarp 90000 \ - -label -origin moon \n\ -- xmountains -b -M -Z 0 -r 1 \n\ -- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\ -- xaos -root -autopilot -nogui -delay 10000 \ - -maxframerate 30 \ - -incoloring -1 -outcoloring -1 \n\ -- xfishtank -d -s \n\ -- xsnow \n\ -- goban -root \n\ -- electricsheep \n\ -- cosmos -root \n\ -- GL: sphereEversion --root \n\ -- GL: fireflies -root \n\ -- GL: antinspect -root \n\ -- GL: providence -root \n - - - -!============================================================================= -! -! You probably don't want to change anything after this point. -! -!============================================================================= - - -XScreenSaver.pointerPollTime: 0:00:05 -XScreenSaver.initialDelay: 0:00:00 -XScreenSaver.windowCreationTimeout: 0:00:30 -XScreenSaver.bourneShell: /bin/sh - - -! Resources for the password and splash-screen dialog boxes of -! the "xscreensaver" daemon. -! -*Dialog.headingFont: *-times-bold-r-*-*-*-180-*-*-*-iso8859-1 -*Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 -*Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 -*Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 -*Dialog.dateFont: *-courier-medium-r-*-*-*-80-*-*-*-iso8859-1 -*Dialog.foreground: #000000 -*Dialog.background: #D6D6D6 -*Dialog.Button.foreground: #000000 -*Dialog.Button.background: #EAEAEA -!*Dialog.Button.background: #D6D6D6 -!*Dialog.Button.pointBackground: #EAEAEA -!*Dialog.Button.clickBackground: #C3C3C3 -*Dialog.text.foreground: #000000 -*Dialog.text.background: #FFFFFF -*passwd.thermometer.foreground: #FF0000 -*passwd.thermometer.background: #FFFFFF -*Dialog.topShadowColor: #FFFFFF -*Dialog.bottomShadowColor: #666666 -*Dialog.logo.width: 210 -*Dialog.logo.height: 210 -*Dialog.internalBorderWidth: 30 -*Dialog.borderWidth: 1 -*Dialog.shadowThickness: 2 - -*passwd.heading.label: XScreenSaver %s -*passwd.body.label: This display is locked. -*passwd.user.label: User: -*passwd.passwd.label: Password: -*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1 -*passwd.thermometer.width: 8 - -*splash.heading.label: XScreenSaver %s -*splash.body.label: Copyright © 1991-2004 by -*splash.body2.label: Jamie Zawinski -*splash.demo.label: Settings -*splash.help.label: Help - - -! Resources for the Motif dialog boxes of the "xscreensaver-demo" program. -! -*fontList: *-helvetica-medium-r-*-*-*-120-*-*-*-iso8859-1 -*demoDialog*label1.fontList: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1 -*cmdText.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 -*label0.fontList: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 -XScreenSaver*doc.fontList: *-helvetica-medium-r-*-*-*-100-*-*-*-iso8859-1 -! above must be fully qualified to get around *sgiMode. - -*foreground: #000000 -*background: #C0C0C0 -*XmTextField.foreground: #000000 -*XmTextField.background: #FFFFFF -*list.foreground: #000000 -*list.background: #FFFFFF - -*ApplicationShell.title: XScreenSaver -*warning.title: XScreenSaver -*warning_popup.title: XScreenSaver -*allowShellResize: True -*autoUnmanage: False - -*menubar*file.labelString: File -*menubar*file.mnemonic: F -*file.blank.labelString: Blank Screen Now -*file.blank.mnemonic: B -*file.lock.labelString: Lock Screen Now -*file.lock.mnemonic: L -*file.kill.labelString: Kill Daemon -*file.kill.mnemonic: K -*file.restart.labelString: Restart Daemon -*file.restart.mnemonic: R -*file.exit.labelString: Exit -*file.exit.mnemonic: E - -*menubar*edit.labelString: Edit -*menubar*edit.mnemonic: E -*edit.cut.labelString: Cut -*edit.cut.mnemonic: u -*edit.copy.labelString: Copy -*edit.copy.mnemonic: C -*edit.paste.labelString: Paste -*edit.paste.mnemonic: P - -*menubar*help.labelString: Help -*menubar*help.mnemonic: H -*help.about.labelString: About... -*help.about.mnemonic: A -*help.docMenu.labelString: Documentation... -*help.docMenu.mnemonic: D - -*demoTab.marginWidth: 10 -*optionsTab.marginWidth: 10 - -*XmScrolledWindow.topOffset: 10 -*XmScrolledWindow.leftOffset: 10 -*demoTab.topOffset: 4 -*form1.bottomOffset: 10 -*form3.leftOffset: 10 -*form3.rightOffset: 10 -*frame.topOffset: 10 -*frame.bottomOffset: 10 -*enabled.topOffset: 10 -*visLabel.topOffset: 10 -*combo.topOffset: 10 -*form4.bottomOffset: 4 -*hr.bottomOffset: 4 -*XmComboBox.marginWidth: 0 -*XmComboBox.marginHeight: 0 - -*demo.marginWidth: 30 -*demo.marginHeight: 4 -*man.marginWidth: 10 -*man.marginHeight: 4 -*down.leftOffset: 40 -*down.marginWidth: 4 -*down.marginHeight: 4 -*up.marginWidth: 4 -*up.marginHeight: 4 -*frame.traversalOn: False - -*list.automaticSelection: True -*list.visibleItemCount: 20 -*doc.columns: 60 -*combo.columns: 11 - -*demoTab.labelString: Graphics Demos -*optionsTab.labelString: Screensaver Options -*down.labelString: \\/ -*up.labelString: /\\ -*frameLabel.labelString: -*cmdLabel.labelString: Command Line: -*cmdLabel.alignment: ALIGNMENT_BEGINNING -*enabled.labelString: Enabled -*visLabel.labelString: Visual: -*visLabel.alignment: ALIGNMENT_END -*visLabel.leftOffset: 20 -*demo.labelString: Demo -*man.labelString: Documentation... -*done.labelString: Quit - -*preferencesLabel.labelString: XScreenSaver Parameters - -*timeoutLabel.labelString: Saver Timeout -*cycleLabel.labelString: Cycle Timeout -*fadeSecondsLabel.labelString: Fade Duration -*fadeTicksLabel.labelString: Fade Ticks -*lockLabel.labelString: Lock Timeout -*passwdLabel.labelString: Password Timeout -*preferencesForm*XmTextField.columns: 8 - -*verboseToggle.labelString: Verbose -*cmapToggle.labelString: Install Colormap -*fadeToggle.labelString: Fade Colormap -*unfadeToggle.labelString: Unfade Colormap -*lockToggle.labelString: Require Password - - -*OK.marginWidth: 30 -*OK.marginHeight: 4 -*OK.leftOffset: 10 -*OK.bottomOffset: 10 -*Cancel.marginWidth: 30 -*Cancel.marginHeight: 4 -*Cancel.rightOffset: 10 -*Cancel.bottomOffset: 10 - - -!============================================================================= -! -! Pretty names for the hacks that have unusual capitalization. -! -!============================================================================= - -*hacks.imsmap.name: IMSmap -*hacks.slidescreen.name: SlideScreen -*hacks.decayscreen.name: DecayScreen -*hacks.blitspin.name: BlitSpin -*hacks.lmorph.name: LMorph -*hacks.ifs.name: IFS -*hacks.fadeplot.name: FadePlot -*hacks.bsod.name: BSOD -*hacks.rd-bomb.name: RD-Bomb -*hacks.t3d.name: T3D -*hacks.shadebobs.name: ShadeBobs -*hacks.ccurve.name: C Curve -*hacks.xteevee.name: XTeeVee -*hacks.xanalogtv.name: XAnalogTV -*hacks.xspirograph.name: XSpiroGraph -*hacks.nerverot.name: NerveRot -*hacks.webcollage.name: WebCollage -*hacks.vidwhacker.name: VidWhacker -*hacks.morph3d.name: Morph3D -*hacks.bubble3d.name: Bubble3D -*hacks.sierpinski3d.name: Sierpinski3D -*hacks.gflux.name: GFlux -*hacks.xrayswarm.name: XRaySwarm -*hacks.whirlwindwarp.name: WhirlwindWarp -*hacks.rotzoomer.name: RotZoomer -*hacks.stonerview.name: StonerView -*hacks.starwars.name: StarWars -*hacks.dangerball.name: DangerBall -*hacks.whirlygig.name: WhirlyGig -*hacks.speedmine.name: SpeedMine -*hacks.glforestfire.name: GLForestFire -*hacks.sballs.name: SBalls -*hacks.xdaliclock.name: XDaliClock -*hacks.xplanetbg.name: XPlanet -*hacks.xplanet.name: XPlanet -*hacks.xaos.name: XaoS -*hacks.xfishtank.name: XFishTank -*hacks.electricsheep.name: ElectricSheep -*hacks.sphereEversion.name: SphereEversion -*hacks.fluidballs.name: FluidBalls -*hacks.flyingtoasters.name: FlyingToasters -*hacks.bouncingcow.name: BouncingCow -*hacks.jigglypuff.name: JigglyPuff -*hacks.hypertorus.name: HyperTorus -*hacks.cubestorm.name: CubeStorm -*hacks.blocktube.name: BlockTube -*hacks.flipflop.name: FlipFlop -*hacks.antspotlight.name: AntSpotlight -*hacks.fontglide.name: FontGlide -*hacks.mirrorblob.name: MirrorBlob -*hacks.blinkbox.name: BlinkBox -*hacks.fuzzyflakes.name: FuzzyFlakes - -! obsolete, but still used by xscreensaver-demo-Xm. -*hacks.documentation.isInstalled: True - -! (xrdb prevention kludge: whole file) */ diff --git a/packages/xscreensaver/xscreensaver-4.16/fixes.patch b/packages/xscreensaver/xscreensaver-4.16/fixes.patch deleted file mode 100644 index 3d138bc490..0000000000 --- a/packages/xscreensaver/xscreensaver-4.16/fixes.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --exclude '*.o' -u xscreensaver-4.16/hacks/bouboule.c xscreensaver-4.16.new/hacks/bouboule.c ---- xscreensaver-4.16/hacks/bouboule.c 2003-10-18 17:29:50.000000000 -0700 -+++ xscreensaver-4.16.new/hacks/bouboule.c 2004-08-06 13:44:21.282983912 -0700 -@@ -105,7 +105,7 @@ - * erase the whole window than to erase each star - */ - --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - #define ADAPT_ERASE 1 /* If 1, then we try ADAPT_CHECKS black XFillArcs, - * and after, ADAPT_CHECKS XFillRectangle. - * We check which method seems better, knowing that -diff --exclude '*.o' -u xscreensaver-4.16/hacks/speedmine.c xscreensaver-4.16.new/hacks/speedmine.c ---- xscreensaver-4.16/hacks/speedmine.c 2003-05-19 21:31:29.000000000 -0700 -+++ xscreensaver-4.16.new/hacks/speedmine.c 2004-08-06 13:46:25.056167528 -0700 -@@ -174,7 +174,7 @@ - /* a forward declaration ... */ - static void change_colors(void); - --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - static int total_nframes = 0; - static int nframes = 0; - static double fps = 0.0; -@@ -189,7 +189,7 @@ - static double get_time(void) { - struct timeval t; - float f; --#if GETTIMEOFDAY_TWO_ARGS -+#ifdef GETTIMEOFDAY_TWO_ARGS - gettimeofday(&t, NULL); - #else - gettimeofday(&t); -@@ -205,7 +205,7 @@ - * initialises the timing structures - */ - static void init_time(void) { --#if GETTIMEOFDAY_TWO_ARGS -+#ifdef GETTIMEOFDAY_TWO_ARGS - gettimeofday(&start_time, NULL); - #else - gettimeofday(&start_time); -@@ -1194,7 +1194,7 @@ - render_speedmine (dpy, dbuf); - XCopyArea (dpy, dbuf, window, draw_gc, 0, 0, width, height, 0, 0); - --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - fps_end = get_time(); - nframes++; - total_nframes++; -diff --exclude '*.o' -u xscreensaver-4.16/hacks/xrayswarm.c xscreensaver-4.16.new/hacks/xrayswarm.c ---- xscreensaver-4.16/hacks/xrayswarm.c 2003-07-21 01:05:51.000000000 -0700 -+++ xscreensaver-4.16.new/hacks/xrayswarm.c 2004-08-06 13:47:01.984553560 -0700 -@@ -980,10 +980,10 @@ - } - } - --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - static struct timeval startupTime; - static void initTime(void) { --#if GETTIMEOFDAY_TWO_ARGS -+#ifdef GETTIMEOFDAY_TWO_ARGS - gettimeofday(&startupTime, NULL); - #else - gettimeofday(&startupTime); -@@ -993,7 +993,7 @@ - static double getTime(void) { - struct timeval t; - float f; --#if GETTIMEOFDAY_TWO_ARGS -+#ifdef GETTIMEOFDAY_TWO_ARGS - gettimeofday(&t, NULL); - #else - gettimeofday(&t); -@@ -1033,7 +1033,7 @@ - } - - nframes = 0; --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - start = getTime(); - #endif - -@@ -1055,7 +1055,7 @@ - XSync(dpy, False); - screenhack_handle_events (dpy); - } --#if HAVE_GETTIMEOFDAY -+#ifdef HAVE_GETTIMEOFDAY - end = getTime(); - nframes++; - diff --git a/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty b/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch new file mode 100644 index 0000000000..1538315e3b --- /dev/null +++ b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch @@ -0,0 +1,15 @@ +--- xscreensaver-4.22~/configure.in 2005-08-26 10:00:58.000000000 -0700 ++++ xscreensaver-4.22/configure.in 2005-08-26 10:01:27.000000000 -0700 +@@ -1080,9 +1080,9 @@ + + # random compiler setup + AC_CANONICAL_HOST +-AC_PROG_CC_ANSI +-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE +-AC_NO_OBJECTIVE_C ++#AC_PROG_CC_ANSI ++#AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE ++#AC_NO_OBJECTIVE_C + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb new file mode 100644 index 0000000000..e4ca0acc3a --- /dev/null +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -0,0 +1,58 @@ +# xscreensaver OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ + file://fixes.patch;patch=1 \ + file://configure.in.patch;patch=1 \ + file://XScreenSaver" + +DESCRIPTION="*The* screensaver package for X11" +LICENSE="BSD" +HOMEPAGE="http://www.jwz.org/xscreensaver/" +PR = "r0" +SECTION="x11-misc" + +DEPENDS="intltool x11 gtk+ libxml2 libglade" + +# xscreensaver-demo is a glade app +LDFLAGS_append = " -Wl,--export-dynamic" + +inherit autotools +EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \ + --with-jpeg --with-xpm" + +PACKAGES =+ " xscreensaver-demo xscreensaver-extra" + +FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \ + /usr/X11R6/lib/X11/app-defaults" + +FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \ + ${datadir}/pixmaps/" + +FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*" + +do_configure_prepend() { + sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in +} + +do_compile() { + oe_runmake GNOME_DATADIR=${datadir} all +} + +do_install() { + unset KDEDIR + oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \ + install_prefix=${D} install + + oe_runmake -C ${S}/hacks install_prefix=${D} install-program + + # Install the defaults file + install -d ${D}/usr/X11R6/lib/X11/app-defaults + install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults +} + +python populate_packages_prepend () { + hackdir = bb.data.expand('${libexecdir}/xscreensaver', d) + do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s') +} -- cgit v1.2.3 From b7c7a335e89702e1c98c63653fff399a098a1882 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 21:10:09 +0000 Subject: pcmcia-cs: patch arm/pcmcia to handle 2.6 modules Patch courtesy Matt Reimer, closes #260 --- packages/pcmcia-cs/files/arm/pcmcia | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia index 3dc330db21..d42bc84e77 100644 --- a/packages/pcmcia-cs/files/arm/pcmcia +++ b/packages/pcmcia-cs/files/arm/pcmcia @@ -1,6 +1,14 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' Date: Fri, 26 Aug 2005 23:26:19 +0000 Subject: xst 0.15: add it --- packages/xst/xst_0.15.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/xst/xst_0.15.bb diff --git a/packages/xst/xst_0.15.bb b/packages/xst/xst_0.15.bb new file mode 100644 index 0000000000..76ab7af26f --- /dev/null +++ b/packages/xst/xst_0.15.bb @@ -0,0 +1,7 @@ +inherit gpe + +DEPENDS = "libxsettings libxsettings-client glib-2.0" +SECTION = "gpe" +DESCRIPTION = "GPE configuration utility" +LICENSE = "GPL" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -- cgit v1.2.3 From d7c35cc7bfca1c235079e3252a4b11ef95c0b864 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 23:27:27 +0000 Subject: xst 0.14: blow away nonworking version --- packages/xst/xst_0.14.bb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/xst/xst_0.14.bb diff --git a/packages/xst/xst_0.14.bb b/packages/xst/xst_0.14.bb deleted file mode 100644 index 76ab7af26f..0000000000 --- a/packages/xst/xst_0.14.bb +++ /dev/null @@ -1,7 +0,0 @@ -inherit gpe - -DEPENDS = "libxsettings libxsettings-client glib-2.0" -SECTION = "gpe" -DESCRIPTION = "GPE configuration utility" -LICENSE = "GPL" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -- cgit v1.2.3 From f079f686948de9c04897de49a409a638645ab4c5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 23:32:26 +0000 Subject: gpsdrive_cvs: remove pda patch as it's applied upstream --- packages/gpsdrive/gpsdrive_cvs.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index ba4432f5ca..fcc87b24d1 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -14,7 +14,6 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ - file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \ file://gpsdrive.desktop" S = "${WORKDIR}/gpsdrive" -- cgit v1.2.3 From bfe154780c963a74e76688b840786da3ffe3fbe2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 23:38:48 +0000 Subject: gpsdrive_cvs: add libart as a depency --- packages/gpsdrive/gpsdrive_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index fcc87b24d1..271ea1f375 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ pcre gpsd" +DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" MAINTAINER = "Koen Kooi " SECTION = "x11" -- cgit v1.2.3