mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
Split meta-extras and meta-moblin out of the main repository
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
@@ -1,17 +0,0 @@
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
@@ -1,6 +0,0 @@
|
||||
SRCREV_pn-evince ??= "2437"
|
||||
SRCDATE_maemo-mapper-nohildon ??= "20061114"
|
||||
SRCREV_pn-libxosd ??= "627"
|
||||
SRCREV_pn-matchbox-applet-light ??= "1548"
|
||||
SRCREV_pn-matchbox-common ??= "1561"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# We have a conf and classes directory, add to BBPATH
|
||||
BBPATH := "${BBPATH}:${LAYERDIR}"
|
||||
|
||||
# We have a packages directory, add to BBFILES
|
||||
BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
|
||||
|
||||
BBFILE_COLLECTIONS += "extras"
|
||||
BBFILE_PATTERN_extras := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_extras = "5"
|
||||
|
||||
require conf/distro/include/poky-extras-src-revisions.inc
|
||||
@@ -1,14 +0,0 @@
|
||||
#@TYPE: Machine
|
||||
#@NAME: imx31 Lite Kit
|
||||
#@DESCRIPTION: Machine configuration for the imx31 based Lite Kit
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-mx31"
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen"
|
||||
|
||||
IMAGE_FSTYPES ?= "tar.gz"
|
||||
SERIAL_CONSOLE = "-L 115200 ttymxc0"
|
||||
|
||||
require conf/machine/include/tune-arm1136jf-s.inc
|
||||
@@ -1,35 +0,0 @@
|
||||
#@TYPE: Machine
|
||||
#@NAME: Nokia 770 internet tablet
|
||||
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
|
||||
PREFERRED_PROVIDER_virtual/bootloader = ""
|
||||
|
||||
XSERVER = "xserver-kdrive-xomap"
|
||||
|
||||
# 800x480 is big enough for me
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
|
||||
require conf/machine/include/tune-arm926ejs.inc
|
||||
|
||||
#size of the root partition (yes, it is 123 MB)
|
||||
ROOT_FLASH_SIZE = "123"
|
||||
EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n"
|
||||
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
|
||||
# serial console port on devboard rev. B3
|
||||
SERIAL_CONSOLE = "115200 ttyS0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
|
||||
|
||||
#use this if you are using the nokia initfs
|
||||
ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat"
|
||||
MACHINE_EXTRA_RDEPENDS = "usbinit"
|
||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
|
||||
|
||||
KERNEL_IMAGE_MAXSIZE = "2097152"
|
||||
@@ -1,30 +0,0 @@
|
||||
#@TYPE: Machine
|
||||
#@NAME: Nokia 800/810 internet tablet
|
||||
#@DESCRIPTION: Machine configuration for the Nokia 800/810
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
|
||||
XSERVER = "xserver-kdrive-xomap"
|
||||
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
|
||||
require conf/machine/include/tune-arm1136jf-s.inc
|
||||
|
||||
ROOT_FLASH_SIZE = "174"
|
||||
EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"
|
||||
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
|
||||
SERIAL_CONSOLE = "-L 115200 ttyS0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
|
||||
|
||||
#use this if you are using the nokia initfs
|
||||
ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat"
|
||||
MACHINE_EXTRA_RDEPENDS = "cx3110x usbinit"
|
||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
|
||||
|
||||
KERNEL_IMAGE_MAXSIZE = "2097152"
|
||||
@@ -1,48 +0,0 @@
|
||||
#-----------------------------------------------------------------------------
|
||||
#@TYPE: Machine
|
||||
#@NAME: FIC GTA01 (Neo1973)
|
||||
#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
MACHINE_CLASS = "neo1973"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
|
||||
UBOOT_ENTRYPOINT = "30008000"
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
|
||||
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
|
||||
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
|
||||
MACHINE_DISPLAY_ORIENTATION = "0"
|
||||
MACHINE_DISPLAY_PPI = "285"
|
||||
XSERVER = "xserver-kdrive-fbdev"
|
||||
|
||||
MACHINE_EXTRA_RDEPENDS = "usbinit"
|
||||
# package machine specific modules
|
||||
MACHINE_EXTRA_RRECOMMENDS = "\
|
||||
kernel-module-gta01-pm-bt \
|
||||
kernel-module-gta01-pm-gps \
|
||||
kernel-module-gta01-pm-gsm \
|
||||
kernel-module-gta01kbd \
|
||||
kernel-module-s3cmci \
|
||||
kernel-module-snd-soc-neo1973-wm8753 \
|
||||
kernel-module-snd-soc-smdk2440 \
|
||||
"
|
||||
|
||||
# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
|
||||
#SERIAL_CONSOLE = "115200 ttySAC0"
|
||||
|
||||
# used by some images
|
||||
ROOT_FLASH_SIZE = "60"
|
||||
|
||||
# extra jffs2 tweaks
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
|
||||
|
||||
# build / upload tools
|
||||
#EXTRA_IMAGEDEPENDS += "dfu-util-native"
|
||||
|
||||
# tune for S3C24x0
|
||||
include conf/machine/include/tune-arm920t.inc
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
#-----------------------------------------------------------------------------
|
||||
#@TYPE: Machine
|
||||
#@NAME: FIC GTA02 (Neo1973)
|
||||
#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
MACHINE_CLASS = "neo1973"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
|
||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
|
||||
UBOOT_ENTRYPOINT = "30008000"
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
|
||||
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
|
||||
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
|
||||
MACHINE_DISPLAY_ORIENTATION = "0"
|
||||
MACHINE_DISPLAY_PPI = "285"
|
||||
XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
|
||||
|
||||
# package machine specific modules
|
||||
MACHINE_EXTRA_RRECOMMENDS = "\
|
||||
kernel-module-gta01-pm-bt \
|
||||
kernel-module-gta01-pm-gps \
|
||||
kernel-module-gta01-pm-gsm \
|
||||
kernel-module-gta01kbd \
|
||||
kernel-module-s3cmci \
|
||||
kernel-module-snd-soc-neo1973-gta02-wm8753 \
|
||||
"
|
||||
|
||||
SERIAL_CONSOLE = "115200 ttySAC2"
|
||||
|
||||
# used by some images
|
||||
ROOT_FLASH_SIZE = "256"
|
||||
|
||||
# extra jffs2 tweaks
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
|
||||
--no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
|
||||
--littleendian --pad \
|
||||
-i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
|
||||
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
|
||||
|
||||
# build / upload tools
|
||||
#EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
|
||||
|
||||
# tune for S3C24x0
|
||||
include conf/machine/include/tune-arm920t.inc
|
||||
@@ -1,9 +0,0 @@
|
||||
LICENSE = "GPL"
|
||||
DESCRIPTION = "GNU Accounting Utilities - user and process accounting."
|
||||
|
||||
SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \
|
||||
file://cross-compile.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/acct-6.4-pre1"
|
||||
|
||||
inherit autotools
|
||||
@@ -1,34 +0,0 @@
|
||||
diff -ur acct-6.4-pre1.org/configure.in acct-6.4-pre1/configure.in
|
||||
--- acct-6.4-pre1.org/configure.in 2006-01-07 23:56:46.000000000 +0200
|
||||
+++ acct-6.4-pre1/configure.in 2006-08-03 21:16:17.000000000 +0300
|
||||
@@ -87,6 +87,10 @@
|
||||
ACCTON_MAN=accton.8
|
||||
LASTCOMM_MAN=lastcomm.1
|
||||
SA_MAN=sa.8
|
||||
+ WTMP_FILE_LOC=/var/log/wtmp
|
||||
+ ACCT_FILE_LOC=/var/account/pacct
|
||||
+ SAVACCT_FILE_LOC=/var/account/savacct
|
||||
+ USRACCT_FILE_LOC=/var/account/usracct
|
||||
AC_DEFINE(HAVE_ACUTIME, ,
|
||||
[Define if <sys/acct.h> has the AC_UTIME field.])
|
||||
AC_DEFINE(ACUTIME_COMPT, ,
|
||||
@@ -130,6 +134,10 @@
|
||||
ACCTON_MAN=accton.8
|
||||
LASTCOMM_MAN=lastcomm.1
|
||||
SA_MAN=sa.8
|
||||
+ WTMP_FILE_LOC=/var/log/wtmp
|
||||
+ ACCT_FILE_LOC=/var/account/pacct
|
||||
+ SAVACCT_FILE_LOC=/var/account/savacct
|
||||
+ USRACCT_FILE_LOC=/var/account/usracct
|
||||
AC_HEADER_EGREP(ac_utime, sys/acct.h,
|
||||
AC_DEFINE(HAVE_ACUTIME, ,
|
||||
[Define if <sys/acct.h> has the AC_UTIME field.])
|
||||
@@ -277,7 +285,7 @@
|
||||
}
|
||||
], . ./locs; rm locs,
|
||||
echo "Error -- could not locate your wtmp and acct files."; exit 1,
|
||||
- echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 )
|
||||
+ echo "Cross-compiling - cannot find out accounting file locations - using Linux defaults."; )
|
||||
AC_TYPE_PID_T dnl for sys/acct.h
|
||||
AC_TYPE_UID_T dnl same as above
|
||||
AC_TYPE_SIZE_T
|
||||
@@ -1,15 +0,0 @@
|
||||
DESCRIPTION = "Clutter Helix"
|
||||
HOMEPAGE = "http://www.clutter-project.org/"
|
||||
LICENSE = "LGPL"
|
||||
|
||||
DEPENDS = "helix-libs"
|
||||
|
||||
FILESPATH = "${FILE_DIRNAME}/clutter-helix"
|
||||
|
||||
COMPATIBLE_HOST = '(x86_64|i.86.*)-linux'
|
||||
|
||||
PACKAGES =+ "${PN}-examples"
|
||||
FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
|
||||
|
||||
inherit autotools pkgconfig gtk-doc
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
require clutter-helix.inc
|
||||
|
||||
PV = "0.8.0+git${SRCPV}"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "git://git.clutter-project.org/clutter-helix.git;protocol=git"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -1,44 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e05b5b7..c348a1e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -64,7 +64,7 @@ HFILES = $(wildcard *.h)
|
||||
%.o: %.c $(HFILES)
|
||||
$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
|
||||
$(BINARY): $(OBJECTS)
|
||||
- $(CXX) -o $@ $(OBJECTS) $(LIBS)
|
||||
+ $(CXX) -rdynamic -o $@ $(OBJECTS) $(LIBS)
|
||||
|
||||
#$(BINARY): $(CFILES)
|
||||
# $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
|
||||
diff --git a/moblin-desktop.c b/moblin-desktop.c
|
||||
index 6dd4f2c..fb9d231 100644
|
||||
--- a/moblin-desktop.c
|
||||
+++ b/moblin-desktop.c
|
||||
@@ -103,6 +103,8 @@ void moblin_blur (void)
|
||||
if (desktop->maincopy)
|
||||
return;
|
||||
|
||||
+ if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
|
||||
+ {
|
||||
#if 0
|
||||
desktop->maincopy = clutter_texture_new_from_actor (desktop->mainstuff);
|
||||
#else
|
||||
@@ -158,6 +160,17 @@ void moblin_blur (void)
|
||||
1.0f / moblin_desktop_width ());
|
||||
}
|
||||
clutter_actor_set_shader_param (desktop->maincopy, "radius", 3.0);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ ClutterColor clr= { 0x44, 0x44, 0x44, 0x77 };
|
||||
+ guint w, h;
|
||||
+
|
||||
+ desktop->maincopy = clutter_rectangle_new_with_color (&clr);
|
||||
+ clutter_actor_get_size (desktop->mainstuff, &w, &h);
|
||||
+ clutter_actor_set_size (desktop->maincopy, w, h);
|
||||
+ clutter_group_add (desktop->copyholder, desktop->maincopy);
|
||||
+ }
|
||||
}
|
||||
|
||||
void moblin_unblur (void)
|
||||
@@ -1,22 +0,0 @@
|
||||
Index: git/Makefile
|
||||
===================================================================
|
||||
--- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100
|
||||
+++ git/Makefile 2008-08-12 12:16:52.000000000 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
SCP_DESTINATION=pug.vpn:tmp
|
||||
|
||||
-BINARY=$(shell basename `pwd`)#
|
||||
+BINARY=moblin-proto
|
||||
PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here
|
||||
|
||||
#CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d
|
||||
@@ -61,7 +61,7 @@
|
||||
%.o: %.c $(HFILES)
|
||||
$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
|
||||
$(BINARY): $(OBJECTS)
|
||||
- $(CC) -o $@ $(OBJECTS) $(LIBS)
|
||||
+ $(CXX) -o $@ $(OBJECTS) $(LIBS)
|
||||
|
||||
#$(BINARY): $(CFILES)
|
||||
# $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/moblin-desktop.h b/moblin-desktop.h
|
||||
index 880a9ad..3d51a14 100644
|
||||
--- a/moblin-desktop.h
|
||||
+++ b/moblin-desktop.h
|
||||
@@ -29,8 +29,8 @@
|
||||
#define __MAIN_H__
|
||||
|
||||
|
||||
-#define ASSET_ROOT "./assets/"
|
||||
-#define JSON_ROOT "./layouts/"
|
||||
+#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
|
||||
+#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@@ -1,19 +0,0 @@
|
||||
DEPENDS = "clutter-box2d"
|
||||
|
||||
PV = "0.0+git${SRCPV}"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
|
||||
file://paths.patch;patch=1 \
|
||||
file://fix-shader-and-callbacks.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${bindir}
|
||||
install ${S}/moblin-proto ${D}${bindir}
|
||||
|
||||
install -d ${D}${datadir}/moblin-proto/
|
||||
cp -a ${S}/assets ${D}${datadir}/moblin-proto/
|
||||
cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
DESCRIPTION = "cx3110x wifi support as found in the Nokia 770/800"
|
||||
SECTION = "kernel/modules"
|
||||
LICENSE = "GPL"
|
||||
PR = "r1"
|
||||
PACKAGES = "${PN}"
|
||||
|
||||
COMPATIBLE_MACHINE = "(nokia770|nokia800)"
|
||||
|
||||
export KERNEL_SRC_DIR = ${STAGING_KERNEL_DIR}
|
||||
export LDFLAGS = ""
|
||||
|
||||
SRC_URI = "https://garage.maemo.org/frs/download.php/939/cx3110x-1.1.tar.gz"
|
||||
|
||||
S = "${WORKDIR}/cx3110x-${PV}"
|
||||
|
||||
inherit module
|
||||
|
||||
do_compile() {
|
||||
oe_runmake modules
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
DESCRIPTION = "cx3110x wifi support as found in the Nokia 770/N800/N810"
|
||||
SECTION = "kernel/modules"
|
||||
LICENSE = "GPL"
|
||||
PACKAGES = "${PN}"
|
||||
PR = "r1"
|
||||
|
||||
COMPATIBLE_MACHINE = "(nokia800)"
|
||||
|
||||
export KERNEL_SRC_DIR = ${STAGING_KERNEL_DIR}
|
||||
export LDFLAGS = ""
|
||||
|
||||
DEFAULT_PREFERENCE_nokia770 = "-1"
|
||||
|
||||
SRC_URI = "http://repository.maemo.org/pool/os2008/free/source/c/cx3110x-module-src/cx3110x-module-src_2.0.15-1.tar.gz \
|
||||
file://no-linux-config.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/cx3110x-module-src-${PV}"
|
||||
|
||||
inherit module
|
||||
|
||||
do_compile() {
|
||||
oe_runmake modules
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
Index: cx3110x-module-src-2.0.15/src/sm_drv_spi.c
|
||||
===================================================================
|
||||
--- cx3110x-module-src-2.0.15.orig/src/sm_drv_spi.c 2008-02-08 13:52:28.000000000 +0100
|
||||
+++ cx3110x-module-src-2.0.15/src/sm_drv_spi.c 2008-02-08 13:52:40.000000000 +0100
|
||||
@@ -36,7 +36,6 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/firmware.h>
|
||||
-#include <linux/config.h>
|
||||
#if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE)
|
||||
#error No Firmware Loading configured in the kernel !
|
||||
#endif
|
||||
@@ -1,7 +0,0 @@
|
||||
DESCRIPTION = "Replacement syslog API"
|
||||
LICENSE = "BSD"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://www.balabit.com/downloads/files/eventlog/0.2/${P}.tar.gz"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
@@ -1,10 +0,0 @@
|
||||
DESCRIPTION = "Evince is a document viewer for document formats like PDF, PS, DjVu."
|
||||
LICENSE = "GPL"
|
||||
SECTION = "x11/office"
|
||||
DEPENDS = "gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring"
|
||||
|
||||
inherit gnome pkgconfig gtk-icon-cache
|
||||
|
||||
SRC_URI += "file://no-icon-theme.diff;patch=1;pnum=0"
|
||||
|
||||
EXTRA_OECONF = "--without-libgnome --disable-thumbnailer"
|
||||
@@ -1,14 +0,0 @@
|
||||
DESCRIPTION = "Evince is a document viewer for document formats like PDF, PS, DjVu."
|
||||
LICENSE = "GPL"
|
||||
SECTION = "x11/office"
|
||||
DEPENDS = "gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring"
|
||||
PV = "0.9.0+svnr${SRCREV}"
|
||||
|
||||
inherit gnome pkgconfig gtk-icon-cache
|
||||
|
||||
SRC_URI = "svn://svn.gnome.org/svn/evince;module=trunk \
|
||||
file://no-icon-theme.diff;patch=1;pnum=0"
|
||||
|
||||
S = "${WORKDIR}/trunk"
|
||||
|
||||
EXTRA_OECONF = "--without-libgnome --disable-thumbnailer"
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac (revision 2436)
|
||||
+++ configure.ac (working copy)
|
||||
@@ -57,7 +57,7 @@
|
||||
PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
|
||||
PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
|
||||
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0)
|
||||
-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
|
||||
+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
|
||||
|
||||
AC_ARG_WITH(libgnome,
|
||||
AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]),
|
||||
@@ -1,68 +0,0 @@
|
||||
Index: flumotion-0.4.1/configure.ac
|
||||
===================================================================
|
||||
--- flumotion-0.4.1.orig/configure.ac 2007-03-05 17:16:48.121264330 +0100
|
||||
+++ flumotion-0.4.1/configure.ac 2007-03-05 17:20:40.343837320 +0100
|
||||
@@ -73,13 +73,6 @@
|
||||
AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version])
|
||||
fi
|
||||
|
||||
-if test "x$DISPLAY" != "x"; then
|
||||
- AS_PYTHON_IMPORT([gtk.glade],,
|
||||
- AC_MSG_ERROR([You need to have python libglade bindings installed]))
|
||||
-else
|
||||
- AC_MSG_NOTICE([Not trying to import gtk.glade because DISPLAY is unset])
|
||||
-fi
|
||||
-
|
||||
if test $GST_010_SUPPORTED = "no"; then
|
||||
AC_MSG_ERROR([No appropriate version of PyGTK installed. Correct the above
|
||||
errors and try again.])
|
||||
@@ -94,16 +87,6 @@
|
||||
[AC_MSG_RESULT([$PYGST_010_PKG_ERRORS])
|
||||
GST_010_SUPPORTED=no])
|
||||
|
||||
- if test $GST_010_SUPPORTED = "yes"; then
|
||||
- saved_PYTHONPATH=$PYTHONPATH
|
||||
- export PYTHONPATH=$PYGST_010_DIR:$PYTHONPATH
|
||||
- AS_PYTHON_IMPORT([gst],,
|
||||
- [AC_MSG_NOTICE([Unable to import gst-python 0.10 -- check your PYTHONPATH?])
|
||||
- GST_010_SUPPORTED=no],
|
||||
- [import pygst; pygst.require('0.10')],
|
||||
- [assert gst.pygst_version[[1]] == 10 or (gst.pygst_version[[1]] == 9 and gst.pygst_version[[2]] >= 7)])
|
||||
-
|
||||
- fi
|
||||
fi
|
||||
|
||||
if test $GST_010_SUPPORTED = "no"; then
|
||||
@@ -158,32 +141,7 @@
|
||||
AC_CHECK_PROG(PYCHECKER, pychecker, yes, no)
|
||||
AM_CONDITIONAL(HAVE_PYCHECKER, test "x$PYCHECKER" = "xyes")
|
||||
|
||||
-dnl check for Twisted
|
||||
-AS_PYTHON_IMPORT(twisted,
|
||||
- [
|
||||
- AC_MSG_CHECKING(for Twisted >= 2.0.1)
|
||||
- prog="
|
||||
-import sys
|
||||
-import twisted.copyright
|
||||
-minver = '2.0.1'
|
||||
-if twisted.copyright.version < minver:
|
||||
- sys.exit(1)
|
||||
-sys.exit(0)
|
||||
-"
|
||||
- if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
|
||||
- then
|
||||
- AC_MSG_RESULT(found)
|
||||
- else
|
||||
- AC_MSG_RESULT(too old)
|
||||
- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
|
||||
- fi
|
||||
- ]
|
||||
- ,
|
||||
- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
|
||||
-)
|
||||
|
||||
-TWISTED_MODULE([twisted.names])
|
||||
-TWISTED_MODULE([twisted.web])
|
||||
|
||||
AC_CONFIG_FILES([env], [chmod +x env])
|
||||
AC_CONFIG_FILES([bin/flumotion], [chmod +x bin/flumotion])
|
||||
@@ -1,25 +0,0 @@
|
||||
Index: flumotion-0.3.1/common/as-python.m4
|
||||
===================================================================
|
||||
--- flumotion-0.3.1.orig/common/as-python.m4 2007-03-02 15:26:46.704717964 +0100
|
||||
+++ flumotion-0.3.1/common/as-python.m4 2007-03-02 15:27:28.601326374 +0100
|
||||
@@ -199,6 +199,12 @@
|
||||
AC_MSG_CHECKING(for headers required to compile python extensions)
|
||||
|
||||
dnl deduce PYTHON_INCLUDES
|
||||
+
|
||||
+ AC_ARG_WITH(python-includes,
|
||||
+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
|
||||
+ if test x$py_exec_prefix != x; then
|
||||
+ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
|
||||
+ else
|
||||
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
|
||||
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
||||
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
|
||||
@@ -206,6 +212,7 @@
|
||||
if test "$py_prefix" != "$py_exec_prefix"; then
|
||||
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
|
||||
fi
|
||||
+ fi
|
||||
AC_SUBST(PYTHON_INCLUDES)
|
||||
|
||||
dnl check if the headers exist:
|
||||
@@ -1,41 +0,0 @@
|
||||
DESCRIPTION = "Fluendo Streaming Server"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
|
||||
RDEPENDS = "python-resource python-pprint python-threading \
|
||||
python-imaging python-xml python-curses \
|
||||
python-compression python-fcntl python-pygobject \
|
||||
python-pickle python-netclient python-datetime \
|
||||
python-crypt python-twisted-core python-twisted-web \
|
||||
python-lang python-zopeinterface python-textutils \
|
||||
python-gst python-misc"
|
||||
RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
|
||||
PR = "r10"
|
||||
|
||||
SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
|
||||
file://python-path.patch;patch=1 \
|
||||
file://no-check-for-python-stuff.patch;patch=1"
|
||||
|
||||
inherit autotools distutils-base pkgconfig
|
||||
|
||||
export EPYDOC = "no"
|
||||
|
||||
EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
|
||||
|
||||
PACKAGES =+ "flumotion-gui"
|
||||
|
||||
FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
|
||||
FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
|
||||
FILES_${PN}-dev += "${libdir}/pkgconfig"
|
||||
FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \
|
||||
${libdir}/flumotion/python/flumotion/admin/gtk \
|
||||
${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \
|
||||
${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \
|
||||
${libdir}/flumotion/python/flumotion/extern/*.py* \
|
||||
${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
|
||||
${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
|
||||
${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
|
||||
${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
|
||||
${libdir}/flumotion/python/flumotion/manager \
|
||||
${libdir}/flumotion/python/flumotion/ui \
|
||||
${libdir}/flumotion/python/flumotion/wizard \
|
||||
${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications"
|
||||
@@ -1,36 +0,0 @@
|
||||
DESCRIPTION = "Bonobo CORBA interfaces library"
|
||||
LICENSE = "GPL"
|
||||
SECTION = "x11/gnome/libs"
|
||||
DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
|
||||
|
||||
inherit gnome
|
||||
|
||||
SRC_URI += "file://gtk-doc.m4 \
|
||||
file://gtk-doc.make \
|
||||
"
|
||||
|
||||
ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
|
||||
|
||||
FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
|
||||
FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
|
||||
${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
|
||||
${libdir}/bonobo-2.0/samples"
|
||||
|
||||
LEAD_SONAME = "libbonobo-2.so"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
do_configure_prepend() {
|
||||
install -d m4
|
||||
install ${WORKDIR}/gtk-doc.m4 m4/
|
||||
install ${WORKDIR}/gtk-doc.make ./
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
--- libbonobo-2.14.0/configure.in.orig 2006-09-04 09:21:54.000000000 +0100
|
||||
+++ libbonobo-2.14.0/configure.in 2006-09-04 09:22:58.000000000 +0100
|
||||
@@ -166,7 +166,7 @@
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR(
|
||||
[No working gthread-2.0 support found, using --disable-threads IS DISCOURAGED])
|
||||
- ]
|
||||
+ ],[AC_MSG_RESULT(yes)]
|
||||
)
|
||||
CFLAGS=$libbonobo_save_CFLAGS
|
||||
LIBS=$libbonobo_save_LIBS
|
||||
@@ -1,53 +0,0 @@
|
||||
dnl -*- mode: autoconf -*-
|
||||
|
||||
# serial 1
|
||||
|
||||
dnl Usage:
|
||||
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
||||
AC_DEFUN([GTK_DOC_CHECK],
|
||||
[
|
||||
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
dnl for overriding the documentation installation directory
|
||||
AC_ARG_WITH(html-dir,
|
||||
AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
|
||||
[with_html_dir='${datadir}/gtk-doc/html'])
|
||||
HTML_DIR="$with_html_dir"
|
||||
AC_SUBST(HTML_DIR)
|
||||
|
||||
dnl enable/disable documentation building
|
||||
AC_ARG_ENABLE(gtk-doc,
|
||||
AC_HELP_STRING([--enable-gtk-doc],
|
||||
[use gtk-doc to build documentation [default=no]]),,
|
||||
enable_gtk_doc=no)
|
||||
|
||||
have_gtk_doc=no
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
fi
|
||||
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
|
||||
have_gtk_doc=yes
|
||||
fi
|
||||
|
||||
dnl do we want to do a version check?
|
||||
ifelse([$1],[],,
|
||||
[gtk_doc_min_version=$1
|
||||
if test "$have_gtk_doc" = yes; then
|
||||
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
|
||||
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
have_gtk_doc=no
|
||||
fi
|
||||
fi
|
||||
])
|
||||
if test x$enable_gtk_doc = xyes; then
|
||||
if test "$have_gtk_doc" != yes; then
|
||||
enable_gtk_doc=no
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
|
||||
AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
|
||||
])
|
||||
@@ -1,148 +0,0 @@
|
||||
# -*- mode: makefile -*-
|
||||
|
||||
####################################
|
||||
# Everything below here is generic #
|
||||
####################################
|
||||
|
||||
if GTK_DOC_USE_LIBTOOL
|
||||
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
else
|
||||
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
endif
|
||||
|
||||
# We set GPATH here; this gives us semantics for GNU make
|
||||
# which are more like other make's VPATH, when it comes to
|
||||
# whether a source that is a target of one rule is then
|
||||
# searched for in VPATH/GPATH.
|
||||
#
|
||||
GPATH = $(srcdir)
|
||||
|
||||
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(content_files) \
|
||||
$(HTML_IMAGES) \
|
||||
$(DOC_MAIN_SGML_FILE) \
|
||||
$(DOC_MODULE).types \
|
||||
$(DOC_MODULE)-sections.txt \
|
||||
$(DOC_MODULE)-overrides.txt
|
||||
|
||||
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
|
||||
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
|
||||
|
||||
SCANOBJ_FILES = \
|
||||
$(DOC_MODULE).args \
|
||||
$(DOC_MODULE).hierarchy \
|
||||
$(DOC_MODULE).interfaces \
|
||||
$(DOC_MODULE).prerequisites \
|
||||
$(DOC_MODULE).signals
|
||||
|
||||
CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
|
||||
|
||||
if ENABLE_GTK_DOC
|
||||
all-local: html-build.stamp
|
||||
|
||||
#### scan ####
|
||||
|
||||
scan-build.stamp: $(HFILE_GLOB)
|
||||
@echo '*** Scanning header files ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
|
||||
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
|
||||
else \
|
||||
cd $(srcdir) ; \
|
||||
for i in $(SCANOBJ_FILES) ; do \
|
||||
test -f $$i || touch $$i ; \
|
||||
done \
|
||||
fi
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
|
||||
touch scan-build.stamp
|
||||
|
||||
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
|
||||
@true
|
||||
|
||||
#### templates ####
|
||||
|
||||
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
|
||||
@echo '*** Rebuilding template files ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
|
||||
touch tmpl-build.stamp
|
||||
|
||||
tmpl.stamp: tmpl-build.stamp
|
||||
@true
|
||||
|
||||
#### xml ####
|
||||
|
||||
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
|
||||
@echo '*** Building XML ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
|
||||
touch sgml-build.stamp
|
||||
|
||||
sgml.stamp: sgml-build.stamp
|
||||
@true
|
||||
|
||||
#### html ####
|
||||
|
||||
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
|
||||
@echo '*** Building HTML ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
rm -rf $(srcdir)/html
|
||||
mkdir $(srcdir)/html
|
||||
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
|
||||
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
|
||||
@echo '-- Fixing Crossreferences'
|
||||
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
|
||||
touch html-build.stamp
|
||||
endif
|
||||
|
||||
##############
|
||||
|
||||
clean-local:
|
||||
rm -f *~ *.bak
|
||||
|
||||
maintainer-clean-local: clean
|
||||
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
|
||||
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
|
||||
(installfiles=`echo $(srcdir)/html/*`; \
|
||||
if test "$$installfiles" = '$(srcdir)/html/*'; \
|
||||
then echo '-- Nothing to install' ; \
|
||||
else \
|
||||
for i in $$installfiles; do \
|
||||
echo '-- Installing '$$i ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||
done; \
|
||||
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
|
||||
fi)
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(TARGET_DIR)/*
|
||||
|
||||
#
|
||||
# Require gtk-doc when making dist
|
||||
#
|
||||
if ENABLE_GTK_DOC
|
||||
dist-check-gtkdoc:
|
||||
else
|
||||
dist-check-gtkdoc:
|
||||
@echo "*** gtk-doc must be installed and enabled in order to make dist"
|
||||
@false
|
||||
endif
|
||||
|
||||
dist-hook: dist-check-gtkdoc dist-hook-local
|
||||
mkdir $(distdir)/tmpl
|
||||
mkdir $(distdir)/xml
|
||||
mkdir $(distdir)/html
|
||||
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
|
||||
-cp $(srcdir)/xml/*.xml $(distdir)/xml
|
||||
-cp $(srcdir)/html/* $(distdir)/html
|
||||
|
||||
.PHONY : dist-hook-local
|
||||
@@ -1,6 +0,0 @@
|
||||
require libbonobo.inc
|
||||
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI += "file://configure-gthread.patch;patch=1"
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
LICENSE = "GPL"
|
||||
SECTION = "x11/gnome/libs"
|
||||
PR = "r1"
|
||||
|
||||
inherit gnome pkgconfig
|
||||
|
||||
FILES_${PN} += "${libdir}/libglade/2.0/*.so"
|
||||
FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
|
||||
${libdir}/bonobo-2.0/samples"
|
||||
FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
|
||||
${libdir}/libglade/2.0/.debug"
|
||||
|
||||
DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
|
||||
|
||||
EXTRA_OECONF = "--disable-gtk-doc"
|
||||
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION = "CORBA ORB"
|
||||
PR = "r0"
|
||||
LICENSE = "LGPL GPL"
|
||||
SECTION = "x11/gnome/libs"
|
||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
|
||||
file://configure-lossage.patch;patch=1;pnum=1 \
|
||||
file://gtk-doc.m4 \
|
||||
file://gtk-doc.make"
|
||||
DEPENDS = "libidl-native popt-native gtk-doc"
|
||||
|
||||
S = "${WORKDIR}/ORBit2-${PV}"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
inherit autotools native pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--disable-gtk-doc"
|
||||
|
||||
do_configure_prepend() {
|
||||
mkdir -p m4
|
||||
install ${WORKDIR}/gtk-doc.m4 ./m4/
|
||||
install ${WORKDIR}/gtk-doc.make ./
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
--- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100
|
||||
+++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100
|
||||
@@ -193,19 +193,19 @@
|
||||
dnl So many people with broken linking setups asked about this
|
||||
dnl it turned out to be necessary to check for this.
|
||||
dnl
|
||||
-dofus_save_libs="$LIBS"
|
||||
-LIBS="$ORBIT_LIBS $LIBS"
|
||||
-AC_TRY_RUN([ #include <stdio.h>
|
||||
- main ()
|
||||
- {
|
||||
- return 0;
|
||||
- } ],,
|
||||
- AC_MSG_ERROR([
|
||||
-Linking is badly borked on your system. Please ensure your library path is correct
|
||||
-Check config.log for details - check near the end of the log above 'failed program was'
|
||||
-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
|
||||
-prefix you're compiling on: '${prefix}' ]))
|
||||
-LIBS="$dofus_save_libs"
|
||||
+dnl dofus_save_libs="$LIBS"
|
||||
+dnl LIBS="$ORBIT_LIBS $LIBS"
|
||||
+dnl AC_TRY_RUN([ #include <stdio.h>
|
||||
+dnl main ()
|
||||
+dnl {
|
||||
+dnl return 0;
|
||||
+dnl } ],,
|
||||
+dnl AC_MSG_ERROR([
|
||||
+dnl Linking is badly borked on your system. Please ensure your library path is correct
|
||||
+dnl Check config.log for details - check near the end of the log above 'failed program was'
|
||||
+dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
|
||||
+dnl prefix you're compiling on: '${prefix}' ]))
|
||||
+dnl LIBS="$dofus_save_libs"
|
||||
|
||||
orig_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
|
||||
@@ -1,53 +0,0 @@
|
||||
dnl -*- mode: autoconf -*-
|
||||
|
||||
# serial 1
|
||||
|
||||
dnl Usage:
|
||||
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
||||
AC_DEFUN([GTK_DOC_CHECK],
|
||||
[
|
||||
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
dnl for overriding the documentation installation directory
|
||||
AC_ARG_WITH(html-dir,
|
||||
AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
|
||||
[with_html_dir='${datadir}/gtk-doc/html'])
|
||||
HTML_DIR="$with_html_dir"
|
||||
AC_SUBST(HTML_DIR)
|
||||
|
||||
dnl enable/disable documentation building
|
||||
AC_ARG_ENABLE(gtk-doc,
|
||||
AC_HELP_STRING([--enable-gtk-doc],
|
||||
[use gtk-doc to build documentation [default=no]]),,
|
||||
enable_gtk_doc=no)
|
||||
|
||||
have_gtk_doc=no
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
fi
|
||||
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
|
||||
have_gtk_doc=yes
|
||||
fi
|
||||
|
||||
dnl do we want to do a version check?
|
||||
ifelse([$1],[],,
|
||||
[gtk_doc_min_version=$1
|
||||
if test "$have_gtk_doc" = yes; then
|
||||
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
|
||||
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
have_gtk_doc=no
|
||||
fi
|
||||
fi
|
||||
])
|
||||
if test x$enable_gtk_doc = xyes; then
|
||||
if test "$have_gtk_doc" != yes; then
|
||||
enable_gtk_doc=no
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
|
||||
AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
|
||||
])
|
||||
@@ -1,148 +0,0 @@
|
||||
# -*- mode: makefile -*-
|
||||
|
||||
####################################
|
||||
# Everything below here is generic #
|
||||
####################################
|
||||
|
||||
if GTK_DOC_USE_LIBTOOL
|
||||
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
else
|
||||
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
endif
|
||||
|
||||
# We set GPATH here; this gives us semantics for GNU make
|
||||
# which are more like other make's VPATH, when it comes to
|
||||
# whether a source that is a target of one rule is then
|
||||
# searched for in VPATH/GPATH.
|
||||
#
|
||||
GPATH = $(srcdir)
|
||||
|
||||
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(content_files) \
|
||||
$(HTML_IMAGES) \
|
||||
$(DOC_MAIN_SGML_FILE) \
|
||||
$(DOC_MODULE).types \
|
||||
$(DOC_MODULE)-sections.txt \
|
||||
$(DOC_MODULE)-overrides.txt
|
||||
|
||||
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
|
||||
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
|
||||
|
||||
SCANOBJ_FILES = \
|
||||
$(DOC_MODULE).args \
|
||||
$(DOC_MODULE).hierarchy \
|
||||
$(DOC_MODULE).interfaces \
|
||||
$(DOC_MODULE).prerequisites \
|
||||
$(DOC_MODULE).signals
|
||||
|
||||
CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
|
||||
|
||||
if ENABLE_GTK_DOC
|
||||
all-local: html-build.stamp
|
||||
|
||||
#### scan ####
|
||||
|
||||
scan-build.stamp: $(HFILE_GLOB)
|
||||
@echo '*** Scanning header files ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
|
||||
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
|
||||
else \
|
||||
cd $(srcdir) ; \
|
||||
for i in $(SCANOBJ_FILES) ; do \
|
||||
test -f $$i || touch $$i ; \
|
||||
done \
|
||||
fi
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
|
||||
touch scan-build.stamp
|
||||
|
||||
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
|
||||
@true
|
||||
|
||||
#### templates ####
|
||||
|
||||
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
|
||||
@echo '*** Rebuilding template files ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
|
||||
touch tmpl-build.stamp
|
||||
|
||||
tmpl.stamp: tmpl-build.stamp
|
||||
@true
|
||||
|
||||
#### xml ####
|
||||
|
||||
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
|
||||
@echo '*** Building XML ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
|
||||
touch sgml-build.stamp
|
||||
|
||||
sgml.stamp: sgml-build.stamp
|
||||
@true
|
||||
|
||||
#### html ####
|
||||
|
||||
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
|
||||
@echo '*** Building HTML ***'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
rm -rf $(srcdir)/html
|
||||
mkdir $(srcdir)/html
|
||||
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
|
||||
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
|
||||
@echo '-- Fixing Crossreferences'
|
||||
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
|
||||
touch html-build.stamp
|
||||
endif
|
||||
|
||||
##############
|
||||
|
||||
clean-local:
|
||||
rm -f *~ *.bak
|
||||
|
||||
maintainer-clean-local: clean
|
||||
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
|
||||
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
|
||||
(installfiles=`echo $(srcdir)/html/*`; \
|
||||
if test "$$installfiles" = '$(srcdir)/html/*'; \
|
||||
then echo '-- Nothing to install' ; \
|
||||
else \
|
||||
for i in $$installfiles; do \
|
||||
echo '-- Installing '$$i ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||
done; \
|
||||
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
|
||||
fi)
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(TARGET_DIR)/*
|
||||
|
||||
#
|
||||
# Require gtk-doc when making dist
|
||||
#
|
||||
if ENABLE_GTK_DOC
|
||||
dist-check-gtkdoc:
|
||||
else
|
||||
dist-check-gtkdoc:
|
||||
@echo "*** gtk-doc must be installed and enabled in order to make dist"
|
||||
@false
|
||||
endif
|
||||
|
||||
dist-hook: dist-check-gtkdoc dist-hook-local
|
||||
mkdir $(distdir)/tmpl
|
||||
mkdir $(distdir)/xml
|
||||
mkdir $(distdir)/html
|
||||
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
|
||||
-cp $(srcdir)/xml/*.xml $(distdir)/xml
|
||||
-cp $(srcdir)/html/* $(distdir)/html
|
||||
|
||||
.PHONY : dist-hook-local
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in
|
||||
--- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100
|
||||
+++ ORBit2-2.14.12/ORBit-2.0.pc.in 2008-09-23 20:13:07.000000000 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
-orbit_idl=@bindir@/orbit-idl-2@EXEEXT@
|
||||
+orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@
|
||||
|
||||
|
||||
Name: ORBit-2.0
|
||||
@@ -1,30 +0,0 @@
|
||||
LICENSE = "GPL"
|
||||
DESCRIPTION = "CORBA ORB"
|
||||
SECTION = "x11/gnome/libs"
|
||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
|
||||
file://configure-lossage.patch;patch=1;pnum=1 \
|
||||
file://pkgconfig-fix.patch;patch=1 \
|
||||
file://gtk-doc.m4 \
|
||||
file://gtk-doc.make"
|
||||
DEPENDS = "libidl popt orbit2-native gtk-doc"
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
FILES_${PN} += "${libdir}/orbit-2.0/*.so"
|
||||
FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la"
|
||||
FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug"
|
||||
|
||||
S = "${WORKDIR}/ORBit2-${PV}"
|
||||
|
||||
LEAD_SONAME = "libORBit-2.so"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--disable-gtk-doc"
|
||||
EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
|
||||
|
||||
do_configure_prepend() {
|
||||
mkdir -p m4
|
||||
install ${WORKDIR}/gtk-doc.m4 ./m4/
|
||||
install ${WORKDIR}/gtk-doc.make ./
|
||||
}
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
DESCRIPTION = "Helix Client Libraries"
|
||||
SECTION = "base"
|
||||
DEPENDS = "ribosome gtk+ libxv"
|
||||
HOMEPAGE = "http://helixcommunity.org"
|
||||
LICENSE = "RPSL"
|
||||
|
||||
_SNAPSHOT = "atlas310_11212008"
|
||||
_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty"
|
||||
|
||||
PV="r0"
|
||||
|
||||
SRC_URI = "${_TARBALL_SERVER}/helix-libs_${_SNAPSHOT}.tar.bz2 \
|
||||
file://helix-libs/helix-player.pc \
|
||||
file://helix-libs/add-clutter.patch;patch=1"
|
||||
S = "${WORKDIR}/helix-libs_${_SNAPSHOT}"
|
||||
|
||||
export BUILD_ROOT=${STAGING_DIR_HOST}${libdir}/ribosome
|
||||
export BUILDRC=${BUILD_ROOT}/buildrc
|
||||
export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
|
||||
export BUILD=$BUILD_ROOT/bin/build.py
|
||||
|
||||
COMPATIBLE_HOST = '(i.86.*-linux)'
|
||||
|
||||
do_compile() {
|
||||
${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
|
||||
}
|
||||
|
||||
do_install() {
|
||||
mkdir -p ${D}/opt/helix/lib
|
||||
mkdir -p ${D}/opt/helix/include
|
||||
mkdir -p ${D}${libdir}/pkgconfig
|
||||
|
||||
install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
|
||||
install -m 0644 ../helix-libs/helix-player.pc ${D}${libdir}/pkgconfig
|
||||
|
||||
install -m 0644 release/*.so ${D}/opt/helix/lib
|
||||
|
||||
install -d ${D}${libdir}
|
||||
install -m 0644 release/libhelix-player.so ${D}${libdir}
|
||||
}
|
||||
|
||||
sysroot_stage_all_append() {
|
||||
sysroot_stage_dir ${D}/opt/helix ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/helix
|
||||
}
|
||||
|
||||
FILES_${PN} = "/usr/lib/libhelix-player.so"
|
||||
FILES_${PN} += "/opt/helix/lib"
|
||||
FILES_${PN}-dev = "/usr/lib/pkgconfig"
|
||||
FILES_${PN}-dev += "/opt/helix/include"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,11 +0,0 @@
|
||||
prefix=/usr
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: helix-player
|
||||
Description: Helix Player Interface
|
||||
Version: 4.1.0
|
||||
Libs: -L${libdir} -lhelix-player -lstdc++
|
||||
Cflags: -I/opt/helix/include -D_UNIX
|
||||
Requires:
|
||||
@@ -1,11 +0,0 @@
|
||||
prefix=/opt/helix
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: hxclient
|
||||
Description: Helix Client Libraries off the Atlas Branch
|
||||
Version: 4.1.0
|
||||
Libs: -L${libdir} -lhxclient -lstdc++
|
||||
Cflags: -I${includedir} -D_UNIX
|
||||
Requires:
|
||||
@@ -1,43 +0,0 @@
|
||||
DESCRIPTION = "Ribosome: HelixCommunity Build System"
|
||||
SECTION = "base"
|
||||
HOMEPAGE = "http://helixcommunity.org"
|
||||
LICENSE = "GPLv2"
|
||||
|
||||
_SNAPSHOT = "22102008"
|
||||
_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty"
|
||||
|
||||
PV="r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${_TARBALL_SERVER}/ribosome-${_SNAPSHOT}.tar.bz2 \
|
||||
${_TARBALL_SERVER}/client-bif-${_SNAPSHOT}.tar.bz2 \
|
||||
${_TARBALL_SERVER}/common-bif-${_SNAPSHOT}.tar.bz2 \
|
||||
file://ribosome/clutter.bif \
|
||||
file://ribosome/buildrc"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
|
||||
COMPATIBLE_HOST = '(i.86.*-linux)'
|
||||
|
||||
do_install() {
|
||||
# Install build system of doom
|
||||
install -d ${D}${libdir}
|
||||
cp -a ribosome-${_SNAPSHOT} ${D}${libdir}/ribosome
|
||||
install -m 0644 ribosome/buildrc ${D}${libdir}/ribosome/
|
||||
|
||||
# Install client BIF's
|
||||
install -d ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
|
||||
install -m 0644 client-bif-${_SNAPSHOT}/*.bif \
|
||||
${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
|
||||
|
||||
# Install common BIF's
|
||||
install -d ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
|
||||
install -m 0644 common-bif-${_SNAPSHOT}/*.bif \
|
||||
${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
|
||||
|
||||
# Install our own custom BIF
|
||||
install -m 0644 ribosome/*.bif ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
|
||||
|
||||
# The [ and ] characters break packaging, remove for now
|
||||
rm -rf ${D}${libdir}/ribosome/test/data/utils/[client-restricted]
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
AddMultiCVS("helix",":ext:cvs.helixcommunity.org:/cvsroot/")
|
||||
AddBIFPath("common", "[helix]/common/build/BIF")
|
||||
AddBIFPath("client", "[helix]/client/build/BIF")
|
||||
SetSDKPath("oggvorbissdk", "/usr/")
|
||||
@@ -1,68 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<build id="clutter">
|
||||
<inherit id="hxclient_3_1_0_atlas"/>
|
||||
<cvs root="helix"/>
|
||||
<cvs tag="hxclient_3_1_0_atlas"/>
|
||||
<default target="clutter" profile="helix-client-all-defines" options=""/>
|
||||
<targets>
|
||||
|
||||
<!-- clutter -->
|
||||
<module id="clutter" name="clientapps/clutter" group="core">
|
||||
<includeplatforms>
|
||||
unix
|
||||
</includeplatforms>
|
||||
|
||||
<defines>
|
||||
HELIX_FEATURE_AUDIO_VORBIS
|
||||
HELIX_FEATURE_VIDEO_THEORA
|
||||
HELIX_FEATURE_NETSERVICES_SHIM
|
||||
HELIX_FEATURE_AVIFF
|
||||
HELIX_CONFIG_SLUGGISHAUTOUPGRADE
|
||||
HELIX_FEATURE_ALSA
|
||||
_FORTIFY_SOURCE=2
|
||||
</defines>
|
||||
|
||||
<source_dependlist>
|
||||
client_include
|
||||
datatype_tools_dtdriver_dtdrplin
|
||||
</source_dependlist>
|
||||
|
||||
<dependlist>
|
||||
helix_client_objs
|
||||
player_hxclientkit
|
||||
player_hxclientkit_src_hxrecordengine
|
||||
client_core
|
||||
client_resource
|
||||
client_xres
|
||||
protocol_sdp
|
||||
video_site
|
||||
datatype_smil
|
||||
datatype_text_realtext_fileformat
|
||||
datatype_text_realtext_renderer
|
||||
datatype_tools_dtdriver_dtdrplin
|
||||
datatype_ogg_fileformat
|
||||
datatype_vorbis_renderer
|
||||
datatype_theora_renderer
|
||||
datatype_h261_renderer
|
||||
datatype_h263
|
||||
datatype_group_audio
|
||||
datatype_group_image
|
||||
datatype_ram
|
||||
datatype_sdp
|
||||
datatype_avi_fileformat
|
||||
filesystem_local
|
||||
filesystem_http
|
||||
filesystem_memory
|
||||
common_auth_authmgr
|
||||
common_auth_rn5auth
|
||||
client_auth_basicauth
|
||||
common_log_logsystem
|
||||
common_log_logobserverfile
|
||||
</dependlist>
|
||||
|
||||
</module>
|
||||
|
||||
</targets>
|
||||
|
||||
</build>
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2007 OpenedHand Ltd.
|
||||
#
|
||||
|
||||
IMAGE_FEATURES += "apps-core apps-pda"
|
||||
|
||||
inherit poky-image
|
||||
|
||||
IMAGE_INSTALL += "task-poky-extraapps"
|
||||
@@ -1,8 +0,0 @@
|
||||
PR = "r7"
|
||||
|
||||
SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
|
||||
|
||||
S = "${WORKDIR}/${PN}-${PV}"
|
||||
|
||||
inherit autotools binconfig
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
DESCRIPTION = "A software library for accessing RDS data"
|
||||
HOMEPAGE = "http://rdsd.berlios.de/"
|
||||
SECTION = "libs"
|
||||
PROVIDES = "librds"
|
||||
LICENSE = "GPLv2"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
@@ -1,116 +0,0 @@
|
||||
Index: current/configure.ac
|
||||
===================================================================
|
||||
--- current.orig/configure.ac 2007-06-14 09:06:04.000000000 +0000
|
||||
+++ current/configure.ac 2007-06-14 09:14:37.000000000 +0000
|
||||
@@ -52,8 +52,6 @@
|
||||
CFLAGS="$CFLAGS $X_CFLAGS -Wall"
|
||||
|
||||
dnl Checks for libraries.
|
||||
-AM_PATH_GTK(1.2.2,,
|
||||
- AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
|
||||
AC_CHECK_LIB(X11, XInitThreads,,
|
||||
AC_MSG_ERROR([*** X11 not threadsafe ***]))
|
||||
AC_CHECK_LIB(Xext, XShapeQueryExtension,,
|
||||
@@ -107,63 +105,6 @@
|
||||
AC_MSG_WARN("beep media player not found")
|
||||
fi
|
||||
|
||||
-dnl Check for xmms
|
||||
-AM_PATH_XMMS(1.2.7,,
|
||||
- AC_MSG_WARN("xmms plugins can not be built"))
|
||||
-dnl Override where to place libxmms_xosd.so
|
||||
-AC_ARG_WITH([plugindir],
|
||||
- AC_HELP_STRING([--with-plugindir=DIR],
|
||||
- [Set the xmms plugin directory]),
|
||||
- [XMMS_PLUGIN_DIR="$withval"],
|
||||
- [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
|
||||
-
|
||||
-dnl Check for gdk-pixbuf
|
||||
-AM_PATH_GDK_PIXBUF(0.22.0,,
|
||||
- AC_MSG_WARN("new xmms plugin can not be built"))
|
||||
-dnl Override where to place pixmaps for libxmms_xosd.so
|
||||
-AC_ARG_WITH([pixmapdir],
|
||||
- AC_HELP_STRING([--with-pixmapdir=DIR],
|
||||
- [Set the directory for xmms plugin pixmaps]),
|
||||
- [XMMS_PIXMAPDIR="$withval"],
|
||||
- [XMMS_PIXMAPDIR="${datadir}/xosd"])
|
||||
-AC_SUBST(XMMS_PIXMAPDIR)
|
||||
-
|
||||
-dnl NEW plugin
|
||||
-AC_ARG_ENABLE([new-plugin],
|
||||
- AC_HELP_STRING([--disable-new-plugin],
|
||||
- [Disable new xmms plugin (enabled by default)]),
|
||||
- [enable_new_plugin="$enableval"],
|
||||
- [enable_new_plugin="yes"])
|
||||
-AC_MSG_CHECKING([whether new xmms plugin was requested])
|
||||
-AC_MSG_RESULT($enable_new_plugin)
|
||||
-AM_CONDITIONAL([BUILD_NEW_PLUGIN],
|
||||
- [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"])
|
||||
-
|
||||
-
|
||||
-dnl Check for Beep Media player
|
||||
-AC_ARG_ENABLE([beep_media_player_plugin],
|
||||
- AC_HELP_STRING([--enable-beep_media_player_plugin],
|
||||
- [Enable beep media plugin (enabled by default)]),
|
||||
- [beep_media_player_plugin="$enableval"],
|
||||
- [beep_media_player_plugin="yes"])
|
||||
-AC_MSG_CHECKING([whether beep media plugin was requested])
|
||||
-AC_MSG_RESULT($beep_media_player_plugin)
|
||||
-
|
||||
-AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
|
||||
- [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])
|
||||
-
|
||||
-dnl OLD plugin
|
||||
-AC_ARG_ENABLE([old-plugin],
|
||||
- AC_HELP_STRING([--enable-old-plugin],
|
||||
- [Enable old xmms plugin (disabled by default)]),
|
||||
- [enable_old_plugin="$enableval"],
|
||||
- [enable_old_plugin="no"])
|
||||
-AC_MSG_CHECKING([whether old xmms plugin was requested])
|
||||
-AC_MSG_RESULT($enable_old_plugin)
|
||||
-AM_CONDITIONAL([BUILD_OLD_PLUGIN],
|
||||
- [test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])
|
||||
-
|
||||
-
|
||||
dnl Define XOSD_VERSION
|
||||
AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")
|
||||
|
||||
@@ -174,8 +115,6 @@
|
||||
Makefile
|
||||
src/Makefile
|
||||
src/libxosd/Makefile
|
||||
-src/xmms_plugin/Makefile
|
||||
-src/bmp_plugin/Makefile
|
||||
macros/Makefile
|
||||
man/Makefile
|
||||
pixmaps/Makefile
|
||||
Index: current/src/Makefile.am
|
||||
===================================================================
|
||||
--- current.orig/src/Makefile.am 2007-06-14 09:06:04.000000000 +0000
|
||||
+++ current/src/Makefile.am 2007-06-14 09:14:37.000000000 +0000
|
||||
@@ -10,6 +10,4 @@
|
||||
|
||||
include_HEADERS = xosd.h
|
||||
|
||||
-AM_CFLAGS = ${GTK_CFLAGS}
|
||||
-
|
||||
-SUBDIRS=libxosd xmms_plugin bmp_plugin
|
||||
+SUBDIRS=libxosd
|
||||
Index: current/Makefile.am
|
||||
===================================================================
|
||||
--- current.orig/Makefile.am 2007-06-14 09:06:04.000000000 +0000
|
||||
+++ current/Makefile.am 2007-06-14 09:16:15.000000000 +0000
|
||||
@@ -1,11 +1,5 @@
|
||||
-if BUILD_NEW_PLUGIN
|
||||
- NEW_SUB = pixmaps
|
||||
-endif
|
||||
-if BUILD_BEEP_MEDIA_PLUGIN
|
||||
- NEW_SUB = pixmaps
|
||||
-endif
|
||||
-SUBDIRS = macros man $(NEW_SUB) src script
|
||||
-DIST_SUBDIRS = macros man pixmaps src script
|
||||
+SUBDIRS = macros man src script
|
||||
+DIST_SUBDIRS = macros man src script
|
||||
|
||||
DISTCLEANFILES = libtool-disable-static
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: current/src/libxosd/xosd.c
|
||||
===================================================================
|
||||
--- current.orig/src/libxosd/xosd.c 2007-06-16 19:37:48.000000000 +0000
|
||||
+++ current/src/libxosd/xosd.c 2007-06-17 05:00:47.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
#define XOFFSET 10
|
||||
|
||||
const char * const osd_default_font =
|
||||
- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
|
||||
+ "fixed";
|
||||
#if 0
|
||||
"-adobe-helvetica-bold-r-*-*-10-*";
|
||||
#endif
|
||||
@@ -1,20 +0,0 @@
|
||||
DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
|
||||
SECTION = "libs/x11"
|
||||
DEPENDS = "virtual/libx11 libxext"
|
||||
LICENSE = "LGPL"
|
||||
PV = "2.2.15+svnr${SRCREV}"
|
||||
PR = "r5"
|
||||
|
||||
SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
|
||||
file://autofoo.patch;patch=1 \
|
||||
file://use-sane-default-font.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/current"
|
||||
|
||||
inherit autotools binconfig
|
||||
|
||||
PACKAGES =+ "${PN}-examples-dbg ${PN}-examples"
|
||||
FILES_${PN}-examples = "${bindir}/osd_cat"
|
||||
FILES_${PN}-examples-dbg += "${bindir}/.debug/"
|
||||
FILES_${PN}-dev += "${bindir}/xosd-config"
|
||||
FILES_${PN} = "${libdir}/libxosd.so.*"
|
||||
@@ -1,30 +0,0 @@
|
||||
---
|
||||
arch/arm/oprofile/op_model_v6.c | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
Index: linux-g/arch/arm/oprofile/op_model_v6.c
|
||||
===================================================================
|
||||
--- linux-g.orig/arch/arm/oprofile/op_model_v6.c 2006-11-08 12:18:41.000000000 +0000
|
||||
+++ linux-g/arch/arm/oprofile/op_model_v6.c 2007-05-23 14:11:19.000000000 +0100
|
||||
@@ -54,12 +54,6 @@
|
||||
#define EVT_DCACHE_MISS 0x0B
|
||||
#define EVT_DCACE_WRITE_BACK 0x0C
|
||||
#define EVT_PC_CHANGED 0x0D
|
||||
-#define EVT_BCU_REQUEST 0x10
|
||||
-#define EVT_BCU_FULL 0x11
|
||||
-#define EVT_BCU_DRAIN 0x12
|
||||
-#define EVT_BCU_ECC_NO_ELOG 0x14
|
||||
-#define EVT_BCU_1_BIT_ERR 0x15
|
||||
-#define EVT_RMW 0x16
|
||||
/* EVT_CCNT is not hardware defined */
|
||||
#define EVT_CCNT 0xFE
|
||||
#define EVT_UNUSED 0xFF
|
||||
@@ -88,7 +82,7 @@ struct pmu_type {
|
||||
static struct pmu_type pmu_parms[] = {
|
||||
{
|
||||
.id = PMU_ARM11,
|
||||
- .name = "arm/arm11",
|
||||
+ .name = "arm/armv6",
|
||||
.num_counters = 3,
|
||||
#ifdef CONFIG_ARCH_OMAP2
|
||||
.interrupt = 3,
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,415 +0,0 @@
|
||||
---
|
||||
arch/arm/mach-omap1/board-nokia770.c | 60 +++++++++++++++++++++++++++++++----
|
||||
arch/arm/mach-omap1/mmu.c | 1
|
||||
drivers/cbus/tahvo-usb.c | 4 +-
|
||||
drivers/i2c/chips/isp1301_omap.c | 1
|
||||
drivers/mtd/mtdchar.c | 6 +++
|
||||
drivers/mtd/mtdpart.c | 5 ++
|
||||
drivers/mtd/nand/omap-hw.c | 55 +++++++++++++++-----------------
|
||||
drivers/serial/8250.c | 2 +
|
||||
drivers/video/omap/omapfb_main.c | 4 +-
|
||||
include/asm-arm/arch-omap/keypad.h | 3 +
|
||||
include/asm-arm/arch-omap/serial.h | 16 +++++++++
|
||||
11 files changed, 118 insertions(+), 39 deletions(-)
|
||||
|
||||
Index: linux-g/arch/arm/mach-omap1/board-nokia770.c
|
||||
===================================================================
|
||||
--- linux-g.orig/arch/arm/mach-omap1/board-nokia770.c 2006-11-08 13:18:39.000000000 +0100
|
||||
+++ linux-g/arch/arm/mach-omap1/board-nokia770.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/ads7846.h>
|
||||
+#include <linux/workqueue.h>
|
||||
+#include <linux/delay.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
@@ -33,9 +35,12 @@
|
||||
#include <asm/arch/gpio.h>
|
||||
#include <asm/arch/omapfb.h>
|
||||
#include <asm/arch/hwa742.h>
|
||||
+#include <asm/arch/lcd_mipid.h>
|
||||
|
||||
#include "../plat-omap/dsp/dsp_common.h"
|
||||
|
||||
+#define ADS7846_PENDOWN_GPIO 15
|
||||
+
|
||||
static void __init omap_nokia770_init_irq(void)
|
||||
{
|
||||
/* On Nokia 770, the SleepX signal is masked with an
|
||||
@@ -75,9 +80,11 @@
|
||||
};
|
||||
|
||||
static struct omap_kp_platform_data nokia770_kp_data = {
|
||||
- .rows = 8,
|
||||
- .cols = 8,
|
||||
- .keymap = nokia770_keymap
|
||||
+ .rows = 8,
|
||||
+ .cols = 8,
|
||||
+ .keymap = nokia770_keymap,
|
||||
+ .keymapsize = ARRAY_SIZE(nokia770_keymap),
|
||||
+ .delay = 4,
|
||||
};
|
||||
|
||||
static struct platform_device nokia770_kp_device = {
|
||||
@@ -94,6 +101,41 @@
|
||||
&nokia770_kp_device,
|
||||
};
|
||||
|
||||
+static void mipid_shutdown(struct mipid_platform_data *pdata)
|
||||
+{
|
||||
+ if (pdata->nreset_gpio != -1) {
|
||||
+ printk(KERN_INFO "shutdown LCD\n");
|
||||
+ omap_set_gpio_dataout(pdata->nreset_gpio, 0);
|
||||
+ msleep(120);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static struct mipid_platform_data nokia770_mipid_platform_data = {
|
||||
+ .shutdown = mipid_shutdown,
|
||||
+};
|
||||
+
|
||||
+static void mipid_dev_init(void)
|
||||
+{
|
||||
+ const struct omap_lcd_config *conf;
|
||||
+
|
||||
+ conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
|
||||
+ if (conf != NULL) {
|
||||
+ nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
|
||||
+ nokia770_mipid_platform_data.data_lines = conf->data_lines;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void ads7846_dev_init(void)
|
||||
+{
|
||||
+ if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
|
||||
+ printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
|
||||
+}
|
||||
+
|
||||
+static int ads7846_get_pendown_state(void)
|
||||
+{
|
||||
+ return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
|
||||
+}
|
||||
+
|
||||
static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
|
||||
.x_max = 0x0fff,
|
||||
.y_max = 0x0fff,
|
||||
@@ -101,14 +143,17 @@
|
||||
.pressure_max = 255,
|
||||
.debounce_max = 10,
|
||||
.debounce_tol = 3,
|
||||
+ .debounce_rep = 1,
|
||||
+ .get_pendown_state = ads7846_get_pendown_state,
|
||||
};
|
||||
|
||||
static struct spi_board_info nokia770_spi_board_info[] __initdata = {
|
||||
[0] = {
|
||||
- .modalias = "lcd_lph8923",
|
||||
+ .modalias = "lcd_mipid",
|
||||
.bus_num = 2,
|
||||
.chip_select = 3,
|
||||
.max_speed_hz = 12000000,
|
||||
+ .platform_data = &nokia770_mipid_platform_data,
|
||||
},
|
||||
[1] = {
|
||||
.modalias = "ads7846",
|
||||
@@ -189,7 +234,7 @@
|
||||
},
|
||||
};
|
||||
|
||||
-static struct omap_board_config_kernel nokia770_config[] = {
|
||||
+static struct omap_board_config_kernel nokia770_config[] __initdata = {
|
||||
{ OMAP_TAG_USB, NULL },
|
||||
{ OMAP_TAG_MMC, &nokia770_mmc_config },
|
||||
};
|
||||
@@ -235,7 +280,7 @@
|
||||
printk("HP connected\n");
|
||||
}
|
||||
|
||||
-static void codec_delayed_power_down(void *arg)
|
||||
+static void codec_delayed_power_down(struct work_struct *work)
|
||||
{
|
||||
down(&audio_pwr_sem);
|
||||
if (audio_pwr_state == -1)
|
||||
@@ -326,9 +371,12 @@
|
||||
ARRAY_SIZE(nokia770_spi_board_info));
|
||||
omap_board_config = nokia770_config;
|
||||
omap_board_config_size = ARRAY_SIZE(nokia770_config);
|
||||
+ omap_gpio_init();
|
||||
omap_serial_init();
|
||||
omap_dsp_init();
|
||||
hwa742_dev_init();
|
||||
+ ads7846_dev_init();
|
||||
+ mipid_dev_init();
|
||||
}
|
||||
|
||||
static void __init omap_nokia770_map_io(void)
|
||||
Index: linux-g/arch/arm/mach-omap1/mmu.c
|
||||
===================================================================
|
||||
--- linux-g.orig/arch/arm/mach-omap1/mmu.c 2007-08-13 13:54:01.000000000 +0200
|
||||
+++ linux-g/arch/arm/mach-omap1/mmu.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/err.h>
|
||||
+#include <linux/delay.h>
|
||||
#include "mmu.h"
|
||||
#include <asm/tlbflush.h>
|
||||
|
||||
Index: linux-g/drivers/cbus/tahvo-usb.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/cbus/tahvo-usb.c 2006-11-08 13:18:51.000000000 +0100
|
||||
+++ linux-g/drivers/cbus/tahvo-usb.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -135,8 +135,8 @@
|
||||
if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) &&
|
||||
tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
|
||||
/* role is host */
|
||||
- usb_bus_start_enum(tu->otg.host,
|
||||
- tu->otg.host->otg_port);
|
||||
+ //usb_bus_start_enum(tu->otg.host,
|
||||
+ // tu->otg.host->otg_port);
|
||||
}
|
||||
OTG_IRQ_SRC_REG = DRIVER_SWITCH;
|
||||
} else
|
||||
Index: linux-g/drivers/i2c/chips/isp1301_omap.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c 2006-11-08 13:18:51.000000000 +0100
|
||||
+++ linux-g/drivers/i2c/chips/isp1301_omap.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <linux/usb_gadget.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/usb_otg.h>
|
||||
+#include <linux/usb/otg.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
Index: linux-g/drivers/mtd/mtdchar.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/mtd/mtdchar.c 2006-11-08 13:18:55.000000000 +0100
|
||||
+++ linux-g/drivers/mtd/mtdchar.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -622,6 +622,12 @@
|
||||
break;
|
||||
}
|
||||
|
||||
+ case MEMSETOOBSEL:
|
||||
+ {
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
case MEMGETBADBLOCK:
|
||||
{
|
||||
loff_t offs;
|
||||
Index: linux-g/drivers/mtd/mtdpart.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/mtd/mtdpart.c 2006-11-08 13:18:55.000000000 +0100
|
||||
+++ linux-g/drivers/mtd/mtdpart.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -200,6 +200,11 @@
|
||||
return -EINVAL;
|
||||
instr->addr += part->offset;
|
||||
ret = part->master->erase(part->master, instr);
|
||||
+ if (ret) {
|
||||
+ if (instr->fail_addr != 0xffffffff)
|
||||
+ instr->fail_addr -= part->offset;
|
||||
+ instr->addr -= part->offset;
|
||||
+ }
|
||||
return ret;
|
||||
}
|
||||
|
||||
Index: linux-g/drivers/mtd/nand/omap-hw.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/mtd/nand/omap-hw.c 2006-11-08 13:18:55.000000000 +0100
|
||||
+++ linux-g/drivers/mtd/nand/omap-hw.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -386,11 +386,6 @@
|
||||
return nand_read_reg8(NND_ACCESS);
|
||||
}
|
||||
|
||||
-static void omap_nand_write_byte(struct mtd_info *mtd, u_char byte)
|
||||
-{
|
||||
- nand_write_reg8(NND_ACCESS, byte);
|
||||
-}
|
||||
-
|
||||
static int omap_nand_dev_ready(struct mtd_info *mtd)
|
||||
{
|
||||
u32 l;
|
||||
@@ -425,9 +420,9 @@
|
||||
if (command == NAND_CMD_SEQIN) {
|
||||
int readcmd;
|
||||
|
||||
- if (column >= mtd->oobblock) {
|
||||
+ if (column >= mtd->writesize) {
|
||||
/* OOB area */
|
||||
- column -= mtd->oobblock;
|
||||
+ column -= mtd->writesize;
|
||||
readcmd = NAND_CMD_READOOB;
|
||||
} else if (column < 256) {
|
||||
/* First 256 bytes --> READ0 */
|
||||
@@ -458,7 +453,7 @@
|
||||
struct nand_chip *this = mtd->priv;
|
||||
|
||||
if (command == NAND_CMD_READOOB) {
|
||||
- column += mtd->oobblock;
|
||||
+ column += mtd->writesize;
|
||||
command = NAND_CMD_READ0;
|
||||
}
|
||||
switch (command) {
|
||||
@@ -495,7 +490,8 @@
|
||||
int n;
|
||||
struct nand_chip *this = mtd->priv;
|
||||
|
||||
- if (this->eccmode == NAND_ECC_HW12_2048)
|
||||
+ /* Ex NAND_ECC_HW12_2048 */
|
||||
+ if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size == 2048))
|
||||
n = 4;
|
||||
else
|
||||
n = 1;
|
||||
@@ -642,7 +638,8 @@
|
||||
int block_count = 0, i, r;
|
||||
|
||||
this = mtd->priv;
|
||||
- if (this->eccmode == NAND_ECC_HW12_2048)
|
||||
+ /* Ex NAND_ECC_HW12_2048 */
|
||||
+ if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size == 2048))
|
||||
block_count = 4;
|
||||
else
|
||||
block_count = 1;
|
||||
@@ -672,12 +669,12 @@
|
||||
{
|
||||
static const char *part_parsers[] = { "cmdlinepart", NULL };
|
||||
struct mtd_partition *parts;
|
||||
- const struct omap_flash_part_config *cfg;
|
||||
+ const struct omap_flash_part_str_config *cfg;
|
||||
char *part_str = NULL;
|
||||
size_t part_str_len;
|
||||
int c;
|
||||
|
||||
- cfg = omap_get_var_config(OMAP_TAG_FLASH_PART, &part_str_len);
|
||||
+ cfg = omap_get_var_config(OMAP_TAG_FLASH_PART_STR, &part_str_len);
|
||||
if (cfg != NULL) {
|
||||
part_str = kmalloc(part_str_len + 1, GFP_KERNEL);
|
||||
if (part_str == NULL)
|
||||
@@ -794,19 +791,20 @@
|
||||
|
||||
/* Used from chip select and nand_command() */
|
||||
this->read_byte = omap_nand_read_byte;
|
||||
- this->write_byte = omap_nand_write_byte;
|
||||
|
||||
- this->select_chip = omap_nand_select_chip;
|
||||
- this->dev_ready = omap_nand_dev_ready;
|
||||
- this->chip_delay = 0;
|
||||
- this->eccmode = NAND_ECC_HW3_512;
|
||||
- this->cmdfunc = omap_nand_command;
|
||||
- this->write_buf = omap_nand_write_buf;
|
||||
- this->read_buf = omap_nand_read_buf;
|
||||
- this->verify_buf = omap_nand_verify_buf;
|
||||
- this->calculate_ecc = omap_nand_calculate_ecc;
|
||||
- this->correct_data = omap_nand_correct_data;
|
||||
- this->enable_hwecc = omap_nand_enable_hwecc;
|
||||
+ this->select_chip = omap_nand_select_chip;
|
||||
+ this->dev_ready = omap_nand_dev_ready;
|
||||
+ this->chip_delay = 0;
|
||||
+ this->ecc.mode = NAND_ECC_HW;
|
||||
+ this->ecc.bytes = 3;
|
||||
+ this->ecc.size = 512;
|
||||
+ this->cmdfunc = omap_nand_command;
|
||||
+ this->write_buf = omap_nand_write_buf;
|
||||
+ this->read_buf = omap_nand_read_buf;
|
||||
+ this->verify_buf = omap_nand_verify_buf;
|
||||
+ this->ecc.calculate = omap_nand_calculate_ecc;
|
||||
+ this->ecc.correct = omap_nand_correct_data;
|
||||
+ this->ecc.hwctl = omap_nand_enable_hwecc;
|
||||
|
||||
nand_write_reg(NND_SYSCFG, 0x1); /* Enable auto idle */
|
||||
nand_write_reg(NND_PSC_CLK, 10);
|
||||
@@ -822,11 +820,10 @@
|
||||
l = nand_read_reg(NND_CTRL);
|
||||
l |= 1 << 4; /* Set the A8 bit in CTRL reg */
|
||||
nand_write_reg(NND_CTRL, l);
|
||||
- this->eccmode = NAND_ECC_HW12_2048;
|
||||
- this->eccsteps = 1;
|
||||
- this->eccsize = 2048;
|
||||
- this->eccbytes = 12;
|
||||
- omap_mtd->eccsize = 2048;
|
||||
+ this->ecc.mode = NAND_ECC_HW;
|
||||
+ this->ecc.steps = 1;
|
||||
+ this->ecc.size = 2048;
|
||||
+ this->ecc.bytes = 12;
|
||||
nand_write_reg(NND_ECC_SELECT, 6);
|
||||
}
|
||||
|
||||
Index: linux-g/drivers/serial/8250.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/serial/8250.c 2006-11-08 13:18:59.000000000 +0100
|
||||
+++ linux-g/drivers/serial/8250.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -44,6 +44,8 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
+#include <asm/arch/serial.h>
|
||||
+
|
||||
#include "8250.h"
|
||||
|
||||
/*
|
||||
Index: linux-g/drivers/video/omap/omapfb_main.c
|
||||
===================================================================
|
||||
--- linux-g.orig/drivers/video/omap/omapfb_main.c 2007-08-13 13:54:01.000000000 +0200
|
||||
+++ linux-g/drivers/video/omap/omapfb_main.c 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
|
||||
#ifdef CONFIG_ARCH_OMAP1
|
||||
-extern struct lcd_ctrl_extif omap1_ext_if;
|
||||
+extern struct lcd_ctrl_extif sossi_extif;
|
||||
#else
|
||||
extern struct lcd_ctrl_extif omap2_ext_if;
|
||||
#endif
|
||||
@@ -1658,7 +1658,7 @@
|
||||
#ifdef CONFIG_ARCH_OMAP1
|
||||
fbdev->int_ctrl = &omap1_int_ctrl;
|
||||
#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
|
||||
- fbdev->ext_if = &omap1_ext_if;
|
||||
+ fbdev->ext_if = &sossi_extif;
|
||||
#endif
|
||||
#else /* OMAP2 */
|
||||
fbdev->int_ctrl = &omap2_int_ctrl;
|
||||
Index: linux-g/include/asm-arm/arch-omap/keypad.h
|
||||
===================================================================
|
||||
--- linux-g.orig/include/asm-arm/arch-omap/keypad.h 2006-11-08 13:19:11.000000000 +0100
|
||||
+++ linux-g/include/asm-arm/arch-omap/keypad.h 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -14,7 +14,10 @@
|
||||
int rows;
|
||||
int cols;
|
||||
int *keymap;
|
||||
+ unsigned int keymapsize;
|
||||
unsigned int rep:1;
|
||||
+ unsigned long delay;
|
||||
+ unsigned int dbounce:1;
|
||||
/* specific to OMAP242x*/
|
||||
unsigned int *row_gpios;
|
||||
unsigned int *col_gpios;
|
||||
Index: linux-g/include/asm-arm/arch-omap/serial.h
|
||||
===================================================================
|
||||
--- linux-g.orig/include/asm-arm/arch-omap/serial.h 2007-08-13 13:54:01.000000000 +0200
|
||||
+++ linux-g/include/asm-arm/arch-omap/serial.h 2007-08-13 16:23:15.000000000 +0200
|
||||
@@ -26,4 +26,20 @@
|
||||
#define OMAP1510_BASE_BAUD (12000000/16)
|
||||
#define OMAP16XX_BASE_BAUD (48000000/16)
|
||||
|
||||
+#define is_omap_port(p) ({int __ret = 0; \
|
||||
+ if (p == IO_ADDRESS(OMAP_UART1_BASE) || \
|
||||
+ p == IO_ADDRESS(OMAP_UART2_BASE) || \
|
||||
+ p == IO_ADDRESS(OMAP_UART3_BASE)) \
|
||||
+ __ret = 1; \
|
||||
+ __ret; \
|
||||
+ })
|
||||
+
|
||||
+#define is_omap_port(p) ({int __ret = 0; \
|
||||
+ if (p == IO_ADDRESS(OMAP_UART1_BASE) || \
|
||||
+ p == IO_ADDRESS(OMAP_UART2_BASE) || \
|
||||
+ p == IO_ADDRESS(OMAP_UART3_BASE)) \
|
||||
+ __ret = 1; \
|
||||
+ __ret; \
|
||||
+ })
|
||||
+
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -1,60 +0,0 @@
|
||||
Index: linux-2.6.21/drivers/cbus/retu-pwrbutton.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.orig/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:44:18.000000000 +0000
|
||||
+++ linux-2.6.21/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:46:22.000000000 +0000
|
||||
@@ -53,7 +53,9 @@
|
||||
state = PWRBTN_PRESSED;
|
||||
|
||||
if (pwrbtn_state != state) {
|
||||
- input_report_key(pwrbtn_dev, KEY_POWER, state);
|
||||
+ input_report_key(pwrbtn_dev, KEY_SUSPEND, state);
|
||||
+ if (state == PWRBTN_PRESSED)
|
||||
+ input_event(pwrbtn_dev, EV_PWR, KEY_SUSPEND, 1);
|
||||
pwrbtn_state = state;
|
||||
}
|
||||
}
|
||||
@@ -92,8 +94,8 @@
|
||||
if (!pwrbtn_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
- pwrbtn_dev->evbit[0] = BIT(EV_KEY);
|
||||
- pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER);
|
||||
+ pwrbtn_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
|
||||
+ pwrbtn_dev->keybit[LONG(KEY_SUSPEND)] = BIT(KEY_SUSPEND);
|
||||
pwrbtn_dev->name = "retu-pwrbutton";
|
||||
|
||||
input_register_device(pwrbtn_dev);
|
||||
Index: linux-2.6.21/drivers/char/apm-emulation.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.orig/drivers/char/apm-emulation.c 2008-02-21 00:32:41.000000000 +0000
|
||||
+++ linux-2.6.21/drivers/char/apm-emulation.c 2008-02-21 00:33:43.000000000 +0000
|
||||
@@ -206,10 +206,18 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static in_suspend;
|
||||
+
|
||||
static void apm_suspend(void)
|
||||
{
|
||||
struct apm_user *as;
|
||||
- int err = pm_suspend(PM_SUSPEND_MEM);
|
||||
+ int err;
|
||||
+
|
||||
+ in_suspend = 1;
|
||||
+
|
||||
+ err = pm_suspend(PM_SUSPEND_MEM);
|
||||
+
|
||||
+ in_suspend = 0;
|
||||
|
||||
/*
|
||||
* Anyone on the APM queues will think we're still suspended.
|
||||
@@ -663,6 +671,9 @@
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
+ if (in_suspend)
|
||||
+ return;
|
||||
+
|
||||
spin_lock_irqsave(&kapmd_queue_lock, flags);
|
||||
queue_add_event(&kapmd_queue, event);
|
||||
spin_unlock_irqrestore(&kapmd_queue_lock, flags);
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,60 +0,0 @@
|
||||
Index: linux-2.6.21/drivers/cbus/retu-pwrbutton.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.orig/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:44:18.000000000 +0000
|
||||
+++ linux-2.6.21/drivers/cbus/retu-pwrbutton.c 2008-02-20 22:46:22.000000000 +0000
|
||||
@@ -53,7 +53,9 @@
|
||||
state = PWRBTN_PRESSED;
|
||||
|
||||
if (pwrbtn_state != state) {
|
||||
- input_report_key(pwrbtn_dev, KEY_POWER, state);
|
||||
+ input_report_key(pwrbtn_dev, KEY_SUSPEND, state);
|
||||
+ if (state == PWRBTN_PRESSED)
|
||||
+ input_event(pwrbtn_dev, EV_PWR, KEY_SUSPEND, 1);
|
||||
pwrbtn_state = state;
|
||||
}
|
||||
}
|
||||
@@ -92,8 +94,8 @@
|
||||
if (!pwrbtn_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
- pwrbtn_dev->evbit[0] = BIT(EV_KEY);
|
||||
- pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER);
|
||||
+ pwrbtn_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
|
||||
+ pwrbtn_dev->keybit[LONG(KEY_SUSPEND)] = BIT(KEY_SUSPEND);
|
||||
pwrbtn_dev->name = "retu-pwrbutton";
|
||||
|
||||
input_register_device(pwrbtn_dev);
|
||||
Index: linux-2.6.21/drivers/char/apm-emulation.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.orig/drivers/char/apm-emulation.c 2008-02-21 00:32:41.000000000 +0000
|
||||
+++ linux-2.6.21/drivers/char/apm-emulation.c 2008-02-21 00:33:43.000000000 +0000
|
||||
@@ -206,10 +206,18 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static in_suspend;
|
||||
+
|
||||
static void apm_suspend(void)
|
||||
{
|
||||
struct apm_user *as;
|
||||
- int err = pm_suspend(PM_SUSPEND_MEM);
|
||||
+ int err;
|
||||
+
|
||||
+ in_suspend = 1;
|
||||
+
|
||||
+ err = pm_suspend(PM_SUSPEND_MEM);
|
||||
+
|
||||
+ in_suspend = 0;
|
||||
|
||||
/*
|
||||
* Anyone on the APM queues will think we're still suspended.
|
||||
@@ -663,6 +671,9 @@
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
+ if (in_suspend)
|
||||
+ return;
|
||||
+
|
||||
spin_lock_irqsave(&kapmd_queue_lock, flags);
|
||||
queue_add_event(&kapmd_queue, event);
|
||||
spin_unlock_irqrestore(&kapmd_queue_lock, flags);
|
||||
@@ -1,43 +0,0 @@
|
||||
SECTION = "kernel"
|
||||
DESCRIPTION = "Linux kernel for Nokia 770/800"
|
||||
LICENSE = "GPL"
|
||||
|
||||
KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
|
||||
KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2"
|
||||
|
||||
inherit kernel deploy
|
||||
|
||||
RPROVIDES_kernel-image = "hostap-modules"
|
||||
|
||||
COMPATIBLE_MACHINE = "nokia770|nokia800"
|
||||
|
||||
RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
|
||||
|
||||
do_configure_prepend() {
|
||||
|
||||
rm -f ${S}/.config || true
|
||||
|
||||
if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
|
||||
echo "CONFIG_AEABI=y" >> ${S}/.config
|
||||
echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
|
||||
else
|
||||
echo "# CONFIG_AEABI is not set" >> ${S}/.config
|
||||
echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
|
||||
fi
|
||||
|
||||
sed -e '/CONFIG_AEABI/d' \
|
||||
-e '/CONFIG_OABI_COMPAT=/d' \
|
||||
'${WORKDIR}/defconfig' >>'${S}/.config'
|
||||
|
||||
yes '' | oe_runmake oldconfig
|
||||
|
||||
}
|
||||
|
||||
do_deploy() {
|
||||
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
|
||||
cd ${DEPLOYDIR}
|
||||
ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin
|
||||
tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
|
||||
}
|
||||
|
||||
addtask deploy before do_populate_sysroot after do_install
|
||||
@@ -1,18 +0,0 @@
|
||||
require linux-nokia800.inc
|
||||
|
||||
PR = "r7"
|
||||
SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
|
||||
http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
|
||||
${RPSRC}/lzo_kernel-r0.patch;patch=1 \
|
||||
${RPSRC}/lzo_jffs2-r0.patch;patch=1 \
|
||||
${RPSRC}/lzo_crypto-r0b.patch;patch=1 \
|
||||
${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \
|
||||
${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \
|
||||
file://fix_oprofile.patch;patch=1 \
|
||||
file://sumversion-fix.patch;patch=1 \
|
||||
file://defconfig"
|
||||
|
||||
SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/linux-g"
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
require linux-nokia800.inc
|
||||
PR = "r0"
|
||||
|
||||
DEFAULT_PREFERENCE_nokia770 = "-1"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
|
||||
file://kernel-source_2.6.21-200823maemo6.diff.gz;patch=1 \
|
||||
http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \
|
||||
file://suspend-button.patch;patch=1 \
|
||||
file://defconfig"
|
||||
|
||||
S = "${WORKDIR}/linux-2.6.21"
|
||||
|
||||
do_install_append () {
|
||||
mkdir -p ${D}/kernel/include/drivers/media/video/omap/
|
||||
cp -f drivers/media/video/omap/tcm825x.h ${D}/kernel/include/drivers/media/video/omap/
|
||||
}
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
require linux-nokia800.inc
|
||||
PR = "r5"
|
||||
|
||||
DEFAULT_PREFERENCE_nokia770 = "-1"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
|
||||
http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \
|
||||
http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \
|
||||
file://suspend-button.patch;patch=1 \
|
||||
file://sumversion-fix.patch;patch=1 \
|
||||
file://defconfig"
|
||||
|
||||
S = "${WORKDIR}/linux-2.6.21"
|
||||
|
||||
do_install_append () {
|
||||
mkdir -p ${D}/kernel/include/drivers/media/video/omap/
|
||||
cp -f drivers/media/video/omap/tcm825x.h ${D}/kernel/include/drivers/media/video/omap/
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
RDEPENDS_kernel-image += "mtd-utils"
|
||||
|
||||
pkg_postinst_kernel-image () {
|
||||
if test "x$D" != "x"; then
|
||||
exit 1
|
||||
else
|
||||
if [ -f ${sysconfdir}/default/flashkernel ] ; then
|
||||
echo "Upgrading Kernel in Flash"
|
||||
echo "DO NOT stop this process"
|
||||
|
||||
MTD_KERNEL_PARTITION=`cat /proc/mtd | grep kernel | cut -d':' -f1`
|
||||
MTD_KERNEL_PARTITION=/dev/$MTD_KERNEL_PARTITION
|
||||
|
||||
if [ "x$MTD_KERNEL_PARTITION" = "x" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
|
||||
${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
|
||||
else
|
||||
touch ${sysconfdir}/default/flashkernel
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
Backport of this patch here
|
||||
|
||||
http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg270684.html
|
||||
|
||||
Needed for 2.6.24 to compile with gcc 4.3
|
||||
Index: linux-2.6.24/include/linux/time.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/include/linux/time.h 2008-05-28 15:39:46.000000000 -0700
|
||||
+++ linux-2.6.24/include/linux/time.h 2008-05-28 15:40:48.000000000 -0700
|
||||
@@ -173,6 +173,10 @@
|
||||
{
|
||||
ns += a->tv_nsec;
|
||||
while(unlikely(ns >= NSEC_PER_SEC)) {
|
||||
+ /* The following asm() prevents the compiler from
|
||||
+ * optimising this loop into a modulo operation. */
|
||||
+ asm("" : "+r"(ns));
|
||||
+
|
||||
ns -= NSEC_PER_SEC;
|
||||
a->tv_sec++;
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
require linux.inc
|
||||
require linux-openmoko.inc
|
||||
|
||||
DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
|
||||
|
||||
PE = "1"
|
||||
PV = "${KERNEL_RELEASE}+git${SRCREV}"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
|
||||
file://timespec_add_ns_avoid_udivdi3.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_configure_prepend() {
|
||||
cp -f ${S}/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig
|
||||
}
|
||||
|
||||
##############################################################
|
||||
# kernel image resides on a seperate flash partition (for now)
|
||||
#
|
||||
ALLOW_EMPTY = "1"
|
||||
|
||||
CMDLINE = "unused -- bootloader passes ATAG list"
|
||||
|
||||
COMPATIBLE_HOST = "arm.*-linux"
|
||||
COMPATIBLE_MACHINE = "om-gta01|om-gta02"
|
||||
DEFAULT_PREFERENCE = "1"
|
||||
|
||||
KERNEL_IMAGETYPE = "uImage"
|
||||
KERNEL_RELEASE = "2.6.24"
|
||||
KERNEL_VERSION = "${KERNEL_RELEASE}"
|
||||
|
||||
CONFIG_NAME_om-gta01 = "gta01"
|
||||
CONFIG_NAME_om-gta02 = "gta02"
|
||||
|
||||
UBOOT_ENTRYPOINT = "30008000"
|
||||
|
||||
###############################################################
|
||||
# module configs specific to this kernel
|
||||
#
|
||||
|
||||
# usb
|
||||
module_autoload_ohci-hcd = "ohci-hcd"
|
||||
module_autoload_hci_usb = "hci_usb"
|
||||
module_autoload_g_ether = "g_ether"
|
||||
# audio
|
||||
module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
|
||||
module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
|
||||
module_autoload_snd-pcm-oss = "snd-pcm-oss"
|
||||
module_autoload_snd-mixer-oss = "snd-mixer-oss"
|
||||
# sd/mmc
|
||||
module_autoload_s3cmci = "s3cmci"
|
||||
@@ -1,10 +0,0 @@
|
||||
--- lirc/drivers/lirc_sir/lirc_sir.c.orig 2004-11-18 17:30:17 +0100
|
||||
+++ lirc/drivers/lirc_sir/lirc_sir.c 2004-11-18 17:30:21 +0100
|
||||
@@ -628,6 +628,7 @@
|
||||
struct timeval curr_tv;
|
||||
static unsigned long deltv;
|
||||
#ifdef LIRC_ON_SA1100
|
||||
+ unsigned long deltintrtv;
|
||||
int status;
|
||||
static int n=0;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,39 +0,0 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# This is an init script for Familiar
|
||||
# Copy it to /etc/init.d/lircd and type
|
||||
# > update-rc.d lircd defaults 20
|
||||
#
|
||||
|
||||
|
||||
test -f /usr/sbin/lircd || exit 0
|
||||
test -f /etc/lircd.conf || exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting lirc daemon: lircd"
|
||||
start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
|
||||
echo "."
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping lirc daemon: lircd"
|
||||
start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
|
||||
echo "."
|
||||
;;
|
||||
reload|force-reload)
|
||||
start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircd
|
||||
;;
|
||||
restart)
|
||||
echo -n "Stopping lirc daemon: lircd"
|
||||
start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
|
||||
sleep 1
|
||||
echo -n "Starting lirc daemon: lircd"
|
||||
start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
|
||||
echo "."
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/lircd {start|stop|reload|restart|force-reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -1,37 +0,0 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# This is an init script for Familiar
|
||||
# Copy it to /etc/init.d/lircexecd and type
|
||||
# > update-rc.d lircexecd defaults 20
|
||||
# It must be started after lircd (and it does alphabetically :-)
|
||||
# irexec reads /etc/lircrc by default
|
||||
|
||||
|
||||
test -f /usr/bin/irexec || exit 0
|
||||
test -f /etc/lircrc || exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting lircexec daemon: irexec"
|
||||
start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
|
||||
echo "."
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping lircexec daemon: irexec"
|
||||
start-stop-daemon --stop --quiet --exec /usr/bin/irexec
|
||||
echo "."
|
||||
;;
|
||||
restart|force-restart)
|
||||
echo -n "Stopping lircexec daemon: irexec"
|
||||
start-stop-daemon --stop --quiet --exec /usr/bin/irexec
|
||||
sleep 1
|
||||
echo -n "Starting lircexec daemon: irexec"
|
||||
start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
|
||||
echo "."
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/lircexec {start|stop|reload|restart|force-restart}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -1,38 +0,0 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# This is an init script for Familiar
|
||||
# Copy it to /etc/init.d/lirc and type
|
||||
# > update-rc.d lirc defaults 20
|
||||
#
|
||||
|
||||
|
||||
test -f /usr/sbin/lircmd || exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting lirc daemon: lircmd"
|
||||
start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
|
||||
echo "."
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping lirc daemon: lircmd"
|
||||
start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
|
||||
echo "."
|
||||
;;
|
||||
reload|force-reload)
|
||||
start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircmd
|
||||
;;
|
||||
restart)
|
||||
echo -n "Stopping lirc daemon: lircmd"
|
||||
start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
|
||||
sleep 1
|
||||
echo -n "Starting lirc daemon: lircmd"
|
||||
start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
|
||||
echo "."
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/lircmd {start|stop|reload|restart|force-reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -1,113 +0,0 @@
|
||||
# This is the default files read by all lirc clients
|
||||
# (see also /etc/lircd.conf)
|
||||
|
||||
# I run /sbin/buzzer before every command to get an audible feedback
|
||||
|
||||
## Here LIRC could shutdown your system
|
||||
#begin
|
||||
# prog = irexec
|
||||
# remote = RC5
|
||||
# repeat = 0
|
||||
# button = vcr2-standby
|
||||
# config = /sbin/buzzer; /sbin/halt
|
||||
#end
|
||||
|
||||
|
||||
## Here LIRC controls your mpd music deamon
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-pause
|
||||
config = /sbin/buzzer; mpc toggle
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-step+
|
||||
config = /sbin/buzzer; mpc next
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-step-
|
||||
config = /sbin/buzzer; mpc prev
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-scan_forward
|
||||
config = /sbin/buzzer; mpc seek +00:00:30
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-scan_reverse
|
||||
config = /sbin/buzzer; mpc seek -00:00:30
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-brightness+
|
||||
config = /sbin/buzzer; mpc volume +20
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-brightness-
|
||||
config = /sbin/buzzer; mpc volume -20
|
||||
end
|
||||
|
||||
|
||||
## Here LIRC acts as an repeater
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-volume+
|
||||
config = /sbin/buzzer; irsend SEND_ONCE RC5 amp1-volume+
|
||||
end
|
||||
begin
|
||||
prog = irexec
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-volume-
|
||||
config = /sbin/buzzer; irsend SEND_ONCE RC5 amp1-volume-
|
||||
end
|
||||
|
||||
|
||||
## Here LIRC is the input device for your LC display software
|
||||
begin
|
||||
prog = lcdd
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-1
|
||||
config = A
|
||||
end
|
||||
begin
|
||||
prog = lcdd
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-2
|
||||
config = B
|
||||
end
|
||||
begin
|
||||
prog = lcdd
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-3
|
||||
config = C
|
||||
end
|
||||
begin
|
||||
prog = lcdd
|
||||
remote = RC5
|
||||
repeat = 0
|
||||
button = vcr2-4
|
||||
config = D
|
||||
end
|
||||
@@ -1,141 +0,0 @@
|
||||
--- lirc/remotes/hauppauge/lircd.conf.hauppauge~ 2003-05-03 15:42:30.000000000 +0100
|
||||
+++ lirc/remotes/hauppauge/lircd.conf.hauppauge 2004-10-10 20:14:14.000000000 +0100
|
||||
@@ -51,71 +51,3 @@
|
||||
end codes
|
||||
|
||||
end remote
|
||||
-
|
||||
-
|
||||
-#
|
||||
-# this config file was automatically generated
|
||||
-# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
|
||||
-#
|
||||
-# contributed by
|
||||
-#
|
||||
-# brand: Hauppauge
|
||||
-# model no. of remote control:
|
||||
-# devices being controlled by this remote: PVR 2/350
|
||||
-#
|
||||
-
|
||||
-begin remote
|
||||
-
|
||||
- name hauppauge_pvr
|
||||
- bits 13
|
||||
- flags RC5|CONST_LENGTH
|
||||
- eps 30
|
||||
- aeps 100
|
||||
-
|
||||
- one 969 811
|
||||
- zero 969 811
|
||||
- plead 1097
|
||||
- gap 114605
|
||||
- toggle_bit 2
|
||||
-
|
||||
-
|
||||
- begin codes
|
||||
- Power 0x00000000000017FD
|
||||
- Go 0x00000000000017FB
|
||||
- 1 0x00000000000017C1
|
||||
- 2 0x00000000000017C2
|
||||
- 3 0x00000000000017C3
|
||||
- 4 0x00000000000017C4
|
||||
- 5 0x00000000000017C5
|
||||
- 6 0x00000000000017C6
|
||||
- 7 0x00000000000017C7
|
||||
- 8 0x00000000000017C8
|
||||
- 9 0x00000000000017C9
|
||||
- Back/Exit 0x00000000000017DF
|
||||
- 0 0x00000000000017C0
|
||||
- Menu 0x00000000000017CD
|
||||
- Red 0x00000000000017CB
|
||||
- Green 0x00000000000017EE
|
||||
- Yellow 0x00000000000017F8
|
||||
- Blue 0x00000000000017E9
|
||||
- Ch+ 0x00000000000017E0
|
||||
- Ch- 0x00000000000017E1
|
||||
- Vol- 0x00000000000017D1
|
||||
- Vol+ 0x00000000000017D0
|
||||
- Ok 0x00000000000017E5
|
||||
- Mute 0x00000000000017CF
|
||||
- Blank 0x00000000000017CC
|
||||
- Full 0x00000000000017FC
|
||||
- Rewind 0x00000000000017F2
|
||||
- Play 0x00000000000017F5
|
||||
- Forward 0x00000000000017F4
|
||||
- Record 0x00000000000017F7
|
||||
- Stop 0x00000000000017F6
|
||||
- Pause 0x00000000000017F0
|
||||
- Replay 0x00000000000017E4
|
||||
- Skip 0x00000000000017DE
|
||||
- end codes
|
||||
-
|
||||
-end remote
|
||||
-
|
||||
-
|
||||
--- /dev/null 2004-06-13 02:32:19.000000000 +0100
|
||||
+++ lirc/remotes/hauppauge/lircd.conf.hauppauge-pvr 2004-10-10 20:14:05.000000000 +0100
|
||||
@@ -0,0 +1,64 @@
|
||||
+#
|
||||
+# this config file was automatically generated
|
||||
+# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
|
||||
+#
|
||||
+# contributed by
|
||||
+#
|
||||
+# brand: Hauppauge
|
||||
+# model no. of remote control:
|
||||
+# devices being controlled by this remote: PVR 2/350
|
||||
+#
|
||||
+
|
||||
+begin remote
|
||||
+
|
||||
+ name hauppauge_pvr
|
||||
+ bits 13
|
||||
+ flags RC5|CONST_LENGTH
|
||||
+ eps 30
|
||||
+ aeps 100
|
||||
+
|
||||
+ one 969 811
|
||||
+ zero 969 811
|
||||
+ plead 1097
|
||||
+ gap 114605
|
||||
+ toggle_bit 2
|
||||
+
|
||||
+
|
||||
+ begin codes
|
||||
+ Power 0x00000000000017FD
|
||||
+ Go 0x00000000000017FB
|
||||
+ 1 0x00000000000017C1
|
||||
+ 2 0x00000000000017C2
|
||||
+ 3 0x00000000000017C3
|
||||
+ 4 0x00000000000017C4
|
||||
+ 5 0x00000000000017C5
|
||||
+ 6 0x00000000000017C6
|
||||
+ 7 0x00000000000017C7
|
||||
+ 8 0x00000000000017C8
|
||||
+ 9 0x00000000000017C9
|
||||
+ Back/Exit 0x00000000000017DF
|
||||
+ 0 0x00000000000017C0
|
||||
+ Menu 0x00000000000017CD
|
||||
+ Red 0x00000000000017CB
|
||||
+ Green 0x00000000000017EE
|
||||
+ Yellow 0x00000000000017F8
|
||||
+ Blue 0x00000000000017E9
|
||||
+ Ch+ 0x00000000000017E0
|
||||
+ Ch- 0x00000000000017E1
|
||||
+ Vol- 0x00000000000017D1
|
||||
+ Vol+ 0x00000000000017D0
|
||||
+ Ok 0x00000000000017E5
|
||||
+ Mute 0x00000000000017CF
|
||||
+ Blank 0x00000000000017CC
|
||||
+ Full 0x00000000000017FC
|
||||
+ Rewind 0x00000000000017F2
|
||||
+ Play 0x00000000000017F5
|
||||
+ Forward 0x00000000000017F4
|
||||
+ Record 0x00000000000017F7
|
||||
+ Stop 0x00000000000017F6
|
||||
+ Pause 0x00000000000017F0
|
||||
+ Replay 0x00000000000017E4
|
||||
+ Skip 0x00000000000017DE
|
||||
+ end codes
|
||||
+
|
||||
+end remote
|
||||
@@ -1,13 +0,0 @@
|
||||
EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=${DRIVER}"
|
||||
|
||||
DRIVER ?= "serial"
|
||||
# fails to build at the moment, re-enable later
|
||||
#DRIVER_collie = "sa1100"
|
||||
DRIVER_h3600 = "sa1100"
|
||||
DRIVER_simpad = "sa1100"
|
||||
DRIVER_nslu2 = "nslu2"
|
||||
# XXX Why is X disabled on all these platforms anyway?
|
||||
EXTRA_OECONF_append_collie = " --without-x"
|
||||
EXTRA_OECONF_append_h3600 = " --without-x"
|
||||
EXTRA_OECONF_append_simpad = " --without-x"
|
||||
EXTRA_OECONF_append_nslu2 = " --without-x --with-transmitter --with-soft-carrier"
|
||||
@@ -1,33 +0,0 @@
|
||||
DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
|
||||
SECTION = "base"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "virtual/kernel virtual/fakeroot-native"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
|
||||
file://lirc_sir-sa1100.patch;patch=1"
|
||||
S = "${WORKDIR}/lirc-${PV}"
|
||||
|
||||
inherit autotools module-base
|
||||
|
||||
include lirc-config.inc
|
||||
|
||||
do_compile() {
|
||||
# ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them
|
||||
cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
|
||||
}
|
||||
|
||||
fakeroot do_install() {
|
||||
oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
|
||||
rm -rf ${D}/dev
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#!/bin/sh
|
||||
set -e
|
||||
if [ ! -c $D/dev/lirc ]; then mknod $D/dev/lirc c 61 0; fi
|
||||
exit 0
|
||||
}
|
||||
|
||||
FILES_${PN} = "/lib/modules"
|
||||
@@ -1,31 +0,0 @@
|
||||
DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
|
||||
SECTION = "console/network"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "virtual/kernel virtual/libx11 libxau libsm libice"
|
||||
PR = "r5"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
|
||||
file://lircd.init file://lircmd.init"
|
||||
S = "${WORKDIR}/lirc-${PV}"
|
||||
|
||||
inherit autotools module-base update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "lircd"
|
||||
INITSCRIPT_PARAMS = "defaults 20"
|
||||
|
||||
include lirc-config.inc
|
||||
|
||||
EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
|
||||
|
||||
install -d ${D}${datadir}/lirc/
|
||||
cp -pPR ${S}/remotes ${D}${datadir}/lirc/
|
||||
}
|
||||
|
||||
PACKAGES =+ "lirc-x"
|
||||
|
||||
FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2"
|
||||
@@ -1,26 +0,0 @@
|
||||
Index: trunk/tools/llvm-config/Makefile
|
||||
===================================================================
|
||||
--- trunk.orig/tools/llvm-config/Makefile 2008-02-11 15:14:22.000000000 +0000
|
||||
+++ trunk/tools/llvm-config/Makefile 2008-04-11 16:58:06.000000000 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
# This is blank for now. We need to be careful about adding stuff here:
|
||||
# LDFLAGS tend not to be portable, and we don't currently require the
|
||||
# user to use libtool when linking against LLVM.
|
||||
-SUB_LDFLAGS =
|
||||
+SUB_LDFLAGS = ${LD.Flags}
|
||||
|
||||
FinalLibDeps = $(PROJ_OBJ_DIR)/FinalLibDeps.txt
|
||||
LibDeps = $(PROJ_OBJ_DIR)/LibDeps.txt
|
||||
@@ -57,10 +57,11 @@
|
||||
# Build our final script.
|
||||
$(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
|
||||
$(Echo) "Building llvm-config script."
|
||||
+ $(Echo) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),'
|
||||
$(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
|
||||
$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
|
||||
$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
|
||||
- $(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
|
||||
+ $(Verb) $(ECHO) 's#@LLVM_LDFLAGS@#$(SUB_LDFLAGS)#' >> temp.sed
|
||||
$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
|
||||
$(Verb) $(SED) -f temp.sed < $< > $@
|
||||
$(Verb) $(RM) temp.sed
|
||||
@@ -1,13 +0,0 @@
|
||||
DEPENDS = "flex-native"
|
||||
SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk \
|
||||
file://fix_ldflags_export.patch;patch=1"
|
||||
|
||||
PV = "0.0+${SRCREV}"
|
||||
PR = "r1"
|
||||
|
||||
S = "${WORKDIR}/trunk"
|
||||
|
||||
inherit autotools native
|
||||
|
||||
EXTRA_OECONF = "--enable-optimized"
|
||||
EXTRA_OEMAKE = "ENABLE_OPTIMIZED=1"
|
||||
@@ -1,12 +0,0 @@
|
||||
DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
|
||||
SECTION = "console/multimedia"
|
||||
DEPENDS = "libmad"
|
||||
LICENSE = "GPL"
|
||||
AUTHOR = "Robert Leslie <rob@mars.org>"
|
||||
HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/"
|
||||
|
||||
SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz"
|
||||
|
||||
inherit autotools
|
||||
|
||||
FILES_${PN} = "${bindir}/madplay"
|
||||
@@ -1,31 +0,0 @@
|
||||
src/maemo-mapper.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: trunk/src/maemo-mapper.c
|
||||
===================================================================
|
||||
--- trunk.orig/src/maemo-mapper.c 2006-11-28 15:11:49.000000000 +0000
|
||||
+++ trunk/src/maemo-mapper.c 2006-11-28 22:40:19.000000000 +0000
|
||||
@@ -140,8 +140,8 @@
|
||||
#define HILDON_HARDKEY_RIGHT GDK_Right
|
||||
#define HILDON_HARDKEY_SELECT GDK_Return
|
||||
#define HILDON_HARDKEY_FULLSCREEN GDK_F10
|
||||
-#define HILDON_HARDKEY_INCREASE GDK_F6
|
||||
-#define HILDON_HARDKEY_DECREASE GDK_F5
|
||||
+#define HILDON_HARDKEY_INCREASE GDK_plus
|
||||
+#define HILDON_HARDKEY_DECREASE GDK_minus
|
||||
#define HILDON_HARDKEY_ESC GDK_Escape
|
||||
#define HILDON_COLOR_BUTTON GTK_COLOR_BUTTON
|
||||
|
||||
@@ -3117,9 +3117,9 @@ set_conn_state(ConnState new_conn_state)
|
||||
gtk_widget_destroy(_fix_banner);
|
||||
_fix_banner = NULL;
|
||||
}
|
||||
- if(!_connect_banner)
|
||||
- _connect_banner = hildon_banner_show_animation(
|
||||
- _window, NULL, _("Searching for GPS receiver"));
|
||||
+// if(!_connect_banner)
|
||||
+// _connect_banner = hildon_banner_show_animation(
|
||||
+// _window, NULL, _("Searching for GPS receiver"));
|
||||
break;
|
||||
case RCVR_UP:
|
||||
if(_connect_banner)
|
||||
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION = "GPS navigation/map display software"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
|
||||
RDEPENDS = "bluez-utils"
|
||||
PV = "1.2.4+svn${SRCDATE}"
|
||||
PR = "r1"
|
||||
|
||||
# Only works with SRCDATE_maemo-mapper-nohildon = "20061114"
|
||||
SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
|
||||
http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;patch=1;pnum=0 \
|
||||
file://fix_segfault.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/trunk"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
do_install_append () {
|
||||
install -d ${D}${datadir}/applications/
|
||||
mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
|
||||
}
|
||||
|
||||
#FILES_${PN} += "${datadir}/icons"
|
||||
@@ -1,26 +0,0 @@
|
||||
#! /bin/sh
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Unmounting virtual fs from initrd"
|
||||
umount /mnt/initfs/sys
|
||||
umount /mnt/initfs/proc
|
||||
ln -s /dev/vc/0 /dev/tty0
|
||||
ln -s /dev/vc/1 /dev/tty1
|
||||
ln -s /dev/vc/2 /dev/tty2
|
||||
ln -s /dev/vc/3 /dev/tty3
|
||||
ln -s /dev/vc/4 /dev/tty4
|
||||
ln -s /dev/vc/5 /dev/tty5
|
||||
ln -s /dev/vc/6 /dev/tty6
|
||||
ln -s /dev/vc/7 /dev/tty7
|
||||
/sbin/ifconfig wlan0 up
|
||||
;;
|
||||
stop)
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop}" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
LICENSE = "GPL"
|
||||
PR = "r7"
|
||||
|
||||
DEPENDS = "base-passwd"
|
||||
|
||||
SRC_URI = "file://fixup-770.sh"
|
||||
|
||||
COMPATIBLE_MACHINE = "(nokia770|nokia800)"
|
||||
|
||||
inherit update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "fixup-770.sh"
|
||||
INITSCRIPT_PARAMS = "defaults 01"
|
||||
|
||||
FILES_${PN} = "${sysconfdir} ${libdir}"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install -m 755 ${WORKDIR}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh
|
||||
|
||||
install -d ${D}/lib/firmware
|
||||
}
|
||||
|
||||
pkg_postinst () {
|
||||
#!/bin/sh
|
||||
|
||||
# set up some links to firmware and modules in initrd
|
||||
mkdir -p $D/lib/firmware
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3825.arm $D/lib/firmware/3825.arm
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3826.arm $D/lib/firmware/3826.arm
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/bc4fw.bin $D/lib/firmware/bc4fw.bin
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin $D/lib/firmware/brf6150fw.bin
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm $D/lib/firmware/mtlm3825.arm
|
||||
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3826.arm $D/lib/firmware/mtlm3826.arm
|
||||
|
||||
# rm -rf $D/lib/modules
|
||||
# ln -s /mnt/initfs/lib/modules $D/lib/modules
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
--- configure.ac.old 2005-06-03 12:53:28.000000000 +0200
|
||||
+++ configure.ac 2005-06-03 12:54:29.000000000 +0200
|
||||
@@ -25,9 +25,9 @@
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT([spext], [1.0], [lauri.leukkunen@nokia.com], spext)
|
||||
+AC_CONFIG_AUX_DIR(.)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
-AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
dnl PKG_CHECK_MODULES(FIXESEXT, fixesext)
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION = "X Server Nokia 770 extensions library"
|
||||
LICENSE= "MIT"
|
||||
SECTION = "x11/libs"
|
||||
PRIORITY = "optional"
|
||||
DEPENDS = "virtual/libx11 libxext"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
|
||||
file://auxdir.patch;patch=1;pnum=0"
|
||||
S = "${WORKDIR}/xpext-1.0"
|
||||
|
||||
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
|
||||
RDEPENDS_${PN}-dev = ""
|
||||
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
do_configure_prepend () {
|
||||
cd ${S}
|
||||
chmod +x ./autogen.sh
|
||||
./autogen.sh
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
DESCRIPTION = "X Server Nokia 770 extensions library"
|
||||
SECTION = "x11/libs"
|
||||
PRIORITY = "optional"
|
||||
LICENSE= "MIT"
|
||||
DEPENDS = "virtual/libx11 libxext xpext"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
|
||||
S = "${WORKDIR}/Xsp"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
@@ -1,12 +0,0 @@
|
||||
DESCRIPTION = "Matchbox input manager"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "matchbox-wm libmatchbox"
|
||||
SECTION = "x11/wm"
|
||||
|
||||
SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz"
|
||||
S = "${WORKDIR}/mb-applet-input-manager-${PV}"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
LICENSE = "GPLv2"
|
||||
PRIORITY = "optional"
|
||||
DEPENDS = "libmatchbox gtk+"
|
||||
PV = "0.0+svnr${SRCREV}"
|
||||
|
||||
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=mb-applet-light;proto=http"
|
||||
|
||||
S = "${WORKDIR}/mb-applet-light"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
@@ -1,11 +0,0 @@
|
||||
DESCRIPTION = "Matchbox Startup monitor applet"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "libmatchbox startup-notification"
|
||||
SECTION = "x11/wm"
|
||||
|
||||
SRC_URI = "http://matchbox-project.org/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz"
|
||||
S = "${WORKDIR}/mb-applet-startup-monitor-${PV}"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
|
||||
@@ -1,12 +0,0 @@
|
||||
DESCRIPTION = "Matchbox Volume Applet"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "matchbox-wm libmatchbox gtk+"
|
||||
SECTION = "x11/wm"
|
||||
|
||||
SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-volume/${PV}/mb-applet-volume-${PV}.tar.gz"
|
||||
S = "${WORKDIR}/mb-applet-volume-${PV}"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
SECTION = "x11/wm"
|
||||
DESCRIPTION = "Matchbox window manager common files"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "libmatchbox"
|
||||
|
||||
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--enable-pda-folders"
|
||||
|
||||
FILES_${PN} = "${bindir} \
|
||||
${datadir}/matchbox/vfolders \
|
||||
${datadir}/pixmaps"
|
||||
@@ -1,17 +0,0 @@
|
||||
SECTION = "x11/wm"
|
||||
DESCRIPTION = "Matchbox window manager common files"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "libmatchbox"
|
||||
PV = "0.9.1+svnr${SRCREV}"
|
||||
S = "${WORKDIR}/matchbox-common"
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = " --enable-pda-folders "
|
||||
|
||||
FILES_${PN} = "${bindir} \
|
||||
${datadir}/matchbox/vfolders \
|
||||
${datadir}/pixmaps"
|
||||
@@ -1,7 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Home
|
||||
Comment=Home
|
||||
Exec=mb-applet-home
|
||||
Type=PanelApp
|
||||
Icon=xrandr.png
|
||||
Categories=Panel;Utility;MB
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
exec mb-applet-launcher -na -o -1 -l --title "Home" mbdesktop.png matchbox-remote -d
|
||||
@@ -1,7 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Screen Rotator
|
||||
Comment=Panel based Rotation tool.
|
||||
Exec=mb-applet-launcher -na -l --title "Screen Rotator" /usr/share/pixmaps/xrandr.png xrandr-panelapp.sh
|
||||
Type=PanelApp
|
||||
Icon=xrandr.png
|
||||
Categories=Panel;Utility;MB
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/sh
|
||||
if [ -n "$(xrandr | grep rotation | grep left)" ]
|
||||
then
|
||||
xrandr -o normal
|
||||
xmodmap /etc/X11/xmodmap-portrait
|
||||
else
|
||||
xrandr -o left
|
||||
xmodmap /etc/X11/xmodmap-left
|
||||
fi
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
@@ -1,23 +0,0 @@
|
||||
DESCRIPTION = "Simple dockapps created with monolaunch and shell script"
|
||||
DEPENDS = "matchbox-common xmodmap"
|
||||
SRC_URI = "file://xrandr-panelapp.sh \
|
||||
file://xrandr-panelapp.desktop \
|
||||
file://mb-applet-home \
|
||||
file://home-panelapp.desktop \
|
||||
file://xrandr.png"
|
||||
SECTION = "x11/wm"
|
||||
PRIORITY = "optional"
|
||||
PR = "r8"
|
||||
LICENSE = "MIT"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -d ${D}${datadir}/applications
|
||||
install -d ${D}${datadir}/pixmaps
|
||||
install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}${bindir}/
|
||||
install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}${datadir}/applications/
|
||||
install -m 0644 ${WORKDIR}/xrandr.png ${D}${datadir}/pixmaps/
|
||||
install -m 0755 ${WORKDIR}/mb-applet-home ${D}${bindir}/
|
||||
install -m 0644 ${WORKDIR}/home-panelapp.desktop ${D}${datadir}/applications/
|
||||
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
DESCRIPTION = "Matchbox Panel Manager"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "gtk+"
|
||||
SECTION = "x11/wm"
|
||||
|
||||
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.bz2"
|
||||
S = "${WORKDIR}/${PN}-${PV}"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user