From 410863206ae912187e07c48f31d4398881c97233 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 22:21:03 +0000 Subject: opie-wellenreiter 1.2.2 remove upstream patch --- packages/opie-wellenreiter/files/.mtn2git_empty | 0 .../files/0916_wellenreiter-fontfix.patch | 43 ---------------------- .../opie-wellenreiter/opie-wellenreiter_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 packages/opie-wellenreiter/files/.mtn2git_empty delete mode 100644 packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/opie-wellenreiter/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch deleted file mode 100644 index b85d46cb08..0000000000 --- a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch +++ /dev/null @@ -1,43 +0,0 @@ - -This patch is backport from OPIE CVS. -Submitted upstream by Marcin Juszkiewicz -Date: 2005-09-16 - -Index: packetview.cpp -=================================================================== -RCS file: /cvs/opie/noncore/net/wellenreiter/gui/packetview.cpp,v -retrieving revision 1.9 -diff -u -r1.9 packetview.cpp ---- wellenreiter/gui/packetview.cpp 24 Aug 2004 11:53:44 -0000 1.9 -+++ wellenreiter/gui/packetview.cpp 16 Sep 2005 17:41:03 -0000 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /* QT */ - #include -@@ -38,6 +39,9 @@ - PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) - :QFrame( parent, name, f ) - { -+ Config c( "qpe" ); -+ c.setGroup( "Appearance" ); -+ - _number = new QSpinBox( this ); - _number->setPrefix( "Pkt# " ); - _label = new QLabel( this ); -@@ -47,11 +51,10 @@ - _list->setColumnAlignment( 0, Qt::AlignCenter ); - _list->setColumnAlignment( 1, Qt::AlignLeft ); - _list->setAllColumnsShowFocus( true ); -- _list->setFont( QFont( "Fixed", 8 ) ); - - _hex = new QTextView( this ); - _hex->setMargin( 0 ); -- _hex->setFont( QFont( "Fixed", 8 ) ); -+ _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) ); - - QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); - QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb index 8d06318bb5..b2e3975f7a 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0916_wellenreiter-fontfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From d9cd8b4dbdd069f9da9ed7fa1b7395572a77c5c1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 08:13:49 +0000 Subject: opie-datebook 1.2.2 remove bugfix that has been applied upstream --- packages/opie-datebook/files/.mtn2git_empty | 0 packages/opie-datebook/files/bug1707fix.patch | 1281 ------------------------- packages/opie-datebook/opie-datebook_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 1283 deletions(-) delete mode 100644 packages/opie-datebook/files/.mtn2git_empty delete mode 100644 packages/opie-datebook/files/bug1707fix.patch diff --git a/packages/opie-datebook/files/.mtn2git_empty b/packages/opie-datebook/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-datebook/files/bug1707fix.patch b/packages/opie-datebook/files/bug1707fix.patch deleted file mode 100644 index ce91c74e9f..0000000000 --- a/packages/opie-datebook/files/bug1707fix.patch +++ /dev/null @@ -1,1281 +0,0 @@ -Index: datebook/dateentry.ui -=================================================================== -RCS file: /cvs/opie/core/pim/datebook/dateentry.ui,v -retrieving revision 1.10 -retrieving revision 1.11 -diff -u -u -r1.10 -r1.11 ---- datebook/dateentry.ui 11 Aug 2005 10:10:40 -0000 1.10 -+++ datebook/dateentry.ui 21 Sep 2005 21:15:13 -0000 1.11 -@@ -18,7 +18,7 @@ - ** Contact info@trolltech.com if any conditions of this licensing are - ** not clear to you. - ** --** $Id: dateentry.ui,v 1.10 2005/08/11 10:10:40 llornkcor Exp $ -+** $Id: dateentry.ui,v 1.11 2005/09/21 21:15:13 llornkcor Exp $ - ** - ********************************************************************* - -@@ -32,20 +32,14 @@ - - 0 - 0 -- 286 -- 396 -+ 242 -+ 339 - - - - caption - New Event - -- -- layoutMargin -- -- -- layoutSpacing -- - - - margin -@@ -53,740 +47,500 @@ - - - spacing -- 2 -+ 0 - -+ -+ QLabel -+ -+ name -+ TextLabel2 -+ -+ -+ frameShape -+ MShape -+ -+ -+ frameShadow -+ MShadow -+ -+ -+ text -+ Location -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel2_2 -+ -+ -+ text -+ Category -+ -+ -+ buddy -+ comboPriority -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ -+ -+ -+ -+ -+ text -+ Meeting -+ -+ -+ -+ -+ text -+ Lunch -+ -+ -+ -+ -+ text -+ Dinner -+ -+ -+ -+ -+ text -+ Travel -+ -+ -+ -+ name -+ comboDescription -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ editable -+ true -+ -+ -+ currentItem -+ 0 -+ -+ -+ duplicatesEnabled -+ false -+ -+ - -- QLayoutWidget -+ QLabel -+ -+ name -+ TextLabel1 -+ -+ -+ text -+ Description -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ -+ -+ -+ -+ -+ text -+ Office -+ -+ -+ -+ -+ text -+ Home -+ -+ -+ -+ name -+ comboLocation -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ editable -+ true -+ -+ -+ currentItem -+ 0 -+ -+ -+ duplicatesEnabled -+ false -+ -+ -+ -+ CategorySelect -+ -+ name -+ comboCategory -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel3 -+ -+ -+ text -+ Start - End -+ -+ -+ -+ QPushButton -+ -+ name -+ buttonStart -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ text -+ Jan 02 00 -+ -+ -+ -+ QLineEdit -+ -+ name -+ comboStart -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ alignment -+ AlignHCenter -+ -+ -+ hAlign -+ -+ -+ -+ -+ name -+ Spacer1_2 -+ -+ -+ orientation -+ Horizontal -+ -+ -+ sizeType -+ Expanding -+ -+ -+ sizeHint -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ TimePicker -+ -+ name -+ timePickerStart -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QPushButton -+ -+ name -+ buttonEnd -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ text -+ Jan 02 00 -+ -+ -+ -+ QLineEdit - - name -- Layout19 -+ comboEnd - -- -- -- margin -- 0 -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ alignment -+ AlignHCenter -+ -+ -+ hAlign -+ -+ -+ -+ QLabel -+ -+ name -+ TimePickerLabel -+ -+ -+ text -+ Start time -+ -+ -+ -+ QCheckBox -+ -+ name -+ checkAllDay -+ -+ -+ text -+ All day -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel3_2_2 -+ -+ -+ text -+ Time zone -+ -+ -+ -+ TimeZoneSelector -+ -+ name -+ timezone -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QCheckBox -+ -+ name -+ checkAlarm -+ -+ -+ enabled -+ true -+ -+ -+ autoMask -+ false -+ -+ -+ text -+ &Alarm -+ -+ -+ checked -+ false -+ -+ -+ -+ QSpinBox -+ -+ name -+ spinAlarm -+ -+ -+ enabled -+ false -+ -+ -+ suffix -+ minutes -+ -+ -+ maxValue -+ 180 -+ -+ -+ minValue -+ 0 -+ -+ -+ lineStep -+ 5 -+ -+ -+ value -+ 5 -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ Silent - -- -- spacing -- 6 -+ -+ -+ -+ text -+ Loud - -- -- QLayoutWidget -- -- name -- Layout1 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel1 -- -- -- text -- Description -- -- -- -- QComboBox -- -- -- text -- -- -- -- -- -- text -- Meeting -- -- -- -- -- text -- Lunch -- -- -- -- -- text -- Dinner -- -- -- -- -- text -- Travel -- -- -- -- name -- comboDescription -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- editable -- true -- -- -- currentItem -- 0 -- -- -- duplicatesEnabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout2 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel2 -- -- -- frameShape -- MShape -- -- -- frameShadow -- MShadow -- -- -- text -- Location -- -- -- -- QComboBox -- -- -- text -- -- -- -- -- -- text -- Office -- -- -- -- -- text -- Home -- -- -- -- name -- comboLocation -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- editable -- true -- -- -- currentItem -- 0 -- -- -- duplicatesEnabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout3 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel2_2 -- -- -- text -- Category -- -- -- buddy -- comboPriority -- -- -- -- CategorySelect -- -- name -- comboCategory -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout18 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLayoutWidget -- -- name -- Layout17 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel3 -- -- -- text -- Start - End -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout4 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QPushButton -- -- name -- buttonStart -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- text -- Jan 02 00 -- -- -- -- QLineEdit -- -- name -- comboStart -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- alignment -- AlignHCenter -- -- -- hAlign -- -- -- -- -- -- -- name -- Spacer12 -- -- -- orientation -- Horizontal -- -- -- sizeType -- Expanding -- -- -- sizeHint -- -- 20 -- 20 -- -- -- -- -- QLayoutWidget -- -- name -- Layout5 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QPushButton -- -- name -- buttonEnd -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- text -- Jan 02 00 -- -- -- -- QLineEdit -- -- name -- comboEnd -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- alignment -- AlignHCenter -- -- -- hAlign -- -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout7 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TimePickerLabel -- -- -- text -- Start time -- -- -- -- TimePicker -- -- name -- timePickerStart -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QCheckBox -- -- name -- checkAllDay -- -- -- text -- All day -- -- -- -- QLayoutWidget -- -- name -- Layout8 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel3_2_2 -- -- -- text -- Time zone -- -- -- -- TimeZoneSelector -- -- name -- timezone -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout9 -- -- -- layoutSpacing -- -- -- -- margin -- 0 -- -- -- spacing -- 1 -- -- -- QCheckBox -- -- name -- checkAlarm -- -- -- enabled -- true -- -- -- autoMask -- false -- -- -- text -- &Alarm -- -- -- checked -- false -- -- -- -- QSpinBox -- -- name -- spinAlarm -- -- -- enabled -- false -- -- -- suffix -- -- -- -- maxValue -- 180 -- -- -- minValue -- 0 -- -- -- lineStep -- 1 -- -- -- value -- 5 -- -- -- -- QComboBox -- -- -- text -- minutes -- -- -- -- -- text -- hours -- -- -- -- -- text -- days -- -- -- -- name -- ComboInterval -- -- -- enabled -- false -- -- -- currentItem -- 0 -- -- -- -- QComboBox -- -- -- text -- Silent -- -- -- -- -- text -- Loud -- -- -- -- name -- comboSound -- -- -- enabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout11 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- lblRepeat -- -- -- text -- Repeat -- -- -- -- QToolButton -- -- name -- cmdRepeat -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- focusPolicy -- TabFocus -- -- -- text -- No Repeat... -- -- -- -- -- -- QToolButton -- -- name -- editNote -- -- -- text -- Note... -- -- -- -+ -+ -+ name -+ comboSound -+ -+ -+ enabled -+ false -+ -+ -+ -+ QLabel -+ -+ name -+ lblRepeat -+ -+ -+ text -+ Repeat -+ -+ -+ -+ QToolButton -+ -+ name -+ cmdRepeat -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ focusPolicy -+ TabFocus -+ -+ -+ text -+ No Repeat... -+ -+ -+ -+ QToolButton -+ -+ name -+ editNote -+ -+ -+ text -+ Note... -+ - - - -@@ -893,12 +647,6 @@ - comboStart - setDisabled(bool) - -- -- checkAlarm -- toggled(bool) -- ComboInterval -- setEnabled(bool) -- - endDateChanged( const QString & ) - endDateChanged( int, int, int ) - endTimeChanged( const QString & ) diff --git a/packages/opie-datebook/opie-datebook_1.2.2.bb b/packages/opie-datebook/opie-datebook_1.2.2.bb index 83493f01a3..7c2b74a550 100644 --- a/packages/opie-datebook/opie-datebook_1.2.2.bb +++ b/packages/opie-datebook/opie-datebook_1.2.2.bb @@ -2,5 +2,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://bug1707fix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 2a42b59c6fb737e55b4f35de30d82a0a43167e24 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 08:26:53 +0000 Subject: irk 0.11.0 fix wrong dependency on virtual/libqpe, palmtop.bbclass handles this --- packages/irk/irk-targus_0.11.0.bb | 2 +- packages/irk/irk.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index d7ba4a70a8..a0508d30f5 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -1,4 +1,4 @@ -include irk.inc +require irk.inc DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" diff --git a/packages/irk/irk.inc b/packages/irk/irk.inc index c988cdafd3..654764a87d 100644 --- a/packages/irk/irk.inc +++ b/packages/irk/irk.inc @@ -3,7 +3,7 @@ SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" -DEPENDS = "virtual/libqpe lirc" +DEPENDS = "lirc" S = "${WORKDIR}/irk" -- cgit v1.2.3 From 7879864edcda9b69f74d1ca461f54b630b42ee25 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:14:46 +0000 Subject: mplayer_1.0pre8.bb : fix options passed to the configure script more strictly, fix depends. Also added a patch that should makes the pld instruction dependant on arm5 so should compile happilly on arm4. --- packages/mplayer/files/pld-onlyarm5.patch | 405 ++++++++++++++++++++++++++++++ packages/mplayer/mplayer_1.0pre8.bb | 120 ++++++++- 2 files changed, 520 insertions(+), 5 deletions(-) create mode 100644 packages/mplayer/files/pld-onlyarm5.patch diff --git a/packages/mplayer/files/pld-onlyarm5.patch b/packages/mplayer/files/pld-onlyarm5.patch new file mode 100644 index 0000000000..3b8c576439 --- /dev/null +++ b/packages/mplayer/files/pld-onlyarm5.patch @@ -0,0 +1,405 @@ +--- MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S.orig 2006-07-03 09:53:33.000000000 +0100 ++++ MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S 2006-07-03 10:06:58.000000000 +0100 +@@ -16,6 +16,13 @@ + @ License along with this library; if not, write to the Free Software + @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + @ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif + + .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 + mov \Rd0, \Rn0, lsr #(\shift * 8) +@@ -74,7 +81,7 @@ + put_pixels16_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11, lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -85,7 +92,7 @@ + ldmia r1, {r4-r7} + add r1, r1, r2 + stmia r0, {r4-r7} +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + add r0, r0, r2 + bne 1b +@@ -95,7 +102,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 1, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -106,7 +113,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 2, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -117,7 +124,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 3, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -136,7 +143,7 @@ + put_pixels8_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r5,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -147,7 +154,7 @@ + ldmia r1, {r4-r5} + add r1, r1, r2 + subs r3, r3, #1 +- pld [r1] ++ PLD ( pld [r1] ) + stmia r0, {r4-r5} + add r0, r0, r2 + bne 1b +@@ -157,7 +164,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -168,7 +175,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -179,7 +186,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -198,7 +205,7 @@ + put_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -210,7 +217,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -223,7 +230,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -236,7 +243,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -248,7 +255,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -267,7 +274,7 @@ + put_no_rnd_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -279,7 +286,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -292,7 +299,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -305,7 +312,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -317,7 +324,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -338,7 +345,7 @@ + put_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -352,13 +359,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -369,18 +376,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -392,18 +399,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -415,18 +422,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -447,7 +454,7 @@ + put_no_rnd_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -461,13 +468,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -478,18 +485,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -501,18 +508,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -524,18 +531,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -562,7 +569,7 @@ + ldmia r1, {r8-r10} + .endif + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + .if \align == 0 + ADJ_ALIGN_DOUBLEWORD_D 1, r4, r5, r6, r7, r8 + .elseif \align == 1 +@@ -624,7 +631,7 @@ + put_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 +@@ -661,7 +668,7 @@ + put_no_rnd_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 9c66221f57..0fdc492968 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ @@ -15,12 +15,13 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://w100-video_out.patch;patch=1 \ file://w100-mplayer.patch;patch=1 \ file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1" + file://libmpcodecs-ogg-include.patch;patch=1 \ + file://pld-onlyarm5.patch;patch=1" MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r0" +PR = "r1" PARALLEL_MAKE = "" @@ -46,17 +47,126 @@ EXTRA_OECONF = " \ --disable-linux-devfs \ --disable-lirc \ --disable-lircc \ + --disable-joystick \ + --disable-vm \ + --disable-xf86keysym \ --disable-tv \ + --disable-tv-v4l \ + --disable-tv-v4l2 \ + --disable-tv-bsdbt848 \ --enable-rtc \ + --enable-network \ + --disable-winsock2 \ --disable-smb \ + --disable-live \ + --disable-dvdread \ + --disable-mpdvdkit \ + --disable-cdparanoia \ + --disable-freetype \ + --enable-fontconfig \ + --disable-unrarlib \ + --disable-menu \ + --enable-sortsub \ + --disable-fribidi \ + --disable-enca \ + --disable-macosx \ + --disable-macosx-finder-support \ + --disable-macosx-bundle \ + --disable-ftp \ + --disable-vstream \ + \ + --enable-gif \ + --enable-png \ + --enable-jpeg \ + --disable-libcdio \ + --enable-liblzo \ --disable-win32 \ + --disable-dshow \ + --disable-qtx \ + --disable-xanim \ + --disable-real \ + --disable-xvid \ + --disable-x264 \ + --disable-divx4linux \ + --disable-opendivx \ + \ + --disable-libavutil_so \ + --disable-libavcodec_so \ + --disable-libavformat_so \ + --disable-libpostproc_so \ + --disable-libfame \ \ --enable-tremor-low \ + \ + --disable-speex \ + --disable-theora \ + --disable-external-faad \ + --disable-faac \ + --disable-ladspa \ + --disable-libdv \ + --enable-mad \ + --disable-toolame \ + --disable-twolame \ + --disable-xmms \ --disable-mp3lib \ + --disable-libdts \ + --enable-libmpeg2 \ + --disable-musepack \ + --disable-amr_nb \ + --disable-amr_nb-fixed \ + --disable-amr_wb \ \ - --disable-x11 \ + --disable-internal-vidix \ + --disable-external-vidix \ + --disable-gl \ + --disable-dga \ + --disable-vesa \ + --disable-svga \ --enable-sdl \ - --enable-fbdev " + --disable-aa \ + --disable-caca \ + --disable-ggi \ + --disable-ggiwmh \ + --disable-directx \ + --disable-dxr2 \ + --disable-dxr3 \ + --disable-dvb \ + --disable-dvbhead \ + --disable-mga \ + --disable-xmga \ + --disable-xv \ + --disable-xvmc \ + --disable-vm \ + --disable-xinerama \ + --disable-x11 \ + --enable-fbdev \ + --disable-mlib \ + --disable-3dfx \ + --disable-tdfxfb \ + --disable-s3fb \ + --disable-directfb \ + --disable-zr \ + --disable-bl \ + --disable-tdfxvid \ + --disable-tga \ + --disable-pnm \ + --disable-md5sum \ + \ + --enable-alsa \ + --enable-ossaudio \ + --disable-arts \ + --disable-esd \ + --disable-polyp \ + --disable-jack \ + --disable-openal \ + --disable-nas \ + --disable-sgiaudio \ + --disable-sunaudio \ + --disable-win32waveout \ + --enable-select \ + \ + --disable-runtime-cpudetection \ + " EXTRA_OECONF_append_c7x0 = " --enable-w100 " -- cgit v1.2.3 From 879bf61864692b861913e124ea4f9dacd0c43200 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:31:16 +0000 Subject: mplayer_1.0pre8.bb : add more DEPENDS alsa-lib, lzo, fontconfig, thanks to hrw for spotting these. --- packages/mplayer/mplayer_1.0pre8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 0fdc492968..18b3ce1bd4 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ -- cgit v1.2.3 From dd4fb149e32dcf1d3505d72c7887c9f8a0cc98ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 11:46:11 +0000 Subject: angstrom: misc stuff * new tasks to get smaller images * new images to take advantage of said tasks * cleanups --- packages/angstrom/angstrom-bootmanager-image.bb | 15 +++++++++++---- packages/angstrom/angstrom-bootstrap-image.bb | 14 ++++++++++++++ packages/angstrom/angstrom-gpe-image.bb | 21 +++++++++++++++++++++ packages/angstrom/task-angstrom.bb | 11 +++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 packages/angstrom/angstrom-bootstrap-image.bb create mode 100644 packages/angstrom/angstrom-gpe-image.bb diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index be281d72bf..b669d2b665 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,9 +1,16 @@ -export IMAGE_BASENAME = "Ångström Bootmanager Image" +#Angstrom bootmanager image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends angstrom-bootmanager" + +export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager" +export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager" inherit image_ipk -DEPENDS += "task-bootstrap angstrom-bootmanager" -LICENSE = "MIT" + diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb new file mode 100644 index 0000000000..84a4845569 --- /dev/null +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -0,0 +1,14 @@ +#Angstrom bootstrap image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends" + +export IMAGE_BASENAME = "bootstrap-image" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "angstrom-base-depends" + +inherit image_ipk + diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb new file mode 100644 index 0000000000..0419ea1b9a --- /dev/null +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -0,0 +1,21 @@ +#Angstrom GPE image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +export IMAGE_BASENAME = "gpe-image" + +DEPENDS = "task-angstrom" +RDEPENDS = "${IPKG_INSTALL}" + +export IPKG_INSTALL = "\ + angstrom-base-depends \ + angstrom-X-base-depends \ + angsgrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + +#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " + +inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index c7323314db..d058457e98 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -3,6 +3,7 @@ PR = "r0" ALLOW_EMPTY = "1" PACKAGES = "\ + angstrom-base-depends \ angstrom-X-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ @@ -13,6 +14,16 @@ PACKAGES = "\ angstrom-task-printing \ angstrom-task-sectest" +RDEPENDS_angstrom-base-depends = "\ + base-files \ + base-passwd tinylogin \ + busybox \ + udev \ + sysvinit initscripts sysvinit-pidof \ + netbase \ + angstrom-version \ + " + RDEPENDS_angstrom-X-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From 154e2d11e0915bf835aee9dddf6de954de4c68e8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 11:52:04 +0000 Subject: irk 0.11 fix wrong dependency, make it work against multithreaded qt as well --- packages/irk/irk-belkin_0.11.bb | 4 ++-- packages/irk/irk-targus_0.11.0.bb | 1 + packages/irk/irk.inc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb index 9710e71109..b743544903 100644 --- a/packages/irk/irk-belkin_0.11.bb +++ b/packages/irk/irk-belkin_0.11.bb @@ -1,9 +1,9 @@ -include irk.inc +require irk.inc DESCRIPTION += "(version with Belkin support)" RCONFLICTS = "irk-targus" RREPLACES = "irk-targus" -PR = "r2" +PR = "r3" SRC_URI = "http://kopsisengineering.com/irk-current.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index a0508d30f5..1b130776a8 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -1,4 +1,5 @@ require irk.inc +PR = "r2" DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" diff --git a/packages/irk/irk.inc b/packages/irk/irk.inc index 654764a87d..b00583c22b 100644 --- a/packages/irk/irk.inc +++ b/packages/irk/irk.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/irk" inherit palmtop -EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" +EXTRA_QMAKEVARS_POST += "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" do_install() { install -d ${D}${sysconfdir}/ -- cgit v1.2.3 From 070b8505d9e79c3fa5b84d8603774442f73d9f5d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:57:51 +0000 Subject: mplayer_1.0pre8.bb : another missed DEPEND --- packages/mplayer/mplayer_1.0pre8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 18b3ce1bd4..071b403695 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses lame" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ -- cgit v1.2.3 From 9bc60bf6699aea7a159fbbb8b4d0176830435d0f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:07:45 +0000 Subject: tslib: not much cvs activity since two years - create a fixed version --- packages/tslib/tslib_20060703.bb | 94 ++++++++++++++++++++++++++++++++++++++++ packages/tslib/tslib_cvs.bb | 94 ---------------------------------------- 2 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 packages/tslib/tslib_20060703.bb delete mode 100644 packages/tslib/tslib_cvs.bb diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb new file mode 100644 index 0000000000..89296c4796 --- /dev/null +++ b/packages/tslib/tslib_20060703.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." +HOMEPAGE = "http://cvs.arm.linux.org.uk/" +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +SECTION = "base" +LICENSE = "LGPL" + +PV = "0.1+cvs+${PV}" +PR = "r0" + +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \ + file://usec_fix.patch;patch=1 \ + file://ts.conf \ + file://ts-2.6.conf \ + file://ts.conf-h3600-2.4 \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-corgi-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh" +SRC_URI_append_mnci += " file://devfs.patch;patch=1" +SRC_URI_append_mnci += " file://event1.patch;patch=1" +S = "${WORKDIR}/tslib" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " + +do_stage() { + autotools_stage_all +} + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + case ${MACHINE} in + a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-h3600-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + c7x0 | spitz | akita | tosa ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-corgi-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + + simpad ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-simpad-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + *) + ;; + esac +} + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" + +RDEPENDS_tslib-conf_h1940 = "detect-stylus" +RDEPENDS_tslib-conf_h2200 = "detect-stylus" +RDEPENDS_tslib-conf_h3600 = "detect-stylus" +RDEPENDS_tslib-conf_h3900 = "detect-stylus" +RDEPENDS_tslib-conf_h6300 = "detect-stylus" + +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" + +PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" + +RDEPENDS_libts = "tslib-conf" + +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_libts-dev = "${FILES_tslib-dev}" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb deleted file mode 100644 index bd3478191e..0000000000 --- a/packages/tslib/tslib_cvs.bb +++ /dev/null @@ -1,94 +0,0 @@ -DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." -HOMEPAGE = "http://cvs.arm.linux.org.uk/" -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPL" - -PV = "0.0+cvs${SRCDATE}" -PR = "r39" - -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ - file://usec_fix.patch;patch=1 \ - file://ts.conf \ - file://ts-2.6.conf \ - file://ts.conf-h3600-2.4 \ - file://ts.conf-simpad-2.4 \ - file://ts.conf-corgi-2.4 \ - file://ts.conf-collie-2.4 \ - file://tslib.sh" -SRC_URI_append_mnci += " file://devfs.patch;patch=1" -SRC_URI_append_mnci += " file://event1.patch;patch=1" -S = "${WORKDIR}/tslib" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared" -EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " - -do_stage() { - autotools_stage_all -} - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ - case ${MACHINE} in - a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-h3600-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - c7x0 | spitz | akita | tosa ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-corgi-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - collie | poodle ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-collie-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - - simpad ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-simpad-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - *) - ;; - esac -} - -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" - -RDEPENDS_tslib-conf_h1940 = "detect-stylus" -RDEPENDS_tslib-conf_h2200 = "detect-stylus" -RDEPENDS_tslib-conf_h3600 = "detect-stylus" -RDEPENDS_tslib-conf_h3900 = "detect-stylus" -RDEPENDS_tslib-conf_h6300 = "detect-stylus" - -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" -PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" - -PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" - -RDEPENDS_libts = "tslib-conf" - -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_libts-dev = "${FILES_tslib-dev}" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" -- cgit v1.2.3 From def4ba6a3759bb55bd5b888cde21379b5202dede Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:23:13 +0000 Subject: zbedic 1.0 fix building against multithreaded qt --- packages/zbedic/zbedic_1.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.0.bb index d7218a241d..4290258b61 100644 --- a/packages/zbedic/zbedic_1.0.bb +++ b/packages/zbedic/zbedic_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ file://opie-icons.patch;patch=1 \ @@ -18,11 +18,11 @@ S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" -do_configure() { - cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ - INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ - LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic +do_configure_prepend() { + rm -f Makefile + qmake -project } do_install() { -- cgit v1.2.3 From 5cb867704ca627b7511cea9f77f17af7803ba956 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:29:20 +0000 Subject: tslib: fix cvs build, reorder metadata for -maemo variant --- packages/tslib/tslib-maemo_0.0.1-15.bb | 18 ++++++++---------- packages/tslib/tslib_20060703.bb | 5 +++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index f744833d57..e303b40841 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,25 +1,18 @@ -DEFAULT_PREFERENCE = "-1" -SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." -PR = "r2" +SECTION = "GPL" +LICENSE = "LGPL" PROVIDES = "tslib" +PR = "r3" DEFAULT_PREFERENCE = "-1" -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" - SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ file://tslib.sh" - S = "${WORKDIR}/tslib" -LICENSE = "LGPL" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" inherit autotools -PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" EXTRA_OECONF = "--enable-shared" do_stage () { @@ -36,6 +29,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" +PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" + RDEPENDS_libts-maemo = "tslib-maemo-conf" RPROVIDES_tslib-maemo-conf = "tslib-conf" diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index 89296c4796..f4ff493b57 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PV = "0.1+cvs+${PV}" +RV := "${PV}" +PV = "0.1+cvs-${RV}" PR = "r0" -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \ +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ file://ts.conf \ file://ts-2.6.conf \ -- cgit v1.2.3 From a536f91cda43bb451202269f3d86ea98f8cf3196 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:39:13 +0000 Subject: angstrom: cleanups as per Marcins suggestions --- packages/angstrom/angstrom-bootmanager-image.bb | 2 +- packages/angstrom/angstrom-bootstrap-image.bb | 2 +- packages/angstrom/angstrom-gpe-image.bb | 9 +++++---- packages/angstrom/task-angstrom.bb | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index b669d2b665..f6aaddd55e 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager" +export IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 84a4845569..b2b5565eb6 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends" export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "angstrom-base-depends" +export IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index 0419ea1b9a..df7f90987e 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -6,16 +6,17 @@ PR = "r0" export IMAGE_BASENAME = "gpe-image" DEPENDS = "task-angstrom" -RDEPENDS = "${IPKG_INSTALL}" - -export IPKG_INSTALL = "\ +RDEPENDS = "\ angstrom-base-depends \ - angstrom-X-base-depends \ + angstrom-x11-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ ${ANGSTROM_EXTRA_INSTALL}" + +export IPKG_INSTALL = "${RDEPENDS}" + #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index d058457e98..7447dc02e2 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PACKAGES = "\ angstrom-base-depends \ - angstrom-X-base-depends \ + angstrom-x11-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ @@ -24,7 +24,7 @@ RDEPENDS_angstrom-base-depends = "\ angstrom-version \ " -RDEPENDS_angstrom-X-base-depends := "\ +RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From a63b99505854d63a59ff9eb20041a6da90548553 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:47:36 +0000 Subject: gcc: add eabi to atexit cases gcc3-build.inc and bump pr for affected toolchains --- packages/gcc/gcc3-build.inc | 5 +++++ packages/gcc/gcc_4.1.1.bb | 2 +- packages/gcc/gcc_csl-arm-2005q3.bb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 74ad11033f..32e22e16f8 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -63,8 +63,13 @@ python __anonymous () { import bb, re if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) + } do_configure () { diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 793aa4bb76..6e332dceca 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 62bacda147..02e984358f 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "GPL" BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" -PR = "r1" +PR = "r2" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" -- cgit v1.2.3 From b4c0b087d67f8fb9db91e6137d8e834ec11b1bc3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:48:37 +0000 Subject: libcwd: upgrade to 0.99.44 --- packages/libcwd/libcwd_0.99.40.bb | 22 ---------------------- packages/libcwd/libcwd_0.99.44.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 packages/libcwd/libcwd_0.99.40.bb create mode 100644 packages/libcwd/libcwd_0.99.44.bb diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.40.bb deleted file mode 100644 index a2650eec85..0000000000 --- a/packages/libcwd/libcwd_0.99.40.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \ -It includes ostream-based debug output with custom debug channels and devices, \ -powerful memory allocation debugging support, as well as run-time support for \ -printing source line number information and demangled type names." -SECTION = "devel/libs" -LICENSE = "QPL" -HOMEPAGE = "http://libcwd.sourceforge.net" -MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r0" - -SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz" - -inherit autotools - -PARALLEL_MAKE = "" - -PACKAGES =+ "${PN}-config ${PN}-mt" -FILES_${PN} = "${libdir}/libcwd.so*" -FILES_${PN}-mt = "${libdir}/libcwd_r.so*" -FILES_${PN}-config = "${datadir}" -RRECOMMENDS_${PN} = "${PN}-config" -RRECOMMENDS_${PN}-mt = "${PN}-config" diff --git a/packages/libcwd/libcwd_0.99.44.bb b/packages/libcwd/libcwd_0.99.44.bb new file mode 100644 index 0000000000..1288ea6e75 --- /dev/null +++ b/packages/libcwd/libcwd_0.99.44.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \ +It includes ostream-based debug output with custom debug channels and devices, \ +powerful memory allocation debugging support, as well as run-time support for \ +printing source line number information and demangled type names." +SECTION = "devel/libs" +LICENSE = "QPL" +HOMEPAGE = "http://libcwd.sourceforge.net" +MAINTAINER = "Michael 'Mickey' Lauer " +PR = "r0" + +SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz" + +inherit autotools + +do_configure() { + oe_runconf +} + +PARALLEL_MAKE = "" + +PACKAGES =+ "${PN}-config ${PN}-mt" +FILES_${PN} = "${libdir}/libcwd.so*" +FILES_${PN}-mt = "${libdir}/libcwd_r.so*" +FILES_${PN}-config = "${datadir}" +RRECOMMENDS_${PN} = "${PN}-config" +RRECOMMENDS_${PN}-mt = "${PN}-config" -- cgit v1.2.3 From 1eb690ef768680928f40ea37cf91bb21959d2d2b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:51:05 +0000 Subject: txdrug 0.1 regenerate Makefile, fix working against qte-mt --- packages/txdrug/txdrug_0.1.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index 7e77fb2348..fd12180ac6 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "sqlite" -PR = "r1" +PR = "r2" SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \ file://${FILESDIR}/${palmtopdir}" @@ -12,6 +12,12 @@ S = "${WORKDIR}/txdrug-tar" inherit palmtop +EXTRA_QMAKEVARS_POST += "LIBS+=-lsqlite TARGET=txdrug" + +do_configure_prepend() { + rm -f Makefile && qmake -project +} + do_install() { install -d ${D}${palmtopdir} cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ -- cgit v1.2.3 From cd3ff97d19adc158b63d54d20e66b4fc45105ca4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:51:23 +0000 Subject: gcc-cross: bump pr --- packages/gcc/gcc-cross_4.1.1.bb | 2 +- packages/gcc/gcc-cross_csl-arm-2005q3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 19e37660b2..4e3805b676 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 93c58aca53..044383cb84 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ include gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r0" +PR = "r1" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -- cgit v1.2.3 From d67f17b36bda753f625435ae7a2236a183550f1a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 13:07:50 +0000 Subject: mileage: catch up with sourceforge CVS hosting --- packages/mileage/mileage_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 355db4d3ea..a917f76d05 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -5,9 +5,9 @@ PRIORITY = "optional" LICENSE = "GPL" #Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV PV = "4.2.0-cvs-${SRCDATE}" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" +SRC_URI = "cvs://anonymous@mileage.cvs.sourceforge.net/cvsroot/mileage;module=mileage" S = "${WORKDIR}/mileage" inherit palmtop -- cgit v1.2.3 From f6e8cf8291ee82a6ab66fbe11a03fd0af23003cb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 14:34:38 +0000 Subject: h2200, ipaq-pxa270: start seperating kernel-modules from BOOTSTRAP_foo, so people aren't forced to use the bloated task-bootstrap to get a booting image --- conf/machine/h2200.conf | 3 ++- conf/machine/ipaq-pxa270.conf | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index fab57cae38..e1baea775d 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,7 +14,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" #ship in rootfs: diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 9ed313334b..359f8296d8 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -21,7 +21,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" @@ -41,7 +42,6 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" # These modules are now compiled into the kernel: #HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ -- cgit v1.2.3 From 493a0dc716163e1f0747d86b1f0e66e64f0162bc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 14:46:29 +0000 Subject: task-angstrom: start using the new BOOTMODULES_RRECOMMENDS var --- packages/angstrom/task-angstrom.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 7447dc02e2..ec989659f1 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -24,6 +24,11 @@ RDEPENDS_angstrom-base-depends = "\ angstrom-version \ " +RRECOMMENDS_angstrom-base-depends = "\ + ${BOOTMODULES_RRECOMMENDS} \ + " + + RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From 5badc4267510b46619fbbe88d0a4acc56f8c4fc5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 3 Jul 2006 15:15:58 +0000 Subject: fluxbox: Split flxubox-gpe in fluxbox and fluxbox-gpe, courtesy hrw & koen --- packages/fluxbox/fluxbox-gpe/.mtn2git_empty | 0 packages/fluxbox/fluxbox-gpe/apps.gpe.akita | 57 ---------- packages/fluxbox/fluxbox-gpe/apps.gpe.default | 7 -- packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session | 40 ------- packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session | 9 -- packages/fluxbox/fluxbox-gpe/gpe-init.patch | 121 -------------------- packages/fluxbox/fluxbox-gpe/style.gpe-default | 137 ----------------------- packages/fluxbox/fluxbox-gpe_1.0rc.bb | 77 ------------- packages/fluxbox/fluxbox/.mtn2git_empty | 0 packages/fluxbox/fluxbox/apps.gpe.akita | 57 ++++++++++ packages/fluxbox/fluxbox/apps.gpe.default | 7 ++ packages/fluxbox/fluxbox/fluxbox-gpe-session | 40 +++++++ packages/fluxbox/fluxbox/fluxbox-gpe.session | 9 ++ packages/fluxbox/fluxbox/gpe-init.patch | 121 ++++++++++++++++++++ packages/fluxbox/fluxbox/style.gpe-default | 137 +++++++++++++++++++++++ packages/fluxbox/fluxbox_0.99+1.0rc.bb | 79 +++++++++++++ 16 files changed, 450 insertions(+), 448 deletions(-) delete mode 100644 packages/fluxbox/fluxbox-gpe/.mtn2git_empty delete mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.akita delete mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.default delete mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session delete mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session delete mode 100644 packages/fluxbox/fluxbox-gpe/gpe-init.patch delete mode 100644 packages/fluxbox/fluxbox-gpe/style.gpe-default delete mode 100644 packages/fluxbox/fluxbox-gpe_1.0rc.bb create mode 100644 packages/fluxbox/fluxbox/.mtn2git_empty create mode 100644 packages/fluxbox/fluxbox/apps.gpe.akita create mode 100644 packages/fluxbox/fluxbox/apps.gpe.default create mode 100644 packages/fluxbox/fluxbox/fluxbox-gpe-session create mode 100644 packages/fluxbox/fluxbox/fluxbox-gpe.session create mode 100644 packages/fluxbox/fluxbox/gpe-init.patch create mode 100644 packages/fluxbox/fluxbox/style.gpe-default create mode 100644 packages/fluxbox/fluxbox_0.99+1.0rc.bb diff --git a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty b/packages/fluxbox/fluxbox-gpe/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita deleted file mode 100644 index 7aca442752..0000000000 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita +++ /dev/null @@ -1,57 +0,0 @@ -[app] (title=Panel 0) - [Deco] {NONE} - [Sticky] {yes} -[end] -[app] (title=Panel 1) - [Deco] {NONE} -[end] -[app] (title=rxvt) - [Dimensions] {635 440} -[end] -[app] (title=x-terminal-emulator) - [Dimensions] {635 440} -[end] -[app] (abiword) - [Dimensions] {635 440} - [Sticky] {no} -[end] -[app] (gpe-filemanager) - [Dimensions] {635 440} - [Sticky] {yes} -[end] -[app] (gpe-info) - [Dimensions] {424 336} -[end] -[app] (gpe-edit) - [Dimensions] {635 440} -[end] -[app] (gpe-calculator) - [Dimensions] {266 321} -[end] -[app] (main) - [Dimensions] {635 440} -[end] -[app] (Gnumeric) - [Dimensions] {635 440} -[end] -[app] (gpdf) - [Dimensions] {635 440} -[end] -[app] (main_window) - [Dimensions] {635 440} -[end] -[app] (gaim) - [Dimensions] {635 440} -[end] -[app] (gpe-calendar) - [Dimensions] {380 343} -[end] -[app] (gpe-mini-browser) - [Dimensions] {635 440} -[end] -[app] (figment) - [Dimensions] {635 440} -[end] -[app] (gpe-sketchbook) - [Dimensions] {471 314} -[end] diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default deleted file mode 100644 index d7a0a83f22..0000000000 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe.default +++ /dev/null @@ -1,7 +0,0 @@ -[app] (title=Panel 0) - [Deco] {NONE} - [Sticky] {yes} -[end] -[app] (title=Panel 1) - [Deco] {NONE} -[end] diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session deleted file mode 100644 index f6e03ede7e..0000000000 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Session script for fluxbox-gpe, heavily based on matchbox's session script -# - -# Install "apps" file with defaults for GPE usage - -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" - -case $MACHINE in -*Akita | *Spitz | *Borzoi | *Terrier) - APPS="apps.gpe.akita";; -*) - APPS="apps.gpe.default";; -esac - -if test -e /usr/share/fluxbox/$APPS -then - mkdir -p $HOME/.fluxbox - test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps -fi - - -if [ -e $HOME/.fluxbox/session ] -then -exec $HOME/.fluxbox/session -fi - -if [ -e /usr/share/fluxbox/session ] -then -exec /usr/share/fluxbox/session -fi - -# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session -# dont exist. - -matchbox-desktop & -matchbox-panel --orientation south -no-flip & -sleep 5 -exec startfluxbox $@ diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session deleted file mode 100644 index 16b7a2703a..0000000000 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` - -matchbox-desktop & -matchbox-panel --orientation south --no-flip& -sleep 5 -exec startfluxbox $@ - diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox-gpe/gpe-init.patch deleted file mode 100644 index c9836923d8..0000000000 --- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- fluxbox-1.0rc/data/init.in.orig 2006-07-02 20:45:39.119045500 +0200 -+++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200 -@@ -1,35 +1,95 @@ -+session.screen0.slit.onTop: False - session.screen0.slit.placement: BottomRight -+session.screen0.slit.alpha: 255 -+session.screen0.slit.onhead: 0 - session.screen0.slit.direction: Vertical --session.screen0.slit.onTop: False --session.screen0.slit.autoHide: False --session.screen0.tab.placement: Top -+session.screen0.slit.layer: Dock -+session.screen0.slit.maxOver: false -+session.screen0.slit.autoHide: false -+session.screen0.menu.alpha: 255 -+session.screen0.iconbar.iconTextPadding: 10l -+session.screen0.iconbar.alignment: Left -+session.screen0.iconbar.wheelMode: Screen -+session.screen0.iconbar.mode: Workspace -+session.screen0.iconbar.deiconifyMode: Follow -+session.screen0.iconbar.iconWidth: 70 -+session.screen0.iconbar.usePixmap: true -+session.screen0.window.focus.alpha: 255 -+session.screen0.window.unfocus.alpha: 255 -+session.screen0.tab.height: 16 - session.screen0.tab.alignment: Left - session.screen0.tab.rotatevertical: True --session.screen0.toolbar.onTop: False --session.screen0.toolbar.autoHide: False --session.screen0.toolbar.placement: BottomCenter --session.screen0.toolbar.widthPercent: 66 --session.screen0.workspaceNames: one,two,three,four -+session.screen0.tab.placement: TopLeft -+session.screen0.tab.width: 64 -+session.screen0.tabs.intitlebar: true -+session.screen0.titlebar.left: Stick -+session.screen0.titlebar.right: Minimize Maximize Close -+session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, clock -+session.screen0.toolbar.visible: true -+session.screen0.toolbar.layer: Top -+session.screen0.toolbar.placement: TopCenter -+session.screen0.toolbar.onhead: 0 -+session.screen0.toolbar.widthPercent: 69 -+session.screen0.toolbar.onTop: true -+session.screen0.toolbar.height: 0 -+session.screen0.toolbar.alpha: 254 -+session.screen0.toolbar.autoHide: false -+session.screen0.toolbar.maxOver: true -+session.screen0.overlay.lineWidth: 1 -+session.screen0.overlay.lineStyle: LineSolid -+session.screen0.overlay.joinStyle: JoinMiter -+session.screen0.overlay.capStyle: CapNotLast -+session.screen0.autoRaise: false - session.screen0.strftimeFormat: %k:%M --session.screen0.focusNewWindows: True --session.screen0.focusModel: ClickToFocus --session.screen0.fullMaximization: False -+session.screen0.clickRaises: true -+session.screen0.imageDither: false -+session.screen0.workspaces: 4 -+session.screen0.menuDelay: 0 -+session.screen0.focusNewWindows: true -+session.screen0.workspaceNames: one,two,three,four, - session.screen0.edgeSnapThreshold: 0 -+session.screen0.menuDelayClose: 0 -+session.screen0.windowScrollReverse: false - session.screen0.rowPlacementDirection: LeftToRight --session.screen0.workspaces: 4 --session.screen0.focusLastWindow: True -+session.screen0.followModel: Ignore -+session.screen0.windowMenu: -+session.screen0.reversewheeling: false -+session.screen0.windowScrollAction: -+session.screen0.sloppywindowgrouping: true -+session.screen0.resizeMode: Bottom - session.screen0.colPlacementDirection: TopToBottom -+session.screen0.desktopwheeling: true -+session.screen0.tabFocusModel: ClickToTabFocus -+session.screen0.antialias: false -+session.screen0.focusLastWindow: true - session.screen0.windowPlacement: RowSmartPlacement --session.screen0.tab.width: 64 --session.screen0.tab.height: 16 --session.screen0.showwindowposition: true --session.opaqueMove: False --session.autoRaiseDelay: 250 -+session.screen0.focusModel: ClickFocus -+session.screen0.opaqueMove: false -+session.screen0.workspacewarping: true -+session.screen0.menuMode: Delay -+session.screen0.decorateTransient: false -+session.screen0.showwindowposition: true -+session.screen0.rootCommand: -+session.screen0.fullMaximization: false -+session.focusTabMinWidth: 0 - session.menuFile: ~/.fluxbox/menu --session.cacheLife: 5 --session.styleFile: @default_style@ --session.keyFile: ~/.fluxbox/keys -+session.imageDither: True - session.colorsPerChannel: 4 -+session.tabPadding: 0 -+session.styleFile: /usr/share/fluxbox/styles/gpe-default -+session.cacheMax: 200l -+session.autoRaiseDelay: 250 - session.doubleClickInterval: 250 --session.cacheMax: 200 --session.imageDither: True -+session.tabsAttachArea: Window -+session.numLayers: 13 -+session.keyFile: ~/.fluxbox/keys -+session.ignoreBorder: false -+session.appsFile: ~/.fluxbox/apps -+session.tabs: false -+session.useMod1: true -+session.slitlistFile: ~/.fluxbox/slitlist -+session.forcePseudoTransparency: false -+session.opaqueMove: False -+session.groupFile: ~/.fluxbox/groups -+session.cacheLife: 5l -+session.styleOverlay: ~/.fluxbox/overlay diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox-gpe/style.gpe-default deleted file mode 100644 index f94aaf7cdd..0000000000 --- a/packages/fluxbox/fluxbox-gpe/style.gpe-default +++ /dev/null @@ -1,137 +0,0 @@ -! meta -! (c) joel carlbark 2003 -! please dont turn on aa with this style -! make sure you have the font 'glisp' (or similar). - -toolbar: flat gradient vertical -toolbar.color: #849ec6 -toolbar.colorTo: #526d8c - -toolbar.button: parentrelative -toolbar.button.picColor: #d6d7e7 - -toolbar.button.pressed: sunken solid -toolbar.button.pressed.color: #526d8c -toolbar.button.pressed.picColor: #000000 - -! clock -toolbar.clock: parentrelative -toolbar.clock.textColor: white - -! shows workspace nr -toolbar.label: parentrelative -toolbar.label.textColor: white - -! current active window / toolbar -toolbar.windowLabel: parentrelative -toolbar.windowLabel.textColor: white - -! menu --------- -menu.title: flat gradient vertical -menu.title.color: #849ec6 -menu.title.colorTo: #526d8c -menu.title.textColor: #d6d7e7 - -menu.frame: flat gradient vertical -menu.frame.color: #efefef -menu.frame.colorTo: #c6c3c6 -menu.frame.textColor: black - -menu.hilite: flat solid -menu.hilite.color: #849ec6 -menu.hilite.textColor: white - -menu.bullet: triangle -menu.bullet.position: right - -! window -------------- -window.title.focus: flat gradient vertical -window.title.focus.color: #849ec6 -window.title.focus.colorTo: #526d8c - -window.label.focus: parentrelative -window.label.focus.textColor: white - -window.button.focus: flat gradient vertical -window.button.focus.color: #849ec6 -window.button.focus.colorTo: #526d8c -window.button.focus.picColor: #d6d7e7 - -window.button.pressed: sunken solid -window.button.pressed.color: #405060 -window.button.pressed.picColor: #000000 - -window.handle.focus: flat gradient vertical -window.handle.focus.color: #efefef -window.handle.focus.colorTo: #c6c3c6 - -window.grip.focus: flat gradient vertical -window.grip.focus.color: #efefef -window.grip.focus.colorTo: #c6c3c6 - -window.frame.focus: flat solid -window.frame.focus.color: white - -! unfocused -window.title.unfocus: flat gradient vertical -window.title.unfocus.color: #efefef -window.title.unfocus.colorTo: #c6c3c6 - -window.label.unfocus: parentrelative -window.label.unfocus.textColor: #949694 - -window.handle.unfocus: flat gradient vertical -window.handle.unfocus.color: #efefef -window.handle.unfocus.colorTo: #c6c3c6 - -window.grip.unfocus: flat gradient vertical -window.grip.unfocus.color: #efefef -window.grip.unfocus.colorTo: #c6c3c6 - -window.frame.unfocus: flat solid -window.frame.unfocus.color: white - -window.button.unfocus: flat gradient vertical -window.button.unfocus.color: #efefef -window.button.unfocus.colorTo: #c6c3c6 -window.button.unfocus.picColor: #949694 - -! tabs ------ -window.tab.justify: left - -window.tab.label.focus: flat gradient vertical -window.tab.label.focus.color: #849ec6 -window.tab.label.focus.colorTo: #526d8c -window.tab.label.focus.textColor: #d6d7e7 - -window.tab.label.unfocus: flat gradient vertical -window.tab.label.unfocus.color: #efefef -window.tab.label.unfocus.colorTo: #c6c3c6 -window.tab.label.unfocus.textColor: #949694 - -window.tab.borderWidth: 1 -window.tab.borderColor: #949694 -! ------- - -toolbar.justify: left -window.justify: center -menu.title.justify: center -menu.frame.justify: left - -borderColor: #000000 -borderWidth: 1 -bevelWidth: 1 -frameWidth: 1 -handleWidth: 4 - -background: flat -background.color: #d6d7e7 - -#*font: Vera-4 -#toolbar.font: Vera-4 - -toolbar*.font: Vera-6 -window.font: Vera-6 -menu.title.font: Vera-7 -menu.frame.font: Vera-7 - diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb deleted file mode 100644 index 0d962ca6f5..0000000000 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright Matthias Hentges (c) 2006 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) -# -# Filename: fluxbox-gpe_1.0rc.bb -# Date: 01-Jul-06 - -DESCRIPTION = "The Fluxbox WindowManager for use with GPE" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://fluxbox.sourceforge.net" -LICENSE = "MIT" -RCONFLICTS = "fluxbox" - -###################################################################################### - -PR = "r2" -S = "${WORKDIR}/fluxbox-${PV}" - -###################################################################################### - -SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ - file://gpe-init.patch;patch=1\ - file://apps.gpe.* \ - file://style.gpe-default \ - file://fluxbox-gpe-session \ - file://fluxbox-gpe.session" - -###################################################################################### - -PACKAGES = "${PN} ${PN}-styles" - -DESCRIPTION_${PN}-styles = "The default styles for fluxbox" - -###################################################################################### - -FILES_${PN} = "/usr/bin \ - /usr/share/fluxbox/init \ - /usr/share/fluxbox/keys \ - /usr/share/fluxbox/menu \ - /usr/share/fluxbox/apps.gpe* \ - /usr/share/fluxbox/session \ - /usr/share/fluxbox/styles/gpe-default" - -FILES_${PN}-styles = "/usr/share/fluxbox/styles" - -###################################################################################### - -inherit autotools - -###################################################################################### - -EXTRA_OECONF = "--disable-xmb \ - " - -###################################################################################### - -do_install_append() { - install -d ${D}/usr/bin - install -d ${D}/usr/share/fluxbox - install -d ${D}/usr/share/fluxbox/styles - - install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox - install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session - install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default - install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin -} - -###################################################################################### - -pkg_postinst_${PN}() { - update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 -} - -pkg_postrm_${PN}() { - update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session -} - diff --git a/packages/fluxbox/fluxbox/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fluxbox/fluxbox/apps.gpe.akita b/packages/fluxbox/fluxbox/apps.gpe.akita new file mode 100644 index 0000000000..7aca442752 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.akita @@ -0,0 +1,57 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] +[app] (title=rxvt) + [Dimensions] {635 440} +[end] +[app] (title=x-terminal-emulator) + [Dimensions] {635 440} +[end] +[app] (abiword) + [Dimensions] {635 440} + [Sticky] {no} +[end] +[app] (gpe-filemanager) + [Dimensions] {635 440} + [Sticky] {yes} +[end] +[app] (gpe-info) + [Dimensions] {424 336} +[end] +[app] (gpe-edit) + [Dimensions] {635 440} +[end] +[app] (gpe-calculator) + [Dimensions] {266 321} +[end] +[app] (main) + [Dimensions] {635 440} +[end] +[app] (Gnumeric) + [Dimensions] {635 440} +[end] +[app] (gpdf) + [Dimensions] {635 440} +[end] +[app] (main_window) + [Dimensions] {635 440} +[end] +[app] (gaim) + [Dimensions] {635 440} +[end] +[app] (gpe-calendar) + [Dimensions] {380 343} +[end] +[app] (gpe-mini-browser) + [Dimensions] {635 440} +[end] +[app] (figment) + [Dimensions] {635 440} +[end] +[app] (gpe-sketchbook) + [Dimensions] {471 314} +[end] diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default new file mode 100644 index 0000000000..d7a0a83f22 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.default @@ -0,0 +1,7 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] diff --git a/packages/fluxbox/fluxbox/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session new file mode 100644 index 0000000000..f6e03ede7e --- /dev/null +++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Session script for fluxbox-gpe, heavily based on matchbox's session script +# + +# Install "apps" file with defaults for GPE usage + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" + +case $MACHINE in +*Akita | *Spitz | *Borzoi | *Terrier) + APPS="apps.gpe.akita";; +*) + APPS="apps.gpe.default";; +esac + +if test -e /usr/share/fluxbox/$APPS +then + mkdir -p $HOME/.fluxbox + test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps +fi + + +if [ -e $HOME/.fluxbox/session ] +then +exec $HOME/.fluxbox/session +fi + +if [ -e /usr/share/fluxbox/session ] +then +exec /usr/share/fluxbox/session +fi + +# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session +# dont exist. + +matchbox-desktop & +matchbox-panel --orientation south -no-flip & +sleep 5 +exec startfluxbox $@ diff --git a/packages/fluxbox/fluxbox/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session new file mode 100644 index 0000000000..16b7a2703a --- /dev/null +++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session @@ -0,0 +1,9 @@ +#!/bin/sh + +XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` + +matchbox-desktop & +matchbox-panel --orientation south --no-flip& +sleep 5 +exec startfluxbox $@ + diff --git a/packages/fluxbox/fluxbox/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch new file mode 100644 index 0000000000..c9836923d8 --- /dev/null +++ b/packages/fluxbox/fluxbox/gpe-init.patch @@ -0,0 +1,121 @@ +--- fluxbox-1.0rc/data/init.in.orig 2006-07-02 20:45:39.119045500 +0200 ++++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200 +@@ -1,35 +1,95 @@ ++session.screen0.slit.onTop: False + session.screen0.slit.placement: BottomRight ++session.screen0.slit.alpha: 255 ++session.screen0.slit.onhead: 0 + session.screen0.slit.direction: Vertical +-session.screen0.slit.onTop: False +-session.screen0.slit.autoHide: False +-session.screen0.tab.placement: Top ++session.screen0.slit.layer: Dock ++session.screen0.slit.maxOver: false ++session.screen0.slit.autoHide: false ++session.screen0.menu.alpha: 255 ++session.screen0.iconbar.iconTextPadding: 10l ++session.screen0.iconbar.alignment: Left ++session.screen0.iconbar.wheelMode: Screen ++session.screen0.iconbar.mode: Workspace ++session.screen0.iconbar.deiconifyMode: Follow ++session.screen0.iconbar.iconWidth: 70 ++session.screen0.iconbar.usePixmap: true ++session.screen0.window.focus.alpha: 255 ++session.screen0.window.unfocus.alpha: 255 ++session.screen0.tab.height: 16 + session.screen0.tab.alignment: Left + session.screen0.tab.rotatevertical: True +-session.screen0.toolbar.onTop: False +-session.screen0.toolbar.autoHide: False +-session.screen0.toolbar.placement: BottomCenter +-session.screen0.toolbar.widthPercent: 66 +-session.screen0.workspaceNames: one,two,three,four ++session.screen0.tab.placement: TopLeft ++session.screen0.tab.width: 64 ++session.screen0.tabs.intitlebar: true ++session.screen0.titlebar.left: Stick ++session.screen0.titlebar.right: Minimize Maximize Close ++session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, clock ++session.screen0.toolbar.visible: true ++session.screen0.toolbar.layer: Top ++session.screen0.toolbar.placement: TopCenter ++session.screen0.toolbar.onhead: 0 ++session.screen0.toolbar.widthPercent: 69 ++session.screen0.toolbar.onTop: true ++session.screen0.toolbar.height: 0 ++session.screen0.toolbar.alpha: 254 ++session.screen0.toolbar.autoHide: false ++session.screen0.toolbar.maxOver: true ++session.screen0.overlay.lineWidth: 1 ++session.screen0.overlay.lineStyle: LineSolid ++session.screen0.overlay.joinStyle: JoinMiter ++session.screen0.overlay.capStyle: CapNotLast ++session.screen0.autoRaise: false + session.screen0.strftimeFormat: %k:%M +-session.screen0.focusNewWindows: True +-session.screen0.focusModel: ClickToFocus +-session.screen0.fullMaximization: False ++session.screen0.clickRaises: true ++session.screen0.imageDither: false ++session.screen0.workspaces: 4 ++session.screen0.menuDelay: 0 ++session.screen0.focusNewWindows: true ++session.screen0.workspaceNames: one,two,three,four, + session.screen0.edgeSnapThreshold: 0 ++session.screen0.menuDelayClose: 0 ++session.screen0.windowScrollReverse: false + session.screen0.rowPlacementDirection: LeftToRight +-session.screen0.workspaces: 4 +-session.screen0.focusLastWindow: True ++session.screen0.followModel: Ignore ++session.screen0.windowMenu: ++session.screen0.reversewheeling: false ++session.screen0.windowScrollAction: ++session.screen0.sloppywindowgrouping: true ++session.screen0.resizeMode: Bottom + session.screen0.colPlacementDirection: TopToBottom ++session.screen0.desktopwheeling: true ++session.screen0.tabFocusModel: ClickToTabFocus ++session.screen0.antialias: false ++session.screen0.focusLastWindow: true + session.screen0.windowPlacement: RowSmartPlacement +-session.screen0.tab.width: 64 +-session.screen0.tab.height: 16 +-session.screen0.showwindowposition: true +-session.opaqueMove: False +-session.autoRaiseDelay: 250 ++session.screen0.focusModel: ClickFocus ++session.screen0.opaqueMove: false ++session.screen0.workspacewarping: true ++session.screen0.menuMode: Delay ++session.screen0.decorateTransient: false ++session.screen0.showwindowposition: true ++session.screen0.rootCommand: ++session.screen0.fullMaximization: false ++session.focusTabMinWidth: 0 + session.menuFile: ~/.fluxbox/menu +-session.cacheLife: 5 +-session.styleFile: @default_style@ +-session.keyFile: ~/.fluxbox/keys ++session.imageDither: True + session.colorsPerChannel: 4 ++session.tabPadding: 0 ++session.styleFile: /usr/share/fluxbox/styles/gpe-default ++session.cacheMax: 200l ++session.autoRaiseDelay: 250 + session.doubleClickInterval: 250 +-session.cacheMax: 200 +-session.imageDither: True ++session.tabsAttachArea: Window ++session.numLayers: 13 ++session.keyFile: ~/.fluxbox/keys ++session.ignoreBorder: false ++session.appsFile: ~/.fluxbox/apps ++session.tabs: false ++session.useMod1: true ++session.slitlistFile: ~/.fluxbox/slitlist ++session.forcePseudoTransparency: false ++session.opaqueMove: False ++session.groupFile: ~/.fluxbox/groups ++session.cacheLife: 5l ++session.styleOverlay: ~/.fluxbox/overlay diff --git a/packages/fluxbox/fluxbox/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default new file mode 100644 index 0000000000..f94aaf7cdd --- /dev/null +++ b/packages/fluxbox/fluxbox/style.gpe-default @@ -0,0 +1,137 @@ +! meta +! (c) joel carlbark 2003 +! please dont turn on aa with this style +! make sure you have the font 'glisp' (or similar). + +toolbar: flat gradient vertical +toolbar.color: #849ec6 +toolbar.colorTo: #526d8c + +toolbar.button: parentrelative +toolbar.button.picColor: #d6d7e7 + +toolbar.button.pressed: sunken solid +toolbar.button.pressed.color: #526d8c +toolbar.button.pressed.picColor: #000000 + +! clock +toolbar.clock: parentrelative +toolbar.clock.textColor: white + +! shows workspace nr +toolbar.label: parentrelative +toolbar.label.textColor: white + +! current active window / toolbar +toolbar.windowLabel: parentrelative +toolbar.windowLabel.textColor: white + +! menu --------- +menu.title: flat gradient vertical +menu.title.color: #849ec6 +menu.title.colorTo: #526d8c +menu.title.textColor: #d6d7e7 + +menu.frame: flat gradient vertical +menu.frame.color: #efefef +menu.frame.colorTo: #c6c3c6 +menu.frame.textColor: black + +menu.hilite: flat solid +menu.hilite.color: #849ec6 +menu.hilite.textColor: white + +menu.bullet: triangle +menu.bullet.position: right + +! window -------------- +window.title.focus: flat gradient vertical +window.title.focus.color: #849ec6 +window.title.focus.colorTo: #526d8c + +window.label.focus: parentrelative +window.label.focus.textColor: white + +window.button.focus: flat gradient vertical +window.button.focus.color: #849ec6 +window.button.focus.colorTo: #526d8c +window.button.focus.picColor: #d6d7e7 + +window.button.pressed: sunken solid +window.button.pressed.color: #405060 +window.button.pressed.picColor: #000000 + +window.handle.focus: flat gradient vertical +window.handle.focus.color: #efefef +window.handle.focus.colorTo: #c6c3c6 + +window.grip.focus: flat gradient vertical +window.grip.focus.color: #efefef +window.grip.focus.colorTo: #c6c3c6 + +window.frame.focus: flat solid +window.frame.focus.color: white + +! unfocused +window.title.unfocus: flat gradient vertical +window.title.unfocus.color: #efefef +window.title.unfocus.colorTo: #c6c3c6 + +window.label.unfocus: parentrelative +window.label.unfocus.textColor: #949694 + +window.handle.unfocus: flat gradient vertical +window.handle.unfocus.color: #efefef +window.handle.unfocus.colorTo: #c6c3c6 + +window.grip.unfocus: flat gradient vertical +window.grip.unfocus.color: #efefef +window.grip.unfocus.colorTo: #c6c3c6 + +window.frame.unfocus: flat solid +window.frame.unfocus.color: white + +window.button.unfocus: flat gradient vertical +window.button.unfocus.color: #efefef +window.button.unfocus.colorTo: #c6c3c6 +window.button.unfocus.picColor: #949694 + +! tabs ------ +window.tab.justify: left + +window.tab.label.focus: flat gradient vertical +window.tab.label.focus.color: #849ec6 +window.tab.label.focus.colorTo: #526d8c +window.tab.label.focus.textColor: #d6d7e7 + +window.tab.label.unfocus: flat gradient vertical +window.tab.label.unfocus.color: #efefef +window.tab.label.unfocus.colorTo: #c6c3c6 +window.tab.label.unfocus.textColor: #949694 + +window.tab.borderWidth: 1 +window.tab.borderColor: #949694 +! ------- + +toolbar.justify: left +window.justify: center +menu.title.justify: center +menu.frame.justify: left + +borderColor: #000000 +borderWidth: 1 +bevelWidth: 1 +frameWidth: 1 +handleWidth: 4 + +background: flat +background.color: #d6d7e7 + +#*font: Vera-4 +#toolbar.font: Vera-4 + +toolbar*.font: Vera-6 +window.font: Vera-6 +menu.title.font: Vera-7 +menu.frame.font: Vera-7 + diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb new file mode 100644 index 0000000000..a01d02af89 --- /dev/null +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -0,0 +1,79 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) +# +# Filename: fluxbox-gpe_1.0rc.bb +# Date: 01-Jul-06 + +DESCRIPTION = "The Fluxbox WindowManager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://fluxbox.sourceforge.net" +LICENSE = "MIT" +REALPV = "1.0rc" +PR = "r0" + +###################################################################################### + +S = "${WORKDIR}/fluxbox-${REALPV}" + +###################################################################################### + +SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \ + file://gpe-init.patch;patch=1 \ + file://apps.gpe.* \ + file://style.gpe-default \ + file://fluxbox-gpe-session \ + file://fluxbox-gpe.session" + +###################################################################################### + +PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" + +DESCRIPTION_${PN}-styles = "The default styles for fluxbox" +DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" +RDEPENDS_${PN}-gpe = "${PN}" + +###################################################################################### + +FILES_${PN} = "/usr/bin \ + /usr/share/fluxbox/init \ + /usr/share/fluxbox/keys \ + /usr/share/fluxbox/menu " + +FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \ + /usr/share/fluxbox/styles/gpe-default \ + /usr/share/fluxbox/session \ + /usr/bin/fluxbox-gpe-session" + +FILES_${PN}-styles = "/usr/share/fluxbox/styles" + +FILES_${PN}-doc = "/usr/share/man" + +###################################################################################### + +inherit autotools update-alternatives + +###################################################################################### + +EXTRA_OECONF = "--disable-xmb \ + " + +###################################################################################### + +do_install_append() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/fluxbox + install -d ${D}/usr/share/fluxbox/styles + + install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox + install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session + install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default + install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin +} + +###################################################################################### + +ALTERNATIVE_PATH = "${bindir}/fluxbox-gpe-session" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "15" -- cgit v1.2.3 From 71c98c82d9fe431909223d48d87b89f94012dfe8 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 3 Jul 2006 15:31:28 +0000 Subject: conf/distro/jlime-donkey.conf : Minor change to opie settings linux/linux-jlime-arm_2.6.17.bb : fix of typo --- conf/distro/jlime-donkey.conf | 4 ++-- packages/linux/linux-jlime-arm_2.6.17.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 89a10705ca..67e2aef263 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,8 +78,8 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.3" -include conf/distro/preferred-opie-versions.inc +#OPIE_VERSION = "1.2.3" // use cvsdate for now +#include conf/distro/preferred-opie-versions.inc #<> #<> We want pcmciautils, not pcmcia-cs diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 5db9de0d6e..194f0dc7c6 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -4,14 +4,14 @@ LICENSE = "GPL" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'jornada7xx' +#COMPATIBLE_MACHINE = "jornada7xx" SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ - file://Kconfig-Keyboard-Jornada720.patch;patch=0\ + file://Kconfig-Keyboard-Jornada720.patch;patch=0 \ file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ -- cgit v1.2.3 From 1e02f2a75343878876170da0640dca72fc8cd986 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:34:16 +0000 Subject: fluxbox: hopefully fix alternate selection --- packages/fluxbox/fluxbox_0.99+1.0rc.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index a01d02af89..c222edb817 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -73,7 +73,7 @@ do_install_append() { ###################################################################################### -ALTERNATIVE_PATH = "${bindir}/fluxbox-gpe-session" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "15" +ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" +ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" +ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY_${PN}-gpe = "15" -- cgit v1.2.3 From a2d8a0ce663fda2b13d1d979d4fe66a8b22effb5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:37:40 +0000 Subject: twm: register with u-a as x-window-manager --- packages/x11-apps/twm_1.0.1.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 27dbb79eef..734e1ee7bf 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -1,2 +1,12 @@ +PR = "r1" + include app-common.inc DEPENDS = "libx11 libxt libxmu" + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" + + + -- cgit v1.2.3 From 416820f43a470a43cd3efe8fd8bf878e654c3bb8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:40:46 +0000 Subject: twm: we need to inherit u-a to make the previous change actually do something --- packages/x11-apps/twm_1.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 734e1ee7bf..e02bc4cf7b 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -3,6 +3,8 @@ PR = "r1" include app-common.inc DEPENDS = "libx11 libxt libxmu" +inherit update-alternatives + ALTERNATIVE_PATH = "${bindir}/twm" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -- cgit v1.2.3 From b6b2930ebf642a880b1862f60d29608c8a19193a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:43:49 +0000 Subject: e-wm: misc fixes * use u-a to register as x-window-manager * we have an scm, so no need to emulate it with '#' --- packages/e17/e-wm_0.16.999.027.bb | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb index df78fbdcd0..5089ce23a4 100644 --- a/packages/e17/e-wm_0.16.999.027.bb +++ b/packages/e17/e-wm_0.16.999.027.bb @@ -3,20 +3,12 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" PR = "r3" -inherit e +inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://Xsession.d/98enlightenment" -# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" -# file://disable-splash.patch;patch=1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" - - S = "${WORKDIR}/enlightenment-${PV}" PROFILE = "LOWRES_PDA" @@ -35,10 +27,6 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" -# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" } do_install_append() { @@ -46,7 +34,7 @@ do_install_append() { install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d } -#pkg_postinst() { -# enlightenment_remote -menu-autoscroll-margin-set 5 -# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 -#} \ No newline at end of file +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" -- cgit v1.2.3 From 353d8c7eecf685d8e10b1ee103c0efe526d1ef3c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 17:22:29 +0000 Subject: iqnotes: remove bogus dependency --- packages/iqnotes/iqnotes.inc | 1 - packages/iqnotes/iqnotes_2.0.2.bb | 4 ++-- packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc index ec49ee2d54..e6568833cf 100644 --- a/packages/iqnotes/iqnotes.inc +++ b/packages/iqnotes/iqnotes.inc @@ -5,7 +5,6 @@ Data can be crypted by strong AES algorithm." SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "virtual/libqpe" MAINTAINER = "Marcin Juszkiewicz " HOMEPAGE = "http://iqnotes.berlios.de" AUTHOR = "Peter Vrabel " diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb index fd42188079..7123f68bb2 100644 --- a/packages/iqnotes/iqnotes_2.0.2.bb +++ b/packages/iqnotes/iqnotes_2.0.2.bb @@ -1,6 +1,6 @@ -include iqnotes.inc +require iqnotes.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \ file://md5.diff;patch=1 \ diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb index 6309d8ba1a..e3288505eb 100644 --- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb +++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb @@ -1,8 +1,8 @@ -include iqnotes.inc +require iqnotes.inc #upstream version UPV = "2.1.0rc1" -PR = "r1" +PR = "r2" SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ file://pro.patch;patch=1" -- cgit v1.2.3 From 0dd3fdbe060a948e8093487bc562da9c73a1b80b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 17:42:33 +0000 Subject: tximage 0.2 add patch for g++4 --- packages/tximage/tximage-0.2/gcc4.patch | 15 +++++++++++++++ packages/tximage/tximage_0.2.bb | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/tximage/tximage-0.2/gcc4.patch diff --git a/packages/tximage/tximage-0.2/gcc4.patch b/packages/tximage/tximage-0.2/gcc4.patch new file mode 100644 index 0000000000..d327754d1b --- /dev/null +++ b/packages/tximage/tximage-0.2/gcc4.patch @@ -0,0 +1,15 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- tximage-0.2/imageviewer.h~gcc4 ++++ tximage-0.2/imageviewer.h +@@ -32,6 +32,7 @@ + #include "imagereader.h" + + class ImageWidget; ++class ImageViewer; + class QString; + class QImage; + class QScrollView; diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb index 892ada0c6b..37d0ea6dc6 100644 --- a/packages/tximage/tximage_0.2.bb +++ b/packages/tximage/tximage_0.2.bb @@ -4,10 +4,11 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" HOMEPAGE = "http://community.zaurus.com/projects/tximage/" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openzaurus.org/mirror/tximage-${PV}.tar.gz \ - file://gcc3.patch;patch=1" + file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1" inherit palmtop -- cgit v1.2.3 From d1cc45abeb3a7e4997bd6dc1794f403e43c3568f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 4 Jul 2006 03:06:15 +0000 Subject: fluxbox: Use update-alternative only for fluxbox-gpe, thanks koen for pointint it out. We can't inherit update-alternative since it only works with PN, and horr ibly b0rks on PN-something. --- packages/fluxbox/fluxbox_0.99+1.0rc.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index c222edb817..cf69b090c4 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -10,7 +10,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" REALPV = "1.0rc" -PR = "r0" +PR = "r1" ###################################################################################### @@ -51,7 +51,7 @@ FILES_${PN}-doc = "/usr/share/man" ###################################################################################### -inherit autotools update-alternatives +inherit autotools ###################################################################################### @@ -73,7 +73,10 @@ do_install_append() { ###################################################################################### -ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" -ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" -ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY_${PN}-gpe = "15" +pkg_postinst_${PN}-gpe() { + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 +} + +pkg_postrm_${PN}-gpe() { + update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session +} -- cgit v1.2.3 From e9d6aaf75c32baf067a682a6ddb36bebfe447fd1 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 4 Jul 2006 03:19:18 +0000 Subject: scap: Replace bl toggle with bl on + bl off as bl toggle doesn't seem to work on SL-Cxx00 at least --- packages/scap/files/scap.sh | 4 ++-- packages/scap/scap_0.1.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index ba8bc7e584..ea3ff24593 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -2,7 +2,7 @@ sleep 2 if [ -x /usr/bin/bl ]; then - bl toggle + bl off fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` @@ -15,6 +15,6 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "" cat /dev/fb0) | nc www.handhelds.org 80 if [ -x /usr/bin/bl ]; then - bl toggle + bl on fi diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 7bef893e59..9ba295a7a5 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r4" +PR = "r5" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" -- cgit v1.2.3 From 32fb77d1adfb5d733794f5da446f6262fd4e0b12 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 4 Jul 2006 03:27:25 +0000 Subject: zip 2.32: Add version 2.32. Version 2.31 has been removed from the source site due to buffer overrun vulnerabilities. Closes bugs #1136, #1137. --- packages/zip/zip-native_2.32.bb | 9 +++++++++ packages/zip/zip.inc | 16 ++++++++++++++++ packages/zip/zip_2.31.bb | 19 ++----------------- packages/zip/zip_2.32.bb | 2 ++ 4 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 packages/zip/zip-native_2.32.bb create mode 100644 packages/zip/zip.inc create mode 100644 packages/zip/zip_2.32.bb diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb new file mode 100644 index 0000000000..7cd0261827 --- /dev/null +++ b/packages/zip/zip-native_2.32.bb @@ -0,0 +1,9 @@ +SECTION = "console/utils" +inherit native +include zip_${PV}.bb +S = "${WORKDIR}/zip-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} +} diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc new file mode 100644 index 0000000000..b66b4b217f --- /dev/null +++ b/packages/zip/zip.inc @@ -0,0 +1,16 @@ +SECTION = "console/utils" +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" +LICENSE = "Info-ZIP" +EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ + 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ + 'BINFLAGS=0755' 'INSTALL_D=install -d'" + +do_compile() { + oe_runmake -f unix/Makefile generic +} + +do_install() { + oe_runmake -f unix/Makefile prefix=${D}${prefix} \ + BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ + install +} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb index 6c588a55e5..d10bb4312e 100644 --- a/packages/zip/zip_2.31.bb +++ b/packages/zip/zip_2.31.bb @@ -1,17 +1,2 @@ -SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz" -LICENSE = "Info-ZIP" -EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ - 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ - 'BINFLAGS=0755' 'INSTALL_D=install -d'" - -do_compile() { - oe_runmake -f unix/Makefile generic -} - -do_install() { - oe_runmake -f unix/Makefile prefix=${D}${prefix} \ - BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ - install -} - +include zip.inc +PR="r0" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb new file mode 100644 index 0000000000..d10bb4312e --- /dev/null +++ b/packages/zip/zip_2.32.bb @@ -0,0 +1,2 @@ +include zip.inc +PR="r0" -- cgit v1.2.3 From d1f207a2c3388bbbd8a6ff976603e679478533b2 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 4 Jul 2006 03:38:21 +0000 Subject: hping2 2.0.0rc3: Added hping2, a network testing tool. Especially useful when testing devices for their handling of various protocols (GRE, IP-IP etc) without needing to resort to an actual working application. --- packages/hping/.mtn2git_empty | 0 packages/hping/files/.mtn2git_empty | 0 packages/hping/files/hping2_configure.patch | 75 +++++++++++++ packages/hping/files/hping2_debian.patch | 168 ++++++++++++++++++++++++++++ packages/hping/hping2_1.9.9+2.0.0rc3.bb | 48 ++++++++ 5 files changed, 291 insertions(+) create mode 100644 packages/hping/.mtn2git_empty create mode 100644 packages/hping/files/.mtn2git_empty create mode 100644 packages/hping/files/hping2_configure.patch create mode 100644 packages/hping/files/hping2_debian.patch create mode 100644 packages/hping/hping2_1.9.9+2.0.0rc3.bb diff --git a/packages/hping/.mtn2git_empty b/packages/hping/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch new file mode 100644 index 0000000000..90795ab0e0 --- /dev/null +++ b/packages/hping/files/hping2_configure.patch @@ -0,0 +1,75 @@ +Allow the byteorder and target os type to be specified via +environment variables when running the configured shell script, don't +try and run the resultant binary after building it, don't set various +compiler related environment varibles - we'll let OE set those. + +diff -dur hping2-rc3-orig/configure hping2-rc3/configure +--- hping2-rc3-orig/configure 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/configure 2005-12-03 19:05:58.000000000 +1100 +@@ -13,16 +13,19 @@ + exit 0 + fi + +-CC=${CC:=cc} ++if [ "x$BYTEORDER" = "x" ]; then ++ CC=${CC:=cc} + +-echo build byteorder.c... +-$CC byteorder.c -o byteorder || exit 1 ++ echo build byteorder.c... ++ $CC byteorder.c -o byteorder || exit 1 ++ ++ BYTEORDER=`./byteorder -m` ++fi + + INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:` + if [ "$INSTALL_MANPATH" = "" ]; then + INSTALL_MANPATH="/usr/local/man" + fi +-BYTEORDER=`./byteorder -m` + + echo create byteorder.h... + cat > byteorder.h < ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define BYTE_ORDER_LITTLE_ENDIAN +-#elif defined(__mc68000__) \ +- || defined (__sparc__) \ +- || defined (__sparc) \ +- || defined (__PPC__) \ +- || defined (__BIG_ENDIAN__) \ +- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define BYTE_ORDER_BIG_ENDIAN + #else + # error can not find the byte order for this architecture, fix bytesex.h +--- hping2-2.rc3.orig/getlhs.c ++++ hping2-2.rc3/getlhs.c +@@ -55,6 +55,12 @@ + case DLT_IEEE802_11: + linkhdr_size = 14; + break; ++ case DLT_IEEE802_11: ++ linkhdr_size = 14; ++ break; ++ case DLT_TOKEN_RING: ++ linkhdr_size = 20; ++ break; + case DLT_ATM_RFC1483: + #ifdef DLT_CIP + case DLT_CIP: +@@ -105,6 +111,15 @@ + } else if ( strstr(ifname, "wlan") ) { + linkhdr_size = WLANHDR_SIZE; + return 0; ++ } else if (strstr(ifname, "atm")) { ++ linkhdr_size = 0; ++ return 0; ++ } else if ( strstr(ifname, "wlan") ) { ++ linkhdr_size = WLANHDR_SIZE; ++ return 0; ++ } else if ( strstr(ifname, "tr") ) { ++ linkhdr_size = TRHDR_SIZE; ++ return 0; + } + else + return -1; +--- hping2-2.rc3.orig/listen.c ++++ hping2-2.rc3/listen.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + #include +--- hping2-2.rc3.orig/main.c ++++ hping2-2.rc3/main.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "hping2.h" + +--- hping2-2.rc3.orig/resolve.c ++++ hping2-2.rc3/resolve.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- hping2-2.rc3.orig/sendicmp.c ++++ hping2-2.rc3/sendicmp.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendtcp.c ++++ hping2-2.rc3/sendtcp.c +@@ -15,6 +15,8 @@ + #include + #include + #include ++#include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendudp.c ++++ hping2-2.rc3/sendudp.c +@@ -15,6 +15,8 @@ + #include + #include + #include ++#include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/statistics.c ++++ hping2-2.rc3/statistics.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + #include "hping2.h" + #include "globals.h" +@@ -33,7 +34,7 @@ + lossrate = 100; + + fprintf(stderr, "\n--- %s hping statistic ---\n", targetname); +- fprintf(stderr, "%d packets tramitted, %d packets received, " ++ fprintf(stderr, "%d packets transmitted, %d packets received, " + "%d%% packet loss\n", sent_pkt, recv_pkt, lossrate); + if (out_of_sequence_pkt) + fprintf(stderr, "%d out of sequence packets received\n", +--- hping2-2.rc3.orig/usage.c ++++ hping2-2.rc3/usage.c +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + void show_usage(void) + { +--- hping2-2.rc3.orig/version.c ++++ hping2-2.rc3/version.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + #include "release.h" + #include "hping2.h" diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb new file mode 100644 index 0000000000..912f7c420e --- /dev/null +++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "hping is a command-line oriented TCP/IP packet \ +assembler/analyzer. The interface is inspired to the ping(8) \ +unix command, but hping isn't only able to send ICMP echo requests. \ +It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute \ +mode, the ability to send files between a covered channel, and many \ +other features." +HOMEPAGE = "http://www.hping.org/" +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan " +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \ + file://hping2_debian.patch;patch=1 \ + file://hping2_configure.patch;patch=1" +S="${WORKDIR}/hping2-rc3" + +# +# We've patched configure to accept byte order and ostype as env +# variables Pass those values in to stop it trying to figure it out +# by itself. +# NOTE: The configure script is not an autoconf script. +# +do_configure() { + # endianness fun.. inspired by openssl.inc + . ${CONFIG_SITE} + BYTEORDER="UNKNOWN" + if test "x$ac_cv_c_bigendian" = "xyes"; then + BYTEORDER="__BIG_ENDIAN_BITFIELD" + elif test "x$ac_cv_c_littleendian" = "xyes"; then + BYTEORDER="__LITTLE_ENDIAN_BITFIELD" + else + oefatal do_configure cannot determine endianess + fi + BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure +} + +# +# Instead of patching the install we do things manually here +# +do_install() { + install -m 0755 -d ${D}${sbindir} ${D}/${mandir} ${D}${docdir}/hping2 + install -m 0755 hping2 ${D}/${sbindir} + install -m 0644 docs/hping2.8 ${D}/${mandir} + install -m 0644 docs/HPING2-HOWTO.txt docs/HPING2-IS-OPEN \ + docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt \ + docs/AS-BACKDOOR docs/APD.txt ${D}${docdir}/hping2 +} -- cgit v1.2.3