diff options
20 files changed, 209 insertions, 53 deletions
diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/alsa/alsa-lib/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ruby/ruby-1.8.5/.mtn2git_empty +++ b/packages/alsa/alsa-lib/.mtn2git_empty diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..59b3b6d150 --- /dev/null +++ b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch @@ -0,0 +1,13 @@ +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include <time.h> + + #ifdef __cplusplus diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 987a5901f4..8b6b7af409 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 = "r0" +PR = "r1" # 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, @@ -10,7 +10,8 @@ PR = "r0" #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index c7ac97d2e5..95fb0cf0c6 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r26" +PR = "r27" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -52,6 +52,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ pango-module-basic-x \ pango-module-basic-fc \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \ " RDEPENDS_angstrom-gpe-task-pim := "\ diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index b04cd86677..a42a87c50d 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,7 +1,6 @@ require busybox.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_slugos = "1" SRC_URI = "file://defconfig" diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb index a617f5b45b..ad42b0868b 100644 --- a/packages/ezx/opentapi_svn.bb +++ b/packages/ezx/opentapi_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Open implementation of motorola's tapisrc" LICENSE = "GPLv2" PV = "0.0+svn${SRCDATE}" +PR = "r1" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ file://opentapi.init \ @@ -10,7 +11,7 @@ SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http inherit update-rc.d INITSCRIPT_NAME = "opentapi" -INITSCRIPT_PARAMS = "defaults" +INITSCRIPT_PARAMS = "start 04 S ." S = "${WORKDIR}/${PN}" diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb new file mode 100644 index 0000000000..e769e0053f --- /dev/null +++ b/packages/lcdproc/lcdproc_0.5.1.bb @@ -0,0 +1,118 @@ +DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \ +shipped with this package can be used to acquire various kinds of system stats." +HOMEPAGE = "http://lcdproc.org" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "utils" +PR="r1" + +DEPENDS = "libusb ncurses libg15 g15daemon libg15render" +RRECOMMENDS_lcdproc = "lcdd" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz" + +inherit autotools update-rc.d + +PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf" + +FILES_lcdd = "${CONFFILES_lcdd} \ + ${sbindir}/LCDd \ + ${sysconfdir}/init.d/lcdd" + +FILES_lcdproc = "${CONFFILES_lcdproc} \ + ${bindir}/lcdproc \ + ${sysconfdir}/init.d/lcdproc" + +# Driver packages + +FILES_lcdd-driver-cfontz = "${libdir}/lcdproc/CFontz*.so" +FILES_lcdd-driver-bayrad = "${libdir}/lcdproc/bayrad.so" +FILES_lcdd-driver-hd44780nousb = "${libdir}/lcdproc/hd44780nousb.so" +FILES_lcdd-driver-hd44780 = "${libdir}/lcdproc/hd44780.so" +FILES_lcdd-driver-mtxorb = "${libdir}/lcdproc/MtxOrb.so" +FILES_lcdd-driver-serialvfd = "${libdir}/lcdproc/serialVFD.so" +FILES_lcdd-driver-curses = "${libdir}/lcdproc/curses.so" +FILES_lcdd-driver-text = "${libdir}/lcdproc/text.so" +FILES_lcdd-driver-sed = "${libdir}/lcdproc/sed*.so" +FILES_lcdd-driver-cwlnx = "${libdir}/lcdproc/CwLnx.so" +FILES_lcdd-driver-glk = "${libdir}/lcdproc/glk.so" +FILES_lcdd-driver-icp-a106 = "${libdir}/lcdproc/icp_a106.so" +FILES_lcdd-driver-imon = "${libdir}/lcdproc/imon.so" +FILES_lcdd-driver-joy = "${libdir}/lcdproc/joy.so" +FILES_lcdd-driver-lb216 = "${libdir}/lcdproc/lb216.so" +FILES_lcdd-driver-lcdm001 = "${libdir}/lcdproc/lcdm001.so" +FILES_lcdd-driver-lcterm = "${libdir}/lcdproc/lcterm.so" +FILES_lcdd-driver-ms6931 = "${libdir}/lcdproc/ms6931.so" +FILES_lcdd-driver-mtc-s16209x = "${libdir}/lcdproc/mtc_s16209x.so" +FILES_lcdd-driver-noritakevfd = "${libdir}/lcdproc/NoritakeVFD.so" +FILES_lcdd-driver-pyramid = "${libdir}/lcdproc/pyramid.so" +FILES_lcdd-driver-sli = "${libdir}/lcdproc/sli.so" +FILES_lcdd-driver-stv5730 = "${libdir}/lcdproc/stv5730.so" +FILES_lcdd-driver-t6963 = "${libdir}/lcdproc/t6963.so" +FILES_lcdd-driver-tyan = "${libdir}/lcdproc/tyan.so" +FILES_lcdd-driver-g15 = "${libdir}/lcdproc/g15.so" + + +# Install-all-drivers-hack: + +DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +# USB / no USB trickery + +CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" + +INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd" +INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults 70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" + +EXTRA_OECONF = "--enable-drivers=all --enable-libusb" + +do_install () { + # binaries + install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd + install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc + + # init scripts + install -d ${D}${sysconfdir}/init.d + # so far, not fixed :-( and now even uglier :-(( + cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd + chmod 0755 ${D}${sysconfdir}/init.d/lcdd + # prevent lcdproc from starting if no SCREENS are set. + # will be fixed in next upstream release + cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc + chmod 0755 ${D}${sysconfdir}/init.d/lcdproc + + # configuration files + install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf + # don't start lcdproc by default + # will be fixed in next upstream release + cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf + chmod 0644 ${D}${sysconfdir}/lcdproc.conf + + # driver library files + install -d ${D}${libdir}/lcdproc + for i in server/drivers/*.so; do + install -m 0644 $i ${D}${libdir}/lcdproc/ + done +} + diff --git a/packages/libg15render/.mtn2git_empty b/packages/libg15render/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libg15render/.mtn2git_empty diff --git a/packages/libg15render/libg15render_1.2.bb b/packages/libg15render/libg15render_1.2.bb new file mode 100644 index 0000000000..2adb511eea --- /dev/null +++ b/packages/libg15render/libg15render_1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "This is a library to render text and shapes into a buffer usable by the Logitech G15 Gaming Keyboard." +HOMEPAGE = "http://g15tools.sourceforge.net" +LICENSE = "GPLv2" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libg15" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15render-${PV}.tar.bz2" + +inherit autotools + +do_stage () { + oe_libinstall -a -so libg15render ${STAGING_LIBDIR} + for i in libg15render.h; do + install -m 0644 ${S}/$i ${STAGING_INCDIR}/ + done +} + diff --git a/packages/ruby/files/.mtn2git_empty b/packages/ruby/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ruby/files/.mtn2git_empty diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/files/disable_wide_getaddrinfo_check.patch index 82137896b9..82137896b9 100644 --- a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch +++ b/packages/ruby/files/disable_wide_getaddrinfo_check.patch diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/files/extmk_run.patch index 57926f51b0..57926f51b0 100644 --- a/packages/ruby/ruby-1.8.5/extmk_run.patch +++ b/packages/ruby/files/extmk_run.patch diff --git a/packages/ruby/ruby-native_1.8.5.bb b/packages/ruby/ruby-native_1.8.5.bb index d5ccae8262..e4d2a3361e 100644 --- a/packages/ruby/ruby-native_1.8.5.bb +++ b/packages/ruby/ruby-native_1.8.5.bb @@ -1,3 +1,2 @@ -include ruby_${PV}.bb +require ruby.inc inherit native -DEPENDS = "" diff --git a/packages/ruby/ruby.inc b/packages/ruby/ruby.inc new file mode 100644 index 0000000000..9fe8333f6f --- /dev/null +++ b/packages/ruby/ruby.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Ruby is an interpreted scripting language \ +for quick and easy object-oriented programming." +SECTION = "devel/ruby" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ + file://extmk_run.patch;patch=1 \ + file://disable_wide_getaddrinfo_check.patch;patch=1" + +S = "${WORKDIR}/ruby-${PV}" + +inherit autotools + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { + sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk + rm -rf ${S}/ruby/ +} diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb index 972d56e14c..d06e9e0943 100644 --- a/packages/ruby/ruby_1.8.5.bb +++ b/packages/ruby/ruby_1.8.5.bb @@ -1,25 +1,2 @@ -DESCRIPTION = "Ruby is an interpreted scripting language \ -for quick and easy object-oriented programming." -SECTION = "devel/ruby" +require ruby.inc DEPENDS = "ruby-native zlib openssl" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ - file://extmk_run.patch;patch=1 \ - file://disable_wide_getaddrinfo_check.patch;patch=1" - -S = "${WORKDIR}/ruby-${PV}" - -inherit autotools - -# This snippet lets compiled extensions which rely on external libraries, -# such as zlib, compile properly. If we don't do this, then when extmk.rb -# runs, it uses the native libraries instead of the target libraries, and so -# none of the linking operations succeed -- which makes extconf.rb think -# that the libraries aren't available and hence that the extension can't be -# built. - -do_configure_prepend() { - sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk -} diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index 71aec2a8b0..bd6841f025 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION = "All packages required for an base XFCE installation" +LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PR = "r1" +PR = "r2" RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ - xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \ + xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" -LICENSE = "MIT" +RRECOMMENDS = "xfce-utils-mcs-plugins" diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce-mcs-manager/xfce-mcs-manager.inc index d913910d69..c50bf0ca64 100644 --- a/packages/xfce-mcs-manager/xfce-mcs-manager.inc +++ b/packages/xfce-mcs-manager/xfce-mcs-manager.inc @@ -5,6 +5,7 @@ DESCRIPTION="XFCE4 Settings manager." DEPENDS="libxfcegui4 libxfce4mcs" SECTION = "x11" +PR = "r1" inherit xfce @@ -20,5 +21,5 @@ do_stage() { do_stage_append () { install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc + sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc } diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc index 3de7625940..0b191194d7 100644 --- a/packages/xfce-utils/xfce-utils.inc +++ b/packages/xfce-utils/xfce-utils.inc @@ -6,21 +6,24 @@ DESCRIPTION="XFCE4 Utilities" DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" inherit xfce -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "/usr/lib/xfce4/mcs-plugins/" +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" # NOTE: This package takes a --with-browser for the default browser # NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb index 57909f2c2d..472ba68a14 100644 --- a/packages/xfce-utils/xfce-utils_4.3.99.2.bb +++ b/packages/xfce-utils/xfce-utils_4.3.99.2.bb @@ -2,5 +2,5 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -PR = "r1" +PR = "r2" require ${PN}.inc diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc index 380832d7c3..e3e64ef355 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" @@ -12,5 +12,3 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" - - |