From 297fac9b424a54ec0340d8062661e2887636fb35 Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Sat, 22 Apr 2006 11:55:50 +0000
Subject: libsdl-mixer: explicitely disable ogg/vorbis support (libraries not
 in DEPENDS)packages/libsdl/libsdl-mixer_1.2.6.bb

---
 classes/image_ipk.bbclass                          | 36 ++++++++++
 classes/kernel.bbclass                             |  3 +
 classes/multimachine.inc                           |  2 +
 conf/bitbake.conf                                  |  2 +-
 conf/distro/familiar-0.8.4.conf                    | 84 ++++++++++++++++++++++
 conf/distro/familiar-feeds.inc                     | 24 +++++++
 packages/konqueror/konqueror-embedded_20030705.bb  |  4 +-
 packages/libsdl/libsdl-mixer_1.2.6.bb              |  4 +-
 .../linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb   |  2 +-
 packages/meta/gpe-image.bb                         | 11 ++-
 packages/meta/meta-opie.bb                         |  4 +-
 packages/meta/opie-image.bb                        | 12 +++-
 packages/opie-rdesktop/opie-rdesktop.inc           |  4 +-
 packages/python/python_2.4.2.bb                    |  2 +-
 14 files changed, 180 insertions(+), 14 deletions(-)
 create mode 100644 conf/distro/familiar-0.8.4.conf
 create mode 100644 conf/distro/familiar-feeds.inc

diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass
index 5fdd340673..37d4b338d6 100644
--- a/classes/image_ipk.bbclass
+++ b/classes/image_ipk.bbclass
@@ -53,6 +53,32 @@ fakeroot do_rootfs () {
 	${IMAGE_POSTPROCESS_COMMAND}
 }
 
+DISTRO_LOCALE_FEEDS_PREFIXES ?= ""
+DISTRO_LOCALE_FEEDS_HEADER ?= ""
+
+python __anonymous() {
+	prefixes = bb.data.getVar("DISTRO_LOCALE_FEEDS_PREFIXES", d, 1).split()
+	locale_feeds = bb.data.getVar("DISTRO_LOCALE_FEEDS_HEADER", d, 1)
+
+	# add template
+	locale_feeds += "# For each supported locale there is a subfeed in each of the feed folders.\n"
+	locale_feeds += "# You can use your webbrowser to check for valid locale codes.\n\n"
+	locale_feeds += "# To point ipkg at packages for your locale, replace <my_locale> with the\n"
+	locale_feeds += "# locale code in the template below and remove the leading '#' characters.\n\n"
+	for p in prefixes:
+		locale_feeds += "# src/gz %s-locale-<my_locale> %s/locale/<my_locale>\n" % (p.split('/')[-1], p)
+	
+	# add feed for each IMAGE_LINGUA
+	linguas = bb.data.getVar("IMAGE_LINGUAS", d, 1).split()
+	for l in linguas:
+		fst = l.split('-')[0]
+		locale_feeds += "\n# %s locale feeds\n" % fst
+		for p in prefixes:
+			locale_feeds += "src/gz %s-locale-%s %s/locale/%s\n" % (p.split('/')[-1], fst, p, fst)
+	
+	bb.data.setVar("DISTRO_LOCALE_FEEDS", locale_feeds, d)
+}
+
 insert_feed_uris () {
 	
 	echo "Building feeds for [${DISTRO}].."
@@ -69,4 +95,14 @@ insert_feed_uris () {
 		# insert new feed-sources
 		echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
 	done			
+
+	if [ -z ${FEED_URIS} ]; then
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-feeds.conf <<EOF
+${DISTRO_FEEDS}
+EOF
+
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-locale-feeds.conf <<EOF
+${DISTRO_LOCALE_FEEDS}
+EOF
+	fi
 }
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index ff9aeeab78..5bb9a85bdf 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -237,6 +237,9 @@ python populate_packages_prepend () {
 		host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
 
 		cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+		#print cmd
+		#import sys
+		#sys.exit(1)
 		f = os.popen(cmd, 'r')
 
 		deps = {}
diff --git a/classes/multimachine.inc b/classes/multimachine.inc
index 1f73ffd30f..7c31f3661a 100644
--- a/classes/multimachine.inc
+++ b/classes/multimachine.inc
@@ -1,3 +1,5 @@
 STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
 WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
 STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel"
+
+#DEPLOY_DIR_SUFFIX = "${@['', bb.data.getVar('PACKAGE_ARCH', d, 1)][bb.data.getVar('PACKAGE_ARCH', d, 1) != bb.data.getVar('HOST_ARCH', d, 1)]}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index cbec1b8ff1..0c179a67ca 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -291,7 +291,7 @@ export palmqtdir = "/opt/QtPalmtop"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
diff --git a/conf/distro/familiar-0.8.4.conf b/conf/distro/familiar-0.8.4.conf
new file mode 100644
index 0000000000..70ad4eda85
--- /dev/null
+++ b/conf/distro/familiar-0.8.4.conf
@@ -0,0 +1,84 @@
+DISTRO = "familiar"
+DISTRO_NAME = "Familiar Linux"
+DISTRO_VERSION = "v0.8.4-rc1"
+
+include conf/distro/familiar.conf
+include conf/distro/familiar-feeds.inc
+
+
+DISTRO_TYPE = "release"
+
+
+CVSDATE = 20051212
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
+
+#newer hostap modules didn't seem to work for me 
+PREFERRED_VERSION_hostap-modules ?= "0.3.9"
+
+#2.4 machines prefer 0.13e ones
+PREFERRED_VERSION_orinoco-modules ?= "0.13e"
+
+#but 0.13e doesn't build against 2.6
+PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
+PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
+
+#prefer a newer hh.org cvs kernel
+CVSDATE_handhelds-pxa-2.6 = "20051221"
+CVSDATE_LAB-kernel = "20051221"
+
+#The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4"
+
+
+#
+# Machines section
+#
+
+# select kernel version for the zaurus family
+
+ZKERNEL_VERSION_poodle = "2.4" 
+ZKERNEL_VERSION_collie = "2.4"
+ZKERNEL_VERSION_c7x0   = "2.6"
+ZKERNEL_VERSION_spitz  = "2.4"
+ZKERNEL_VERSION_akita  = "2.4"
+ZKERNEL_VERSION_borzoi = "2.4"
+ZKERNEL_VERSION_tosa   = "2.4" 
+
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+OPIE_VERSION = "1.2.1"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.7.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/conf/distro/familiar-feeds.inc b/conf/distro/familiar-feeds.inc
new file mode 100644
index 0000000000..234088246f
--- /dev/null
+++ b/conf/distro/familiar-feeds.inc
@@ -0,0 +1,24 @@
+DISTRO_FEED_PREFIX = "http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed"
+
+DISTRO_FEEDS_prepend () {
+# Familiar ${DISTRO_VERSION} feeds
+
+# base - essential packages
+src/gz base ${DISTRO_FEED_PREFIX}/base
+src/gz base-${MACHINE} ${DISTRO_FEED_PREFIX}/base/machine/${MACHINE}
+
+# updates - security and bugfix updates go in this feed
+src/gz updates ${DISTRO_FEED_PREFIX}/updates
+src/gz updates-${MACHINE} ${DISTRO_FEED_PREFIX}/updates/machine/${MACHINE}
+
+# common - additional packages not specific to any graphical environment
+src/gz common ${DISTRO_FEED_PREFIX}/common
+src/gz common-${MACHINE} ${DISTRO_FEED_PREFIX}/common/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES = "${DISTRO_FEED_PREFIX}/base ${DISTRO_FEED_PREFIX}/updates ${DISTRO_FEED_PREFIX}/common"
+
+DISTRO_LOCALE_FEEDS_HEADER_prepend () {
+# Familiar ${DISTRO_VERSION} locale feeds
+
+}
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index e3fc55a88f..3b2d5ea97c 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-DEPENDS = "libqpe-opie openssl pcre"
+DEPENDS = "libqpe-opie pcre"
 LICENSE = "LGPL/GPL"
 PR = "r3"
 
@@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}
                 --enable-static --disable-shared --disable-debug                                \
                 --with-javascript=static --enable-qpe --enable-qt-embedded                      \
                 --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}     \
-                --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/..                   \
+                --without-ssl                                                                   \
                 --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR}                             \
 		--enable-libsuffix=""							        '
 
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index 3aafa18d0c..7e76334e99 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_mixer-${PV}"
@@ -13,7 +13,7 @@ export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod"
+EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod --disable-music-ogg"
 # although we build smpeg... need to find out how
 # to deal with optional dependencies
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index 2e301a172d..58daef865d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -6,7 +6,7 @@ PR = "r0"
 DEFAULT_PREFERENCE="-1"
 
 
