diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/avahi/avahi-ui_0.6.21.bb | 20 | ||||
-rw-r--r-- | packages/avahi/mango-lassi_git.bb | 18 | ||||
-rw-r--r-- | packages/gutenprint/.mtn2git_empty (renamed from packages/nonworking/gutenprint/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/gutenprint/gutenprint-native_5.1.3.bb | 39 | ||||
-rw-r--r-- | packages/gutenprint/gutenprint.inc | 28 | ||||
-rw-r--r-- | packages/linux/linux-openmoko-devel/defconfig-2.6.23.1 (renamed from packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9) | 7 | ||||
-rw-r--r-- | packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb (renamed from packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb) | 24 | ||||
-rw-r--r-- | packages/nonworking/gutenprint/gutenprint_5.0.0.bb | 22 |
8 files changed, 123 insertions, 35 deletions
diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb new file mode 100644 index 0000000000..1159b8ead4 --- /dev/null +++ b/packages/avahi/avahi-ui_0.6.21.bb @@ -0,0 +1,20 @@ +require avahi.inc +PR = "r0" + +DEPENDS += "avahi gtk+" + +SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1" +AVAHI_GTK = "--enable-gtk" + +S = "${WORKDIR}/avahi-${PV}" + +do_stage() { + install -d ${STAGING_INCDIR}/avahi-ui + cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/ + oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR} +} + +PACKAGES = "${PN} ${PN}-dbg" + +FILES_${PN} = "${libdir}/libavahi-ui*.so.*" +FILES_${PN}-dbg = "${libdir}/.debug/libavah-ui*" diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb new file mode 100644 index 0000000000..99fd617ec9 --- /dev/null +++ b/packages/avahi/mango-lassi_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Input sharing, the avahi way" +DEPENDS = "avahi-ui libglade libnotify" + +PV = "0.0+git${SRCDATE}" + +SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" + + +S = "${WORKDIR}/${PN}" + +do_compile_prepend() { + export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`" +} + +do_install() { + install -d ${D}${bindir} + install -m 755 mango-lassi ${D}${bindir} +} diff --git a/packages/nonworking/gutenprint/.mtn2git_empty b/packages/gutenprint/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/gutenprint/.mtn2git_empty +++ b/packages/gutenprint/.mtn2git_empty diff --git a/packages/gutenprint/gutenprint-native_5.1.3.bb b/packages/gutenprint/gutenprint-native_5.1.3.bb new file mode 100644 index 0000000000..4fe56d6c59 --- /dev/null +++ b/packages/gutenprint/gutenprint-native_5.1.3.bb @@ -0,0 +1,39 @@ +SECTION = "libs" +require gutenprint_${PV}.bb +DEPENDS = "" +inherit native + +EXTRA_OECONF = "\ + --disable-nls \ + --disable-gtktest \ + --enable-cups-ppds \ + --disable-libgutenprintui \ + --disable-libgutenprintui2 \ + --disable-translated-cups-ppds \ + --with-ghostscript \ + --enable-cups-level3-ppds \ + --disable-gimptest \ + --enable-test \ + --enable-epson \ + --with-user-guide \ + --with-samples \ + --with-escputil \ + " + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + + + + +do_stage() { + autotools_stage_includes + install -m 0755 -d ${STAGING_DATADIR}/cups/model + install -m 0644 src/cups/ppd/C/*ppd* ${STAGING_DATADIR}/cups/model/ +# oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + + diff --git a/packages/gutenprint/gutenprint.inc b/packages/gutenprint/gutenprint.inc new file mode 100644 index 0000000000..961613036a --- /dev/null +++ b/packages/gutenprint/gutenprint.inc @@ -0,0 +1,28 @@ +DESCRIPTION = "Gutenprint printer drivers" +HOMEPAGE = "http://gimp-print.sourceforge.net/" +LICENSE = "GPL" + +DEPENDS = "glib-2.0 cups tiff jpeg libpng gutenprint-native espgs" + + +inherit autotools pkgconfig +PARALLEL_MAKE="" + +#EXTRA_OECONF = "\ +# --disable-nls \ +# --disable-gtktest \ +# --enable-cups-ppds \ +# --disable-libgutenprintui \ +# --disable-libgutenprintui2 \ +# --disable-translated-cups-ppds \ +# --with-ghostscript \ +# --enable-cups-level3-ppds \ +# --disable-gimptest \ +# --enable-test \ +# --enable-epson \ +# --with-user-guide \ +# --with-samples \ +# --with-escputil \ +# " + + diff --git a/packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9 b/packages/linux/linux-openmoko-devel/defconfig-2.6.23.1 index c2b7151295..2419f90981 100644 --- a/packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9 +++ b/packages/linux/linux-openmoko-devel/defconfig-2.6.23.1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.23-rc9 -# Sun Oct 7 15:39:12 2007 +# Tue Oct 9 15:27:11 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -199,6 +199,7 @@ CONFIG_ARCH_S3C2440=y CONFIG_SMDK2440_CPU2440=y CONFIG_MACH_HXD8=y CONFIG_MACH_NEO1973_GTA02=y +CONFIG_CPU_S3C2442=y # # S3C2442 Machines @@ -1735,8 +1736,8 @@ CONFIG_FORCED_INLINING=y CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set -# CONFIG_DEBUG_S3C_PORT is not set -CONFIG_DEBUG_S3C_UART=0 +CONFIG_DEBUG_S3C_PORT=y +CONFIG_DEBUG_S3C_UART=2 # # Security options diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb index 004a3db9c7..f116fd1143 100644 --- a/packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb +++ b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb @@ -1,11 +1,14 @@ require linux.inc DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.22" -KERNEL_VERSION = "2.6.23-rc9" -KERNEL_RELEASE = "2.6.23-rc9" -PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r3" +VANILLA_VERSION = "2.6.23.1" +#KERNEL_VERSION = "2.6.23-rc9" +#KERNEL_RELEASE = "2.6.23-rc9" +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" +KERNEL_VERSION = "${VANILLA_VERSION}" +KERNEL_RELEASE = "${VANILLA_VERSION}" +PV = "${VANILLA_VERSION}+svnr${SRCREV}" +PR = "r1" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -14,15 +17,16 @@ UBOOT_ENTRYPOINT = "30008000" # source and patches # SRCREV_FORMAT = "patches" -SRCREV = "3101" +SRCREV = "3140" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \ +# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \ svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \ file://squashfs-2.6.23.patch;patch=1 \ file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ -# file://printascii.patch;patch=1 \ - file://defconfig-2.6.23-rc9 \ +# file://printascii-2.6.23.patch;patch=1 \ + file://hack-gta02-cpu.patch;patch=1 \ + file://defconfig-2.6.23.1 \ file://logo_linux_clut224.ppm" S = "${WORKDIR}/linux-${VANILLA_VERSION}" @@ -51,7 +55,7 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" module_autoload_s3cmci = "s3cmci" do_prepatch() { - cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION} +# cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION} mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av mv patches patches.openmoko mv .pc .pc.old diff --git a/packages/nonworking/gutenprint/gutenprint_5.0.0.bb b/packages/nonworking/gutenprint/gutenprint_5.0.0.bb deleted file mode 100644 index 5a0de7797f..0000000000 --- a/packages/nonworking/gutenprint/gutenprint_5.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ - - - -DEPENDS = "glib-2.0 gtk+ cups" - -inherit autotools pkgconfig - -SRC_URI = "${SOURCEFORGE_MIRROR}/gimp-print/${P}.tar.bz2" - -EXTRA_OECONF = "\ - --disable-gtktest \ - --disable-libgutenprintui \ - --enable-libgutenprintui2 \ - --enable-translated-cups-ppds \ - --disable-gimptest \ - " - -do_configure() { - oe_runconf -} - - |