diff options
Diffstat (limited to 'packages')
49 files changed, 573 insertions, 411 deletions
diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 78df6dfe02..860ef11f18 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r3" +PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/packages/alsa/alsa-plugins_1.0.14.bb b/packages/alsa/alsa-plugins_1.0.14.bb new file mode 100644 index 0000000000..b17a3265e8 --- /dev/null +++ b/packages/alsa/alsa-plugins_1.0.14.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "ALSA Plugins" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "multimedia/alsa/plugins" +LICENSE = "GPL" +DEPENDS = "alsa-lib pulseaudio" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" + +inherit autotools + +PACKAGES_DYNAMIC = "libasound-module*" + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) +} + +FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" +FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 35c8f5d3d3..00669e48de 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2007 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# License: MIT (see http://www.opensource.org/licenses/mit-license.php # for a copy of the license) # # Filename: alsa-state.bb @@ -11,7 +11,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.0.4" -PR = "r2" +PR = "r3" SRC_URI = "file://asound.state \ file://alsa-state " @@ -32,7 +32,7 @@ INITSCRIPT_PARAMS = "defaults 10" do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d - + install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} } @@ -48,7 +48,7 @@ pkg_postinst_${PN}() { if test -x /usr/sbin/alsactl then /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore - fi + fi fi } diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state index a83141fcbb..f7fb55ccd1 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state @@ -16,8 +16,8 @@ state.neo1973 { comment.range '0 - 255' iface MIXER name 'ADC Capture Volume' - value.0 195 - value.1 195 + value.0 0 + value.1 0 } control.3 { comment.access 'read write' @@ -46,7 +46,7 @@ state.neo1973 { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 121 + value 111 } control.6 { comment.access 'read write' @@ -55,8 +55,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Bypass Playback Volume' - value.0 2 - value.1 2 + value.0 5 + value.1 5 } control.7 { comment.access 'read write' @@ -65,8 +65,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Sidetone Playback Volume' - value.0 2 - value.1 2 + value.0 1 + value.1 1 } control.8 { comment.access 'read write' @@ -103,7 +103,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Bypass Playback Volume' - value 2 + value 5 } control.12 { comment.access 'read write' @@ -112,7 +112,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Sidetone Playback Volume' - value 2 + value 6 } control.13 { comment.access 'read write' @@ -121,7 +121,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Voice Playback Volume' - value 2 + value 6 } control.14 { comment.access 'read write' @@ -159,7 +159,7 @@ state.neo1973 { comment.access 'read write' comment.type INTEGER comment.count 1 - comment.range '0 - 7' + comment.range '0 - 15' iface MIXER name 'Bass Volume' value 0 @@ -168,7 +168,7 @@ state.neo1973 { comment.access 'read write' comment.type INTEGER comment.count 1 - comment.range '0 - 7' + comment.range '0 - 15' iface MIXER name 'Treble Volume' value 7 @@ -190,8 +190,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Sidetone Capture Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.21 { comment.access 'read write' @@ -200,7 +200,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Voice Sidetone Capture Volume' - value 2 + value 0 } control.22 { comment.access 'read write' @@ -209,8 +209,8 @@ state.neo1973 { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 24 - value.1 24 + value.0 0 + value.1 0 } control.23 { comment.access 'read write' @@ -227,8 +227,8 @@ state.neo1973 { comment.count 2 iface MIXER name 'Capture Switch' - value.0 true - value.1 true + value.0 false + value.1 false } control.25 { comment.access 'read write' @@ -250,7 +250,7 @@ state.neo1973 { comment.item.1 Voice iface MIXER name 'Capture Filter Cut-off' - value HiFi + value Voice } control.27 { comment.access 'read write' @@ -267,7 +267,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'ALC Capture Target Volume' - value 3 + value 5 } control.29 { comment.access 'read write' @@ -276,7 +276,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'ALC Capture Max Volume' - value 1 + value 7 } control.30 { comment.access 'read write' @@ -288,7 +288,7 @@ state.neo1973 { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Stereo + value Off } control.31 { comment.access 'read write' @@ -305,7 +305,7 @@ state.neo1973 { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 7 + value 15 } control.33 { comment.access 'read write' @@ -323,7 +323,7 @@ state.neo1973 { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 5 } control.35 { comment.access 'read write' @@ -447,7 +447,7 @@ state.neo1973 { comment.item.1 Inverted iface MIXER name 'Playback Phase' - value 'Non Inverted' + value Inverted } control.48 { comment.access 'read write' @@ -570,7 +570,7 @@ state.neo1973 { comment.count 1 iface MIXER name 'ALC Mixer Mic2 Capture Switch' - value true + value false } control.60 { comment.access 'read write' @@ -598,7 +598,7 @@ state.neo1973 { comment.item.3 'Right PGA' iface MIXER name 'Mic Sidetone Mux' - value 'Left PGA' + value 'Mic 2' } control.63 { comment.access 'read write' @@ -815,7 +815,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Left Playback Volume' - value 31 + value 26 } control.87 { comment.access 'read write' @@ -824,7 +824,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Right Playback Volume' - value 31 + value 0 } control.88 { comment.access 'read write' @@ -833,7 +833,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Mono Playback Volume' - value 0 + value 9 } control.89 { comment.access 'read write' @@ -895,6 +895,6 @@ state.neo1973 { comment.count 1 iface MIXER name 'Amp Earpiece 6dB Playback Switch' - value true + value false } } diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 9e1bc18f5c..42b4ccb7a2 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -9,10 +9,9 @@ PV = "0.9.9+cvs${SRCDATE}" inherit efl_library -SRC_URI += "\ +SRC_URI += "file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ - file://fix-directfb-include.patch;patch=1 \ -" + file://fix-directfb-include.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" diff --git a/packages/efl1/ecore/configure.patch b/packages/efl1/ecore/configure.patch index 23d8193b44..9939bd9d34 100644 --- a/packages/efl1/ecore/configure.patch +++ b/packages/efl1/ecore/configure.patch @@ -1,5 +1,7 @@ ---- ecore-0.9.9.036/configure.in.bak 2006-11-13 14:01:10.000000000 -0800 -+++ ecore-0.9.9.036/configure.in 2006-11-13 14:02:15.000000000 -0800 +Index: ecore/configure.in +=================================================================== +--- ecore.orig/configure.in 2007-08-20 17:21:13.000000000 +0000 ++++ ecore/configure.in 2007-08-20 17:23:31.000000000 +0000 @@ -16,7 +16,6 @@ AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED @@ -8,14 +10,14 @@ if test "x${bindir}" = 'xNONE'; then if test "x${prefix}" = "xNONE"; then -@@ -200,9 +199,7 @@ - AM_CONDITIONAL(BUILD_ECORE_X, true) - AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) - have_ecore_x="yes" -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" - ecore_x_libs="-lecore_x $x_libs"; - ],[ - AM_CONDITIONAL(BUILD_ECORE_X, false) +@@ -238,9 +237,7 @@ + AC_CHECK_HEADER(X11/X.h, + [ + have_x="yes" +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" + ] + ) + diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 6fb6d7f60e..e83dd11c4e 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -9,9 +9,8 @@ PV = "0.9.9+cvs${SRCDATE}" inherit efl_library -export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" - SRC_URI += "file://fix-configure.patch;patch=1" + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch index abf9b94bdf..1a5bf78e46 100644 --- a/packages/efl1/evas/fix-configure.patch +++ b/packages/efl1/evas/fix-configure.patch @@ -1,36 +1,71 @@ -diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in ---- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800 -+++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800 -@@ -161,9 +161,7 @@ +Index: evas/configure.in +=================================================================== +--- evas.orig/configure.in 2007-08-20 16:44:22.000000000 +0000 ++++ evas/configure.in 2007-08-20 16:49:08.000000000 +0000 +@@ -260,9 +260,7 @@ AC_CHECK_HEADER(X11/X.h, [ AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" ], [ AC_MSG_RESULT(disabling software X11 engine) -@@ -407,10 +405,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ], [ -@@ -471,7 +469,7 @@ +@@ -303,9 +301,7 @@ + AC_CHECK_HEADER(X11/X.h, + [ + AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" + ], + [ + AC_MSG_RESULT(disabling software 16bit X11 engine) +@@ -599,10 +595,7 @@ + [ + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) +- x_dir=${x_dir:-/usr/X11R6}; +- x_cflags=${x_cflags:--I$x_dir/include} +- x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" +- gl_cflags="-I/usr/include" ++ x_libs="${x_libs} -lX11 -lXext" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ], +@@ -694,9 +687,7 @@ AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) - x_dir="/usr/X11R6"; -+ x_dir=""; - x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" +- x_cflags="-I"$x_dir"/include" +- x_libs="-L"$x_dir"/lib -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" ], [ + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false) + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false) +@@ -738,9 +729,7 @@ + AC_CHECK_HEADER(X11/extensions/Xrender.h, + [ + AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender" ++ x_libs="${x_libs} -lX11 -lXext -lXrender" + ], + [ + AC_MSG_RESULT(disabling xrender X11 engine) +@@ -826,9 +815,7 @@ + [ + PKG_CHECK_MODULES(GLITZ, glitz glitz-glx, + [ +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" + AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend]) + ], + [ diff --git a/packages/gammu/gammu_1.10.0.bb b/packages/gammu/gammu_1.10.0.bb deleted file mode 100644 index bba0fa8deb..0000000000 --- a/packages/gammu/gammu_1.10.0.bb +++ /dev/null @@ -1,78 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -HOMEPAGE = "http://www.gammu.org/" -PR = "r1" - -SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ - file://ldflags-again.patch;patch=1" - -EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" - -EXTRA_LDFLAGS = "-lbluetooth2" - -inherit autotools pkgconfig - -do_compile () { - oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' -} - -do_stage() { - install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ - ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ - ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ - ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ - ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ - ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ - ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ - ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ - ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ - ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ - ${STAGING_INCDIR}/gammu/protocol/alcatel - - oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} - - install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ - install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc - install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding - install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone - install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at - install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex - install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia - install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 - install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian - install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel - install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service - install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms - install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup - install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device - install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda - install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth - install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial - install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol - install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at - install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex - install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia - install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian - install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel -} - -do_install () { - oe_runmake 'DESTDIR=${D}' installshared -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu" -FILES_libgammu = "${libdir}/libGammu.so*" - -PACKAGES_DYNAMIC = "gammu-locale-*" - -python populate_packages_prepend () { - help_dir = bb.data.expand('${datadir}/gammu/', d) - - do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') -} diff --git a/packages/gammu/gammu_1.12.94.bb b/packages/gammu/gammu_1.12.94.bb deleted file mode 100644 index 5453b01833..0000000000 --- a/packages/gammu/gammu_1.12.94.bb +++ /dev/null @@ -1,81 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -HOMEPAGE = "http://www.gammu.org/" -PR = "r0" - -SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ - file://ldflags-again.patch;patch=1" - -EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" - -EXTRA_LDFLAGS = "-lbluetooth2" - -DEFAULT_PREFERENCE = "-1" -BROKEN = "1" -# TODO we don't have cmake yet -# inherit cmake pkgconfig - -do_compile () { - oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' -} - -do_stage() { - install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ - ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ - ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ - ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ - ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ - ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ - ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ - ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ - ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ - ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ - ${STAGING_INCDIR}/gammu/protocol/alcatel - - oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} - - install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ - install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc - install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding - install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone - install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at - install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex - install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia - install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 - install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian - install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel - install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service - install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms - install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup - install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device - install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda - install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth - install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial - install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol - install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at - install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex - install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia - install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian - install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel -} - -do_install () { - oe_runmake 'DESTDIR=${D}' installshared -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu" -FILES_libgammu = "${libdir}/libGammu.so*" - -PACKAGES_DYNAMIC = "gammu-locale-*" - -python populate_packages_prepend () { - help_dir = bb.data.expand('${datadir}/gammu/', d) - - do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') -} diff --git a/packages/gammu/gammu_1.13.0.bb b/packages/gammu/gammu_1.13.0.bb new file mode 100644 index 0000000000..fc7adb1b79 --- /dev/null +++ b/packages/gammu/gammu_1.13.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "GNU All Mobile Managment Utilities" +SECTION = "console/network" +DEPENDS = "bluez-libs cmake-native" +LICENSE = "GPL" +HOMEPAGE = "http://www.gammu.org/" + +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 " + +inherit pkgconfig + +do_configure() { + cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup +} + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +do_stage() { + install -d ${STAGING_INCDIR}/gammu/ + install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/ + + oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR} +} + +PACKAGES =+ "libgammu" + +FILES_${PN} = "${bindir}/gammu" +FILES_libgammu = "${libdir}/libGammu.so*" diff --git a/packages/gsm/files/fix-mlbuf.patch b/packages/gsm/files/fix-mlbuf.patch new file mode 100644 index 0000000000..ed4aa2519d --- /dev/null +++ b/packages/gsm/files/fix-mlbuf.patch @@ -0,0 +1,50 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm/src/gsmd/atcmd.c (revision 2745) ++++ gsm/src/gsmd/atcmd.c (working copy) +@@ -370,8 +370,8 @@ + if (g->mlbuf_len) + g->mlbuf[g->mlbuf_len ++] = '\n'; + DEBUGP("Appending buf to mlbuf\n"); +- if (len > sizeof(g->mlbuf) - g->mlbuf_len) +- len = sizeof(g->mlbuf) - g->mlbuf_len; ++ if (len > MLPARSE_BUF_SIZE - g->mlbuf_len) ++ len = MLPARSE_BUF_SIZE - g->mlbuf_len; + memcpy(g->mlbuf + g->mlbuf_len, buf, len); + g->mlbuf_len += len; + +@@ -470,7 +470,7 @@ + if (cr) + len = cr - pos->cur; + else +- len = pos->buflen; ++ len = pos->buflen - 1; /* assuming zero-terminated strings */ + rc = write(fd, pos->cur, len); + if (rc == 0) { + gsmd_log(GSMD_ERROR, "write returns 0, aborting\n"); +@@ -480,8 +480,8 @@ + fd, rc); + return rc; + } +- if (cr && rc == len) +- rc ++; /* Skip the \n */ ++ if (!cr || rc == len) ++ rc ++; /* Skip the \n or \0 */ + pos->buflen -= rc; + pos->cur += rc; + write(fd, "\r", 1); +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm/src/gsmd/gsmd.c (revision 2745) ++++ gsm/src/gsmd/gsmd.c (working copy) +@@ -301,6 +301,10 @@ + { + INIT_LLIST_HEAD(&g->users); + ++ g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE); ++ if (!g->mlbuf) ++ return -ENOMEM; ++ + return 0; + } + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index c715092b8d..4f6fe12766 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -9,6 +9,7 @@ PR = "r19" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ + file://fix-mlbuf.patch;patch=1 \ file://gsmd \ file://default" S = "${WORKDIR}/gsm" @@ -27,6 +28,15 @@ do_install_append() { install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ install -d ${D}/${sysconfdir}/default install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd + # band-aid: + install -d ${D}${includedir}/common + install -m 0644 ${S}/include/common/linux_list.h ${D}${includedir}/common +} + +# band-aid: +do_stage_append () { + install -d ${STAGING_INCDIR}/common + install ${S}/include/common/linux_list.h ${STAGING_INCDIR}/common } PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \ diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb index 182790bdea..fbf36b94b0 100644 --- a/packages/gstreamer/gst-meta-base_0.10.bb +++ b/packages/gstreamer/gst-meta-base_0.10.bb @@ -1,8 +1,8 @@ -# Copyright (C) 2006,2007 OpenedHand LTD +# Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD DESCRIPTION = "Gstreamer package groups" DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly" -PR = "r4" +PR = "r5" PACKAGES = "\ gst-meta-base \ @@ -32,7 +32,8 @@ RDEPENDS_gst-meta-audio = "\ gst-meta-base \ gst-plugin-ivorbis \ gst-plugin-ogg \ - gst-plugin-mad" + gst-plugin-mad \ + gst-plugin-id3demux" RDEPENDS_gst-meta-debug = "\ diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.4.bb b/packages/gstreamer/gst-plugin-pulse_0.9.4.bb new file mode 100644 index 0000000000..f88cb66ff4 --- /dev/null +++ b/packages/gstreamer/gst-plugin-pulse_0.9.4.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source" +HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/" +LICENSE = "GPL" +DEPENDS = "gstreamer pulseaudio" +PR = "r1" + +SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz" +S = "${WORKDIR}/gst-pulse-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-lynx" +GST_LIBV = 0.10 + +do_install() { + install -d ${D}${libdir}/gstreamer-${GST_LIBV}/ + install -m 0755 src/.libs/libgstpulse.so ${D}${libdir}/gstreamer-${GST_LIBV} +} + +export GST_MODDIR=${libdir}/gstreamer-0.10 + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstpulse.so" +FILES_${PN}-dev = "\ + ${libdir}/gstreamer-0.10/libgstpulse.a \ + ${libdir}/gstreamer-0.10/libgstpulse.la \ + ${libdir}/gstreamer-0.10/libgstpulse.so*" +FILES_${PN}-dbg = "${libdir}/gstreamer-0.10/.debug" + diff --git a/packages/initscripts/initscripts-1.0/functions b/packages/initscripts/initscripts-1.0/functions new file mode 100644 index 0000000000..358fc6edb3 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/functions @@ -0,0 +1,17 @@ +# -*-Shell-script-*- +# +# functions This file contains functions to be used by most or all +# shell scripts in the /etc/init.d directory. +# + +cpuinfo_id() { # return the Hardware module ID + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +killproc() { # kill the named process(es) + pid=`/bin/ps -e x | + /bin/grep $1 | + /bin/grep -v grep | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid +} diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index aa30833895..ebddf17b61 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,9 +4,10 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r97" +PR = "r98" -SRC_URI = "file://halt \ +SRC_URI = "file://functions \ + file://halt \ file://ramdisk \ file://umountfs \ file://devices \ @@ -32,7 +33,7 @@ SRC_URI = "file://halt \ file://volatiles \ file://save-rtc.sh" -SRC_URI_append_arm = " file://alignment.sh" +SRC_URI_append_arm = " file://alignment.sh" KERNEL_VERSION = "" @@ -40,18 +41,19 @@ do_install () { # # Create directories and install device independent scripts # - install -d ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/rcS.d \ - ${D}${sysconfdir}/rc0.d \ - ${D}${sysconfdir}/rc1.d \ - ${D}${sysconfdir}/rc2.d \ - ${D}${sysconfdir}/rc3.d \ - ${D}${sysconfdir}/rc4.d \ - ${D}${sysconfdir}/rc5.d \ - ${D}${sysconfdir}/rc6.d \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/default/volatiles + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rcS.d + install -d ${D}${sysconfdir}/rc0.d + install -d ${D}${sysconfdir}/rc1.d + install -d ${D}${sysconfdir}/rc2.d + install -d ${D}${sysconfdir}/rc3.d + install -d ${D}${sysconfdir}/rc4.d + install -d ${D}${sysconfdir}/rc5.d + install -d ${D}${sysconfdir}/rc6.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/functions ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/finish ${D}${sysconfdir}/init.d diff --git a/packages/libpng/libpng-native_1.2.19.bb b/packages/libpng/libpng-native_1.2.19.bb new file mode 100644 index 0000000000..231b956678 --- /dev/null +++ b/packages/libpng/libpng-native_1.2.19.bb @@ -0,0 +1,14 @@ +require libpng_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" +DEPENDS = "zlib-native" + +INHIBIT_NATIVE_STAGE_INSTALL = "1" + +do_stage_append() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} diff --git a/packages/libpng/libpng_1.2.19.bb b/packages/libpng/libpng_1.2.19.bb new file mode 100644 index 0000000000..c6c296cae4 --- /dev/null +++ b/packages/libpng/libpng_1.2.19.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +LICENSE = "libpng" +SECTION = "libs" +DEPENDS = "zlib" +PRIORITY = "required" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" +S = "${WORKDIR}/libpng-${PV}" + +inherit autotools binconfig pkgconfig + +do_stage() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng ${STAGING_LIBDIR}/ + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir} + install -d ${D}${libdir} + install -d ${D}${includedir} + unset LDFLAGS + oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ + 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ + 'DL=${D}${libdir}' 'DM=${D}${mandir}' \ + install +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libpng12', d) + bb.build.exec_func('package_do_package', d) +} + +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" + +FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" +FILES_${PN}12 = "${libdir}/libpng12.so.*" +FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" + diff --git a/packages/libsdl/libsdl-net_1.2.5.bb b/packages/libsdl/libsdl-net_1.2.7.bb index a2ab06d479..a2ab06d479 100644 --- a/packages/libsdl/libsdl-net_1.2.5.bb +++ b/packages/libsdl/libsdl-net_1.2.7.bb diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb index baf8feab67..23110b6007 100644 --- a/packages/libtiff/tiff_3.7.2.bb +++ b/packages/libtiff/tiff_3.7.2.bb @@ -1,9 +1,10 @@ -DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)" -LICENSE = "" -HOMEPAGE = "http://www.remotesensing.org/libtiff/" +DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)" +LICENSE = "" +HOMEPAGE = "http://www.remotesensing.org/libtiff/" +DEPENDS = "zlib jpeg" +PR = "r1" -DEPENDS = "zlib jpeg" -SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz" +SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz" inherit autotools @@ -13,3 +14,10 @@ do_stage() { install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so } + +PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" +FILES_tiffxx = "${libdir}/libtiffxx.so.*" +FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.*a" +FILES_tiffxx-dbg = "${libdir}/.debug/libtiffxx.so*" +FILES_tiff-utils = "${bindir}/*" +FILES_tiff-utils-dbg = "${bindir}/.debug/" diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 48b962c86a..ac9b9e36e9 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -167,7 +167,6 @@ CONFIG_MACH_MAGICIAN=y CONFIG_MAGICIAN_PM=y CONFIG_MAGICIAN_TS=m CONFIG_MAGICIAN_LCD=y -CONFIG_MAGICIAN_DS1WM=m CONFIG_MAGICIAN_PHONE=m # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set @@ -908,6 +907,7 @@ CONFIG_ADC_ADS7846_SSP=m # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +CONFIG_HTC_PASIC3=y CONFIG_HTC_EGPIO=y # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set @@ -929,13 +929,15 @@ CONFIG_LEDS_CLASS=y # LED drivers # CONFIG_LEDS_MAGICIAN=y +CONFIG_LEDS_PASIC3=y # # LED Triggers # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_HWTIMER=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y diff --git a/packages/makedevs/makedevs-1.0.0/makedevs.c b/packages/makedevs/makedevs-1.0.0/makedevs.c index a9bf8e782a..14569c61a2 100644 --- a/packages/makedevs/makedevs-1.0.0/makedevs.c +++ b/packages/makedevs/makedevs-1.0.0/makedevs.c @@ -106,6 +106,7 @@ static char *xstrdup(const char *s) static void add_new_directory(char *name, char *path, unsigned long uid, unsigned long gid, unsigned long mode) { + mkdir(path,mode); // printf("Directory: %s %s UID: %ld GID %ld MODE: %ld\n", path, name, uid, gid, mode); } @@ -136,6 +137,13 @@ static void add_new_device(char *name, char *path, unsigned long uid, static void add_new_file(char *name, char *path, unsigned long uid, unsigned long gid, unsigned long mode) { + int fd = open(path,O_CREAT | O_WRONLY, mode); + if(fd<0) + { + error_msg_and_die("%s: file can not be created!", path); + } else { + close(fd); + } // printf("File: %s %s UID: %ld GID: %ld MODE: %ld\n", // path, name, gid, uid, mode); } diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch new file mode 100644 index 0000000000..3a09ac5bc2 --- /dev/null +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -0,0 +1,13 @@ +Index: matchbox-keyboard/src/matchbox-keyboard.c +=================================================================== +--- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 ++++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 +@@ -52,7 +52,7 @@ + kb->row_spacing = 5; + + kb->font_family = strdup("sans"); +- kb->font_pt_size = 5; ++ kb->font_pt_size = 3; + kb->font_variant = strdup("bold"); + + for (i = 1; i < argc; i++) diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 4f59b646dc..a97ed96d50 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -6,11 +6,13 @@ RPROVIDES = matchbox-keyboard #DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ file://80matchboxkeyboard" +SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" + S = "${WORKDIR}/matchbox-keyboard" inherit autotools pkgconfig gettext diff --git a/packages/mrxvt/files/font-defaults.patch b/packages/mrxvt/files/font-defaults.patch new file mode 100644 index 0000000000..3412305d99 --- /dev/null +++ b/packages/mrxvt/files/font-defaults.patch @@ -0,0 +1,25 @@ +Index: mrxvt-0.5.2/src/feature.h +=================================================================== +--- mrxvt-0.5.2.orig/src/feature.h ++++ mrxvt-0.5.2/src/feature.h +@@ -474,15 +474,15 @@ + #define DEFAULT_MIN_VISIBLE_TABS (6) + + /* Minimum Xft font size (pixel) */ +-#define MIN_XFT_FONT_SIZE (8) ++#define MIN_XFT_FONT_SIZE (2) + + /* Default Xft font name and size */ +-#define DEFAULT_XFT_FONT_SIZE (12) +-#define DEFAULT_XFT_FONT_NAME "Monospace" ++#define DEFAULT_XFT_FONT_SIZE (6) ++#define DEFAULT_XFT_FONT_NAME "Vera Sans Mono" + + /* Default Xft propotional font name and size (used for menubar / tabs) */ +-#define DEFAULT_XFT_PFONT_SIZE (10) +-#define DEFAULT_XFT_PFONT_NAME "Sans" ++#define DEFAULT_XFT_PFONT_SIZE (8) ++#define DEFAULT_XFT_PFONT_NAME "Vera Sans" + + /* Default cursor blinking time (ms) */ + #define MIN_BLINK_TIME (100) diff --git a/packages/mrxvt/mrxvt_0.5.2.bb b/packages/mrxvt/mrxvt_0.5.2.bb index 9b1b4a4c24..c1811cb167 100644 --- a/packages/mrxvt/mrxvt_0.5.2.bb +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -4,11 +4,12 @@ AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS = "freetype fontconfig libxft virtual/libx11" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;pnum=0;patch=1 \ - file://fix-compile.patch;patch=1" + file://fix-compile.patch;patch=1 \ + file://font-defaults.patch;patch=1" inherit autotools diff --git a/packages/ode/.mtn2git_empty b/packages/nonworking/ode/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ode/.mtn2git_empty +++ b/packages/nonworking/ode/.mtn2git_empty diff --git a/packages/ode/files/.mtn2git_empty b/packages/nonworking/ode/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ode/files/.mtn2git_empty +++ b/packages/nonworking/ode/files/.mtn2git_empty diff --git a/packages/ode/files/config.h b/packages/nonworking/ode/files/config.h index 8711bd91b2..8711bd91b2 100644 --- a/packages/ode/files/config.h +++ b/packages/nonworking/ode/files/config.h diff --git a/packages/nonworking/ode/ode_0.8.bb b/packages/nonworking/ode/ode_0.8.bb new file mode 100644 index 0000000000..9055681a36 --- /dev/null +++ b/packages/nonworking/ode/ode_0.8.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "ODE is an Open Source Physics Engine." +SECTION = "libs" +HOMEPAGE = "http://www.ode.org" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \ + file://config.h" + +inherit autotools + +#do_configure() { +# touch configurator.exe +# chmod a+rx configurator.exe +# install -m 0644 ${WORKDIR}/config.h include/ode/ +#} + +#do_compile() { +# oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib +#} + +#do_stage() { +# install -d ${STAGING_INCDIR}/ode/ +# install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/ +# oe_libinstall -C lib -a libode ${STAGING_LIBDIR} +#} + +#do_install() { +# : +#} diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/nonworking/python/python-pyode_1.2.0.bb index 95dc0228e3..95dc0228e3 100644 --- a/packages/python/python-pyode_1.0.0.bb +++ b/packages/nonworking/python/python-pyode_1.2.0.bb diff --git a/packages/ode/ode_0.5.bb b/packages/ode/ode_0.5.bb deleted file mode 100644 index 3b287d4b36..0000000000 --- a/packages/ode/ode_0.5.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "ODE is an Open Source Physics Engine." -SECTION = "libs" -PR = "r0" -LICENSE = "LGPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-${PV}.tgz \ - file://config.h" - -do_configure() { - touch configurator.exe - chmod a+rx configurator.exe - install -m 0644 ${WORKDIR}/config.h include/ode/ -} - -do_compile() { - oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib -} - -do_stage() { - install -d ${STAGING_INCDIR}/ode/ - install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/ - oe_libinstall -C lib -a libode ${STAGING_LIBDIR} -} - -do_install() { - : -} diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb index 007131659a..8c643347e3 100644 --- a/packages/openmoko2/libmokojournal2_svn.bb +++ b/packages/openmoko2/libmokojournal2_svn.bb @@ -8,3 +8,4 @@ inherit openmoko2 do_stage() { autotools_stage_all } + diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 3655f8977b..97d598b7cc 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Feed Reader" SECTION = "openmoko/apps" -DEPENDS += "libmrss check webkit-gtk" +DEPENDS += "libmokoui2 libmrss check webkit-gtk" PV = "0.0.1+svn${SVNREV}" PR = "r0" diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index 84bd470f7a..cff759edd6 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r2" +PR = "r4" RCONFLICTS = "openmoko-terminal" RREPLACES = "openmoko-terminal" @@ -29,7 +29,7 @@ pkg_postinst_${PN}() { # Mrxvt.xft: 1 Mrxvt.xftFont: Bitstream Vera Sans Mono -Mrxvt.xftSize: 8 +Mrxvt.xftSize: 5 Mrxvt.xftAntialias: 1 # Don't load a multi-char font. This will reduce the line space if your multi @@ -39,7 +39,7 @@ Mrxvt.xftNomFont: 1 # Font to use for tab bar / menus. This need not be mono-spaced ;). Mrxvt.xftPFont: Bitstream Vera Sans -Mrxvt.xftPSize: 8 +Mrxvt.xftPSize: 6 EOF } diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.21.bb index 0994a9d92b..f8989d9181 100644 --- a/packages/python/python-gammu_0.21.bb +++ b/packages/python/python-gammu_0.21.bb @@ -1,6 +1,3 @@ -#TODO needs recent gammu, which in turn needs cmake which we don't have yet -BROKEN = "1" - DESCRIPTION = "Python bindings for the gammu GSM phone communication library." HOMEPAGE = "http://cihar.com/gammu/python" SECTION = "devel/python" @@ -11,4 +8,3 @@ PR = "ml0" SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" inherit distutils - diff --git a/packages/python/python-pygtk-0.6.12/.mtn2git_empty b/packages/python/python-pygtk-1.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-pygtk-0.6.12/.mtn2git_empty +++ b/packages/python/python-pygtk-1.2/.mtn2git_empty diff --git a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch index 94bb164f67..94bb164f67 100644 --- a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al +++ b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb index 90f8cb3821..a974a2471d 100644 --- a/packages/python/python-pygtk-1.2_0.6.12.bb +++ b/packages/python/python-pygtk-1.2_0.6.12.bb @@ -8,7 +8,7 @@ SRCNAME = "pygtk" PR = "r1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \ - file://remove-imlib-et-al;patch=1 \ + file://remove-imlib-et-al.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -17,7 +17,7 @@ inherit autotools pkgconfig distutils-base EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" -FILES_${PN} = "${libdir}/${PYTHON_DIR}/" +#FILES_${PN} = "${libdir}/${PYTHON_DIR}/" do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ diff --git a/packages/python/python-pytest_0.6.0.bb b/packages/python/python-pytester_0.6.0.bb index 17db94897c..bc7953b73e 100644 --- a/packages/python/python-pytest_0.6.0.bb +++ b/packages/python/python-pytester_0.6.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" HOMEPAGE = "http://oss.wxnet.org/pytester/index.html" PRIORITY = "optional" LICENSE = "GPL" -SRCNAME = "pytest" +SRCNAME = "pytester" PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" diff --git a/packages/tar/tar/.mtn2git_empty b/packages/tar/tar/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tar/tar/.mtn2git_empty +++ /dev/null diff --git a/packages/tar/tar/tar-native_1.13.25.oe b/packages/tar/tar/tar-native_1.13.25.oe deleted file mode 100644 index 07771156ba..0000000000 --- a/packages/tar/tar/tar-native_1.13.25.oe +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "base" -DESCRIPTION = "This version of GNU tar is only used for compatibility \ -reasons, where an old ipkg (e.g. ipkg 0.99.84) has to extract and \ -install *.ipk files created with OpenEmbedded." -LICENSE = "GPL" -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" - -SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz" - -inherit autotools -inherit native - -S = "${WORKDIR}/tar-${PV}" - -OEDEBUG = 2 - -do_configure() { - oe_runconf -} - -do_stage() { - install -m 755 src/tar ${STAGING_BINDIR} -} - -do_install() { - true -} diff --git a/packages/tar/tar_1.18.bb b/packages/tar/tar_1.18.bb new file mode 100644 index 0000000000..701c0b77bf --- /dev/null +++ b/packages/tar/tar_1.18.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "GNU tar saves many files together into a single tape \ +or disk archive, and can restore individual files from the archive." +SECTION = "base" +LICENSE = "GPLv3" + +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" + +inherit autotools + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} + mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 + update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove tar tar.${PN} + update-alternatives --remove rmt rmt.${PN} +} diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb new file mode 100644 index 0000000000..6ea7ca236b --- /dev/null +++ b/packages/tasks/task-openmoko-debug.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "OpenMoko: Debugging Tools" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r57" + +inherit task + +RDEPENDS_task-openmoko-debug = "\ + alsa-utils-amixer \ + alsa-utils-aplay \ + alsa-utils-aconnect \ + alsa-utils-alsamixer \ + alsa-utils-speakertest \ + madplay \ + vorbis-tools \ + strace \ + ltrace \ + gdb \ + gdbserver \ + tcpdump \ + tslib-calibrate \ + tslib-tests \ + fbgrab \ + fstests \ + lsof \ + lrzsz \ + udev-utils \ + usbutils \ + uucp \ + cu \ +# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ + xev \ + bonnie++ \ + memtester \ + dbench \ +" diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb new file mode 100644 index 0000000000..6a5c2c2aa5 --- /dev/null +++ b/packages/tasks/task-openmoko-native-sdk.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "OpenMoko: Native SDK" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r58" + +inherit task + +RDEPENDS_task-openmoko-native-sdk = "\ + binutils \ + binutils-symlinks \ + gcc \ + gcc-symlinks \ + cpp \ + cpp-symlinks \ + cvs \ + libc6-dev \ + libgcc-dev \ + glibc-utils \ + ldd \ + g++ \ + g++-symlinks \ + libstdc++-dev \ + \ + make \ + flex \ + flex-dev \ + bison \ + gawk \ + grep \ + sed \ + automake \ + autoconf \ + patch \ + patchutils \ + diffstat \ + diffutils \ + libtool \ + pkgconfig \ + \ + xoo \ +" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index a7739d8c01..754e32b1d2 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,10 +2,9 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r57" +PR = "r59" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" +inherit task PACKAGES = "\ task-openmoko-linux \ @@ -17,12 +16,14 @@ PACKAGES = "\ \ task-openmoko-games \ task-openmoko-examples \ +" + +RDEPENDS_task-openmoko-everything := "\ + ${PACKAGES} \ task-openmoko-debug \ task-openmoko-native-sdk \ " -RDEPENDS_task-openmoko-everything := "${PACKAGES}" - # # task-openmoko-core # @@ -72,6 +73,7 @@ RDEPENDS_task-openmoko-ui = "\ openmoko-sound-system \ openmoko-sound-theme-standard \ neod \ + gpe-scap \ " # @@ -137,76 +139,3 @@ DESCRIPTION_task-openmoko-games = "OpenMoko: Games" RDEPENDS_task-openmoko-games = "\ oh-puzzles \ " - -# -# task-openmoko-debug -# -DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools" -RDEPENDS_task-openmoko-debug = "\ - alsa-utils-amixer \ - alsa-utils-aplay \ - alsa-utils-aconnect \ - alsa-utils-alsamixer \ - alsa-utils-speakertest \ - madplay \ - vorbis-tools \ - strace \ - ltrace \ - gdb \ - gdbserver \ - tcpdump \ - tslib-calibrate \ - tslib-tests \ - fbgrab \ - fstests \ - lsof \ - lrzsz \ - udev-utils \ - usbutils \ - uucp \ - cu \ -# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ - xev \ - bonnie++ \ - memtester \ - dbench \ -" - -# -# task-openmoko-native-sdk -# -DESCRIPTION_task-openmoko-native-sdk = "OpenMoko: Native SDK" -RDEPENDS_task-openmoko-native-sdk = "\ - binutils \ - binutils-symlinks \ - gcc \ - gcc-symlinks \ - cpp \ - cpp-symlinks \ - cvs \ - libc6-dev \ - libgcc-dev \ - glibc-utils \ - ldd \ - g++ \ - g++-symlinks \ - libstdc++-dev \ - \ - make \ - flex \ - flex-dev \ - bison \ - gawk \ - grep \ - sed \ - automake \ - autoconf \ - patch \ - patchutils \ - diffstat \ - diffutils \ - libtool \ - pkgconfig \ - \ - xoo \ -" diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 4eb843fa5e..ffa3280b11 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,13 +1,12 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml17" +PR = "ml19" RDEPENDS = "\ python-ao \ python-cheetah \ python-constraint \ - python-crypto \ python-dbus \ python-dialog \ python-evas \ @@ -53,13 +52,12 @@ RDEPENDS = "\ python-pyiw \ python-pylinda \ python-pylint \ - python-pyode \ python-pyraf \ python-pyreverse \ python-pyrex \ python-pyro \ python-pyserial \ - python-pytest \ + python-pytester \ python-pyvisa \ python-pyweather \ python-pyxml \ diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb index 1511341f0a..b5a4c6eac1 100644 --- a/packages/zten/zten_1.6.2.bb +++ b/packages/zten/zten_1.6.2.bb @@ -7,7 +7,7 @@ DEPENDS = "eb kakasi" RDEPENDS = "virtual/japanese-font" RCONFLICTS = "ztenv" -SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc9321 \ +SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \ file://zten.patch;patch=1" S = "${WORKDIR}/zten" |