summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/hentges-2.0.conf42
-rw-r--r--conf/machine/hentges-2.0_common.conf40
-rw-r--r--conf/machine/hentges-2.0_spitz.conf39
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR66.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR59.bb)4
-rw-r--r--packages/fbreader/fbreader_0.8.2a.bb10
-rw-r--r--packages/fbreader/files/zaurus-VGA.patch13
-rw-r--r--packages/images/hentges-console-image.bb37
-rw-r--r--packages/images/hentges-x11-image.bb47
-rw-r--r--packages/tasks/task-hentges-base.bb28
-rw-r--r--packages/tasks/task-hentges-x11.bb29
10 files changed, 24 insertions, 265 deletions
diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf
deleted file mode 100644
index 5f23949d2d..0000000000
--- a/conf/distro/hentges-2.0.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: hentges-2.0.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net"
-LICENSE = "MIT"
-
-######################################################################################
-
-require conf/distro/angstrom-2007.1.conf
-
-######################################################################################
-
-require conf/machine/hentges-2.0_common.conf
-require conf/machine/hentges-2.0_${MACHINE}.conf
-
-######################################################################################
-
-DISTRO_VERSION = "1.9+WIP-${DATE}"
-DISTRO_REVISION = "1"
-
-DISTRO = "hentges-2.0"
-DISTRO_NAME = "Hentges"
-
-######################################################################################
-
-# Override FEED_URIS here
-
-######################################################################################
-
-HENTGES_PV = "${DISTRO_VERSION}"
-HENTGES_PR = "${DISTRO_REVISION}"
-
-######################################################################################
-
diff --git a/conf/machine/hentges-2.0_common.conf b/conf/machine/hentges-2.0_common.conf
deleted file mode 100644
index e7e1d5b2b7..0000000000
--- a/conf/machine/hentges-2.0_common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: hentges-2.0_common.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Hentges common dependency description"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-LICENSE = "MIT"
-
-######################################################################################
-
-HENTGES_BASE_DEPENDS = "task-base-wifi"
-HENTGES_BASE_RDEPENDS = "task-base-wifi"
-
-######################################################################################
-
-# Handled via task-base:
-
-DISTRO_SSH_DAEMON ?= "dropbear"
-
-######################################################################################
-
-# Handled via task-base:
-
-DISTRO_EXTRA_RDEPENDS = "\
- update-modules \
- ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
- angstrom-version \
- ipkg ipkg-collateral \
- util-linux-mount util-linux-umount \
- ${EXTRA_STUFF} \
- ${DEBUG_APPS} \
- "
-
-HENTGES_X11_DEPENDS += "angstrom-x11-base-depends \
- angstrom-gpe-task-base"
diff --git a/conf/machine/hentges-2.0_spitz.conf b/conf/machine/hentges-2.0_spitz.conf
deleted file mode 100644
index cffa01de92..0000000000
--- a/conf/machine/hentges-2.0_spitz.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: hentges-2.0_spitz.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Hentges dependency description for Spitz aka SL-C3x00"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "<homepage>"
-LICENSE = "MIT"
-
-######################################################################################
-
-DISTRO_SSH_DAEMON_spitz = "openssh"
-
-XSERVER = "xserver-kdrive-fbdev"
-
-######################################################################################
-
-HENTGES_BASE_RDEPENDS += "tar bash"
-
-######################################################################################
-
-# In the future I plan to replace the angstrom-*task* stuff with custom
-# hentges tasks, replacing the angstrom defaults where needed
-
-HENTGES_X11_RDEPENDS += "${XSERVER} \
- angstrom-gpe-task-pim \
- angstrom-ohand-task-pim \
- angstrom-gpe-task-settings \
- angstrom-gpe-task-apps \
- angstrom-gpe-task-games \
- angstrom-task-office \
- angstrom-task-printing \
- angstrom-task-sectest \
- firefox gftp"
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR59.bb b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb
index 4af0a7c630..912082c70f 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR59.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb
@@ -1,8 +1,8 @@
require altboot.inc
-PR = "r9"
+PR = "r0"
-SVN_REV = "59"
+SVN_REV = "66"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV}"
do_install() {
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 3a0dc543e8..2419ccf4ae 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r3"
+PR = "r4"
# The RESOLUTION is defined at compile time which makes
# this package MACHINE specific.
@@ -13,6 +13,12 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
file://480x640-buildfix.patch;patch=1"
+
+SRC_URI_append_spitz = "\
+ file://zaurus-VGA.patch;patch=1"
+
+SRC_URI_append_akita = "\
+ file://zaurus-VGA.patch;patch=1"
# Set the defaults
READER_RESOLUTION = "240x320"
@@ -22,6 +28,8 @@ READER_STATUS = "release"
# Set device specific overrides
READER_RESOLUTION_fic-gta01 = "480x640"
+READER_RESOLUTION_spitz = "640x480"
+READER_RESOLUTION_akita = "640x480"
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
diff --git a/packages/fbreader/files/zaurus-VGA.patch b/packages/fbreader/files/zaurus-VGA.patch
new file mode 100644
index 0000000000..5ba7d91b9d
--- /dev/null
+++ b/packages/fbreader/files/zaurus-VGA.patch
@@ -0,0 +1,13 @@
+--- fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml.orig 2007-06-24 23:55:56.000000000 +0000
++++ fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml 2007-06-24 23:56:22.000000000 +0000
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <DefaultStyles>
+- <base family="Sans" fontSize="16"/>
++ <base family="Sans" fontSize="8"/>
+ <style id="0" name="Regular Paragraph" firstLineIndentDelta="22" allowHyphenations="true"/>
+- <style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
++ <style id="1" name="Title" fontSizeDelta="5" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
+ <style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
+ <style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
+ <style id="31" name="Header 1" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb
deleted file mode 100644
index 87381a4c77..0000000000
--- a/packages/images/hentges-console-image.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: hentges-console-image.bb
-# Date: 20070516 (YMD)
-
-DESCRIPTION = "Hentges Console Image"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-export IMAGE_NAME = "hentges-console-image"
-export IMAGE_LINGUAS = ""
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
-######################################################################################
-
-DEPENDS = "task-base \
- task-hentges-base"
-
-RDEPENDS = "task-base \
- task-hentges-base"
-
-######################################################################################
-
-inherit image
-
-
diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb
deleted file mode 100644
index 475f9f0ea9..0000000000
--- a/packages/images/hentges-x11-image.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: hentges-x11-image.bb
-# Date: 20070522 (YMD)
-
-DESCRIPTION = "Hentges X11 Image"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-export IMAGE_NAME = "hentges-x11-image"
-export IMAGE_LINGUAS = ""
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
-######################################################################################
-
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-
-######################################################################################
-
-DEPENDS = "task-base \
- task-hentges-base \
- task-hentges-x11"
-
-RDEPENDS = "task-base \
- task-hentges-base \
- task-hentges-x11"
-
-######################################################################################
-
-inherit image
-
-
diff --git a/packages/tasks/task-hentges-base.bb b/packages/tasks/task-hentges-base.bb
deleted file mode 100644
index 89b39aeba9..0000000000
--- a/packages/tasks/task-hentges-base.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: task-hentges-base.bb
-# Date: 20070516 (YMD)
-
-DESCRIPTION = "task-hentges-base"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-#DEPENDS = "${HENTGES_DEPENDS}"
-#
-RDEPENDS = "${HENTGES_BASE_RDEPENDS}"
diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb
deleted file mode 100644
index db658e9014..0000000000
--- a/packages/tasks/task-hentges-x11.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: task-hentges-x11.bb
-# Date: 20070522 (YMD)
-
-DESCRIPTION = "task-hentges-x11"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-DEPENDS = "task-angstrom-x11"
-
-RDEPENDS = "${HENTGES_X11_RDEPENDS}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 02:57:43 +0000