-KERNEL_CCSUFFIX = "-3.3.3"
+KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 3767611af3..7d37c4f4fc 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -1,7 +1,15 @@
 FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 "
 FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
+
+DISTRO_FEEDS_append_familiar () {
+
+# x11 - additional packages specific to the x11 graphical environment
+src/gz x11 ${DISTRO_FEED_PREFIX}/x11
+src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11"
 
 PR = "r21"
 
@@ -55,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \
 		       ${XSERVER} \
 		       ${GPE_EXTRA_INSTALL}"
 
-IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp "
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index f82a69f367..6cc4ccbf98 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
                   opie-console opie-dagger opie-embeddedkonsole \
                   opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
                   opie-helpbrowser opie-irc opie-keypebble opie-odict \
-                  opie-oxygen opie-rdesktop opie-reader opie-remote \
+                  opie-oxygen opie-reader opie-remote \
                   opie-sheet opie-tableviewer opie-tinykate \
                   opie-wellenreiter opie-write opie-zsafe"
 
@@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
 #
 
 task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
-                        opie-rdesktop opie-wellenreiter opie-irc \
+                        opie-wellenreiter opie-irc \
                         opie-mediaplayer2 \
                         konqueror-embedded qpdf2"
 
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index e012b2c34f..5c30876dec 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,15 @@ export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
 FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
+
+DISTRO_FEEDS_append_familiar () {
+
+# opie - additional packages specific to the opie graphical environment
+src/gz opie ${DISTRO_FEED_PREFIX}/opie
+src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie"
 
 LICENSE = "MIT"
 PR = "r19"
@@ -66,6 +74,6 @@ merge_feeds() {
 }
 
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; "
 
 inherit image_ipk
diff --git a/packages/opie-rdesktop/opie-rdesktop.inc b/packages/opie-rdesktop/opie-rdesktop.inc
index 1924f9c7d6..2b69707f38 100644
--- a/packages/opie-rdesktop/opie-rdesktop.inc
+++ b/packages/opie-rdesktop/opie-rdesktop.inc
@@ -1,9 +1,11 @@
+# doesn't build without openssl enabled
+BROKEN = "1"
+
 DESCRIPTION = "Remote Desktop Protocol (RDP) Client"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "openssl"
 I18N_FILES = "ordesktop.ts"
 APPNAME = "ordesktop"
 APPTYPE = "binary"
diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb
index f065b68112..4ff07b3250 100644
--- a/packages/python/python_2.4.2.bb
+++ b/packages/python/python_2.4.2.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
+DEPENDS = "python-native readline zlib gdbm tcl tk"
 PR = "ml4"
 
 PYTHON_MAJMIN = "2.4"
-- 
cgit 1.2.3-korg