diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/angstrom/angstrom-led-config.bb | 2 | ||||
-rw-r--r-- | packages/angstrom/angstrom-led-config/at32stk1000/.mtn2git_empty (renamed from packages/opie-console/files/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/angstrom/angstrom-led-config/at32stk1000/leds | 9 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie/argv.patch | 13 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 1 | ||||
-rw-r--r-- | packages/linux/linux-2.6.25/at32stk1000/defconfig | 7 | ||||
-rw-r--r-- | packages/opie-console/files/double_name.patch | 118 | ||||
-rw-r--r-- | packages/opie-console/opie-console_cvs.bb | 1 | ||||
-rw-r--r-- | packages/popt/popt_1.14.bb | 2 | ||||
-rw-r--r-- | packages/powertop/powertop_1.10.bb | 2 | ||||
-rw-r--r-- | packages/xorg-lib/pixman/pixman-x888-565.patch | 68 | ||||
-rw-r--r-- | packages/xorg-lib/pixman_0.11.8.bb | 3 | ||||
-rw-r--r-- | packages/xqt/xqt_0.0.9.bb | 6 |
13 files changed, 91 insertions, 141 deletions
diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb index 36585f0b00..6a4f26240e 100644 --- a/packages/angstrom/angstrom-led-config.bb +++ b/packages/angstrom/angstrom-led-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d diff --git a/packages/opie-console/files/.mtn2git_empty b/packages/angstrom/angstrom-led-config/at32stk1000/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-console/files/.mtn2git_empty +++ b/packages/angstrom/angstrom-led-config/at32stk1000/.mtn2git_empty diff --git a/packages/angstrom/angstrom-led-config/at32stk1000/leds b/packages/angstrom/angstrom-led-config/at32stk1000/leds new file mode 100644 index 0000000000..5adb04da5d --- /dev/null +++ b/packages/angstrom/angstrom-led-config/at32stk1000/leds @@ -0,0 +1,9 @@ +#file format: name trigger +led0:amber nand-disk +led1:amber mmc0 +led2:amber none +led3:amber none +led4:amber none +led5:amber none +led6:amber none +led7:amber heartbeat diff --git a/packages/libqpe/libqpe-opie/argv.patch b/packages/libqpe/libqpe-opie/argv.patch deleted file mode 100644 index 5926a8d000..0000000000 --- a/packages/libqpe/libqpe-opie/argv.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: library/qpeapplication.h -=================================================================== ---- library.orig/qpeapplication.h 2008-06-12 01:18:24.548201862 +0200 -+++ library/qpeapplication.h 2008-06-12 01:18:30.861635469 +0200 -@@ -127,7 +127,7 @@ - static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; - /* Merge setTempScreenSaverMode */ - #ifdef QTOPIA_INTERNAL_INITAPP -- void initApp( int argv, char **argv ); -+ void initApp( int argc, char **argv ); - #endif - - static void setKeepRunning(); diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 7c69904cd2..d3b17ac7ee 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -7,6 +7,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ file://citytime-path-2.patch;patch=1 \ - file://argv.patch;patch=1 \ " diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index 66a1a789b3..b402eedf9f 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Sat Jul 5 12:40:54 2008 +# Sun Sep 7 16:28:02 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -136,8 +136,8 @@ CONFIG_BOARD_ATSTK1002=y # CONFIG_BOARD_ATSTK1006 is not set # CONFIG_BOARD_ATSTK100X_CUSTOM is not set # CONFIG_BOARD_ATSTK100X_SPI1 is not set -# CONFIG_BOARD_ATSTK1000_J2_LED is not set -# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set +CONFIG_BOARD_ATSTK1000_J2_LED=y +CONFIG_BOARD_ATSTK1000_J2_LED8=y # CONFIG_BOARD_ATSTK1000_J2_RGB is not set CONFIG_BOARD_ATSTK1000_EXTDAC=y # CONFIG_BOARD_ATSTK100X_ENABLE_AC97 is not set @@ -592,6 +592,7 @@ CONFIG_INPUT_POLLDEV=y # Userland interfaces # CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_VMS=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 diff --git a/packages/opie-console/files/double_name.patch b/packages/opie-console/files/double_name.patch deleted file mode 100644 index 47e127e160..0000000000 --- a/packages/opie-console/files/double_name.patch +++ /dev/null @@ -1,118 +0,0 @@ -Index: opie-console/profiledialogwidget.h -=================================================================== ---- opie-console.orig/profiledialogwidget.h 2002-10-21 23:43:44.000000000 +0200 -+++ opie-console/profiledialogwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -13,7 +13,7 @@ - Terminal, - Keyboard - }; -- ProfileDialogWidget( const QString& name, QWidget* parent, const char* name = 0l); -+ ProfileDialogWidget( const QString& name, QWidget* parent, const char* na = 0l); - ~ProfileDialogWidget(); - - /* -@@ -34,7 +34,7 @@ - Q_OBJECT - public: - ProfileDialogTerminalWidget( const QString& name, QWidget* widget, -- const char* name =0l); -+ const char* na =0l); - ~ProfileDialogTerminalWidget(); - Type type()const; - }; -@@ -42,7 +42,7 @@ - Q_OBJECT - public: - ProfileDialogConnectionWidget( const QString& name, QWidget* parent, -- const char* name =0l); -+ const char* na =0l); - ~ProfileDialogConnectionWidget(); - Type type() const; - -@@ -51,7 +51,7 @@ - Q_OBJECT - public: - ProfileDialogKeyWidget( const QString &name, QWidget* parent, -- const char *name =0l); -+ const char *na =0l); - ~ProfileDialogKeyWidget(); - Type type() const; - }; -Index: opie-console/function_keyboard.h -=================================================================== ---- opie-console.orig/function_keyboard.h 2007-08-27 01:49:15.000000000 +0200 -+++ opie-console/function_keyboard.h 2008-08-26 16:22:31.618071081 +0200 -@@ -86,7 +86,7 @@ - Q_OBJECT - - public: -- FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l ); -+ FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* na = 0l ); - ~FunctionKeyboardConfig(); - - void load(const Profile&); -Index: opie-console/serialconfigwidget.h -=================================================================== ---- opie-console.orig/serialconfigwidget.h 2002-10-09 01:13:17.000000000 +0200 -+++ opie-console/serialconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -10,7 +10,7 @@ - class SerialConfigWidget : public ProfileDialogConnectionWidget { - Q_OBJECT - public: -- SerialConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ SerialConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~SerialConfigWidget(); - - void load( const Profile& ); -Index: opie-console/irdaconfigwidget.h -=================================================================== ---- opie-console.orig/irdaconfigwidget.h 2002-10-09 18:33:36.000000000 +0200 -+++ opie-console/irdaconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -12,7 +12,7 @@ - Q_OBJECT - - public: -- IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ IrdaConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~IrdaConfigWidget(); - - void load( const Profile& ); -Index: opie-console/btconfigwidget.h -=================================================================== ---- opie-console.orig/btconfigwidget.h 2002-10-17 16:16:03.000000000 +0200 -+++ opie-console/btconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -14,7 +14,7 @@ - Q_OBJECT - - public: -- BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ BTConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~BTConfigWidget(); - - void load( const Profile& ); -Index: opie-console/modemconfigwidget.h -=================================================================== ---- opie-console.orig/modemconfigwidget.h 2002-10-13 23:10:15.000000000 +0200 -+++ opie-console/modemconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -15,7 +15,7 @@ - Q_OBJECT - - public: -- ModemConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ ModemConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~ModemConfigWidget(); - - void load( const Profile& ); -Index: opie-console/consoleconfigwidget.h -=================================================================== ---- opie-console.orig/consoleconfigwidget.h 2008-08-26 16:23:08.198065869 +0200 -+++ opie-console/consoleconfigwidget.h 2008-08-26 16:23:12.938066770 +0200 -@@ -11,7 +11,7 @@ - class ConsoleConfigWidget : public ProfileDialogConnectionWidget { - Q_OBJECT - public: -- ConsoleConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ ConsoleConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~ConsoleConfigWidget(); - - void load( const Profile& ); diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 00f8a284a3..857f6d10a1 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -6,5 +6,4 @@ PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps \ - file://double_name.patch;patch=1 \ " diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb index d78d8dc337..240ac52275 100644 --- a/packages/popt/popt_1.14.bb +++ b/packages/popt/popt_1.14.bb @@ -1,6 +1,6 @@ require popt.inc -DEPENDS = "gettext virtual/libintl" +DEPENDS = "gettext-native virtual/libintl" PR = "r1" diff --git a/packages/powertop/powertop_1.10.bb b/packages/powertop/powertop_1.10.bb index 0b2d4ffa05..4a429d68ba 100644 --- a/packages/powertop/powertop_1.10.bb +++ b/packages/powertop/powertop_1.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." HOMEPAGE = "http://www.linuxpowertop.org/" LICENSE = "GPLv2" -DEPENDS = "ncurses" +DEPENDS = "virtual/libintl ncurses" SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz" diff --git a/packages/xorg-lib/pixman/pixman-x888-565.patch b/packages/xorg-lib/pixman/pixman-x888-565.patch new file mode 100644 index 0000000000..a458e045b8 --- /dev/null +++ b/packages/xorg-lib/pixman/pixman-x888-565.patch @@ -0,0 +1,68 @@ +commit 8507756d8868b8d8c7a149bd2427a04262638156 +Author: Vladimir Vukicevic <vladimir@slide.(none)> +Date: Sat Sep 6 17:46:52 2008 -0700 + + Add SRC x888x0565 C fast path + +diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c +index eeefa33..b5fb0ff 100644 +--- a/pixman/pixman-pict.c ++++ b/pixman/pixman-pict.c +@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op, + } + } + ++ ++void ++fbCompositeSrc_x888x0565 (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) ++{ ++ uint16_t *dstLine, *dst; ++ uint32_t *srcLine, *src, s; ++ int dstStride, srcStride; ++ uint16_t w; ++ ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); ++ ++ while (height--) ++ { ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++ while (w--) ++ { ++ s = READ(pSrc, src++); ++ WRITE(pDst, dst, cvt8888to0565(s)); ++ dst++; ++ } ++ } ++} ++ + void + fbCompositeSrcAdd_8000x8000 (pixman_op_t op, + pixman_image_t * pSrc, +@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[] = + { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 }, + { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 }, + #endif ++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, + { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 }, + { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 }, + { PIXMAN_OP_NONE }, diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index a66041da74..239684e71f 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,10 +3,11 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PR = "r3" +PR = "r4" SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ + file://pixman-x888-565.patch;patch=1 \ " inherit autotools diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index 3fc071ec28..c2673edfc6 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -2,6 +2,8 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" SECTION = "x11" +PR = "r1" + SRCDATE = "20041111" DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie" @@ -9,6 +11,8 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserv file://imake-staging.patch;patch=1 \ file://moc_call.patch;patch=1 " +inherit palmtop + S = "${WORKDIR}/xc" do_configure() { @@ -28,7 +32,7 @@ do_configure() { # Qt defines echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def echo "#define QtDir ${QTDIR}" >> config/cf/host.def - echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def + echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX QtCmnDefs" >> config/cf/host.def |