From 1c132a6be0014d3b1cd3bc1081b980bfdf8244f1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 7 Feb 2007 15:44:37 +0000 Subject: e2fsprogs-libs: Add 1.39, take care of pkgconfig files. --- .../e2fsprogs-libs-1.39/.mtn2git_empty | 0 .../e2fsprogs-libs-1.39/configure.patch | 22 ++++++++++++++++++++++ packages/e2fsprogs-libs/e2fsprogs-libs.inc | 2 +- packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb | 13 +++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty create mode 100644 packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch create mode 100644 packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb (limited to 'packages') diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch new file mode 100644 index 0000000000..1b31c0b305 --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- e2fsprogs-libs-1.33/./lib/uuid/configure.in~configure ++++ e2fsprogs-libs-1.33/./lib/uuid/configure.in +@@ -2,9 +2,11 @@ + dnl Not used now, for the future when uuid is separated out into its + dnl own package. + dnl +-AC_INIT(gen_uuid.c) +-AC_PREREQ(2.12) ++AC_INIT ++AC_CONFIG_SRCDIR([gen_uuid.c]) ++AC_PREREQ(2.57) + + AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h) + AC_CHECK_FUNCS(srandom) +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc index 03f9c8dc22..9efa6d1d70 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "optional" -inherit autotools +inherit autotools pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1 \ diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb new file mode 100644 index 0000000000..dfd83e3c1f --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb @@ -0,0 +1,13 @@ +require e2fsprogs-libs.inc + +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://configure.patch;patch=1" + +EXTRA_OECONF=" --enable-elf-shlibs " + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} -- cgit v1.2.3 From b09a67c2da336338d76df5dde8fb400e9f0fd38e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 7 Feb 2007 15:53:09 +0000 Subject: phoneserver: Add patch to use a different port. --- packages/gpephone/phoneserver/.mtn2git_empty | 0 packages/gpephone/phoneserver/changeport.patch | 11 +++++++++++ packages/gpephone/phoneserver_1.0.bb | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/gpephone/phoneserver/.mtn2git_empty create mode 100644 packages/gpephone/phoneserver/changeport.patch (limited to 'packages') diff --git a/packages/gpephone/phoneserver/.mtn2git_empty b/packages/gpephone/phoneserver/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/phoneserver/changeport.patch b/packages/gpephone/phoneserver/changeport.patch new file mode 100644 index 0000000000..fac4546d96 --- /dev/null +++ b/packages/gpephone/phoneserver/changeport.patch @@ -0,0 +1,11 @@ +--- config.h~ 2007-02-07 10:43:57.000000000 +0100 ++++ config.h 2007-02-07 10:43:57.000000000 +0100 +@@ -22,7 +22,7 @@ + /* serial port name */ + #ifndef SERIAL_PORT + //#define SERIAL_PORT "/dev/pts/0" //ttyS1" +-#define SERIAL_PORT "/dev/ttyS1" //ttyS1" ++#define SERIAL_PORT "/dev/ttyS0" //ttyS1" + #endif /* */ + + /* serial port baudrate */ diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb index fdde9d73f9..d9ee660cdb 100644 --- a/packages/gpephone/phoneserver_1.0.bb +++ b/packages/gpephone/phoneserver_1.0.bb @@ -2,10 +2,12 @@ LICENSE = "LiPS" DESCRIPTION = "Phone services server" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" DEPENDS = "dbus-glib glib-2.0 libmsgenabler libabenabler" GPE_TARBALL_SUFFIX= "bz2" inherit gpephone autotools - + +SRC_URI += "file://changeport.patch;patch=1;pnum=0" + -- cgit v1.2.3 From e3364a5e3c0e90e4d4cd3be4f239d8a1da507089 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 7 Feb 2007 17:20:09 +0000 Subject: uim: update SRC_URI, fix SECTION, misc clean up --- packages/uim/uim.inc | 9 +++------ packages/uim/uim_1.3.1.bb | 29 ++++++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'packages') diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc index a4b0215896..94eb11d332 100644 --- a/packages/uim/uim.inc +++ b/packages/uim/uim.inc @@ -1,12 +1,11 @@ DESCRIPTION = "A multilingual user input method library" HOMEPAGE = "http://uim.freedesktop.org/" LICENSE = "GPL" -SECTION = "libs/inputmethod" -PR = "r0" +SECTION = "inputmethods" EXTRA_OECONF += "--disable-applet \ --disable-emacs \ - --without-qt \ +# --without-qt \ --without-scim \ --without-m17nlib \ --without-prime \ @@ -14,6 +13,4 @@ EXTRA_OECONF += "--disable-applet \ --without-mana \ --without-eb" -SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.bz2" - -S = "${WORKDIR}/uim-${PV}" +SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2" diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb index 5d82945df7..37433a4252 100644 --- a/packages/uim/uim_1.3.1.bb +++ b/packages/uim/uim_1.3.1.bb @@ -1,29 +1,20 @@ require uim.inc DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses" +SECTION_uim-gtk2.0 = "x11/inputmethods" +PR = "r1" SRC_URI += "file://uim-module-manager.patch;patch=1" -S = "${WORKDIR}/uim-${PV}" - -do_stage() { - autotools_stage_all -} - inherit autotools pkgconfig PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" LEAD_SONAME = "libuim.so.1" RDEPENDS_uim = "libuim0" - -DESCRIPTION_libuim-dev = "Development files for uim" -FILES_libuim-dev = "${libdir}/libuim*.a \ - ${libdir}/libuim*.la \ - ${libdir}/libuim*.so \ - ${includedir}/uim \ - ${libdir}/pkgconfig/uim.pc" +RDEPENDS_uim-anthy = "virtual/japanese-font" DESCRIPTION_libuim0 = "Simple and flexible input method collection and library" +SECTION_libuim0 = "lib/inputmethods" FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${libdir}/libuim-custom.so.* \ ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ @@ -31,6 +22,14 @@ FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ ${libdir}/libuim.so.*" +DESCRIPTION_libuim-dev = "Development files for uim" +SECTION_libuim-dev = "devel/libs" +FILES_libuim-dev = "${libdir}/libuim*.a \ + ${libdir}/libuim*.la \ + ${libdir}/libuim*.so \ + ${includedir}/uim \ + ${libdir}/pkgconfig/uim.pc" + DESCRIPTION_uim-anthy = "Anthy plugin for uim" FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ ${datadir}/uim/anthy*.scm" @@ -140,3 +139,7 @@ if [ -f /usr/bin/uim-module-manager ]; then tutcode tcode hangul viqr ipa-x-sampa latin byeoru fi } + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 2840544cedfaae9b773018ad13f235b6e02c340e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 7 Feb 2007 17:23:58 +0000 Subject: uim: libs not lib SECTION --- packages/uim/uim_1.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb index 37433a4252..e5ddcd0737 100644 --- a/packages/uim/uim_1.3.1.bb +++ b/packages/uim/uim_1.3.1.bb @@ -14,7 +14,7 @@ RDEPENDS_uim = "libuim0" RDEPENDS_uim-anthy = "virtual/japanese-font" DESCRIPTION_libuim0 = "Simple and flexible input method collection and library" -SECTION_libuim0 = "lib/inputmethods" +SECTION_libuim0 = "libs/inputmethods" FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${libdir}/libuim-custom.so.* \ ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ -- cgit v1.2.3 From be485925ed95bc02072a4cbe4504f11af814efec Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 7 Feb 2007 17:33:48 +0000 Subject: poboxserver: fix SECTION --- packages/poboxserver/poboxserver_1.2.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb index 6278c920be..e582ce0ccf 100644 --- a/packages/poboxserver/poboxserver_1.2.5.bb +++ b/packages/poboxserver/poboxserver_1.2.5.bb @@ -1,8 +1,8 @@ DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Operation Based On eXample'" -SECTION = "libs/inputmethods" +SECTION = "inputmethods" LICENSE = "GPL" DEPENDS = "perl-native ruby-native nkf-native" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \ http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \ -- cgit v1.2.3 From 984172e96143a8fbf12f62f32fddaa9e5ce2b6e7 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 7 Feb 2007 17:40:12 +0000 Subject: anthy: fix SECTION, minor clean up --- packages/anthy/anthy_7811.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_7811.bb index a6c8eff200..5ac651223b 100644 --- a/packages/anthy/anthy_7811.bb +++ b/packages/anthy/anthy_7811.bb @@ -3,8 +3,8 @@ AUTHOR = "Anthy Developers " HOMEPAGE = "http://anthy.sourceforge.jp" LICENSE = "GPL" DEPENDS = "anthy-native" -SECTION = "libs/inputmethod" -PR = "r0" +SECTION = "inputmethods" +PR = "r1" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \ file://not_build_elc.patch;patch=1 \ @@ -12,8 +12,6 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \ file://change_anthy_dic_path.patch;patch=1 \ file://native-mkanthydic-mkdepgraph.patch;patch=1" -S = "${WORKDIR}/anthy-${PV}" - inherit autotools pkgconfig PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev" @@ -21,6 +19,8 @@ PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev" DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)" DESCRIPTION_libanthy0 = "Anthy runtime library" DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers" +SECTION_libanthy0 = "libs/inputmethods" +SECTION_libanthy-dev = "devel/libs" # gettext -- cgit v1.2.3 From 92f1049b080402154265defeddc869bb726cb0cc Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 7 Feb 2007 19:45:28 +0000 Subject: sysvinit: fix divide by 0 error on shutdown in /etc/init.d/rc --- packages/sysvinit/sysvinit/angstrom/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc index 7716a52099..e43ddec14b 100755 --- a/packages/sysvinit/sysvinit/angstrom/rc +++ b/packages/sysvinit/sysvinit/angstrom/rc @@ -23,7 +23,7 @@ startup_progress() { step=$(($step + $step_change)) if [ $(($num_steps + $first_step)) -lt 1 ]; then - numsteps="1" + num_steps="1" first_step="0" fi -- cgit v1.2.3 From 24a15db7f3fcc37d4aab5a5f42a965c18c357ec5 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 7 Feb 2007 20:01:02 +0000 Subject: sysvinit: bump PR for divide by zero fix in /etc/init.d/rc --- packages/sysvinit/sysvinit_2.86.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index aa7aa83351..53634b7556 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r31" +PR = "r32" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. -- cgit v1.2.3 From 085c633b3088b9091308f8e09b70c4d7f0f21ae2 Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Wed, 7 Feb 2007 20:28:39 +0000 Subject: gdb-cross: fix issue where patch has already been applied to 6.6 gdb-cross version 6.6 fails the patch process because the sim-install.patch tries to apply patches to Makefile-common which have already been merged into gdm mainstream. Attached is a patch for OE that seperates the two patches in sim-install.patch so that gdb-cross 6.6 only applies the first one while gdb-cross 6.3 (which also uses the sim-install.patch applies both. --- .../gdb/files/sim-install-makefile-common.patch | 22 ++++++++++++++ packages/gdb/files/sim-install-makefile.patch | 11 +++++++ packages/gdb/files/sim-install.patch | 34 ---------------------- packages/gdb/gdb-cross_6.3.bb | 5 +++- packages/gdb/gdb-cross_6.6.bb | 4 ++- 5 files changed, 40 insertions(+), 36 deletions(-) create mode 100644 packages/gdb/files/sim-install-makefile-common.patch create mode 100644 packages/gdb/files/sim-install-makefile.patch delete mode 100644 packages/gdb/files/sim-install.patch (limited to 'packages') diff --git a/packages/gdb/files/sim-install-makefile-common.patch b/packages/gdb/files/sim-install-makefile-common.patch new file mode 100644 index 0000000000..24550edc6c --- /dev/null +++ b/packages/gdb/files/sim-install-makefile-common.patch @@ -0,0 +1,22 @@ +--- gdb-6.1/sim/common/Make-common.in~sim-install.patch 2003-09-08 18:24:59.000000000 +0100 ++++ gdb-6.1/sim/common/Make-common.in 2004-07-22 17:56:18.947423032 +0100 +@@ -581,14 +581,14 @@ + + install-common: installdirs + n=`echo run | sed '$(program_transform_name)'`; \ +- $(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT) ++ $(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) + n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \ +- $(INSTALL_DATA) libsim.a $(libdir)/$$n ; \ +- ( cd $(libdir) ; $(RANLIB) $$n ) ++ $(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \ ++ ( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n ) + + installdirs: +- $(SHELL) $(srcdir)/../../mkinstalldirs $(bindir) +- $(SHELL) $(srcdir)/../../mkinstalldirs $(libdir) ++ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir) ++ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir) + + check: + cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)" diff --git a/packages/gdb/files/sim-install-makefile.patch b/packages/gdb/files/sim-install-makefile.patch new file mode 100644 index 0000000000..7ac67496ac --- /dev/null +++ b/packages/gdb/files/sim-install-makefile.patch @@ -0,0 +1,11 @@ +--- gdb-6.6~org/sim/common/Makefile.in 2007-01-30 09:23:31.000000000 -0500 ++++ gdb-6.6/sim/common/Makefile.in 2007-01-30 09:25:32.000000000 -0500 +@@ -34,7 +34,7 @@ + + datadir = @datadir@ + mandir = @mandir@ +-man1dir = $(mandir)/man1 ++man1dir = $(DESTDIR)$(mandir)/man1 + infodir = @infodir@ + includedir = @includedir@ + diff --git a/packages/gdb/files/sim-install.patch b/packages/gdb/files/sim-install.patch deleted file mode 100644 index 3c88c4c059..0000000000 --- a/packages/gdb/files/sim-install.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- gdb-6.1/sim/common/Makefile.in~ 2004-01-15 21:25:06.000000000 +0000 -+++ gdb-6.1/sim/common/Makefile.in 2004-07-22 17:07:46.237809032 +0100 -@@ -34,7 +34,7 @@ - - datadir = @datadir@ - mandir = @mandir@ --man1dir = $(mandir)/man1 -+man1dir = $(DESTDIR)$(mandir)/man1 - infodir = @infodir@ - includedir = @includedir@ - - ---- gdb-6.1/sim/common/Make-common.in~sim-install.patch 2003-09-08 18:24:59.000000000 +0100 -+++ gdb-6.1/sim/common/Make-common.in 2004-07-22 17:56:18.947423032 +0100 -@@ -581,14 +581,14 @@ - - install-common: installdirs - n=`echo run | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT) -+ $(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) - n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \ -- $(INSTALL_DATA) libsim.a $(libdir)/$$n ; \ -- ( cd $(libdir) ; $(RANLIB) $$n ) -+ $(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \ -+ ( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n ) - - installdirs: -- $(SHELL) $(srcdir)/../../mkinstalldirs $(bindir) -- $(SHELL) $(srcdir)/../../mkinstalldirs $(libdir) -+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir) -+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir) - - check: - cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)" diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 9cc72cca69..5dd5cf5ac5 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -5,9 +5,12 @@ DEPENDS = "ncurses-native" inherit autotools sdk +PR = "r1" + S = "${WORKDIR}/gdb-${PV}" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install.patch;patch=1" + file://sim-install-makefile.patch;patch=1 \ + file://sim-install-makefile-common.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb index 32076b529e..03d9cda12c 100644 --- a/packages/gdb/gdb-cross_6.6.bb +++ b/packages/gdb/gdb-cross_6.6.bb @@ -6,9 +6,11 @@ DEPENDS = "ncurses-native" inherit autotools sdk +PR = "r1" + S = "${WORKDIR}/gdb-${PV}" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install.patch;patch=1" + file://sim-install-makefile.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" -- cgit v1.2.3 From 45f624694b2e7601e10cae4ff957d6b42b0bc032 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 8 Feb 2007 00:39:10 +0000 Subject: opie-taskbar: init.d/opie: explicitly shut down psplash on opie start, plus allow it some time for that. Otherwise, there's race between psplash and opie on some machines (seen on h3900), leading to opie hang. With this change, opie *could* run on VT 2, but it appears that opie's GUI manager has off-by-one error, causing it to not use last screen scanline, so old content is seen there, which is unaesthetic. So, keep running opie on VT 3, which is empty. --- packages/opie-taskbar/opie-taskbar/opie | 6 ++++++ packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index b2677ddc0d..3fe4d0cdf8 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -41,6 +41,12 @@ fi case $1 in 'start') #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 + + # Turn off psplash if any - sleep is required for anti-race + if [ -e /mnt/.psplash ]; then + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + sleep 1 + fi if [ -x "$OPIEDIR/bin/opie-login" ]; then echo Starting Opie-login.... diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index 384fbd0ec8..a5e154cfef 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 38172af970..b2992b0c28 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From 8afb6c6f4dbcb8c14f42d9c95cc761a8a4cee422 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 8 Feb 2007 00:40:46 +0000 Subject: libopie2: Add patch to properly handle all various native LCD orientations of ipaqs. --- .../libopie/libopie2/ipaq-lcd-rotate-cleanup.patch | 39 ++++++++++++++++++++++ packages/libopie/libopie2_cvs.bb | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch (limited to 'packages') diff --git a/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch b/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch new file mode 100644 index 0000000000..735663f343 --- /dev/null +++ b/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch @@ -0,0 +1,39 @@ +Index: libopie2/opiecore/device/odevice_ipaq.cpp +=================================================================== +--- libopie2.orig/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:40:33.000000000 +0000 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 2007-02-05 21:51:43.000000000 +0000 +@@ -317,24 +317,20 @@ + break; + } + +- // Rotate cursor keys 180 or 270 ++ // QT has strange screen coordinate system, so depending ++ // on native device screen orientation, we need to rotate cursor keys + case Key_Left : + case Key_Right: + case Key_Up : + case Key_Down : { +- if (( d->m_model == Model_iPAQ_H31xx ) || +- ( d->m_model == Model_iPAQ_H38xx )) { +- newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; +- } +- // Rotate the cursor keys by 270 +- // keycode - Key_Left = position of the button starting from left clockwise +- // add the rotation to it and modolo. No we've the original offset +- // add the offset to the Key_Left key +- if (( d->m_model == Model_iPAQ_H5xxx ) || +- ( d->m_model == Model_iPAQ_H191x ) || +- ( d->m_model == Model_iPAQ_H4xxx ) || +- ( d->m_model == Model_iPAQ_H1940 )) +- newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; ++ int quarters; ++ switch (d->m_rotation) { ++ case Rot0: quarters = 3/*270deg*/; break; ++ case Rot90: quarters = 2/*270deg*/; break; ++ case Rot180: quarters = 1/*270deg*/; break; ++ case Rot270: quarters = 0/*270deg*/; break; ++ } ++ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; + break; + } + diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 1635a5b1a3..d6403d645a 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,12 +1,13 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \ + file://ipaq-lcd-rotate-cleanup.patch;patch=1 \ file://include.pro" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 4d0fccc940c8bffe5eb8e384d622e9db1bb9431b Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 8 Feb 2007 10:22:12 +0000 Subject: kpengine: fix SECTION and FILES --- packages/kanjipad/kanjipad.inc | 2 ++ packages/kanjipad/kpengine_0.1.bb | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/kanjipad/kanjipad.inc b/packages/kanjipad/kanjipad.inc index aecd130b82..ce9613b3ab 100644 --- a/packages/kanjipad/kanjipad.inc +++ b/packages/kanjipad/kanjipad.inc @@ -6,4 +6,6 @@ LICENSE = "GPL" SRC_URI="http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz" +S = ${WORKDIR}/kanjipad-2.0.0/ + inherit autotools pkgconfig diff --git a/packages/kanjipad/kpengine_0.1.bb b/packages/kanjipad/kpengine_0.1.bb index 0fa32faf13..d9a6fee7d6 100644 --- a/packages/kanjipad/kpengine_0.1.bb +++ b/packages/kanjipad/kpengine_0.1.bb @@ -1,10 +1,9 @@ require kanjipad.inc -SECTION = "libs" +DESCRIPTION = "Japanese HWR engine used by a number of programs. Original algorithms by Todd Ruddick." +SECTION = "inputmethods" +PR = "r1" SRC_URI += "file://Makefile-kpengine-only.patch;patch=1" -FILES = "${bindir}/kpengine ${datadir}" - -# would it be better to make this a part of kanjipad bb? -S = ${WORKDIR}/kanjipad-2.0.0/ +FILES_${PN} = "${bindir}/kpengine ${datadir}" -- cgit v1.2.3