def base_dep_prepend(d):
- import bb;
+ import bb
#
# Ideally this will check a flag so we will operate properly in
# the case where host == build == target, for now we don't work in
os.system('rm -f '+ dir)
}
+#Uncomment this for bitbake 1.8.12
+#addtask rebuild after do_${BB_DEFAULT_TASK}
addtask rebuild
do_rebuild[dirs] = "${TOPDIR}"
do_rebuild[nostamp] = "1"
python base_do_rebuild() {
"""rebuild a package"""
- bb.build.exec_task('do_clean', d)
- bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
+ from bb import __version__
+ try:
+ from distutils.version import LooseVersion
+ except ImportError:
+ def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+ if (LooseVersion(__version__) < LooseVersion('1.8.11')):
+ bb.build.exec_func('do_clean', d)
+ bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
}
addtask mrproper
if dir == '/': bb.build.FuncFailed("wrong DATADIR")
bb.debug(2, "removing " + dir)
os.system('rm -rf ' + dir)
- bb.build.exec_task('do_clean', d)
+ bb.build.exec_func('do_clean', d)
}
addtask fetch
if pesteruser:
bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
+ #
+ # Handle removing stamps for 'rebuild' task
+ #
+ if name.startswith("StampUpdate"):
+ for (fn, task) in e.targets:
+ #print "%s %s" % (task, fn)
+ if task == "do_rebuild":
+ dir = "%s.*" % e.stampPrefix[fn]
+ bb.note("Removing stamps: " + dir)
+ os.system('rm -f '+ dir)
+
if not data in e.__dict__:
return NotHandled
import bb, os
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
archs.reverse()
+ pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d)
+ targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
for arch in archs:
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d)
+ fn = pkgdata + arch + targetdir + pkg
if os.path.exists(fn):
return fn
return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
bb.data.setVar(key, sdata[key], d)
}
+# Make sure MACHINE isn't exported
+# (breaks binutils at least)
+MACHINE[unexport] = "1"
+
+# Make sure TARGET_ARCH isn't exported
+# (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this
+# in them, undocumented)
+TARGET_ARCH[unexport] = "1"
+
+# Make sure DISTRO isn't exported
+# (breaks sysvinit at least)
+DISTRO[unexport] = "1"
+
+
def base_after_parse(d):
import bb, os, exceptions
if this_machine and not re.match(need_machine, this_machine):
raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
-
-
pn = bb.data.getVar('PN', d, 1)
# OBSOLETE in bitbake 1.7.4
if use_nls != None:
bb.data.setVar('USE_NLS', use_nls, d)
- # Make sure MACHINE isn't exported
- # (breaks binutils at least)
- bb.data.delVarFlag('MACHINE', 'export', d)
- bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
-
- # Make sure TARGET_ARCH isn't exported
- # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this
- # in them, undocumented)
- bb.data.delVarFlag('TARGET_ARCH', 'export', d)
- bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d)
-
- # Make sure DISTRO isn't exported
- # (breaks sysvinit at least)
- bb.data.delVarFlag('DISTRO', 'export', d)
- bb.data.setVarFlag('DISTRO', 'unexport', 1, d)
-
# Git packages should DEPEND on git-native
srcuri = bb.data.getVar('SRC_URI', d, 1)
if "git://" in srcuri:
if len(paths) == 0:
return
- for s in bb.data.getVar('SRC_URI', d, 1).split():
+ for s in srcuri.split():
if not s.startswith("file://"):
continue
local = bb.data.expand(bb.fetch.localpath(s, d), d)
return
python () {
+ import bb
+ from bb import __version__
base_after_parse(d)
+
+ # Remove this for bitbake 1.8.12
+ try:
+ from distutils.version import LooseVersion
+ except ImportError:
+ def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+ if (LooseVersion(__version__) >= LooseVersion('1.8.11')):
+ deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or []
+ deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1))
+ bb.data.setVarFlag('do_rebuild', 'deps', deps, d)
}
def check_app_exists(app, d):
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
PYTHON_DIR = "${@python_dir(d)}"
+
+PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
+
FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
-FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
- ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
- ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"
+FILES_${PN}-dev += "\
+ ${libdir}/pkgconfig \
+ ${libdir}/${PYTHON_DIR}/site-packages/*.la \
+"
+FILES_${PN}-dbg = "\
+ ${libdir}/${PYTHON_DIR}/site-packages/.debug \
+ ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
+ ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \
+"
}
distutils_stage_headers() {
- install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+ install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
oefatal "python setup.py install_headers execution failed."
}
distutils_stage_all() {
- install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
- # is this missing a lib below?
- PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
+ install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
+ PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
oefatal "python setup.py install (stage) execution failed."
#
valid_archs = "alpha cris ia64 \
- x86_64,i386 x86 \
+ x86_64 i386 x86 \
m68knommu m68k ppc powerpc ppc64 \
sparc sparc64 \
arm arm26 \
do_builtin_initramfs() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
+ cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin
requires = [e for e in requires if not e in provides]
return provides, requires
+CLILIBSDIR = "${STAGING_DIR_HOST}/clilibs"
+
python mono_do_clilibs() {
import bb, os, re, os.path
bb.error("WORKDIR not defined")
return
- staging = bb.data.getVar('STAGING_DIR', d, 1)
- if not staging:
- bb.error("STAGING_DIR not defined")
- return
-
pkgdest = bb.data.getVar('PKGDEST', d, 1)
- clilibs_dir = os.path.join(staging, "clilibs")
+ clilibs_dir = bb.data.getVar('CLILIBSDIR', d, 1)
bb.mkdirhier(clilibs_dir)
provides, requires = {}, {}
MIRRORS_append () {
-ftp://.*/.*/ http://meshcube.org/nylon/stable/sources/
-https?://.*/.*/ http://meshcube.org/nylon/stable/sources/
-ftp://.*/.*/ http://meshcube.org/nylon/unstable/sources/
-https?://.*/.*/ http://meshcube.org/nylon/unstable/sources/
+ftp://.*/.* http://meshcube.org/nylon/stable/sources/
+https?://.*/.* http://meshcube.org/nylon/stable/sources/
+ftp://.*/.* http://meshcube.org/nylon/unstable/sources/
+https?://.*/.* http://meshcube.org/nylon/unstable/sources/
}
\ No newline at end of file
# Released under the MIT license (see packages/COPYING)
MIRRORS_append () {
-ftp://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/
-https?://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/
-ftp://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/
-https?://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/
+ftp://.*/.* http://digital-opsis.com/oplinux/stable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux/stable/sources/
+ftp://.*/.* http://digital-opsis.com/oplinux/unstable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux/unstable/sources/
-ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/
-https?://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/
-ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/
-https?://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+ftp://.*/.* http://digital-opsis.com/oplinux-uclibc/stable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux-uclibc/stable/sources/
+ftp://.*/.* http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux-uclibc/unstable/sources/
}
ldconfig_postinst_fragment() {
if [ x"$D" = "x" ]; then
- ldconfig
+ [ -x /sbin/ldconfig ] && /sbin/ldconfig
fi
}
-SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
+SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs"
python package_do_shlibs() {
import os, re, os.path
pkgfn = bb.data.getVar('PKGFN', d, 1)
rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
- stagingdir = bb.data.getVar('STAGING_DIR', d, 1)
+ apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d)
stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1)
tmpdir = bb.data.getVar('TMPDIR', d, 1)
# Set up environment
apt_config_backup = os.getenv('APT_CONFIG')
- os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf'))
+ os.putenv('APT_CONFIG', apt_config)
path = os.getenv('PATH')
os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH')))
}
python package_ipk_install () {
+ #
+ # Warning - this function is not multimachine safe (see stagingdir reference)!
+ #
+
import os, sys
pkg = bb.data.getVar('PKG', d, 1)
pkgfn = bb.data.getVar('PKGFN', d, 1)
#
# override variables set by qmake_base to compile Qt/X11 apps
#
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
-export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
#
# override variables set by qmake_base to compile Qt/X11 apps
#
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
}
do_rm_work_all[recrdeptask] = "do_rm_work"
addtask rm_work_all after do_rm_work
+
+
+addhandler rmwork_stampfixing_eventhandler
+python rmwork_stampfixing_eventhandler() {
+ from bb.event import getName
+ import os
+
+ if getName(e) == "StampUpdate":
+ for (fn, task) in e.targets:
+ if task == 'rm_work_all':
+ continue
+ stamp = "%s.do_rm_work" % e.stampPrefix[fn]
+ if os.path.exists(stamp):
+ dir = "%s.*" % e.stampPrefix[fn]
+ bb.note("Removing stamps: " + dir)
+ os.system('rm -f '+ dir)
+
+ return NotHandled
+}
+
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
- mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
-
rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
- > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
- > ${STAGING_ETCDIR_NATIVE}/apt/preferences
> ${IMAGE_ROOTFS}/var/dpkg/status
> ${IMAGE_ROOTFS}/var/dpkg/available
# > ${STAGING_DIR}/var/dpkg/status
priority=$(expr $priority + 5)
done
- tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
+ tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
- cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
+ cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
from distutils.version import LooseVersion
except ImportError:
def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
- import os
+ import os, commands
# Check the bitbake version meets minimum requirements
minversion = data.getVar('BB_MIN_VERSION', e.data , True)
# Check that the MACHINE is valid, if it is set
if data.getVar('MACHINE', e.data, True):
- if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
- messages = messages + 'Please set a valid MACHINE in your local.conf\n'
+ if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+ messages = messages + 'Please set a valid MACHINE in your local.conf\n'
# Check that the DISTRO is valid
# need to take into account DISTRO renaming DISTRO
required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
+ if data.getVar('TARGET_ARCH', e.data, True) == "arm":
+ # qemu-native needs gcc 3.x
+ if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
+ gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
+
+ if not check_gcc3(e.data) and gcc_version[0] != '3':
+ messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
+ missing = missing + "gcc-3.x (needed for qemu-native),"
+
+ if "qemu-native" in assume_provided:
+ if not check_app_exists("qemu-arm", e.data):
+ messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
+
for util in required_utilities.split():
if not check_app_exists( util, e.data ):
missing = missing + "%s," % util
oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
if not oes_bb_conf:
- messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf\n'
+ messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
+
+ #
+ # Check that TMPDIR hasn't changed location since the last time we were run
+ #
+ tmpdir = data.getVar('TMPDIR', e.data, True)
+ checkfile = os.path.join(tmpdir, "saved_tmpdir")
+ if os.path.exists(checkfile):
+ f = file(checkfile, "r")
+ if (f.read().strip() != tmpdir):
+ messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % tmpdir
+ else:
+ f = file(checkfile, "w")
+ f.write(tmpdir)
+ f.close()
+
+ #
+ # Check the 'ABI' of TMPDIR
+ #
+ current_abi = data.getVar('SANITY_ABI', e.data, True)
+ abifile = data.getVar('SANITY_ABIFILE', e.data, True)
+ if os.path.exists(abifile):
+ f = file(abifile, "r")
+ abi = f.read().strip()
+ if not abi.isdigit():
+ f = file(abifile, "w")
+ f.write(current_abi)
+ elif (abi != current_abi):
+ # Code to convert from one ABI to another could go here if possible.
+ messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
+ else:
+ f = file(abifile, "w")
+ f.write(current_abi)
+ f.close()
if messages != "":
raise_sanity_error(messages)
from bb import note, error, data, __version__
from bb.event import getName
- try:
- from distutils.version import LooseVersion
- except ImportError:
- def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-
- if (LooseVersion(bb.__version__) > LooseVersion("1.8.6")):
- if getName(e) == "ConfigParsed":
- check_sanity(e)
- return NotHandled
-
- if getName(e) == "BuildStarted":
+ if getName(e) == "ConfigParsed":
check_sanity(e)
return NotHandled
APPNAME ?= "${PN}"
APPIMAGE ?= "${WORKDIR}/${PN}.png"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
sdl_do_sdl_install() {
install -d ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
if name == "PkgFailed":
if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0":
- build.exec_task('do_clean', data)
+ build.exec_func('do_clean', data)
elif name == "TaskFailed":
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
done
}
+do_generate[deptask] = "do_populate_staging"
+
EXPORT_FUNCTIONS do_generate
addtask generate after do_unpack do_patch before do_configure
done
}
+do_generate[deptask] = "do_populate_staging"
+
EXPORT_FUNCTIONS do_generate
addtask generate after do_unpack do_patch before do_configure
log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True)
elif name == "PkgFailed":
if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0":
- build.exec_task('do_clean', event.data)
+ build.exec_func('do_clean', event.data)
log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True)
status = 200
# remember the failure for the -k case
${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
${libdir}/matchbox-panel/.debug"
SECTION_${PN}-dbg = "devel"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
FILES_${PN}-locale = "${datadir}/locale"
STAGING_DIR = "${TMPDIR}/staging"
STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin"
-STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
+STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}"
-STAGING_BINDIR = "${STAGING_DIR_HOST}/bin"
-STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib"
-STAGING_INCDIR = "${STAGING_DIR_HOST}/include"
-STAGING_DATADIR = "${STAGING_DIR_HOST}/share"
+STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
+STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
+STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}"
STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
# Build utility info.
##################################################################
-CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}"
TOOLCHAIN_OPTIONS = ""
export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
##################################################################
export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
+BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
+BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
export CFLAGS = "${TARGET_CFLAGS}"
export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
-Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
+
+BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
+ -Wl,-rpath-link,${STAGING_LIBDIR} \
+ -Wl,-rpath,${libdir} -Wl,-O1"
+
export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \
- -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+ -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
-Wl,-O1"
# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
md5=b014170483cf85a93d08ee59196c53f9
sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
+[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz]
+md5=72120d9195ab1649c2d787eb1102a90c
+sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4
+
[http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz]
md5=863311e29550f9b4bf6c2502fdbed1fa
sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
md5=fca5d26c8efea4e6e547c81c801bf67c
sha256=bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.4.tar.bz2]
+md5=7ee7874108cbe9ea7fff1f4ab3389ce8
+sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
+
[http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
md5=aa214a10d873b68ddd67cd9de2ccae55
sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
md5=1ad07e10f34e46ffdaf10688743f2f43
sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
-[http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz]
+[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
md5=28b13b7253c8f019433be68686070558
sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
+[http://www.gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz]
+md5=5d0c7dc9163b2fd9a92ddd886ed7cfab
+sha256=ebefe385ec41e3ff26fa55c0fcecbed75d4cd5581ae5ae39038aac796af126c6
+
[http://downloads.sourceforge.net/gpstk/gpstk-1.2-src.tar.gz]
md5=541ec5a5b86cf9e56f0b23cf6c80dd6e
sha256=c1378384b1737b2fa330f8d63d7777db311c976bb20e0c0e0fcd5dac0e78672a
md5=bb196907ea1e182dcb396eb22f7d2c1a
sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.4.tar.bz2]
+md5=8b36cdf08df12be96615e3d550236626
+sha256=765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/xtrans-X11R7.0-1.0.0.tar.bz2]
md5=153642136a003871a9093c8103d6ac5a
sha256=c9a049b4367318b53cbad02bc7e3c4450778e3237400a515b2a6272405b8b912
#Preferred version for the kernel on various machines
PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
+#Initramfs for kernels
+KERNEL_INITRAMFS_PATH = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/initramfs-bootmenu-image-${MACHINE}.cpio.gz"
+
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
PREFERRED_VERSION_gpe-keylock ?= "0.12"
PREFERRED_VERSION_gpe-life ?= "0.2"
PREFERRED_VERSION_gpe-lights ?= "0.13"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
PREFERRED_VERSION_gpe-mininet ?= "0.7"
PREFERRED_VERSION_pwlib ?= "1.5.2"
PREFERRED_VERSION_pwmpi ?= "2.2.7"
PREFERRED_VERSION_pxaregs ?= "1.14"
-PREFERRED_VERSION_python ?= "2.5.1"
+PREFERRED_VERSION_python ?= "2.5.2"
PREFERRED_VERSION_python-ao ?= "0.82"
PREFERRED_VERSION_python-constraint ?= "1.1"
PREFERRED_VERSION_python-dbus ?= "0.81.1"
PREFERRED_VERSION_dbus = "1.1.4"
PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_vte = "0.16.10"
# Can be "glibc", "eglibc" or "uclibc"
ANGSTROM_MODE ?= "glibc"
+CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
+
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
PREFERRED_VERSION_gpe-icons ?= "0.25"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
PREFERRED_VERSION_gpe-su ?= "0.19"
PREFERRED_VERSION_keylaunch ?= "2.0.10"
-PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_asterisk = "1.4.17"
PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.24"
PREFERRED_VERSION_pulseaudio = "0.9.9"
# this is alphabetical!
+# yes, really!
+
+# you know what that means? like... a, b, c, d, e, f, g...
+
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7650"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-ffmpeg ?= "12186"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "77"
+SRCREV_pn-gsm0710muxd ?= "85"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "56"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3349"
SRCREV_pn-libmokoui2 ?= "3688"
+SRCREV_pn-libw100 ?= "47"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4079"
+SRCREV_pn-linux-openmoko ?= "4102"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-moko-gtk-engine ?= "3405"
SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-multitap-pad ?= "337"
SRCREV_pn-neod ?= "3421"
+SRCREV_pn-netsurf ?= "3859"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
SRCREV_pn-openmoko-panel-gps ?= "2900"
SRCREV_pn-openmoko-panel-gsm ?= "3664"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-memory ?= "3903"
SRCREV_pn-openmoko-panel-usb ?= "3360"
SRCREV_pn-openmoko-sample2 ?= "3528"
SRCREV_pn-openmoko-session ?= "152"
SRCREV_pn-opkg-native ?= "4019"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pyneod ?= "86"
+SRCREV_pn-pyneog ?= "85"
SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-fso-pyproto = "70"
SRCREV_pn-python-gsmd = "127"
SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
+SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
SRCREV_pn-webkit-gtk ?= "28656"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1623"
-SRCREV_pn-mplayer ?= "24587"
-SRCREV_pn-networkmanager ?= "2887"
-SRCREV_pn-networkmanager-applet ?= "200"
-SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-usbpath ?= "3108"
-SRCREV_pn-usbpath-native ?= "3108"
+
DISTRO_VERSION = "P1-Snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat"
OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
-PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
FEED_URIS = "\
snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-
DISTRO_NAME = "OpenWRT"
DISTRO_REVISION = "2"
+# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them
IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
# This is what lives in SDK
ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# Rename packages to names used in OpenWRT
+PKG_ncurses = "libncurses"
+
# Make sure that we have correct package dependencies for SDK-provided libs.
ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
PREFERRED_VERSION_glibc = "2.2.5"
QTE_VERSION = "2.3.10"
OPIE_VERSION = "1.2.2"
PALMTOP_USE_MULTITHREADED_QT = "no"
+export palmtopdir = "/opt/QtPalmtop"
require conf/distro/include/preferred-opie-versions.inc
#
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+PREFERRED_VERSION_u-boot ?= "git"
MACHINE_FEATURES = "kernel26 usbhost ext2"
TARGET_FPU ?= "soft"
PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
BB_MIN_VERSION = "1.8.10"
+
+#
+# SANITY_ABI allows us to notify users when the format of TMPDIR changes in
+# an incompatible way. Such changes should usually be detailed in the commit
+# that breaks the format and have been previously discussed on the mailing list
+# with general agreement from the core team.
+#
+SANITY_ABI = "0"
+SANITY_ABIFILE = "${TMPDIR}/abi_version"
+
INHERIT += "sanity"
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+ id="svg1"
+ sodipodi:version="0.32"
+ inkscape:version="0.38.1"
+ width="8.0000000cm"
+ height="6.0000000cm"
+ sodipodi:docname="oe-2.svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ sodipodi:docbase="/home/kergoth/docs/oe/logos/phil">
+ <defs
+ id="defs3" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.9119411"
+ inkscape:cx="130.17182"
+ inkscape:cy="82.153497"
+ inkscape:window-width="1600"
+ inkscape:window-height="1181"
+ showguides="true"
+ snaptoguides="true"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;"
+ d="M 150.60592,91.743209 C 150.60592,126.90946 122.06521,155.45016 86.898980,155.45016 C 51.732741,155.45016 23.192037,126.90946 23.192037,91.743209 C 23.192037,56.576987 51.732741,28.036281 86.898980,28.036281 C 122.06521,28.036281 150.60592,56.576987 150.60592,91.743209 z M 125.59088,91.743225 C 125.59088,123.01260 108.25691,148.39065 86.898996,148.39065 C 65.541064,148.39065 48.207098,123.01260 48.207098,91.743225 C 48.207098,60.473843 65.541064,35.095803 86.898996,35.095803 C 108.25691,35.095803 125.59088,60.473843 125.59088,91.743225 z "
+ id="path861" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000;fill-opacity:1.0000000;stroke-dasharray:none;"
+ d="M 132.75147,91.356420 C 132.87448,64.917742 151.72789,27.858725 196.63972,27.835097 C 207.45455,27.890687 223.63895,35.346804 225.55952,41.517017 C 183.84040,25.116588 151.35632,59.619550 151.26456,91.865400 C 151.42728,124.36573 184.86806,158.68422 225.66493,141.78379 C 222.82764,147.71089 208.80153,155.59326 196.50275,155.65048 C 151.84536,155.85942 132.62846,118.04958 132.75147,91.356420 z "
+ id="path869"
+ sodipodi:nodetypes="csczcsz" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;"
+ d="M 173.2093 62.12526 C 187.1012 61.82853 198.1696 76.01726 198.3348 91.56551 C 198.4135 107.2003 187.9133 121.6873 173.1847 121.1256 C 187.7964 112.1516 188.1917 94.48494 188.1594 91.61621 C 188.1270 88.66092 187.4490 70.73875 173.2093 62.12526 z "
+ id="path877"
+ sodipodi:nodetypes="czczc" />
+ <g
+ id="g921"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-188.5137,-265.4138)">
+ <text
+ xml:space="preserve"
+ style="font-size:56.000000;stroke-width:3.0000000pt;font-family:Verdana;"
+ x="417.81043"
+ y="1061.9202"
+ id="text902"
+ sodipodi:linespacing="100%"
+ transform="matrix(0.631134,0.000000,0.000000,0.631134,3.430357,0.000000)">
+ <tspan
+ id="tspan903"
+ style="fill:#000000;fill-opacity:1.0000000;">open</tspan>
+ </text>
+ <text
+ xml:space="preserve"
+ style="font-size:56.000000;fill:#929292;stroke-width:3.0000000pt;font-family:Verdana;"
+ x="567.82333"
+ y="1061.9202"
+ id="text905"
+ sodipodi:linespacing="100%"
+ transform="scale(0.631134,0.631134)">
+ <tspan
+ id="tspan906"
+ style="fill:#929292;fill-opacity:1.0000000;">embedded</tspan>
+ </text>
+ </g>
+ <g
+ id="g945"
+ style="stroke:#000000;stroke-opacity:0.1200;">
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-opacity:0.1200;"
+ d="M 210.10063,527.64010 L 600.37556,527.64010"
+ id="path840"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 577.34380,527.64009 C 577.34380,579.33452 535.38890,621.28942 483.69447,621.28942 C 432.00004,621.28942 390.04514,579.33452 390.04514,527.64009 C 390.04514,475.94566 432.00004,433.99076 483.69447,433.99076 C 535.38890,433.99076 577.34380,475.94566 577.34380,527.64009 z "
+ id="path849"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 378.24332,527.64008 C 378.24332,558.43082 353.25373,583.42040 322.46301,583.42040 C 291.67226,583.42040 266.68267,558.43082 266.68267,527.64008 C 266.68267,496.84933 291.67226,471.85976 322.46301,471.85976 C 353.25373,471.85976 378.24332,496.84933 378.24332,527.64008 z "
+ id="path839"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 322.46300,422.21153 L 322.46300,633.06864"
+ id="path841"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 539.47480,527.64009 C 539.47480,558.43083 514.48521,583.42041 483.69449,583.42041 C 452.90374,583.42041 427.91415,558.43083 427.91415,527.64009 C 427.91415,496.84934 452.90374,471.85977 483.69449,471.85977 C 514.48521,471.85977 539.47480,496.84934 539.47480,527.64009 z "
+ id="path850"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 483.69448,422.21153 L 483.69448,633.06864"
+ id="path851"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.76683110;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 144.34955,91.743214 C 144.34955,123.45594 118.61168,149.19380 86.898970,149.19380 C 55.186251,149.19380 29.448400,123.45594 29.448400,91.743214 C 29.448400,60.030495 55.186251,34.292644 86.898970,34.292644 C 118.61168,34.292644 144.34955,60.030495 144.34955,91.743214 z "
+ id="path943" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.76683110;stroke-linejoin:round;stroke-opacity:0.1200;"
+ d="M 254.03070,91.743050 C 254.03070,123.45578 228.29283,149.19364 196.58012,149.19364 C 164.86740,149.19364 139.12954,123.45578 139.12954,91.743050 C 139.12954,60.030332 164.86740,34.292480 196.58012,34.292480 C 228.29283,34.292480 254.03070,60.030332 254.03070,91.743050 z "
+ id="path944" />
+ </g>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg1"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ width="8.0000000cm"
+ height="6.0000000cm"
+ sodipodi:docname="oe.svg"
+ sodipodi:docbase="/home/mallum/Desktop"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata22">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.621852"
+ inkscape:cx="141.73228"
+ inkscape:cy="106.29921"
+ inkscape:window-width="1600"
+ inkscape:window-height="972"
+ showguides="true"
+ snaptoguides="true"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="svg1" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+ d="M 150.60592,99.743209 C 150.60592,134.90946 122.06521,163.45016 86.89898,163.45016 C 51.732741,163.45016 23.192037,134.90946 23.192037,99.743209 C 23.192037,64.576987 51.732741,36.036281 86.89898,36.036281 C 122.06521,36.036281 150.60592,64.576987 150.60592,99.743209 z M 125.59088,99.743225 C 125.59088,131.0126 108.25691,156.39065 86.898996,156.39065 C 65.541064,156.39065 48.207098,131.0126 48.207098,99.743225 C 48.207098,68.473843 65.541064,43.095803 86.898996,43.095803 C 108.25691,43.095803 125.59088,68.473843 125.59088,99.743225 z "
+ id="path861" />
+ <path
+ style="fill:#9ca3c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d="M 132.75147,99.35642 C 132.87448,72.917742 151.72789,35.858725 196.63972,35.835097 C 207.45455,35.890687 223.63895,43.346804 225.55952,49.517017 C 183.8404,33.116588 151.35632,67.61955 151.26456,99.8654 C 151.42728,132.36573 184.86806,166.68422 225.66493,149.78379 C 222.82764,155.71089 208.80153,163.59326 196.50275,163.65048 C 151.84536,163.85942 132.62846,126.04958 132.75147,99.35642 z "
+ id="path869"
+ sodipodi:nodetypes="csczcsz" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+ d="M 173.2093,70.12526 C 187.1012,69.82853 198.1696,84.01726 198.3348,99.56551 C 198.4135,115.2003 187.9133,129.6873 173.1847,129.1256 C 187.7964,120.1516 188.1917,102.48494 188.1594,99.61621 C 188.127,96.66092 187.449,78.73875 173.2093,70.12526 z "
+ id="path877"
+ sodipodi:nodetypes="czczc" />
+ <g
+ id="g921"
+ transform="matrix(0.680271,0,0,0.680271,-188.5137,-257.4138)">
+ <text
+ xml:space="preserve"
+ style="font-size:56px;line-height:100%;stroke-width:3pt;font-family:Verdana"
+ x="417.81042"
+ y="1061.9202"
+ id="text902"
+ sodipodi:linespacing="100%"
+ transform="matrix(0.631134,0,0,0.631134,3.430357,0)"> <tspan
+ id="tspan903"
+ style="fill:#000000;fill-opacity:1">open</tspan> </text>
+ <text
+ xml:space="preserve"
+ style="font-size:56px;line-height:100%;fill:#929292;stroke-width:3pt;font-family:Verdana"
+ x="567.8233"
+ y="1061.9202"
+ id="text905"
+ sodipodi:linespacing="100%"
+ transform="scale(0.631134,0.631134)"> <tspan
+ id="tspan906"
+ style="fill:#929292;fill-opacity:1">embedded</tspan> </text>
+ </g>
+ <g
+ id="g945"
+ style="stroke:#000000;stroke-opacity:0.12000002"
+ transform="translate(0,8)">
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-opacity:0.12000002"
+ d="M 210.10063,527.6401 L 600.37556,527.6401"
+ id="path840"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 577.3438,527.64009 C 577.3438,579.33452 535.3889,621.28942 483.69447,621.28942 C 432.00004,621.28942 390.04514,579.33452 390.04514,527.64009 C 390.04514,475.94566 432.00004,433.99076 483.69447,433.99076 C 535.3889,433.99076 577.3438,475.94566 577.3438,527.64009 z "
+ id="path849"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 378.24332,527.64008 C 378.24332,558.43082 353.25373,583.4204 322.46301,583.4204 C 291.67226,583.4204 266.68267,558.43082 266.68267,527.64008 C 266.68267,496.84933 291.67226,471.85976 322.46301,471.85976 C 353.25373,471.85976 378.24332,496.84933 378.24332,527.64008 z "
+ id="path839"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 322.463,422.21153 L 322.463,633.06864"
+ id="path841"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 539.4748,527.64009 C 539.4748,558.43083 514.48521,583.42041 483.69449,583.42041 C 452.90374,583.42041 427.91415,558.43083 427.91415,527.64009 C 427.91415,496.84934 452.90374,471.85977 483.69449,471.85977 C 514.48521,471.85977 539.4748,496.84934 539.4748,527.64009 z "
+ id="path850"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 483.69448,422.21153 L 483.69448,633.06864"
+ id="path851"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7668311;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 144.34955,91.743214 C 144.34955,123.45594 118.61168,149.1938 86.89897,149.1938 C 55.186251,149.1938 29.4484,123.45594 29.4484,91.743214 C 29.4484,60.030495 55.186251,34.292644 86.89897,34.292644 C 118.61168,34.292644 144.34955,60.030495 144.34955,91.743214 z "
+ id="path943" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7668311;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 254.0307,91.74305 C 254.0307,123.45578 228.29283,149.19364 196.58012,149.19364 C 164.8674,149.19364 139.12954,123.45578 139.12954,91.74305 C 139.12954,60.030332 164.8674,34.29248 196.58012,34.29248 C 228.29283,34.29248 254.0307,60.030332 254.0307,91.74305 z "
+ id="path944" />
+ </g>
+ <text
+ sodipodi:linespacing="100%"
+ id="text2180"
+ y="24.027855"
+ x="71.040924"
+ style="font-size:24.0431633px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#929292;stroke-width:3pt;font-family:Verdana"
+ xml:space="preserve"><tspan
+ sodipodi:role="line"
+ id="tspan2195"
+ x="71.040924"
+ y="24.027855">Powered by</tspan></text>
+</svg>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-<svg
- id="svg1"
- sodipodi:version="0.32"
- inkscape:version="0.38.1"
- width="8.0000000cm"
- height="6.0000000cm"
- sodipodi:docname="oe-2.svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xml="http://www.w3.org/XML/1998/namespace"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- sodipodi:docbase="/home/kergoth/docs/oe/logos/phil">
- <defs
- id="defs3" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="4.9119411"
- inkscape:cx="130.17182"
- inkscape:cy="82.153497"
- inkscape:window-width="1600"
- inkscape:window-height="1181"
- showguides="true"
- snaptoguides="true"
- inkscape:window-x="0"
- inkscape:window-y="0" />
- <path
- style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;"
- d="M 150.60592,91.743209 C 150.60592,126.90946 122.06521,155.45016 86.898980,155.45016 C 51.732741,155.45016 23.192037,126.90946 23.192037,91.743209 C 23.192037,56.576987 51.732741,28.036281 86.898980,28.036281 C 122.06521,28.036281 150.60592,56.576987 150.60592,91.743209 z M 125.59088,91.743225 C 125.59088,123.01260 108.25691,148.39065 86.898996,148.39065 C 65.541064,148.39065 48.207098,123.01260 48.207098,91.743225 C 48.207098,60.473843 65.541064,35.095803 86.898996,35.095803 C 108.25691,35.095803 125.59088,60.473843 125.59088,91.743225 z "
- id="path861" />
- <path
- style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000;fill-opacity:1.0000000;stroke-dasharray:none;"
- d="M 132.75147,91.356420 C 132.87448,64.917742 151.72789,27.858725 196.63972,27.835097 C 207.45455,27.890687 223.63895,35.346804 225.55952,41.517017 C 183.84040,25.116588 151.35632,59.619550 151.26456,91.865400 C 151.42728,124.36573 184.86806,158.68422 225.66493,141.78379 C 222.82764,147.71089 208.80153,155.59326 196.50275,155.65048 C 151.84536,155.85942 132.62846,118.04958 132.75147,91.356420 z "
- id="path869"
- sodipodi:nodetypes="csczcsz" />
- <path
- style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.8625;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;"
- d="M 173.2093 62.12526 C 187.1012 61.82853 198.1696 76.01726 198.3348 91.56551 C 198.4135 107.2003 187.9133 121.6873 173.1847 121.1256 C 187.7964 112.1516 188.1917 94.48494 188.1594 91.61621 C 188.1270 88.66092 187.4490 70.73875 173.2093 62.12526 z "
- id="path877"
- sodipodi:nodetypes="czczc" />
- <g
- id="g921"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-188.5137,-265.4138)">
- <text
- xml:space="preserve"
- style="font-size:56.000000;stroke-width:3.0000000pt;font-family:Verdana;"
- x="417.81043"
- y="1061.9202"
- id="text902"
- sodipodi:linespacing="100%"
- transform="matrix(0.631134,0.000000,0.000000,0.631134,3.430357,0.000000)">
- <tspan
- id="tspan903"
- style="fill:#000000;fill-opacity:1.0000000;">open</tspan>
- </text>
- <text
- xml:space="preserve"
- style="font-size:56.000000;fill:#929292;stroke-width:3.0000000pt;font-family:Verdana;"
- x="567.82333"
- y="1061.9202"
- id="text905"
- sodipodi:linespacing="100%"
- transform="scale(0.631134,0.631134)">
- <tspan
- id="tspan906"
- style="fill:#929292;fill-opacity:1.0000000;">embedded</tspan>
- </text>
- </g>
- <g
- id="g945"
- style="stroke:#000000;stroke-opacity:0.1200;">
- <path
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-opacity:0.1200;"
- d="M 210.10063,527.64010 L 600.37556,527.64010"
- id="path840"
- sodipodi:nodetypes="cc"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 577.34380,527.64009 C 577.34380,579.33452 535.38890,621.28942 483.69447,621.28942 C 432.00004,621.28942 390.04514,579.33452 390.04514,527.64009 C 390.04514,475.94566 432.00004,433.99076 483.69447,433.99076 C 535.38890,433.99076 577.34380,475.94566 577.34380,527.64009 z "
- id="path849"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 378.24332,527.64008 C 378.24332,558.43082 353.25373,583.42040 322.46301,583.42040 C 291.67226,583.42040 266.68267,558.43082 266.68267,527.64008 C 266.68267,496.84933 291.67226,471.85976 322.46301,471.85976 C 353.25373,471.85976 378.24332,496.84933 378.24332,527.64008 z "
- id="path839"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 322.46300,422.21153 L 322.46300,633.06864"
- id="path841"
- sodipodi:nodetypes="cc"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 539.47480,527.64009 C 539.47480,558.43083 514.48521,583.42041 483.69449,583.42041 C 452.90374,583.42041 427.91415,558.43083 427.91415,527.64009 C 427.91415,496.84934 452.90374,471.85977 483.69449,471.85977 C 514.48521,471.85977 539.47480,496.84934 539.47480,527.64009 z "
- id="path850"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 483.69448,422.21153 L 483.69448,633.06864"
- id="path851"
- sodipodi:nodetypes="cc"
- transform="matrix(0.680271,0.000000,0.000000,0.680271,-132.4632,-267.1952)" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.76683110;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 144.34955,91.743214 C 144.34955,123.45594 118.61168,149.19380 86.898970,149.19380 C 55.186251,149.19380 29.448400,123.45594 29.448400,91.743214 C 29.448400,60.030495 55.186251,34.292644 86.898970,34.292644 C 118.61168,34.292644 144.34955,60.030495 144.34955,91.743214 z "
- id="path943" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.76683110;stroke-linejoin:round;stroke-opacity:0.1200;"
- d="M 254.03070,91.743050 C 254.03070,123.45578 228.29283,149.19364 196.58012,149.19364 C 164.86740,149.19364 139.12954,123.45578 139.12954,91.743050 C 139.12954,60.030332 164.86740,34.292480 196.58012,34.292480 C 228.29283,34.292480 254.03070,60.030332 254.03070,91.743050 z "
- id="path944" />
- </g>
-</svg>
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 48
+ value.1 48
}
control.2 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Capture ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.3 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Capture Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.4 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Headphone Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.5 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Speaker Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.6 {
comment.access 'read write'
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 220
+ value.1 220
}
control.11 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'Bass Volume'
- value 11
+ value 0
}
control.14 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 11
+ value 0
}
control.15 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name '3D Volume'
- value 9
+ value 0
}
control.18 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'ALC Capture ZC Switch'
- value false
+ value true
}
control.25 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 0
+ value 9
}
control.26 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Decay Time'
- value 3
+ value 9
}
control.27 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Attack Time'
- value 2
+ value 3
}
control.28 {
comment.access 'read write'
comment.range '0 - 255'
iface MIXER
name 'Right ADC Capture Volume'
- value 0
+ value 195
}
control.33 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'ZC Timeout Switch'
- value false
+ value true
}
control.34 {
comment.access 'read write'
comment.range '0 - 3'
iface MIXER
name 'Mic Boost'
- value.0 0
- value.1 0
+ value.0 3
+ value.1 3
}
control.37 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 105
+ value.1 105
}
control.42 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.43 {
comment.access 'read write'
comment.item.3 'Digital Mono'
iface MIXER
name 'Right ADC Mux'
- value 'Mono (Left)'
+ value 'Digital Mono'
}
control.45 {
comment.access 'read write'
comment.item.3 'Digital Mono'
iface MIXER
name 'Left ADC Mux'
- value 'Mono (Left)'
+ value 'Digital Mono'
}
control.46 {
comment.access 'read write'
comment.item.4 Differential
iface MIXER
name 'Right Line Mux'
- value 'Line 2'
+ value Differential
}
control.49 {
comment.access 'read write'
comment.item.4 Differential
iface MIXER
name 'Left Line Mux'
- value 'Line 1'
+ value Differential
}
control.50 {
comment.access 'read write'
comment.item.3 Differential
iface MIXER
name 'Right PGA Mux'
- value 'Line 2'
+ value Differential
}
control.51 {
comment.access 'read write'
comment.item.3 Differential
iface MIXER
name 'Left PGA Mux'
- value 'Line 1'
+ value Differential
}
control.52 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.4 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 0
+ value.1 0
}
control.5 {
comment.access 'read write'
--- /dev/null
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 255
+ value.1 255
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 127
+ value.1 127
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 115
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 true
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 true
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 3
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 1
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 1
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 7
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 2
+ value.1 2
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 24
+ value.1 24
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 true
+ value.1 true
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value HiFi
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value false
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 1
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Stereo
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 7
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 12
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value Stereo
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 + 2'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Line Mix'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Rx Mix'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Rx Mix'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value true
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Left PGA'
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value PGA
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value Stereo
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value Stereo
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'
+ value false
+ }
+ control.68 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Left Capture Swi'
+ value false
+ }
+ control.69 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Right Capture Sw'
+ value false
+ }
+ control.70 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'Capture ST'
+ comment.item.2 LOUT2
+ iface MIXER
+ name 'Out4 Mux'
+ value VREF
+ }
+ control.71 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 ROUT2
+ comment.item.2 'Left + Right'
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.72 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Inverted Mono 1'
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 'Left + Right'
+ iface MIXER
+ name 'Mono 2 Mux'
+ value 'Inverted Mono 1'
+ }
+ control.73 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.74 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.75 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Voice Playback Switc'
+ value false
+ }
+ control.76 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Sidetone Playback Sw'
+ value true
+ }
+ control.77 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Bypass Playback Swit'
+ value false
+ }
+ control.78 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Voice Playback Swit'
+ value false
+ }
+ control.79 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Sidetone Playback S'
+ value true
+ }
+ control.80 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Playback Swit'
+ value false
+ }
+ control.81 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Bypass Playback Swi'
+ value false
+ }
+ control.82 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Voice Playback Switc'
+ value false
+ }
+ control.83 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.84 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Playback Switch'
+ value false
+ }
+ control.85 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Bypass Playback Swit'
+ value true
+ }
+ control.86 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Stereo Out Switch'
+ value true
+ }
+ control.87 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line Out Switch'
+ value true
+ }
+ control.88 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line In Switch'
+ value false
+ }
+ control.89 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Headset Mic Switch'
+ value false
+ }
+ control.90 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Mic Switch'
+ value true
+ }
+ control.91 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Spk Switch'
+ value true
+ }
+}
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.4 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 0
+ value.1 0
}
control.5 {
comment.access 'read write'
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 48
+ value.1 48
}
control.2 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Capture ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.3 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Capture Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.4 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Headphone Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.5 {
comment.access 'read write'
comment.count 2
iface MIXER
name 'Speaker Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.6 {
comment.access 'read write'
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 220
+ value.1 220
}
control.11 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 15
+ value 0
}
control.15 {
comment.access 'read write'
comment.item.1 Playback
iface MIXER
name '3D Mode'
- value Capture
+ value Playback
}
control.21 {
comment.access 'read write'
comment.item.3 Stereo
iface MIXER
name 'ALC Capture Function'
- value Off
+ value Left
}
control.24 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'ALC Capture ZC Switch'
- value false
+ value true
}
control.25 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 0
+ value 9
}
control.26 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Decay Time'
- value 3
+ value 9
}
control.27 {
comment.access 'read write'
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Attack Time'
- value 2
+ value 3
}
control.28 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'ZC Timeout Switch'
- value false
+ value true
}
control.34 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'Right Speaker Playback Invert Switch'
- value false
+ value true
}
control.36 {
comment.access 'read write'
comment.range '0 - 3'
iface MIXER
name 'Mic Boost'
- value.0 0
- value.1 0
+ value.0 3
+ value.1 3
}
control.37 {
comment.access 'read write'
comment.range '0 - 7'
iface MIXER
name 'Bypass Left Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.38 {
comment.access 'read write'
comment.range '0 - 7'
iface MIXER
name 'Bypass Right Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.39 {
comment.access 'read write'
comment.range '0 - 7'
iface MIXER
name 'Bypass Mono Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.40 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 105
+ value.1 105
}
control.42 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.43 {
comment.access 'read write'
comment.range '0 - 127'
iface MIXER
name 'Mono Playback Volume'
- value 121
+ value 0
}
control.44 {
comment.access 'read write'
comment.item.3 'Digital Mono'
iface MIXER
name 'Right ADC Mux'
- value Stereo
+ value 'Digital Mono'
}
control.45 {
comment.access 'read write'
comment.item.3 'Digital Mono'
iface MIXER
name 'Left ADC Mux'
- value Stereo
+ value 'Digital Mono'
}
control.46 {
comment.access 'read write'
comment.item.4 Differential
iface MIXER
name 'Right Line Mux'
- value 'Line 1'
+ value Differential
}
control.49 {
comment.access 'read write'
comment.item.4 Differential
iface MIXER
name 'Left Line Mux'
- value 'Line 1'
+ value Differential
}
control.50 {
comment.access 'read write'
comment.item.3 Differential
iface MIXER
name 'Right PGA Mux'
- value 'Line 1'
+ value Differential
}
control.51 {
comment.access 'read write'
comment.item.3 Differential
iface MIXER
name 'Left PGA Mux'
- value 'Line 1'
+ value Differential
}
control.52 {
comment.access 'read write'
comment.count 1
iface MIXER
name 'Right Mixer Left Playback Switc'
- value true
+ value false
}
control.57 {
comment.access 'read write'
LICENSE = "GPL"
RDEPENDS_${PN} = "${PN}-conf"
RDEPENDS_${PN}-conf = "${PN}"
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools kexec-tools kernel-module-loop"
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck e2fsprogs-mke2fs dosfstools kexec-tools kernel-module-loop"
RRECOMMENDS_${PN}_spitz += " kernel-module-jffs2"
S = "${WORKDIR}/trunk/"
#RDEPENDS_${PN}_append_poodle = " kexec-tools"
#RDEPENDS_${PN}-conf = "${PN}"
-PR = "r1"
+PR = "r2"
SVN_REV="65"
#TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
require altboot.inc
-PR = "r3"
+PR = "r4"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
+++ /dev/null
-require altboot.inc
-
-PR = "r1"
-
-SVN_REV = "78"
-SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
- "
-
-do_install() {
- install -d ${D}/sbin
- install -d ${D}/etc/altboot-menu
- install -d ${D}/etc/altboot.rc
- install -d ${D}/usr/share/doc/altboot
- install -d ${D}/usr/share/sounds
-
- if test -d ${S}/${MACHINE_DIR}
- then
- install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
- else
- install -m 0644 ${S}/altboot*.cfg ${D}/etc/
- fi
-
- install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
- install -m 0644 ${S}/altboot.func ${D}/etc
- install -m 0644 ${S}/altboot.sbin ${D}/etc
- install -m 0644 ${S}/altbootctl.conf ${D}/etc
- install -m 0755 ${S}/init.altboot ${D}/sbin
- install -m 0755 ${S}/altbootctl ${D}/sbin
-
- ln -s /sbin/init.altboot ${D}/sbin/altboot
-
- if test -d ${S}/${MACHINE_DIR}/altboot-menu
- then
- install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
-
- if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
- then
- install -d ${D}/etc/altboot-menu/Advanced
- install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
- fi
- else
- install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
- if test -d ${S}/altboot-menu/Advanced
- then
- install -d ${D}/etc/altboot-menu/Advanced
- install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
- fi
- fi
-
- if test -d ${S}/${MACHINE_DIR}/altboot.rc
- then
- install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
- install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
- else
- install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
- install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
- fi
-}
-
-do_configure() {
- cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
- mv ${S}/init.altboot_ ${S}/init.altboot
-}
-
-pkg_postinst_${PN}() {
- test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
-
- update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-pkg_postrm_${PN}() {
- test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
-
- update-alternatives --remove init /sbin/init.altboot
-}
--- /dev/null
+require altboot.inc
+
+PR = "r0"
+
+SVN_REV = "80"
+SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
+ "
+
+do_install() {
+ install -d ${D}/sbin
+ install -d ${D}/etc/altboot-menu
+ install -d ${D}/etc/altboot.rc
+ install -d ${D}/usr/share/doc/altboot
+ install -d ${D}/usr/share/sounds
+
+ if test -d ${S}/${MACHINE_DIR}
+ then
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
+ else
+ install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+ fi
+
+ install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+ install -m 0644 ${S}/altboot.func ${D}/etc
+ install -m 0644 ${S}/altboot.sbin ${D}/etc
+ install -m 0644 ${S}/altbootctl.conf ${D}/etc
+ install -m 0755 ${S}/init.altboot ${D}/sbin
+ install -m 0755 ${S}/altbootctl ${D}/sbin
+
+ ln -s /sbin/init.altboot ${D}/sbin/altboot
+
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+ then
+ install -d ${D}/etc/altboot-menu/Advanced
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ else
+ install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ if test -d ${S}/altboot-menu/Advanced
+ then
+ install -d ${D}/etc/altboot-menu/Advanced
+ install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
+ fi
+
+ if test -d ${S}/${MACHINE_DIR}/altboot.rc
+ then
+ install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ else
+ install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+ fi
+}
+
+do_configure() {
+ cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+ mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+pkg_postinst_${PN}() {
+ test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+
+ update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+pkg_postrm_${PN}() {
+ test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+
+ update-alternatives --remove init /sbin/init.altboot
+}
require altboot.inc
PV = "1.1.1+wip-${SRCDATE}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;proto=svn"
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
inherit task
RDEPENDS_${PN} = "\
nmap \
- ettercap \
+ ettercap-ng \
stunnel \
curl \
# dsniff \
require apt-native.inc
+PR = "r1"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
require apt-native.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
require apt-native.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
-Dir "${STAGING_DIR}/"
+Dir "${STAGING_DIR_NATIVE}/"
{
State "var/lib/apt/"
{
'LD=${KERNEL_LD}' \
'KDIR=${STAGING_KERNEL_DIR}'"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+ -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}"
do_install() {
install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\
+ --with-z=${STAGING_EXECPREFIXDIR}\
+ --with-curl=${STAGING_EXECPREFIXDIR}\
+ --with-termcap=${STAGING_EXECPREFIXDIR}\
+ --with-ogg=${STAGING_EXECPREFIXDIR}\
+ --with-vorbis=${STAGING_EXECPREFIXDIR}\
+ --with-sqlite=${STAGING_EXECPREFIXDIR}\
+ --with-popt=${STAGING_EXECPREFIXDIR}\
+ --with-gnutls=${STAGING_EXECPREFIXDIR}\
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR}\
--without-imap\
--without-netsnmp\
--without-odbc\
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
do_compile() {
(
#make sure that menuselect gets build using host toolchain
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB
cd menuselect
./configure
oe_runmake
exec_prefix = "${prefix}"
do_stage () {
-# install into CROSS_DIR
+ # install into CROSS_DIR
oe_runmake install
-# install into STAGING_DIR
- oe_runmake "prefix=${STAGING_DIR}" "exec_prefix=${STAGING_DIR}" \
+ # install into staging
+ oe_runmake "prefix=${STAGING_DIR_HOST}${layout_prefix}" \
+ "exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" \
"bindir=${STAGING_BINDIR}" "libdir=${STAGING_LIBDIR}" \
- "tooldir=${STAGING_DIR}" "toolibdir=${STAGING_LIBDIR}" \
+ "tooldir=${STAGING_DIR_HOST}" "toolibdir=${STAGING_LIBDIR}" \
install
}
--- /dev/null
+DESCRIPTION = "Blackbox Window Manager"
+SECTION = "x11/wm"
+LICENSE = "GPL"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
+ file://remove-host-includes.patch;patch=1"
+S = "${WORKDIR}/blackbox-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+
--- /dev/null
+Index: blackbox-0.70.1/configure.ac
+===================================================================
+--- blackbox-0.70.1.orig/configure.ac
++++ blackbox-0.70.1/configure.ac
+@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])
+ dnl Determine default prefix
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+
+-dnl Look in the most logical places for external libraries
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+- LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ dnl Locate required external software
+ AC_PROG_CC
+
S = "${WORKDIR}/${BOOST_P}"
# Make a package for each library, plus -dev and -python
-PACKAGES =
+PACKAGES = "${PN}-dbg"
+BOOSTLIBS = ""
PACKAGES += "boost-date-time"
FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
-PACKAGES += "boost-filesystem"
+BOOSTLIBS += "boost-filesystem"
FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
-PACKAGES += "boost-prg-exec-monitor"
+BOOSTLIBS += "boost-prg-exec-monitor"
FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
-PACKAGES += "boost-program-options"
+BOOSTLIBS += "boost-program-options"
FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
-PACKAGES += "boost-regex"
+BOOSTLIBS += "boost-regex"
FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
-PACKAGES += "boost-signals"
+BOOSTLIBS += "boost-signals"
FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
-PACKAGES += "boost-test-exec-monitor"
+BOOSTLIBS += "boost-test-exec-monitor"
FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
-PACKAGES += "boost-thread-mt"
+BOOSTLIBS += "boost-thread-mt"
FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
-PACKAGES += "boost-unit-test-framework"
+BOOSTLIBS += "boost-unit-test-framework"
FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
-PACKAGES += "boost-iostreams"
+BOOSTLIBS += "boost-iostreams"
FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
-PACKAGES += "boost-serialization"
+BOOSTLIBS += "boost-serialization"
FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
-PACKAGES += "boost-wserialization"
+BOOSTLIBS += "boost-wserialization"
FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
# Python - remove this and set:
PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
-PACKAGES += "boost-python"
+BOOSTLIBS += "boost-python"
FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+PACKAGES += "${BOOSTLIBS}"
+
# -dev last to pick up the remaining stuff
PACKAGES += "${PN}-dev"
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+
# Oh yippee, a new build system, it's sooo cooool I could eat my own
# foot. inlining=on lets the compiler choose, I think. At least this
# stuff is documented...
S = "${WORKDIR}/${BOOST_P}"
# Make a package for each library, plus -dev and -python
-PACKAGES =
+PACKAGES = "${PN}-dbg"
+BOOSTLIBS = ""
PACKAGES += "boost-date-time"
FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
-PACKAGES += "boost-filesystem"
+BOOSTLIBS += "boost-filesystem"
FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
-PACKAGES += "boost-prg-exec-monitor"
+BOOSTLIBS += "boost-prg-exec-monitor"
FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
-PACKAGES += "boost-program-options"
+BOOSTLIBS += "boost-program-options"
FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
-PACKAGES += "boost-regex"
+BOOSTLIBS += "boost-regex"
FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
-PACKAGES += "boost-signals"
+BOOSTLIBS += "boost-signals"
FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
-PACKAGES += "boost-test-exec-monitor"
+BOOSTLIBS += "boost-test-exec-monitor"
FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
-PACKAGES += "boost-thread-mt"
+BOOSTLIBS += "boost-thread-mt"
FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
-PACKAGES += "boost-unit-test-framework"
+BOOSTLIBS += "boost-unit-test-framework"
FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
-PACKAGES += "boost-iostreams"
+BOOSTLIBS += "boost-iostreams"
FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
-PACKAGES += "boost-serialization"
+BOOSTLIBS += "boost-serialization"
FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
-PACKAGES += "boost-wserialization"
+BOOSTLIBS += "boost-wserialization"
FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
# Python - remove this and set:
PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
-PACKAGES += "boost-python"
+BOOSTLIBS += "boost-python"
FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+PACKAGES += "${BOOSTLIBS}"
+
# -dev last to pick up the remaining stuff
PACKAGES += "${PN}-dev"
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+
# Oh yippee, a new build system, it's sooo cooool I could eat my own
# foot. inlining=on lets the compiler choose, I think. At least this
# stuff is documented...
require bootsplash_${PV}.bb
+DEPENDS += "jpeg-native"
+
inherit native
S="${WORKDIR}/bootsplash-${PV}"
# CONFIG_FEATURE_SHADOWPASSWDS is not set
# CONFIG_USE_BB_SHADOW is not set
# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-CONFIG_ADDUSER=y
-CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
# CONFIG_PAM is not set
# CONFIG_LOGIN_SCRIPTS is not set
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
# CONFIG_CRYPTPW is not set
# CONFIG_CHPASSWD is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
# CONFIG_SULOGIN is not set
-CONFIG_VLOCK=y
+# CONFIG_VLOCK is not set
#
# Linux Ext2 FS Progs
--- /dev/null
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.9.1
+# Thu Feb 14 11:54:00 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_SULOGIN is not set
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+# CONFIG_HD is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TTYSIZE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+# CONFIG_PSCAN is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+# CONFIG_APP_DHCPRELAY is not set
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# ipsvd utilities
+#
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set
--- /dev/null
+Summary: 0001591: inconsistent behavior of sort -z
+
+URL: http://busybox.net/bugs/view.php?id=1591
+http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u
+
+Description:
+
+busybox sort -z does:
+use NUL instead of EOL on input
+
+GNU sort -z does:
+use NUL instead of EOL on input and output
+
+GNU sort -z documents:
+use NUL instead of EOL on input
+
+Additional Information:
+
+Note that sort -z is not part of any standard. But several applications
+(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior.
+
+GNU sort documentation bug was reported to coreutils maintainers.
+
+Notes:
+
+vda 02-13-08 06:30 (0004364)
+Fixed in revision 21004. Thanks!
+
+--- busybox/coreutils/sort.c 2007/11/16 12:39:16 20435
++++ busybox/coreutils/sort.c 2008/02/13 14:30:33 21004
+@@ -32,7 +32,7 @@
+ FLAG_u = 8, /* Unique */
+ FLAG_c = 0x10, /* Check: no output, exit(!ordered) */
+ FLAG_s = 0x20, /* Stable sort, no ascii fallback at end */
+- FLAG_z = 0x40, /* Input is null terminated, not \n */
++ FLAG_z = 0x40, /* Input and output is NUL terminated, not \n */
+ /* These can be applied to search keys, the previous four can't */
+ FLAG_b = 0x80, /* Ignore leading blanks */
+ FLAG_r = 0x100, /* Reverse */
+@@ -396,8 +396,9 @@
+ if (linecount) linecount = flag+1;
+ }
+ /* Print it */
++ flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+ for (i = 0; i < linecount; i++)
+- fprintf(outfile, "%s\n", lines[i]);
++ fprintf(outfile, "%s%c", lines[i], flag);
+
+ fflush_stdout_and_exit(EXIT_SUCCESS);
+ }
SECTION = "base"
PRIORITY = "required"
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
- file://busybox-cron \
- file://busybox-httpd \
- file://busybox-udhcpd \
- file://default.script \
- file://dhcp-hostname.patch;patch=1 \
- file://hwclock.sh \
- file://ifupdown-spurious-environ.patch;patch=1 \
- file://mount.busybox \
- file://syslog \
- file://syslog.conf \
- file://udhcpscript.patch;patch=1 \
- file://umount.busybox"
+SRC_URI = "\
+ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+ file://busybox-cron \
+ file://busybox-httpd \
+ file://busybox-udhcpd \
+ file://default.script \
+ file://dhcp-hostname.patch;patch=1 \
+ file://hwclock.sh \
+ file://ifupdown-spurious-environ.patch;patch=1 \
+ file://mount.busybox \
+ file://syslog \
+ file://syslog.conf \
+ file://udhcpscript.patch;patch=1 \
+ file://umount.busybox \
+"
SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-FILES_${PN} += " ${datadir}/udhcpc"
+FILES_${PN} += "${datadir}/udhcpc"
INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
inherit cml1 update-rc.d
-do_compile () {
- unset CFLAGS
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
base_do_compile
}
+do_install () {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ install -d ${D}${sysconfdir}/init.d
+ oe_runmake "PREFIX=${D}" install
+ cp -pPR ${S}/_install/* ${D}/
+
+ # Move everything to /busybox (not supposed to end up in any package)
+ install -d ${D}/busybox
+ ls ${D} -R
+
+ cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+ # Move the busybox binary back to /bin
+ install -d ${D}${base_bindir}
+ mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+ # Move back the sh symlink
+ test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+ install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+ # Move crond back to /usr/sbin/crond
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+ # Move httpd back to /usr/sbin/httpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+ install -d ${D}/srv/www
+ fi
+ if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+ # Move udhcpd back to /usr/sbin/udhcpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+ # Move hwclock back to /sbin/hwclock
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+ install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+ # Move dhcpc back to /usr/sbin/udhcpc
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+ install -d ${D}${sysconfdir}/udhcpc.d
+ install -d ${D}${datadir}/udhcpc
+ install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+ install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+ fi
+
+ install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
pkg_postinst_${PN} () {
# If we are not making an image we create links for the utilities that doesn't exist
# so the update-alternatives script will get the utilities it needs
# This adds the links, remember that this has to work when building an image too, hence the $D
while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
}
+
+pkg_prerm_${PN} () {
+ # This is so you can make busybox commit suicide - removing busybox with no other packages
+ # providing its files, this will make update-alternatives work, but the update-rc.d part
+ # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+ tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+ ln -s /bin/busybox $tmpdir/[
+ ln -s /bin/busybox $tmpdir/test
+ ln -s /bin/busybox $tmpdir/head
+ ln -s /bin/busybox $tmpdir/sh
+ ln -s /bin/busybox $tmpdir/basename
+ ln -s /bin/busybox $tmpdir/echo
+ ln -s /bin/busybox $tmpdir/mv
+ ln -s /bin/busybox $tmpdir/ln
+ ln -s /bin/busybox $tmpdir/dirname
+ ln -s /bin/busybox $tmpdir/rm
+ ln -s /bin/busybox $tmpdir/sed
+ ln -s /bin/busybox $tmpdir/sort
+ export PATH=$PATH:$tmpdir
+
+ while read link
+ do
+ case "$link" in
+ /*/*/*) to="../../bin/busybox";;
+ /bin/*) to="busybox";;
+ /*/*) to="../bin/busybox";;
+ esac
+ bn=`basename $link`
+ sh /usr/bin/update-alternatives --remove $bn $to
+ done </etc/busybox.links
+}
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
file://udhcpscript.patch;patch=1 \
file://adduser-longops.patch;patch=1 \
+ file://sort-z-nul.patch;patch=1;status=upstream \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
install -m 0644 ${WORKDIR}/defconfig ${S}/.config
cml1_do_configure
}
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- base_do_compile
-}
-
-do_install () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- install -d ${D}${sysconfdir}/init.d
- oe_runmake "PREFIX=${D}" install
- cp -pPR ${S}/_install/* ${D}/
-
- # Move everything to /busybox (not supposed to end up in any package)
- install -d ${D}/busybox
- ls ${D} -R
-
- cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
- # Move the busybox binary back to /bin
- install -d ${D}${base_bindir}
- mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
- # Move back the sh symlink
- test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
-
- install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
- install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
- if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
- # Move crond back to /usr/sbin/crond
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
- # Move httpd back to /usr/sbin/httpd
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
- install -d ${D}/srv/www
- fi
- if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
- # Move udhcpd back to /usr/sbin/udhcpd
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
- # Move hwclock back to /sbin/hwclock
- install -d ${D}${base_sbindir}
- mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-
- install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
- # Move dhcpc back to /usr/sbin/udhcpc
- install -d ${D}${base_sbindir}
- mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
-
- install -d ${D}${sysconfdir}/udhcpc.d
- install -d ${D}${datadir}/udhcpc
- install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
- install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
- fi
-
- install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
-}
-
-pkg_prerm_${PN} () {
- # This is so you can make busybox commit suicide - removing busybox with no other packages
- # providing its files, this will make update-alternatives work, but the update-rc.d part
- # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
- tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
- ln -s /bin/busybox $tmpdir/[
- ln -s /bin/busybox $tmpdir/test
- ln -s /bin/busybox $tmpdir/head
- ln -s /bin/busybox $tmpdir/sh
- ln -s /bin/busybox $tmpdir/basename
- ln -s /bin/busybox $tmpdir/echo
- ln -s /bin/busybox $tmpdir/mv
- ln -s /bin/busybox $tmpdir/ln
- ln -s /bin/busybox $tmpdir/dirname
- ln -s /bin/busybox $tmpdir/rm
- ln -s /bin/busybox $tmpdir/sed
- ln -s /bin/busybox $tmpdir/sort
- export PATH=$PATH:$tmpdir
- while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
-}
--- /dev/null
+--- 1/Makefile.in.org 2001-12-25 15:37:37.000000000 +0200
++++ 1/Makefile.in 2008-02-20 02:54:56.000000000 +0200
+@@ -63,8 +63,8 @@
+ install: all installdirs
+ @echo "Installing bvi"
+ @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir)
+- @$(INSTALL_PROGRAM) -s bvi $(bindir)
+- @$(INSTALL_PROGRAM) -s bmore $(bindir)
++ @$(INSTALL_PROGRAM) bvi $(bindir)
++ @$(INSTALL_PROGRAM) bmore $(bindir)
+ @$(INSTALL_DATA) bmore.help $(datadir)
+ @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
+ @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
SECTION = "console/utils"
DEPENDS = "ncurses"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
file://configure.patch;patch=1 \
- file://compile.patch;patch=1"
+ file://compile.patch;patch=1 \
+ file://no-strip.patch;patch=1"
inherit autotools
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
inherit autotools update-rc.d
-EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \
+EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \
--disable-zaptel --with-directory-layout=lsb --enable-t38 \
- --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \
+ --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
--with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \
--with-javascript --with-res_js \
--bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \
require classpath.inc
-PR = "r4"
+PR = "r5"
SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
--- /dev/null
+require classpath.inc
+
+PR = "r0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ "
RDEPENDS_${PN}-tools = "java2-runtime"
RPROVIDES_${PN} = "${PBN}"
+RPROVIDES_${PN}-common = "${PBN}-common"
RPROVIDES_${PN}-gtk = "${PBN}-awt"
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \
"
-
-PR = "r3"
+PR = "r4"
DEPENDS += "gtk+ gconf libxtst"
--- /dev/null
+require classpath.inc
+
+PR = "r0"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
+++ /dev/null
-SECTION = "libs"
-LICENSE= "BSD-X"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Composite extension headers and specification"
-
-SRC_URI = "${XLIBS_MIRROR}/compositeext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Composite extension headers and specification"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt"
-S = "${WORKDIR}/CompositeExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- damageext-1.0/configure.ac~autofoo 2003-11-25 22:47:58.000000000 -0500
-+++ damageext-1.0/configure.ac 2005-01-16 11:47:08.123775952 -0500
-@@ -25,9 +25,9 @@
-
- AC_PREREQ([2.57])
- AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--AC_CONFIG_AUX_DIR(.)
-
- PKG_CHECK_MODULES(FIXESEXT, fixesext)
-
+++ /dev/null
-SECTION = "libs"
-LICENSE = "MIT-X"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Damage extension headers and specification"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/damageext-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Damage extension headers and specification"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt"
-S = "${WORKDIR}/DamageExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- DamageExt/configure.ac~autofoo.patch 2003-11-25 22:47:58.000000000 -0500
-+++ DamageExt/configure.ac 2005-01-16 11:50:07.183554728 -0500
-@@ -25,9 +25,9 @@
-
- AC_PREREQ([2.57])
- AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--AC_CONFIG_AUX_DIR(.)
-
- PKG_CHECK_MODULES(FIXESEXT, fixesext)
-
---- DamageExt/ChangeLog~autofoo.patch 2004-02-03 15:44:42.000000000 -0500
-+++ DamageExt/ChangeLog 2005-01-16 11:52:45.455493736 -0500
-@@ -1,3 +1,7 @@
-+2005-01-16 Chris Larson <kergoth@handhelds.org>
-+
-+ * configure.ac: Fix to work with automake 1.9.x.
-+
- 2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Add AUTHORS to file
--- /dev/null
+--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+ exit (0);
+ ]])],
+ [ac_cv_have_abstract_sockets=yes],
++ [ac_cv_have_abstract_sockets=no],
+ [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
--- /dev/null
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+
+ if [ ! -d $UUIDDIR ]; then
+ mkdir -p $UUIDDIR
+ chown $DAEMONUSER $UUIDDIR
+ chgrp $DAEMONUSER $UUIDDIR
+ fi
+
+ dbus-uuidgen --ensure
+
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ # TODO: --reverse when busybox supports it
+ run-parts --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+reload_it()
+{
+ echo -n "Reloading $DESC config: "
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
--- /dev/null
+Index: dbus-1.1.20/tools/dbus-launch.c
+===================================================================
+--- dbus-1.1.20.orig/tools/dbus-launch.c
++++ dbus-1.1.20/tools/dbus-launch.c
+@@ -966,7 +966,9 @@ main (int argc, char **argv)
+ char write_pid_fd_as_string[MAX_FD_LEN];
+ char write_address_fd_as_string[MAX_FD_LEN];
+
++#ifdef DBUS_BUILD_X11
+ xdisplay = NULL;
++#endif
+
+ if (close_stderr)
+ do_close_stderr ();
--- /dev/null
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ fi
+- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
--- /dev/null
+--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+- DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+- DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+- DEFAULT_SOCKET_DIR=$TMP
+-else
+- DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++# DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++# DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++# DEFAULT_SOCKET_DIR=$TMP
++#else
++# DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+
+ if ! test -z "$with_test_socket_dir" ; then
+ TEST_SOCKET_DIR="$with_test_socket_dir"
+++ /dev/null
---- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
-+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
-@@ -719,6 +719,7 @@
- exit (0);
- ]])],
- [ac_cv_have_abstract_sockets=yes],
-+ [ac_cv_have_abstract_sockets=no],
- [ac_cv_have_abstract_sockets=no]
- )])
- AC_LANG_POP(C)
+++ /dev/null
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-UUIDDIR=/var/lib/dbus
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus ]; then
- . /etc/default/dbus
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
- if [ ! -d $PIDDIR ]; then
- mkdir -p $PIDDIR
- chown $DAEMONUSER $PIDDIR
- chgrp $DAEMONUSER $PIDDIR
- fi
- if [ -e $PIDFILE ]; then
- PIDDIR=/proc/$(cat $PIDFILE)
- if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
- echo "$DESC already started; not starting."
- else
- echo "Removing stale PID file $PIDFILE."
- rm -f $PIDFILE
- fi
- fi
-
- if [ ! -d $UUIDDIR ]; then
- mkdir -p $UUIDDIR
- chown $DAEMONUSER $UUIDDIR
- chgrp $DAEMONUSER $UUIDDIR
- fi
-
- dbus-uuidgen --ensure
-
- echo -n "Starting $DESC: "
- start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
- echo "$NAME."
- if [ -d $EVENTDIR ]; then
- run-parts --arg=start $EVENTDIR
- fi
-}
-
-shut_it_down()
-{
- if [ -d $EVENTDIR ]; then
- # TODO: --reverse when busybox supports it
- run-parts --arg=stop $EVENTDIR
- fi
- echo -n "Stopping $DESC: "
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --user $DAEMONUSER
- # We no longer include these arguments so that start-stop-daemon
- # can do its job even given that we may have been upgraded.
- # We rely on the pidfile being sanely managed
- # --exec $DAEMON -- --system $PARAMS
- echo "$NAME."
- rm -f $PIDFILE
-}
-
-reload_it()
-{
- echo -n "Reloading $DESC config: "
- dbus-send --print-reply --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig > /dev/null
- # hopefully this is enough time for dbus to reload it's config file.
- echo "done."
-}
-
-case "$1" in
- start)
- start_it_up
- ;;
- stop)
- shut_it_down
- ;;
- reload|force-reload)
- reload_it
- ;;
- restart)
- shut_it_down
- sleep 1
- start_it_up
- ;;
- *)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
+++ /dev/null
-Index: dbus-0.94/bus/Makefile.am
-===================================================================
---- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,7 @@
- $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
- chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- fi
-- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
-+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
+++ /dev/null
---- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
-+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
-
- #### Find socket directories
--if ! test -z "$TMPDIR" ; then
-- DEFAULT_SOCKET_DIR=$TMPDIR
--elif ! test -z "$TEMP" ; then
-- DEFAULT_SOCKET_DIR=$TEMP
--elif ! test -z "$TMP" ; then
-- DEFAULT_SOCKET_DIR=$TMP
--else
-- DEFAULT_SOCKET_DIR=/tmp
--fi
-+#if ! test -z "$TMPDIR" ; then
-+# DEFAULT_SOCKET_DIR=$TMPDIR
-+#elif ! test -z "$TEMP" ; then
-+# DEFAULT_SOCKET_DIR=$TEMP
-+#elif ! test -z "$TMP" ; then
-+# DEFAULT_SOCKET_DIR=$TMP
-+#else
-+# DEFAULT_SOCKET_DIR=/tmp
-+#fi
-+
-+# checks disabled to avoid expanding this at build time
-+DEFAULT_SOCKET_DIR=/tmp
-
- if ! test -z "$with_test_socket_dir" ; then
- TEST_SOCKET_DIR="$with_test_socket_dir"
require dbus.inc
-DEFAULT_PREFERENCE = "1"
+
+DEFAULT_PREFERENCE = "-1"
inherit native
do_install() {
:
}
-
--- /dev/null
+require dbus.inc
+inherit native
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+
+SRC_URI = "\
+ http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://tmpdir.patch;patch=1 \
+ file://fix-dbus-launch-x11.patch;patch=1 \
+ file://dbus-1.init \
+"
+
+do_stage() {
+ oe_runmake install
+ autotools_stage_all
+
+ # for dbus-glib-native introspection generation
+ install -d ${STAGING_DATADIR}/dbus
+ install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
+
+do_install() {
+ :
+}
+++ /dev/null
-require dbus.inc
-inherit native
-
-DEPENDS = "glib-2.0-native libxml2-native expat-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
-
-SRC_URI = "\
- http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
- file://cross.patch;patch=1 \
- file://tmpdir.patch;patch=1 \
- file://dbus-1.init \
-"
-
-do_stage() {
- oe_runmake install
- autotools_stage_all
-
- # for dbus-glib-native introspection generation
- install -d ${STAGING_DATADIR}/dbus
- install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
-}
-
-do_install() {
- :
-}
+DESCRIPTION = "A message bus system for inter-process communication"
HOMEPAGE = "http://dbus.freedesktop.org"
-DESCRIPTION = "Message bus system for applications to talk to one another"
+SECTION = "base"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "\
- http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
+ http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
file://tmpdir.patch;patch=1 \
file://fix-install-daemon.patch;patch=1 \
DEBIANNAME_${PN} = "dbus-1"
-PACKAGES += "${PN}-lib"
+PACKAGES =+ "${PN}-lib"
FILES_${PN} = "\
${bindir}/dbus-daemon* \
${datadir}/dbus-1/system-services \
"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+RRECOMMENDS_${PN}-lib = "${PN}"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
pkg_postinst_dbus() {
#!/bin/sh
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
grep -q netdev: /etc/group || addgroup netdev
-
+chmod u+s /usr/libexec/dbus-daemon-launch-helper
}
-EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \
- --disable-checks --disable-xml-docs --disable-doxygen-docs \
- --with-xml=expat --without-x"
-
+EXTRA_OECONF = "\
+ --disable-qt \
+ --disable-qt3 \
+ --disable-gtk \
+ --disable-tests \
+ --disable-checks \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --with-xml=expat \
+ --without-x \
+"
do_stage() {
oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+ # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
+ if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
+ install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
+ fi
}
require dbus.inc
-DEFAULT_PREFERENCE = "1"
-
-PR = "r9"
-
+PR = "r11"
+DEFAULT_PREFERENCE = "-1"
--- /dev/null
+include dbus.inc
+
+PR = "r1"
+
+SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
+++ /dev/null
-include dbus.inc
-
-PR = "r1"
install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
#!/bin/sh
-exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1
+exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1
EOF
chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
}
DEPENDS = "jpeg libpng tiff"
PR = "r1"
-SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
+SRC_URI = "http://${SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
file://fix-cross-configure.patch;patch=1"
inherit qt4x11 autotools pkgconfig
SECTION = "console/utils"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native"
for doctype in html ps dvi man pdf rtf tex texi txt
do
install -m 0755 ${S}/bin/docbook2$doctype ${STAGING_BINDIR_NATIVE}/
+ ln -sf docbook2x-$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype
ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype
ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/docbook-to-$doctype
done
SECTION = "libs"
DEPENDS = "db openssl python-native xerces-c"
LICENSE = "Apache"
-SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
-PR = "r2"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
+ file://configure_fix.patch;patch=1"
+PR = "r3"
inherit autotools
EXTRA_OECONF = "\
--with-python=${STAGING_BINDIR_NATIVE}/python \
- --with-db=${STAGING_DIR} \
- --with-tcl=${STAGING_DIR} \
+ --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \
--without-google-perftools \
--without-bluez \
--without-bonjour \
- --with-expat=${STAGING_DIR} \
- --with-xerces-c=${STAGING_DIR} \
+ --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \
--without-tclreadline \
- --with-zlib=${STAGING_DIR} \
+ --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \
--without-xsd-tool \
- --with-db=${STAGING_DIR} \
+ --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
--enable-ecl \
--enable-edp \
--without-mysql \
--without-postgres \
- --with-openssl=${STAGING_DIR} \
+ --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \
"
def dtn_python_dir(d):
FILES_${PN} += "${datadir}/emacs"
-QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}"
LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
EXTRA_OECONF = "--without-sound --without-x"
inherit autotools
-EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}"
+EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
do_configure_append() {
sed -i s:-I/usr/include::g Makefile
EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}"
EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe"
EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe"
--- /dev/null
+DESCRIPTION = "Set framebuffer mode during boot"
+PR = "r1"
+
+SRC_URI = "file://fbset.sh file://default-fbset"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "fbset.sh"
+INITSCRIPT_PARAMS = "start 0 S ."
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -m 0755 ${WORKDIR}/fbset.sh ${D}${sysconfdir}/init.d/
+ install -m 0644 ${WORKDIR}/default-fbset ${D}${sysconfdir}/default/fbset
+}
+
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/default/fbset"
--- /dev/null
+# Uncomment and set value below to one of modes from /etc/fb.modes
+# or alternatively to "-xres <width> -yres <height>"
+#FBSET_MODE="vga"
--- /dev/null
+#!/bin/sh
+
+. /etc/default/fbset
+[ -n "$FBSET_MODE" ] && fbset -n $FBSET_MODE
DESCRIPTION = "Default display timings and resolutions for fbset"
PV = "0.1.0"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://fb.modes"
--- /dev/null
+# QEMU versatilepb machine, qemuarm in OE
+
+mode "vga" "640x480"
+ geometry 640 480 640 480 16
+endmode
+
+mode "vga-portrait" "480x640"
+ geometry 480 640 480 640 16
+endmode
+
+mode "qvga" "320x240"
+ geometry 320 240 320 240 16
+endmode
+
+mode "qvga-portrait" "240x320"
+ geometry 240 320 240 320 16
+endmode
+++ /dev/null
---- ffmpeg-0.4.9-pre1/libavcodec/common.h.orig 2004-12-24 23:49:50.000000000 +0100
-+++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2004-12-24 23:51:37.000000000 +0100
-@@ -1292,10 +1292,6 @@
- #define time time_is_forbidden_due_to_security_issues
- #define rand rand_is_forbidden_due_to_state_trashing
- #define srand srand_is_forbidden_due_to_state_trashing
--#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
--#define printf please_use_av_log
--#define fprintf please_use_av_log
--#endif
-
- #define CHECKED_ALLOCZ(p, size)\
- {\
--- /dev/null
+--- ffmpeg-0.4.9-pre1/libavcodec/common.h.orig 2008-02-23 19:42:48.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2008-02-23 19:08:09.000000000 -0500
+@@ -64,11 +64,11 @@
+
+ struct AVOption;
+ #ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
++extern const struct AVOption *avoptions_common[2 + 5];
+ #else
+-extern const struct AVOption avoptions_common[3];
++extern const struct AVOption *avoptions_common[2];
+ #endif
+-extern const struct AVOption avoptions_workaround_bug[11];
++extern const struct AVOption *avoptions_workaround_bug[10];
+
+ #endif /* HAVE_AV_CONFIG_H */
+
+@@ -1292,10 +1292,6 @@ tend= rdtsc();\
+ #define time time_is_forbidden_due_to_security_issues
+ #define rand rand_is_forbidden_due_to_state_trashing
+ #define srand srand_is_forbidden_due_to_state_trashing
+-#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
+-#define printf please_use_av_log
+-#define fprintf please_use_av_log
+-#endif
+
+ #define CHECKED_ALLOCZ(p, size)\
+ {\
+--- ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h.orig 2008-02-23 19:46:06.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h 2008-02-23 19:08:09.000000000 -0500
+@@ -4,10 +4,10 @@
+ */
+
+ /* possible frequencies */
+-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
++const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+
+ /* possible bitrates */
+-static const uint16_t ac3_bitratetab[19] = {
++const uint16_t ac3_bitratetab[19] = {
+ 32, 40, 48, 56, 64, 80, 96, 112, 128,
+ 160, 192, 224, 256, 320, 384, 448, 512, 576, 640
+ };
+@@ -15,7 +15,7 @@ static const uint16_t ac3_bitratetab[19]
+ /* AC3 MDCT window */
+
+ /* MDCT window */
+-static const int16_t ac3_window[256] = {
++const int16_t ac3_window[256] = {
+ 4, 7, 12, 16, 21, 28, 34, 42,
+ 51, 61, 72, 84, 97, 111, 127, 145,
+ 164, 184, 207, 231, 257, 285, 315, 347,
+@@ -144,27 +144,27 @@ static const uint8_t baptab[64]= {
+ 15, 15, 15, 15,
+ };
+
+-static const uint8_t sdecaytab[4]={
++const uint8_t sdecaytab[4]={
+ 0x0f, 0x11, 0x13, 0x15,
+ };
+
+-static const uint8_t fdecaytab[4]={
++const uint8_t fdecaytab[4]={
+ 0x3f, 0x53, 0x67, 0x7b,
+ };
+
+-static const uint16_t sgaintab[4]= {
++const uint16_t sgaintab[4]= {
+ 0x540, 0x4d8, 0x478, 0x410,
+ };
+
+-static const uint16_t dbkneetab[4]= {
++const uint16_t dbkneetab[4]= {
+ 0x000, 0x700, 0x900, 0xb00,
+ };
+
+-static const uint16_t floortab[8]= {
++const uint16_t floortab[8]= {
+ 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
+ };
+
+-static const uint16_t fgaintab[8]= {
++const uint16_t fgaintab[8]= {
+ 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
+ };
+
+--- ffmpeg-0.4.9-pre1/libavcodec/dsputil.h.orig 2008-02-23 19:47:34.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/dsputil.h 2008-02-23 19:08:09.000000000 -0500
+@@ -558,15 +558,15 @@ static int name16(void /*MpegEncContext*
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+ /* btw, rintf() is existing on fbsd too -- alex */
+-static inline long int lrintf(float x)
+-{
+-#ifdef CONFIG_WIN32
+- /* XXX: incorrect, but make it compile */
+- return (int)(x);
+-#else
+- return (int)(rint(x));
+-#endif
+-}
++//static inline long int lrintf(float x)
++//{
++//#ifdef CONFIG_WIN32
++// /* XXX: incorrect, but make it compile */
++// return (int)(x);
++//#else
++// return (int)(rint(x));
++//#endif
++//}
+ #else
+ #ifndef _ISOC9X_SOURCE
+ #define _ISOC9X_SOURCE
+--- ffmpeg-0.4.9-pre1/libavcodec/opts.c.orig 2008-02-23 19:49:11.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/opts.c 2008-02-23 19:08:09.000000000 -0500
+@@ -12,7 +12,7 @@
+
+ #include "avcodec.h"
+
+-const AVOption avoptions_common[] = {
++const AVOption *avoptions_common[] = {
+ AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0),
+ AVOPTION_CODEC_FLAG("mm_force", "force mm flags", dsp_mask, FF_MM_FORCE, 0),
+ #ifdef HAVE_MMX
+@@ -22,10 +22,10 @@ const AVOption avoptions_common[] = {
+ AVOPTION_CODEC_FLAG("mm_sse", "mask SSE feature", dsp_mask, FF_MM_SSE, 0),
+ AVOPTION_CODEC_FLAG("mm_sse2", "mask SSE2 feature", dsp_mask, FF_MM_SSE2, 0),
+ #endif
+- AVOPTION_END()
++// AVOPTION_END()
+ };
+
+-const AVOption avoptions_workaround_bug[] = {
++const AVOption *avoptions_workaround_bug[] = {
+ AVOPTION_CODEC_FLAG("bug_autodetect", "workaround bug autodetection", workaround_bugs, FF_BUG_AUTODETECT, 1),
+ AVOPTION_CODEC_FLAG("bug_old_msmpeg4", "workaround old msmpeg4 bug", workaround_bugs, FF_BUG_OLD_MSMPEG4, 0),
+ AVOPTION_CODEC_FLAG("bug_xvid_ilace", "workaround XviD interlace bug", workaround_bugs, FF_BUG_XVID_ILACE, 0),
+@@ -36,7 +36,7 @@ const AVOption avoptions_workaround_bug[
+ AVOPTION_CODEC_FLAG("bug_std_qpel", "workaround std qpel bug", workaround_bugs, FF_BUG_STD_QPEL, 0),
+ AVOPTION_CODEC_FLAG("bug_qpel_chroma2", "workaround qpel chroma2 bug", workaround_bugs, FF_BUG_QPEL_CHROMA2, 0),
+ AVOPTION_CODEC_FLAG("bug_direct_blocksize", "workaround direct blocksize bug", workaround_bugs, FF_BUG_DIRECT_BLOCKSIZE, 0),
+- AVOPTION_END()
++// AVOPTION_END()
+ };
+
+ /* avoid compatibility problems by redefining it */
---- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig 2004-08-25 22:36:39.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2004-08-25 22:37:22.000000000 +0200
-@@ -7,7 +7,7 @@
+--- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig 2008-02-23 19:34:18.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2008-02-23 19:24:55.000000000 -0500
+@@ -7,7 +7,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h
OBJS= common.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -197,7 +197,7 @@
+@@ -89,9 +89,10 @@ endif
+
+ ifeq ($(CONFIG_PP),yes)
+ ifeq ($(SHARED_PP),yes)
+-EXTRALIBS += -lpostproc
++LIBS += -lpostproc
+ else
+ # LIBS += libpostproc/libpostproc.a ... should be fixed
++LIBS += libpostproc/libpostproc.a
+ OBJS += libpostproc/postprocess.o
+ endif
+ endif
+@@ -197,7 +198,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
endif
dsputil.o: dsputil.c dsputil.h
-@@ -269,8 +269,9 @@
+@@ -269,8 +270,9 @@ ifeq ($(CONFIG_WIN32),yes)
install -s -m 755 $(SLIB) "$(prefix)"
else
install -d $(prefix)/lib
ldconfig || true
endif
else
-
---- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2004-08-26 13:45:12.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2004-08-26 13:46:00.000000000 +0200
-@@ -6,7 +6,7 @@
+--- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2008-02-23 19:37:40.000000000 -0500
++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-02-23 19:06:56.000000000 -0500
+@@ -6,7 +6,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavformat
OBJS= utils.o cutils.o os_support.o allformats.o
PPOBJS=
-@@ -54,6 +54,7 @@
+@@ -54,6 +54,7 @@ endif
ifeq ($(CONFIG_AUDIO_BEOS),yes)
PPOBJS+= beosaudio.o
EXTRALIBS+=-lbe -lmedia
# this should be the default !
EXTRALIBS+=-lavcodec -L../libavcodec
endif
-@@ -93,7 +94,7 @@
+@@ -93,7 +94,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
-lib /machine:i386 /def:$(@:.dll=.def)
else
endif
depend: $(SRCS)
-@@ -105,8 +106,9 @@
+@@ -105,8 +106,9 @@ ifeq ($(CONFIG_WIN32),yes)
install -s -m 755 $(SLIB) "$(prefix)"
else
install -d $(prefix)/lib
ldconfig || true
endif
else
-
--- /dev/null
+DESCRIPTION = "FFmpeg is a complete solution to record, convert and stream audio and video"
+HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
+AUTHOR = "Fabrice Bellard ffmpeg-devel@mplayerhq.hu"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
+RSUGGESTS = "mplayer"
+
+inherit autotools pkgconfig
+
+LEAD_SONAME = "libavcodec.so"
+
+EXTRA_OECONF = "\
+ \
+ --enable-pp \
+ --enable-shared \
+ --enable-pthreads \
+ --enable-gpl \
+ \
+ --cross-prefix=${TARGET_PREFIX} \
+ --disable-debug \
+ --disable-ffserver \
+ --disable-ffplay \
+ \
+"
+
+PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}/${PN}"
+
+FILES_${PN}-vhook = "${libdir}/vhook"
+FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
+++ /dev/null
---- ffmpeg/libavcodec/common.h.orig 2005-02-10 15:10:34.000000000 +0100
-+++ ffmpeg/libavcodec/common.h 2005-02-10 15:11:28.000000000 +0100
-@@ -501,10 +501,6 @@
- #define srand srand_is_forbidden_due_to_state_trashing
- #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
- #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
--#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
--#define printf please_use_av_log
--#define fprintf please_use_av_log
--#endif
-
- #define CHECKED_ALLOCZ(p, size)\
- {\
+++ /dev/null
---- ./configure~configure.patch 2004-07-06 03:36:16.000000000 +0930
-+++ ./configure 2004-09-27 00:07:23.000000000 +0930
-@@ -88,7 +88,7 @@
- mandir=""
- bindir=""
- cross_prefix=""
--cc="gcc"
-+cc="$CC"
- ar="ar"
- ranlib="ranlib"
- make="make"
-@@ -104,7 +104,7 @@
- cpu="x86"
- ;;
- # armv4l is a subset of armv5tel
-- armv4l|armv5tel)
-+ armv4l|armv5tel|arm|xscale)
- cpu="armv4l"
- ;;
- alpha)
-@@ -434,6 +434,37 @@
- esac
- done
-
-+case "$cpu" in
-+ i386|i486|i586|i686|i86pc|BePC)
-+ cpu="x86"
-+ ;;
-+ # armv4l is a subset of armv5tel
-+ armv4l|armv5tel|arm|xscale)
-+ cpu="armv4l"
-+ ;;
-+ alpha)
-+ cpu="alpha"
-+ ;;
-+ "Power Macintosh"|ppc)
-+ cpu="powerpc"
-+ ;;
-+ mips)
-+ cpu="mips"
-+ ;;
-+ sun4u|sparc64)
-+ cpu="sparc64"
-+ ;;
-+ sparc)
-+ cpu="sparc"
-+ ;;
-+ sh4)
-+ cpu="sh4"
-+ ;;
-+ *)
-+ cpu="unknown"
-+ ;;
-+esac
-+
- if test "$gpl" != "yes"; then
- if test "$pp" != "no" -o "$shared_pp" != "no"; then
- echo "The Postprocessing code is under GPL and --enable-gpl is not specified"
-@@ -662,7 +693,6 @@
- bindir="$prefix"
- fi
-
--cc="${cross_prefix}${cc}"
- ar="${cross_prefix}${ar}"
- ranlib="${cross_prefix}${ranlib}"
- strip="${cross_prefix}${strip}"
-@@ -753,21 +783,6 @@
- fi
-
- if test "$zlib" = "yes"; then
--# check for zlib - mmu_man
--cat > $TMPC << EOF
--#include <zlib.h>
--int main ( void ) {
--if (zlibVersion() != ZLIB_VERSION)
-- puts("zlib version differs !!!");
-- return 1;
--return 0;
--}
--EOF
--$cc $CFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no"
--# $TMPE 2> /dev/null > /dev/null || zlib="no"
--# XXX: more tests needed - runtime test
--fi
--if test "$zlib" = "yes"; then
- extralibs="$extralibs -lz"
- fi
+++ /dev/null
---- ffmpeg/libavcodec/Makefile.orig 2005-02-10 18:11:57.000000000 +0100
-+++ ffmpeg/libavcodec/Makefile 2005-02-10 18:15:36.000000000 +0100
-@@ -7,7 +7,7 @@
- VPATH=$(SRC_PATH)/libavcodec
-
- # NOTE: -I.. is needed to include config.h
--CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC
-
- OBJS= bitstream.o utils.o mem.o allcodecs.o \
- mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -222,7 +222,7 @@
- $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
- -lib /machine:i386 /def:$(@:.dll=.def)
- else
-- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
-+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavcodec.so.0
- endif
-
- dsputil.o: dsputil.c dsputil.h
-@@ -294,8 +294,9 @@
- install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
- else
- install -d $(prefix)/lib
-- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
-- ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+ install -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9
-+ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0
-+ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so
- ldconfig || true
- endif
- ifeq ($(CONFIG_PP),yes)
-
---- ffmpeg/libavformat/Makefile.orig 2005-02-10 18:15:50.000000000 +0100
-+++ ffmpeg/libavformat/Makefile 2005-02-10 18:18:23.000000000 +0100
-@@ -6,7 +6,7 @@
-
- VPATH=$(SRC_PATH)/libavformat
-
--CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC
-
- OBJS= utils.o cutils.o os_support.o allformats.o
- PPOBJS=
-@@ -104,7 +104,7 @@
- $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
- -lib /machine:i386 /def:$(@:.dll=.def)
- else
-- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
-+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) -Wl,-soname -Wl,libavformat.so.0
- endif
-
- depend: $(SRCS)
-@@ -116,8 +116,9 @@
- install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
- else
- install -d $(prefix)/lib
-- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
-- ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
-+ install -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9
-+ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0
-+ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so
- ldconfig || true
- endif
- else
+require ffmpeg.inc
-DESCRIPTION = "ffmpeg"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libvorbis faad2 faac liba52 lame mplayer"
-LICENSE = "LGPL"
-PR = "r1"
-
-
-inherit autotools
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
- file://configure.patch;patch=0 \
- file://common.patch;patch=1 \
- file://soname.patch;patch=1 \
- "
-
-TARGET_LDFLAGS_append = " -lm -la52 "
-
-EXTRA_OECONF=" \
- --enable-mp3lame \
- --enable-vorbis \
- --enable-faad \
- --enable-faadbin \
- --enable-faac \
- --enable-a52 \
- --enable-a52bin \
- --enable-pp \
- --enable-shared-pp \
- --enable-shared \
- --disable-amr_nb \
- --enable-amr_nb-fixed \
- --disable-amr_wb \
- --enable-pthreads \
- --enable-gpl \
- --enable-zlib \
- \
- --disable-audio-beos \
- --disable-v4l \
- --disable-dv1394 \
- --disable-debug \
- --disable-ffserver \
- --disable-ffplay \
- \
- --cross-prefix=${TARGET_PREFIX} \
- --extra-cflags=\$(TARGET_CFLAGS) \
- --extra-ldflags=\$(TARGET_LDFLAGS) \
- --extra-libs=\$(TARGET_LDFLAGS) \
- \
- --cpu=${PACKAGE_ARCH} \
- --prefix=${D}${prefix} \
- --mandir=${D}${prefix}/share/man \
+ file://configure.patch;patch=0 \
+ file://gcc4.patch;patch=1 \
+ file://soname.patch;patch=1 \
+ "
+
+EXTRA_OECONF += " \
+ \
+ --prefix=${D}${prefix} \
+ --mandir=${D}${prefix}/share/man \
+ \
+ --enable-mp3lame \
+ --enable-vorbis \
+ --enable-faad \
+ --enable-faadbin \
+ --enable-faac \
+ --enable-a52 \
+ --enable-a52bin \
+ --enable-shared-pp \
+ --disable-amr_nb \
+ --enable-amr_nb-fixed \
+ --disable-amr_wb \
+ \
+ --cpu=${TARGET_ARCH} \
+ --tune=${PACKAGE_ARCH} \
+ --extra-ldflags="-la52" \
+ \
+ --disable-audio-beos \
+ --disable-v4l \
+ --disable-dv1394 \
"
-PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}"
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+do_stage() {
+ oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+ install -d ${STAGING_INCDIR}/ffmpeg
-# --enable-shared-pp \
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+ install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
+ install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
-do_configure_prepend() {
- export CC="${CC}"
+ install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
+ install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
+ install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
+ install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
+ install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
}
-do_stage() {
- oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+PACKAGES += "libavcodec libavcodec-dev \
+ libavformat libavformat-dev"
- install -d ${STAGING_INCDIR}/ffmpeg
- install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
- install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
- install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
- install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
- install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
- install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
- install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
- install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
-}
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so"
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so"
-DESCRIPTION = "ffmpeg"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "libogg zlib libvorbis faac liba52 lame"
+require ffmpeg.inc
+
+DEPENDS += "libgsm"
+
PV = "0.4.9+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/trunk"
-inherit autotools pkgconfig
-
-TARGET_LDFLAGS_append = " -lm -la52 "
-
-EXTRA_OECONF = " \
- --enable-libmp3lame \
- --enable-libvorbis \
- --disable-libfaad \
- --enable-liba52 \
- --enable-liba52bin \
- --enable-libogg \
- --enable-pp \
- --enable-shared \
- --enable-pthreads \
- --enable-gpl \
+EXTRA_OECONF += " \
+ --prefix=/usr \
\
- --disable-audio-beos \
- --disable-v4l \
- --disable-dv1394 \
- --disable-debug \
- --disable-ffserver \
- --disable-ffplay \
- --disable-strip \
+ --enable-nonfree \
+ --enable-swscaler \
+ --enable-x11grab \
\
- --cross-prefix=${TARGET_PREFIX} \
+ --enable-liba52 \
+ --enable-liba52bin \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libfaadbin \
+ --enable-libgsm \
+ --enable-libmp3lame \
+ --enable-libvorbis \
\
- --cpu=${PACKAGE_ARCH} \
- --arch=${PACKAGE_ARCH} \
+ --arch=${TARGET_ARCH} \
+ --cross-compile \
+ --cc="gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+ --extra-cflags="${TARGET_CFLAGS}" \
+ --extra-ldflags="${TARGET_LDFLAGS}" \
+ --enable-hardcoded-tables \
"
+do_configure() {
+ ${S}/configure ${EXTRA_OECONF}
+}
-# We do this because the install program is called with -s
-# which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+do_stage() {
+ for lib in libavcodec libavdevice libavformat \
+ libavutil libpostproc libswscale
+ do
+ oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR}
+ done
-do_configure_prepend() {
- export CC="${CC}"
-}
+ install -d ${STAGING_INCDIR}/ffmpeg
-oe_runconf () {
- # make ffmpeg detect arm targets that don't end in 'l'
- sed -i -e s:'armv\[4567\]\*l':'armv\[4567\]\*':g ${S}/configure
- if [ -x ${S}/configure ] ; then
- cfgcmd="${S}/configure \
- --prefix=${prefix} \
- --mandir=${mandir} \
- ${EXTRA_OECONF} \
- $@"
- oenote "Running $cfgcmd..."
- $cfgcmd || oefatal "oe_runconf failed"
- else
- oefatal "no configure script found"
- fi
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+ install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h
-}
+ install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h
+
+ for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+ do
+ install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h
+ done
-do_stage() {
- oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR}
+ for h in adler32.h avstring.h avutil.h base64.h bswap.h \
+ common.h crc.h fifo.h integer.h intfloat_readwrite.h \
+ log.h lzo.h mathematics.h md5.h mem.h random.h \
+ rational.h sha1.h
+ do
+ install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h
+ done
- install -d ${STAGING_INCDIR}/ffmpeg
- install -m 0644 ${S}/libavcodec/avcodec.h \
- ${STAGING_INCDIR}/ffmpeg/avcodec.h
-
- install -m 0644 ${S}/libavformat/avformat.h \
- ${STAGING_INCDIR}/ffmpeg/avformat.h
- install -m 0644 ${S}/libavformat/avio.h \
- ${STAGING_INCDIR}/ffmpeg/avio.h
- install -m 0644 ${S}/libavformat/rtp.h \
- ${STAGING_INCDIR}/ffmpeg/rtp.h
- install -m 0644 ${S}/libavformat/rtsp.h \
- ${STAGING_INCDIR}/ffmpeg/rtsp.h
- install -m 0644 ${S}/libavformat/rtspcodes.h \
- ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
-
- install -m 0644 ${S}/libavutil/avutil.h \
- ${STAGING_INCDIR}/ffmpeg/avutil.h
- install -m 0644 ${S}/libavutil/bswap.h \
- ${STAGING_INCDIR}/ffmpeg/bswap.h
- install -m 0644 ${S}/libavutil/common.h \
- ${STAGING_INCDIR}/ffmpeg/common.h
- install -m 0644 ${S}/libavutil/crc.h \
- ${STAGING_INCDIR}/ffmpeg/crc.h
- install -m 0644 ${S}/libavutil/integer.h \
- ${STAGING_INCDIR}/ffmpeg/integer.h
- install -m 0644 ${S}/libavutil/intfloat_readwrite.h \
- ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h
- install -m 0644 ${S}/libavutil/mathematics.h \
- ${STAGING_INCDIR}/ffmpeg/mathematics.h
- install -m 0644 ${S}/libavutil/rational.h \
- ${STAGING_INCDIR}/ffmpeg/rational.h
- install -m 0644 ${S}/libavutil/mem.h \
- ${STAGING_INCDIR}/ffmpeg/mem.h
- install -m 0644 ${S}/libavutil/log.h \
- ${STAGING_INCDIR}/ffmpeg/log.h
+ install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h
+ install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h
install -d ${STAGING_INCDIR}/libpostproc
- install -m 0644 ${S}/libpostproc/postprocess.h \
- ${STAGING_INCDIR}/libpostproc/postprocess.h
+ install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
}
-PACKAGES += "libavcodec libavcodec-dev \
- libavformat libavformat-dev \
- libavutil libavutil-dev \
- libpostproc libpostproc-dev"
-
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}"
-FILES_${PN}-doc = "${mandir}"
+PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \
+ libavdevice libavdevice-dev libavdevice-dbg \
+ libavformat libavformat-dev libavformat-dbg \
+ libavutil libavutil-dev libavutil-dbg \
+ libpostproc libpostproc-dev libpostproc-dbg \
+ libswscale libswscale-dev libswscale-dbg"
FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so \
- ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
+FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
+
+FILES_libavdevice = "${libdir}/libavdevice*.so.*"
+FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
+FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so \
- ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
+FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
FILES_libavutil = "${libdir}/libavutil*.so.*"
-FILES_libavutil-dev = "${libdir}/libavutil*.so \
- ${libdir}/libavutil*.la ${libdir}/libavutil*.a"
+FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
+FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
FILES_libpostproc = "${libdir}/libpostproc*.so.*"
-FILES_libpostproc-dev = "${libdir}/libpostproc*.so \
- ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
+FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
+
+FILES_libswscale = "${libdir}/libswscale*.so.*"
+FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
+FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
require findutils.inc
+EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
+
do_install_append () {
mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
+++ /dev/null
-SECTION = "libs"
-LICENSE= "BSD-X"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Fixes extension headers and specification."
-
-SRC_URI = "${XLIBS_MIRROR}/fixesext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Fixes extension headers and specification."
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt"
-S = "${WORKDIR}/FixesExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
--- /dev/null
+DESCRIPTION = "EFLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://equinox-project.org/page/documentation"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "zlib jpeg libpng libxext libxft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz"
+S = "${WORKDIR}/efltk"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "\
+ --enable-shared \
+ --enable-xdbe \
+ --enable-xft \
+ --enable-gl \
+ --disable-mysql \
+ --disable-unixODBC \
+ --x-includes=${STAGING_INCDIR}/freetype2 \
+ --x-libraries=${STAGING_LIBDIR} \
+"
+
+# yes, this is nasty, but configure is so broken there is no other way
+do_configure() {
+ gnu-configize
+ oe_runconf
+ mv -f config.h save
+ autotools_do_configure
+ mv -f save config.h
+}
+
+# more nasties
+do_configure_append() {
+ sed -i s,/usr/include,${STAGING_INCDIR}, makeinclude
+ sed -i s,/usr/include/freetype2,, makeinclude
+ sed -i s,/usr/bin/strip,echo, makeinclude
+ sed -i s,CONFIGDIR,'"${datadir}/ede/"', src/core/Fl_Config.cpp
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install () {
+ install -d ${D}${libdir}
+ oe_runmake install prefix="${D}${prefix}" \
+ bindir="${D}${bindir}" \
+ libdir="${D}${libdir}" \
+ includedir="${D}${includedir}" \
+ datadir="${STAGING_DATADIR}"
+}
+
+python populate_packages_prepend () {
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_${PN}', 'libefltk${PV}', d)
+}
+
+LEAD_SONAME = "libefltk.so"
+
+FILES_${PN} += "${libdir}/fltk/*.theme"
+FILES_${PN}-dbg += "${libdir}/fltk/.debug"
}
do_install () {
- oe_runmake prefix="${D}${prefix}" \
- bindir="${D}${bindir}" \
- libdir="${D}${libdir}" \
- includedir="${D}${includedir}" \
- install
+ autotools_stage_all
}
do_stage() {
}
do_stage() {
- oe_runmake install prefix="${STAGING_DIR}" \
- bindir="${STAGING_BINDIR}" \
- includedir="${STAGING_INCDIR}" \
- libdir="${STAGING_LIBDIR}" \
- datadir="${STAGING_DATADIR}"
+ autotools_stage_all
}
do_install () {
+++ /dev/null
-DESCRIPTION = "Free42 RPN Calculator"
-SECTION = "openmoko/applications"
-DEPENDS = "gtk+"
-PV = "1.4.36"
-PR = "r1"
-
-SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
- http://sense.net/zc/free42/42c_skins.tgz \
- file://free42-bcd-gtk-only.patch;patch=1 \
- file://free42-vga-skin.patch;patch=1 \
- file://free42-dont-declare-sincos.patch;patch=1 \
- file://free42dec.desktop"
-
-S = "${WORKDIR}/free42"
-
-TARGET_CXXFLAGS_append = " -fsigned-char"
-TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
-
-do_compile() {
- cp -fv ${S}/common/* ${S}/gtk
- cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/
- cp ${WORKDIR}/42ct.* ${S}/skins/
- cd ${S}/gtk/
- ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
- ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
- oe_runmake
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
- install -d ${D}${datadir}/applications
- install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
- install -d ${D}${datadir}/pixmaps
- install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
-}
-
-
--- /dev/null
+DESCRIPTION = "Free42 RPN Calculator"
+HOMEPAGE = "http://free42.sf.net"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz \
+ http://sense.net/zc/free42/42c_skins.tgz \
+ file://free42-bcd-gtk-only.patch;patch=1 \
+ file://free42-vga-skin.patch;patch=1 \
+ file://free42-dont-declare-sincos.patch;patch=1 \
+ file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+ cp -fv ${S}/common/* ${S}/gtk
+ cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/
+ cp ${WORKDIR}/42ct.* ${S}/skins/
+ cd ${S}/gtk/
+ ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+ ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
--- /dev/null
+DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays"
+SECTION = "openmoko/inputmethods"
+DEPENDS = "ecore evas edje"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz"
+
+FILES_${PN} += "${datadir}"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
DEPENDS = "intltool-native dbus"
+RCONFLICTS = "gsmd"
+RREPLACES = "gsmd"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r3"
SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
S = "${WORKDIR}/gsm0710muxd"
inherit autotools
+do_install_append() {
+ # temp hack
+ mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service
+}
+
pkg_postinst_${PN}() {
# can't do this offline
if [ "x$D" != "x" ]; then
--- /dev/null
+DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs"
+AUTHOR = "M. Dietrich"
+SECTION = "console/network"
+DEPENDS = "python"
+LICENSE = "GPL"
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "pyneod"
+INITSCRIPT_PARAMS = "defaults 40"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod"
+S = "${WORKDIR}/pyneod"
+
+export D := "${D}"
+export PREFIX = "${prefix}"
+
+do_compile() {
+ :
+}
+
+do_install() {
+ python setup.py
+}
+
+RCONFLICTS = "gsmd"
+RREPLACES = "gsmd"
+RDEPENDS = "\
+ python-codecs \
+ python-compression \
+ python-crypt \
+ python-curses \
+ python-datetime \
+ python-dbus \
+ python-fcntl \
+ python-gdbm \
+ python-gst \
+ python-html \
+ python-io \
+ python-lang \
+ python-logging \
+ python-math \
+ python-mime \
+ python-netclient \
+ python-netserver \
+ python-pickle \
+ python-pprint \
+ python-pycrypto \
+ python-pygobject \
+ python-pyserial \
+ python-re \
+ python-readline \
+ python-shell \
+ python-simplejson \
+ python-sqlite3 \
+ python-stringold \
+ python-syslog \
+ python-threading \
+ python-xml \
+ python-zlib \
+"
+
+FILES_${PN} = "${datadir} ${sysconfdir} ${bindir}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
--- /dev/null
+DESCRIPTION = "FIC Neo Smartphone UI Environment"
+AUTHOR = "M. Dietrich"
+SECTION = "python/ui"
+LICENSE = "GPL"
+PV = "0.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog"
+S = "${WORKDIR}/pyneog"
+
+do_compile() {
+ :
+}
+
+do_install() {
+ find . -name ".svn"|xargs rm -rf
+ install -d ${D}${datadir}/pyneog
+ for i in media *.py Xsession.d.zadje; do
+ cp -a $i ${D}${datadir}/pyneog/
+ done
+
+ install -d ${D}${sysconfdir}/X11/Xsession.d/
+ ln -sf ${datadir}/pyneog/Xsession.d.zadje ${D}${sysconfdir}/X11/Xsession.d/80zadje
+}
+
+FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}"
+
+RCONFLICTS = "openmoko-session2"
+RREPlACES = "openmoko-session2"
+RDEPENDS = "task-python-efl"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+++ /dev/null
-DESCRIPTION = "FreeSmartPhone.org Python Prototypes"
-AUTHOR = "M. Dietrich"
-SECTION = "console/network"
-RDEPENDS = "python-serial python-lang"
-LICENSE = "GPL"
-PV = "0.0+svnr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-proto"
-S = "${WORKDIR}/py-proto"
-
-inherit distutils
-
--- /dev/null
+DESCRIPTION = "Task for a FIC Neo SmartPhone environment"
+LICENSE = "MIT"
+SECTION = "devel/python"
+PR = "r2"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ matchbox-wm \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ \
+ gsm0710muxd \
+ pyneod \
+ pyneog \
+"
+
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ Src/m4/sdl.m4 2004-01-21 00:43:55.000000000 +0100
-@@ -0,0 +1,175 @@
-+# Configure paths for SDL
-+# Sam Lantinga 9/21/99
-+# stolen from Manish Singh
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_SDL,
-+[dnl
-+dnl Get the cflags and libraries from the sdl-config script
-+dnl
-+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
-+ sdl_prefix="$withval", sdl_prefix="")
-+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-+ sdl_exec_prefix="$withval", sdl_exec_prefix="")
-+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
-+ , enable_sdltest=yes)
-+
-+ if test x$sdl_exec_prefix != x ; then
-+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-+ if test x${SDL_CONFIG+set} != xset ; then
-+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-+ fi
-+ fi
-+ if test x$sdl_prefix != x ; then
-+ sdl_args="$sdl_args --prefix=$sdl_prefix"
-+ if test x${SDL_CONFIG+set} != xset ; then
-+ SDL_CONFIG=$sdl_prefix/bin/sdl-config
-+ fi
-+ fi
-+
-+ AC_REQUIRE([AC_CANONICAL_TARGET])
-+ PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-+ min_sdl_version=ifelse([$1], ,0.11.0,$1)
-+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-+ no_sdl=""
-+ if test "$SDL_CONFIG" = "no" ; then
-+ no_sdl=yes
-+ else
-+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-+
-+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_sdltest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $SDL_CFLAGS"
-+ LIBS="$LIBS $SDL_LIBS"
-+dnl
-+dnl Now check if the installed SDL is sufficiently new. (Also sanity
-+dnl checks the results of sdl-config to some extent
-+dnl
-+ rm -f conf.sdltest
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "SDL.h"
-+
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ /* This hangs on some systems (?)
-+ system ("touch conf.sdltest");
-+ */
-+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_sdl_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_sdl_version");
-+ exit(1);
-+ }
-+
-+ if (($sdl_major_version > major) ||
-+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-+ printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ return 1;
-+ }
-+}
-+
-+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_sdl" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$SDL_CONFIG" = "no" ; then
-+ echo "*** The sdl-config script installed by SDL could not be found"
-+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the SDL_CONFIG environment variable to the"
-+ echo "*** full path to sdl-config."
-+ else
-+ if test -f conf.sdltest ; then
-+ :
-+ else
-+ echo "*** Could not run SDL test program, checking why..."
-+ CFLAGS="$CFLAGS $SDL_CFLAGS"
-+ LIBS="$LIBS $SDL_LIBS"
-+ AC_TRY_LINK([
-+#include <stdio.h>
-+#include "SDL.h"
-+
-+int main(int argc, char *argv[])
-+{ return 0; }
-+#undef main
-+#define main K_and_R_C_main
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding SDL or finding the wrong"
-+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-+ echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ SDL_CFLAGS=""
-+ SDL_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(SDL_CFLAGS)
-+ AC_SUBST(SDL_LIBS)
-+ rm -f conf.sdltest
-+])
DEPENDS = "libsdl-qpe"
LICENSE = "GPL"
SRCDATE = "20040801"
-PR = "r1"
+PR = "r2"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
- file://m4.patch;patch=1 \
file://configure.patch;patch=1 \
file://frodorc \
file://Frodo.png \
inherit autotools
-EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
do_install() {
install -d ${D}${palmtopdir}/bin \
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
+++ /dev/null
-Index: gaim/src/gtkblist.c
-===================================================================
---- gaim.orig/src/gtkblist.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200
-@@ -873,16 +873,23 @@
- void
- gaim_gtk_blist_joinchat_show(void)
- {
-- GtkWidget *hbox, *vbox;
-+ GtkWidget *vbox;
- GtkWidget *rowbox;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GaimGtkBuddyList *gtkblist;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img = NULL;
-+#endif
- GaimGtkJoinChatData *data = NULL;
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
- data = g_new0(GaimGtkJoinChatData, 1);
-
- data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
-@@ -897,6 +904,7 @@
- GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE);
- gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -905,6 +913,9 @@
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(_("Please enter the appropriate information "
- "about the chat you would like to join.\n"));
-@@ -4304,9 +4315,13 @@
- {
- GtkWidget *table;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GtkWidget *hbox;
- GtkWidget *vbox;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-+#endif
- GaimGtkBuddyList *gtkblist;
- GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1);
-
-@@ -4315,8 +4330,10 @@
- ? account
- : gaim_connection_get_account(gaim_connections_get_all()->data));
-
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-@@ -4335,6 +4352,7 @@
- gtk_window_set_type_hint(GTK_WINDOW(data->window),
- GDK_WINDOW_TYPE_HINT_DIALOG);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -4342,6 +4360,9 @@
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(
- _("Please enter the screen name of the person you would like "
-@@ -4663,10 +4684,14 @@
- GList *l;
- GaimConnection *gc;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GtkWidget *rowbox;
-- GtkWidget *hbox;
- GtkWidget *vbox;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
-
- if (account != NULL) {
- gc = gaim_account_get_connection(account);
-@@ -4698,8 +4723,10 @@
- data->account = account;
- data->default_chat_name = g_strdup(name);
-
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-@@ -4720,6 +4747,7 @@
- gtk_window_set_type_hint(GTK_WINDOW(data->window),
- GDK_WINDOW_TYPE_HINT_DIALOG);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -4727,6 +4755,9 @@
-
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(
- _("Please enter an alias, and the appropriate information "
-Index: gaim/src/gtkconn.c
-===================================================================
---- gaim.orig/src/gtkconn.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkconn.c 2005-08-19 23:27:18.000000000 +0200
-@@ -371,7 +371,10 @@
-
- /* Build the window if it isn't there yet */
- if (!disconnect_window) {
-- GtkWidget *hbox, *vbox, *img;
-+ GtkWidget *hbox, *vbox;
-+ #if ICONS_IN_DIALOGS
-+ GtkWidget *img;
-+ #endif
- GtkCellRenderer *rend, *rend2;
-
- disconnect_window = g_new0(struct disconnect_window, 1);
-@@ -384,6 +387,7 @@
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox);
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
-@@ -392,6 +396,9 @@
-
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(disconnect_window->window)->vbox;
-+#endif
-
- disconnect_window->label = gtk_label_new(label_text);
-
-Index: gaim/src/gtkconv.c
-===================================================================
---- gaim.orig/src/gtkconv.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkconv.c 2005-08-19 23:27:18.000000000 +0200
-@@ -847,10 +847,12 @@
- GtkWidget *label;
- GtkWidget *vbox, *hbox;
- GtkWidget *table;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- info = g_new0(InviteBuddyInfo, 1);
- info->conv = conv;
-@@ -880,6 +882,7 @@
- gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the inner hbox and put the dialog's icon in it. */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(vbox), hbox);
-@@ -889,6 +892,7 @@
- /* Setup the right vbox. */
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#endif
-
- /* Put our happy label in it. */
- label = gtk_label_new(_("Please enter the name of the user you wish "
-@@ -1107,8 +1111,10 @@
- GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
- GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
- GtkWidget *hbox;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
- GtkWidget *label;
- struct _search *s;
-
-@@ -1139,9 +1145,11 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
- hbox);
-+#if ICONS_IN_DIALOGS
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-+#endif
- gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search),
- GTK_RESPONSE_OK, FALSE);
-
-Index: gaim/src/gtkdebug.c
-===================================================================
---- gaim.orig/src/gtkdebug.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200
-@@ -149,7 +149,10 @@
- static void
- find_cb(GtkWidget *w, DebugWindow *win)
- {
-- GtkWidget *hbox, *img, *label;
-+ GtkWidget *hbox, *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *img;
-+#endif
- struct _find *f;
-
- if(win->find)
-@@ -179,11 +182,13 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
- hbox);
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-+#endif
- gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find),
- GTK_RESPONSE_OK, FALSE);
-
-Index: gaim/src/gtkdialogs.c
-===================================================================
---- gaim.orig/src/gtkdialogs.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkdialogs.c 2005-08-19 23:27:18.000000000 +0200
-@@ -534,7 +534,9 @@
- GtkWidget *window;
- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-+#endif
- gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
-
- label = gtk_label_new(NULL);
-@@ -582,8 +584,10 @@
-
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL));
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-+#endif
-
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-19 23:26:29.000000000 +0200
-+++ gaim/src/gtkgaim.h 2005-08-21 02:32:29.270335816 +0200
-@@ -61,5 +61,10 @@
- #define GAIM_HIG_BORDER 12
- #define GAIM_HIG_BOX_SPACE 6
-
-+/**
-+ * Do we want icons in dialogs?
-+ */
-+#define ICONS_IN_DIALOGS 1
-+
- #endif /* _GAIM_GTKGAIM_H_ */
-
-Index: gaim/src/gtknotify.c
-===================================================================
---- gaim.orig/src/gtknotify.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtknotify.c 2005-08-21 02:32:03.765213184 +0200
-@@ -125,7 +125,9 @@
- GtkWidget *dialog;
- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img = NULL;
-+#endif
- char label_text[2048];
- const char *icon_name = NULL;
- char *primary_esc, *secondary_esc;
-@@ -149,11 +151,13 @@
- break;
- }
-
-+#if ICONS_IN_DIALOGS
- if (icon_name != NULL)
- {
- img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
- }
-+#endif
-
- dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE,
- NULL, 0, GTK_STOCK_CLOSE,
-@@ -173,8 +177,10 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-
-+#if ICONS_IN_DIALOGS
- if (img != NULL)
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-+#endif
-
- primary_esc = g_markup_escape_text(primary, -1);
- secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
-@@ -218,9 +224,11 @@
- GaimNotifyMailData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- char *detail_text;
- char *label_text;
-
-@@ -248,6 +256,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -262,6 +271,9 @@
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- detail_text = g_strdup_printf(ngettext("%s has %d new message.",
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkrequest.c 2005-08-21 02:32:15.943361824 +0200
-@@ -281,10 +281,12 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *entry;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *toolbar;
- char *label_text;
- char *primary_esc, *secondary_esc;
-@@ -318,6 +320,7 @@
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -332,6 +335,9 @@
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
-@@ -435,9 +441,11 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox, *vbox2;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *radio = NULL;
- char *label_text;
- char *radio_text;
-@@ -475,6 +483,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -488,6 +497,9 @@
- /* Vertical box */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
-@@ -536,9 +548,11 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- void **buttons;
- char *label_text;
- char *primary_esc, *secondary_esc;
-@@ -584,6 +598,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -597,7 +612,10 @@
- /* Vertical box */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
--
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-+
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
- secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
-@@ -620,10 +638,12 @@
-
-
- if (default_action == GAIM_DEFAULT_ACTION_NONE) {
-+#if ICONS_IN_DIALOGS
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS);
- gtk_widget_grab_focus(img);
- gtk_widget_grab_default(img);
-+#endif
- } else
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action);
-
-@@ -1351,13 +1371,15 @@
- GtkWidget *win;
- GtkWidget *vbox;
- GtkWidget *vbox2;
-- GtkWidget *hbox;
- GtkWidget *bbox;
- GtkWidget *frame;
- GtkWidget *label;
- GtkWidget *table;
- GtkWidget *button;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *sw;
- GtkSizeGroup *sg;
- GList *gl, *fl;
-@@ -1392,6 +1414,7 @@
- g_signal_connect(G_OBJECT(win), "delete_event",
- G_CALLBACK(destroy_multifield_cb), data);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), hbox);
-@@ -1407,6 +1430,10 @@
- /* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_container_add(GTK_CONTAINER(win), vbox);
-+#endif
- gtk_widget_show(vbox);
-
- sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+++ /dev/null
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-19 21:46:09.550560256 +0200
-+++ gaim/src/gtkgaim.h 2005-08-19 21:47:37.276223928 +0200
-@@ -66,5 +66,11 @@
- */
- #define ICONS_IN_DIALOGS 0
-
-+/**
-+ * How many fields is there screen-space for vertically, before a scrollbar is needed?
-+ */
-+#define VERT_ITEMS 0
-+
-+
- #endif /* _GAIM_GTKGAIM_H_ */
-
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 21:46:09.550560256 +0200
-+++ gaim/src/gtkrequest.c 2005-08-19 21:53:46.782050504 +0200
-@@ -1381,6 +1381,8 @@
- GtkWidget *img;
- #endif
- GtkWidget *sw;
-+ GtkWidget *pri_label;
-+ GtkWidget *sec_label;
- GtkSizeGroup *sg;
- GList *gl, *fl;
- GaimRequestFieldGroup *group;
-@@ -1450,6 +1452,7 @@
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
- gtk_widget_show(label);
-+ pri_label = label;
- g_free(label_text);
- }
-
-@@ -1457,7 +1460,7 @@
- gl = gl->next)
- total_fields += g_list_length(gaim_request_field_group_get_fields(gl->data));
-
-- if(total_fields > 9) {
-+ if(total_fields > VERT_ITEMS) {
- sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-@@ -1484,6 +1487,7 @@
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
- gtk_widget_show(label);
-+ sec_label = label;
- }
-
- for (gl = gaim_request_fields_get_groups(fields);
-@@ -1718,6 +1722,59 @@
-
- gtk_widget_show(win);
-
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h, field_labels_w;
-+ GtkRequisition sg_labels_req;
-+ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
-+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
-+
-+ printf("%d / %d\n", field_labels_w, w);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ if (primary) gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ if (secondary) gtk_widget_set_size_request(GTK_WIDGET(sec_label), w, -1);
-+
-+ //Determine what to do - add a scrollbar or resize the input fields?
-+ if ((float)field_labels_w / w > 0.5) //if the labels fill more than half the screen add a horizontal scrollbar
-+ {
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ }
-+ else //resize the input fields
-+ {
-+ for (gl = gaim_request_fields_get_groups(fields);
-+ gl != NULL;
-+ gl = gl->next)
-+ {
-+ GList *field_list;
-+ size_t field_count = 0;
-+ size_t cols = 1;
-+ size_t rows;
-+ size_t col_num;
-+ size_t row_num = 0;
-+
-+ group = gl->data;
-+ field_list = gaim_request_field_group_get_fields(group);
-+
-+ for (row_num = 0, fl = field_list;
-+ row_num < rows && fl != NULL;
-+ row_num++)
-+ {
-+ for (col_num = 0;
-+ col_num < cols && fl != NULL;
-+ col_num++, fl = fl->next)
-+ {
-+ field = fl->data;
-+ gtk_widget_set_size_request(GTK_WIDGET(field->ui_data), w-field_labels_w, -1);
-+ }
-+ }
-+ }
-+ }
-+
- return data;
- }
-
+++ /dev/null
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtkblist.c
-===================================================================
---- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200
-+++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200
-@@ -825,6 +825,15 @@
- joinchat_set_sensitive_if_input_cb(NULL, data);
-
- gtk_widget_show_all(data->entries_box);
-+
-+ GList* children;
-+ children = GTK_BOX(data->entries_box)->children;
-+ while (children)
-+ {
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
-+ children = children->next;
-+ }
- }
-
- static void
-@@ -916,12 +925,26 @@
- #else
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-+
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-
- label = gtk_label_new(_("Please enter the appropriate information "
- "about the chat you would like to join.\n"));
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-+ pri_label = label;
-
- rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0);
-@@ -955,6 +978,22 @@
- g_object_unref(data->sg);
-
- gtk_widget_show_all(data->window);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
- }
-
- static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
-@@ -4364,6 +4403,19 @@
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-+
- label = gtk_label_new(
- _("Please enter the screen name of the person you would like "
- "to add to your buddy list. You may optionally enter an alias, "
-@@ -4374,6 +4426,7 @@
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-+ pri_label = label;
-
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
- gtk_container_add(GTK_CONTAINER(vbox), hbox);
-@@ -4446,6 +4499,25 @@
-
- if (group != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h, field_labels_w;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ //Set the size of the input fields
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1);
-+
- }
-
- static void
-@@ -4572,6 +4644,9 @@
- GHashTable *defaults = NULL;
- struct proto_chat_entry *pce;
- gboolean focus = TRUE;
-+ GtkWidget *label;
-+ GtkWidget *rowbox;
-+ GtkWidget *input;
-
- g_return_if_fail(data->account != NULL);
-
-@@ -4596,10 +4671,6 @@
-
- for (tmp = list; tmp; tmp = tmp->next)
- {
-- GtkWidget *label;
-- GtkWidget *rowbox;
-- GtkWidget *input;
--
- pce = tmp->data;
-
- rowbox = gtk_hbox_new(FALSE, 5);
-@@ -4657,6 +4728,15 @@
- addchat_set_sensitive_if_input_cb(NULL, data);
-
- gtk_widget_show_all(data->entries_box);
-+
-+ GList* children;
-+ children = GTK_BOX(data->entries_box)->children;
-+ while (children)
-+ {
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
-+ children = children->next;
-+ }
- }
-
- static void
-@@ -4759,6 +4839,19 @@
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-+
- label = gtk_label_new(
- _("Please enter an alias, and the appropriate information "
- "about the chat you would like to add to your buddy list.\n"));
-@@ -4766,7 +4859,8 @@
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
-+ pri_label = label;
-+
- rowbox = gtk_hbox_new(FALSE, 5);
- gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
-
-@@ -4825,6 +4919,24 @@
- G_CALLBACK(add_chat_resp_cb), data);
-
- gtk_widget_show_all(data->window);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust the label accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1);
-+
- }
-
- static void
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200
-+++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200
-@@ -650,6 +650,17 @@
- /* Show everything. */
- gtk_widget_show_all(dialog);
-
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(dialog), &w, &h);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ gtk_widget_set_size_request(GTK_WIDGET(label), w, -1);
-+
- return data;
- }
-
+++ /dev/null
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtksavedstatuses.c
-===================================================================
---- gaim.orig/src/gtksavedstatuses.c 2005-08-13 07:54:33.000000000 +0200
-+++ gaim/src/gtksavedstatuses.c 2005-08-19 21:20:41.806812608 +0200
-@@ -417,6 +417,7 @@
- bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-@@ -449,12 +450,13 @@
- G_CALLBACK(status_window_delete_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(status_window_close_cb), dialog);
-+ G_CALLBACK(status_window_close_cb), dialog);*/
-
- gtk_widget_show(win);
- }
-@@ -790,7 +792,8 @@
- disclosure = gaim_disclosure_new(_("Use a different status for some accounts"),
- _("Use a different status for some accounts"));
- gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0);
-- gtk_widget_show(disclosure);
-+ //For now, do without the custom messages - not implemented yet
-+ //gtk_widget_show(disclosure);
-
- /* Setup the box that the disclosure will cover */
- dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
+++ /dev/null
---- gaim.ori/src/gtkstatusbox.c 2005-09-04 20:42:29.000000000 +0200
-+++ gaim/src/gtkstatusbox.c 2005-09-05 08:44:13.000000000 +0200
-@@ -173,7 +173,7 @@
-
- text_rend = gtk_cell_renderer_text_new();
- icon_rend = gtk_cell_renderer_pixbuf_new();
-- icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);
-+ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
-
- status_box->imhtml_visible = FALSE;
- status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE,
+++ /dev/null
-Index: gaim/src/gtkaccount.c
-===================================================================
---- gaim.orig/src/gtkaccount.c 2005-08-25 17:16:44.000000000 +0200
-+++ gaim/src/gtkaccount.c 2005-08-29 22:34:25.511003600 +0200
-@@ -857,7 +857,6 @@
- {
- GtkWidget *frame;
- GtkWidget *vbox;
-- GtkWidget *vbox2;
- GtkWidget *hbox;
- GtkWidget *hbox2;
- GtkWidget *button;
-@@ -901,12 +900,8 @@
- gaim_set_accessible_label (dialog->icon_entry, label);
- dialog->icon_path = NULL;
-
-- vbox2 = gtk_vbox_new(FALSE, 0);
-- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
-- gtk_widget_show(vbox2);
--
- hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
-- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
-+ gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
- gtk_widget_show(hbox2);
-
- button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-@@ -1275,7 +1270,18 @@
- gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown));
- #endif
-
-- add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
-+ GtkWidget *label;
-+ label = gtk_label_new_with_mnemonic(_("Proxy _type:"));
-+ gtk_size_group_add_widget(dialog->sg, label);
-+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-+ gtk_widget_show(label);
-+
-+ gtk_box_pack_start(GTK_BOX(vbox), dialog->proxy_dropdown, TRUE, TRUE, GAIM_HIG_BORDER);
-+ gtk_widget_show(dialog->proxy_dropdown);
-+ gaim_set_accessible_label (dialog->proxy_dropdown, label);
-+
-+ //add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
-
- /* Setup the second vbox, which may be hidden at times. */
- dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
-@@ -1643,6 +1649,7 @@
- AccountPrefsDialog *dialog;
- GtkWidget *win;
- GtkWidget *main_vbox;
-+ GtkWidget *sw;
- GtkWidget *vbox;
- GtkWidget *bbox;
- GtkWidget *dbox;
-@@ -1709,10 +1716,19 @@
- gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
-
- /* Setup the inner vbox */
-+ //With a scrollbox
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, -1);
-+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
-+ gtk_label_new_with_mnemonic("_Basic"));
-+ gtk_widget_show(sw);
- dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
-- gtk_label_new_with_mnemonic("_Basic"));
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
- gtk_widget_show(vbox);
-
- /* Setup the top frames. */
-@@ -1720,10 +1736,20 @@
- add_user_options(dialog, vbox);
-
- /* Setup the page with 'Advanced'. */
-+ //With a scrollbox
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, -1);
-+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
-+ gtk_label_new_with_mnemonic("_Advanced"));
-+ gtk_widget_show(sw);
- dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
-- gtk_label_new_with_mnemonic("_Advanced"));
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), dbox);
-+ gtk_widget_show(dbox);
-
- /** Setup the bottom frames. */
- add_protocol_options(dialog, dbox);
-@@ -1731,46 +1757,50 @@
- add_proxy_options(dialog, dbox);
-
- /* Setup the button box */
-- bbox = gtk_hbutton_box_new();
-+ //bbox = gtk_hbutton_box_new();
-+ //Replaced with a hbox, otherwise the Register-button doesn't fit (same size required)
-+ bbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
-- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-- /* Register button */
-- button = gtk_button_new_with_label(_("Register"));
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-- gtk_widget_show(button);
--
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(register_account_prefs_cb), dialog);
--
-- dialog->register_button = button;
--
-+ /* Save button */
-+ button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+
- if (dialog->account == NULL)
- gtk_widget_set_sensitive(button, FALSE);
-
-- if (!dialog->prpl_info || !dialog->prpl_info->register_user)
-- gtk_widget_hide(button);
-+ gtk_widget_show(button);
-+
-+ dialog->ok_button = button;
-+
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(ok_account_prefs_cb), dialog);
-
- /* Cancel button */
- button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(cancel_account_prefs_cb), dialog);
-
-- /* Save button */
-- button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ /* Register button */
-+ button = gtk_button_new_with_label(_("Register"));
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ gtk_widget_show(button);
-+
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(register_account_prefs_cb), dialog);
-+
-+ dialog->register_button = button;
-
- if (dialog->account == NULL)
- gtk_widget_set_sensitive(button, FALSE);
-
-- gtk_widget_show(button);
--
-- dialog->ok_button = button;
-+ if (!dialog->prpl_info || !dialog->prpl_info->register_user)
-+ gtk_widget_hide(button);
-
- /* Set up DND */
- gtk_drag_dest_set(dialog->window,
-@@ -1783,11 +1813,20 @@
- g_signal_connect(G_OBJECT(dialog->window), "drag_data_received",
- G_CALLBACK(account_dnd_recv), dialog);
-
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(ok_account_prefs_cb), dialog);
--
- /* Show the window. */
- gtk_widget_show(win);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ gtk_widget_set_size_request(GTK_WIDGET(dialog->protocol_menu), w, -1);
-+
- }
-
- /**************************************************************************
-@@ -2389,6 +2428,7 @@
- bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-@@ -2421,12 +2461,13 @@
- G_CALLBACK(ask_delete_account_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_accounts_cb), dialog);
-+ G_CALLBACK(close_accounts_cb), dialog);*/
-
- /* Setup some gaim signal handlers. */
- gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
+++ /dev/null
-Index: gaim/src/gtkroomlist.c
-===================================================================
---- gaim.orig/src/gtkroomlist.c 2005-08-13 01:53:28.000000000 +0200
-+++ gaim/src/gtkroomlist.c 2005-08-19 21:37:26.225117816 +0200
-@@ -129,7 +129,9 @@
- gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree);
-
- gtk_widget_set_sensitive(dialog->stop_button, TRUE);
-+ gtk_widget_show(dialog->stop_button);
- gtk_widget_set_sensitive(dialog->list_button, FALSE);
-+ gtk_widget_hide(dialog->list_button);
- gtk_widget_set_sensitive(dialog->join_button, FALSE);
- }
-
-@@ -141,7 +143,9 @@
- gtk_widget_set_sensitive(dialog->account_widget, TRUE);
-
- gtk_widget_set_sensitive(dialog->stop_button, FALSE);
-+ gtk_widget_hide(dialog->stop_button);
- gtk_widget_set_sensitive(dialog->list_button, TRUE);
-+ gtk_widget_show(dialog->list_button);
- gtk_widget_set_sensitive(dialog->join_button, FALSE);
- }
-
-@@ -396,7 +400,7 @@
- g_signal_connect(G_OBJECT(dialog->stop_button), "clicked",
- G_CALLBACK(stop_button_cb), dialog);
- gtk_widget_set_sensitive(dialog->stop_button, FALSE);
-- gtk_widget_show(dialog->stop_button);
-+ //gtk_widget_show(dialog->stop_button);
-
- /* list button */
- dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List"));
-@@ -415,11 +419,12 @@
- gtk_widget_show(dialog->join_button);
-
- /* close button */
-- dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), dialog->close_button, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(dialog->close_button), "clicked",
- G_CALLBACK(close_button_cb), dialog);
-- gtk_widget_show(dialog->close_button);
-+ gtk_widget_show(dialog->close_button);*/
-
- /* show the dialog window and return the dialog */
- gtk_widget_show(dialog->window);
-@@ -683,14 +688,18 @@
- if (rl->dialog->account_widget)
- gtk_widget_set_sensitive(rl->dialog->account_widget, FALSE);
- gtk_widget_set_sensitive(rl->dialog->stop_button, TRUE);
-+ gtk_widget_show(rl->dialog->stop_button);
- gtk_widget_set_sensitive(rl->dialog->list_button, FALSE);
-+ gtk_widget_hide(rl->dialog->list_button);
- } else {
- rl->dialog->pg_needs_pulse = FALSE;
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(rl->dialog->progress), 0.0);
- if (rl->dialog->account_widget)
- gtk_widget_set_sensitive(rl->dialog->account_widget, TRUE);
- gtk_widget_set_sensitive(rl->dialog->stop_button, FALSE);
-+ gtk_widget_hide(rl->dialog->stop_button);
- gtk_widget_set_sensitive(rl->dialog->list_button, TRUE);
-+ gtk_widget_show(rl->dialog->list_button);
- }
- }
-
+++ /dev/null
---- gaim.ori/src/gtkprefs.c 2005-09-05 08:28:17.000000000 +0200
-+++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200
-@@ -2108,12 +2108,18 @@
- if (icon)
- g_object_unref(icon);
-
--#if GTK_CHECK_VERSION(2,4,0)
-- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
--#else
-- gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
-- return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
--#endif
-+ //Add a scrolled window around the page contents
-+ GtkWidget *sw;
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ //gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page);
-+
-+
-+ return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text));
- }
-
- static void prefs_notebook_init() {
-@@ -2146,9 +2152,9 @@
- void gaim_gtk_prefs_show(void)
- {
- GtkWidget *vbox;
-- GtkWidget *bbox;
-+ //GtkWidget *bbox;
- GtkWidget *notebook;
-- GtkWidget *button;
-+ //GtkWidget *button;
-
- if (prefs) {
- gtk_window_present(GTK_WINDOW(prefs));
-@@ -2176,11 +2182,13 @@
-
- /* The notebook */
- prefsnotebook = notebook = gtk_notebook_new ();
-- gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
-+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE);
-+ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
-
-
- /* The buttons to press! */
-- bbox = gtk_hbutton_box_new();
-+ //To save screen estate we will do without a close button
-+ /*bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-@@ -2190,7 +2198,7 @@
- g_signal_connect_swapped(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy), prefs);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-- gtk_widget_show(button);
-+ gtk_widget_show(button);*/
-
- prefs_notebook_init();
-
+++ /dev/null
-Index: gaim/src/gtkft.c
-===================================================================
---- gaim.orig/src/gtkft.c 2005-08-21 01:59:50.000000000 +0200
-+++ gaim/src/gtkft.c 2005-08-29 23:05:02.000000000 +0200
-@@ -772,24 +772,26 @@
- G_CALLBACK(open_button_cb), dialog);
-
- /* Pause button */
-- button = gtk_button_new_with_mnemonic(_("_Pause"));
-+ /* Pause button has no function*/
-+ /*button = gtk_button_new_with_mnemonic(_("_Pause"));
- gtk_widget_set_sensitive(button, FALSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->pause_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(pause_button_cb), dialog);
-+ G_CALLBACK(pause_button_cb), dialog);*/
-
- /* Resume button */
-- button = gtk_button_new_with_mnemonic(_("_Resume"));
-+ /* Resume button has no function */
-+ /*button = gtk_button_new_with_mnemonic(_("_Resume"));
- gtk_widget_set_sensitive(button, FALSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->resume_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(resume_button_cb), dialog);
-+ G_CALLBACK(resume_button_cb), dialog);*/
-
- /* Remove button */
- button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
-@@ -811,13 +813,14 @@
- G_CALLBACK(stop_button_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ /* Do without a close button to save screen estate */
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->close_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_button_cb), dialog);
-+ G_CALLBACK(close_button_cb), dialog);*/
-
- return dialog;
- }
+++ /dev/null
-Index: gaim/src/gtkconv.c
-===================================================================
---- gaim.orig/src/gtkconv.c 2005-08-25 17:16:50.000000000 +0200
-+++ gaim/src/gtkconv.c 2005-08-29 23:56:48.142463528 +0200
-@@ -6126,7 +6126,7 @@
- gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/show_incoming_formatting", TRUE);
-
-- gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
-+ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", FALSE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE);
-
- gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
+++ /dev/null
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-25 17:29:42.000000000 +0200
-+++ gaim/src/gtkgaim.h 2005-08-25 19:00:37.335318168 +0200
-@@ -57,14 +57,14 @@
- * Spacings between components, as defined by the
- * Gnome Human Interface Guidelines.
- */
--#define GAIM_HIG_CAT_SPACE 18
--#define GAIM_HIG_BORDER 12
--#define GAIM_HIG_BOX_SPACE 6
-+#define GAIM_HIG_CAT_SPACE 9
-+#define GAIM_HIG_BORDER 6
-+#define GAIM_HIG_BOX_SPACE 3
-
- /**
- * Do we want icons in dialogs?
- */
--#define ICONS_IN_DIALOGS 1
-+#define ICONS_IN_DIALOGS 0
-
- /**
- * How many fields is there screen-space for vertically, before a scrollbar is needed?
-Index: gaim/src/gtkutils.c
-===================================================================
---- gaim.orig/src/gtkutils.c 2005-08-25 19:01:19.630888264 +0200
-+++ gaim/src/gtkutils.c 2005-08-25 19:02:05.067980776 +0200
-@@ -398,7 +398,7 @@
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show(hbox);
-
-- label = gtk_label_new(" ");
-+ label = gtk_label_new(" ");
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_widget_show(label);
-
+++ /dev/null
-Index: gaim/gaim.desktop
-===================================================================
---- gaim.orig/gaim.desktop 2005-06-06 03:40:46.000000000 +0200
-+++ gaim/gaim.desktop 2005-08-21 02:00:18.525853592 +0200
-@@ -33,21 +33,7 @@
- GenericName[sq]=Lajmësjellës Internet
- GenericName[sv]=Meddelandeklient
- GenericName[zh_CN]=互联网通讯程序
--Name=Gaim Internet Messenger
--Name[da]=Gaim - internet beskeder
--Name[de]=Gaim Internet Messenger
--Name[fr]=Gaim Messagerie Instantanée
--Name[hu]=Gaim IM
--Name[it]=Gaim Internet Messenger
--Name[ko]=게임 메신저
--Name[nb]=Gaim lynmeldingsklient
--Name[nl]=Gaim - Expresberichten
--Name[pl]=Komunikator Internetowy Gaim
--Name[pt]=Mensageiro Internet Gaim
--Name[sl]=Gaim - spletni sel
--Name[sq]=Lajmësjellësi Internet Gaim
--Name[sv]=Gaim Internet Messenger
--Name[zh_CN]=Gaim 互联网通讯程序
-+Name=Gaim
- Exec=gaim
- Icon=gaim.png
- StartupNotify=true
+++ /dev/null
---- gaim-1.0.3/gaim.desktop.old 2005-01-01 16:48:58.000000000 +0000
-+++ gaim-1.0.3/gaim.desktop 2005-01-01 16:49:15.000000000 +0000
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[de]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
- Name[fr]=Gaim Messagerie Instantanée
+++ /dev/null
---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
-+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
-
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[ca]=Missatger d'Internet Gaim
- Name[cs]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
+++ /dev/null
---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
-+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
-
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[ca]=Missatger d'Internet Gaim
- Name[cs]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
+++ /dev/null
-Index: gaim/plugins/docklet/docklet-x11.c
-===================================================================
---- gaim.orig/plugins/docklet/docklet-x11.c 2005-04-02 17:23:28.000000000 +0200
-+++ gaim/plugins/docklet/docklet-x11.c 2005-08-21 02:06:51.869056336 +0200
-@@ -112,7 +112,7 @@
- break;
- }
-
-- gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+ gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR);
-
- #if 0
- GdkPixbuf *p;
+++ /dev/null
---- /tmp/irc.h 2005-10-04 14:10:59.699874560 +0200
-+++ gaim/src/protocols/irc/irc.h 2005-10-04 14:13:10.135045400 +0200
-@@ -35,7 +35,7 @@
- #define IRC_DEFAULT_CHARSET "UTF-8"
- #define IRC_DEFAULT_ALIAS "gaim"
-
--#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
-
- #define IRC_INITIAL_BUFSIZE 1024
-
+++ /dev/null
---- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100
-+++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100
-@@ -38,17 +38,12 @@
-
--#include <libedata-book/Evolution-DataServer-Addressbook.h>
-
--#include <libebook/e-book-listener.h>
--#include <libedata-book/e-data-book-factory.h>
--#include <bonobo/bonobo-main.h>
-+#include <libebook/e-book-view-listener.h>
-+#include <libebook/e-data-book-factory-bindings.h>
-
- #include <glib.h>
-
- #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution"
-
--#define E_DATA_BOOK_FACTORY_OAF_ID \
-- "OAFIID:GNOME_Evolution_DataServer_BookFactory"
--
- enum
- {
- COLUMN_AUTOADD,
-@@ -324,8 +320,6 @@
- static gboolean
- plugin_load(GaimPlugin *plugin)
- {
-- bonobo_activate();
--
- backup_blist_ui_ops = gaim_blist_get_ui_ops();
-
- blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps));
-@@ -370,7 +364,6 @@
- static void
- plugin_destroy(GaimPlugin *plugin)
- {
-- bonobo_debug_shutdown();
- }
-
- static void
-@@ -563,13 +556,6 @@
- * So, in conclusion, this is an evil hack, but it doesn't harm anything
- * and it works.
- */
-- g_module_make_resident(plugin->handle);
--
-- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
-- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
-- {
-- gaim_debug_error("evolution", "Unable to initialize bonobo.\n");
-- }
- }
-
- GAIM_INIT_PLUGIN(gevolution, init_plugin, info)
+++ /dev/null
---- gaim/configure.ac.orig 2005-12-19 23:04:14 +0100
-+++ gaim/configure.ac 2005-12-19 23:04:49 +0100
-@@ -442,10 +442,6 @@
- fi
- fi
-
--if test "x$enable_deprecated" = "xno"; then
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
- if test "x$GCC" = "xyes"; then
- DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
- CFLAGS="-g $CFLAGS"
+++ /dev/null
-Index: gaim/src/gtkstock.c
-===================================================================
---- gaim.orig/src/gtkstock.c 2005-08-15 08:52:45.000000000 +0200
-+++ gaim/src/gtkstock.c 2005-08-19 18:13:26.550881552 +0200
-@@ -214,12 +214,12 @@
-
- pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-
- g_free(filename);
-
-- if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
-- gaim_gtk_stock_versionize(&pixbuf, win);
-+ /*if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
-+ gaim_gtk_stock_versionize(&pixbuf, win);*/
-
- iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
-
- g_object_unref(G_OBJECT(pixbuf));
- }
+++ /dev/null
---- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200
-+++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200
-@@ -35,9 +35,9 @@
- #define IRC_DEFAULT_SSL_PORT 994
-
- #define IRC_DEFAULT_CHARSET "UTF-8"
--#define IRC_DEFAULT_ALIAS "purple"
-+#define IRC_DEFAULT_ALIAS "OE-user"
-
--#define IRC_DEFAULT_QUIT "Leaving."
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
-
- #define IRC_INITIAL_BUFSIZE 1024
-
+++ /dev/null
-no-superimposed-version-on-logo.patch
-01-optional-icons-in-dialogs.patch
-02-request-field-dialogs.patch
-03-blist-dialogs.patch
-04-saved-status-dialogs.patch
-05-statusbox-icon-size.patch
-06-account-dialogs.patch
-07-roomlist-dialog.patch
-define-pda-mode.patch
-desktop-name-2.0.0.patch
-docklet-icon-size.patch
-08-prefs-dialog.patch
-09-filetransfer-dialog.patch
-10-pda-default-settings.patch
+++ /dev/null
-SECTION = "x11/network"
-DESCRIPTION = "multi-protocol instant messaging client"
-LICENSE = "GPL"
-
-DEPENDS = "gtk+ gnutls virtual/libintl"
-RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet"
-
-EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers"
-FILES_${PN}-dev += "${libdir}/gaim/*.la"
-
-inherit autotools gettext
-
-PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*"
-
-python populate_packages_prepend () {
- root = bb.data.expand('${libdir}/gaim', d)
-
- do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
- output_pattern='gaim-plugin-%s',
- description='GAIM plugin %s',
- prepend=True)
-
- do_split_packages(d, root, '^lib(.*)\.so$',
- output_pattern='gaim-protocol-%s',
- description='GAIM protocol plugin for %s',
- prepend=True,
- aux_files_pattern=['${datadir}/pixmaps/gaim/status/default/%s.png', '${datadir}/pixmaps/gaim/smileys/default/%s_*'])
-}
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name_1.4.0.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
+++ /dev/null
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
+++ /dev/null
-PR = "r3"
-SRCDATE_${PN} = "20050904"
-#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
-PV = "2.0.0-cvs-mco1-${SRCDATE}"
-
-DEFAULT_PREFERENCE = "-1"
-
-WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
-
-SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \
- ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \
- ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \
- ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \
- ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \
- ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \
- ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \
- ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \
- ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \
- ${WEBCVSURL}/define-pda-mode.patch;patch=1 \
- ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \
- ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \
- ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \
- ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \
- ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \
- file://gaim-OE-branding.patch;patch=1 \
- "
-
-require gaim.inc
-
-S = "${WORKDIR}/gaim"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-
-DEPENDS += "startup-notification"
-
-#include autopoint (gettext)
-EXTRA_AUTORECONF = ""
-
-#disable "X Session Management"... It is EVIL
-EXTRA_OECONF += "--disable-sm --enable-startup-notification \
- --with-gnutls-includes=${STAGING_INCDIR}"
-
-
+++ /dev/null
-SECTION = "x11/network"
-DESCRIPTION = "multi-protocol instant messaging client"
-LICENSE = "GPL"
-
-DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
-RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
-
-EXTRA_OECONF = " \
- --disable-audio \
- --disable-perl \
- --disable-tcl \
- --disable-deprecated \
- --disable-gevolution \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-gnutls=yes \
- --with-ncurses-headers=${STAGING_INCDIR} \
- --with-gnutls-includes=${STAGING_INCDIR} \
- --with-gnutls-libs=${STAGING_LIBDIR} \
- "
-
-OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
-OE_LT_RPATH_ALLOW[export]="1"
-
-PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
-
-
-LEAD_SONAME = "libpurple.so.0"
-FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*"
-FILES_libpurple-dev = "${libdir}/libpurple* \
- ${libdir}/purple-2/*.la "
-FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
- ${libdir}/purple-2/.debug"
-FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*"
-FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*"
-FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so"
-FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*"
-FILES_finch-dev = "${libdir}/finch/*.la"
-FILES_finch-dbg = "${bindir}/.debug/finch \
- ${libdir}/finch/.debug"
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers ${datadir}/icons"
-FILES_${PN}-dev += "${libdir}/pidgin/*.la"
-
-inherit autotools gettext pkgconfig gconf
-
-PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
-
-python populate_packages_prepend () {
- root = bb.data.expand('${libdir}/pidgin', d)
- purple = bb.data.expand('${libdir}/purple-2', d)
- finch = bb.data.expand('${libdir}/finch', d)
-
- do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
- output_pattern='pidgin-plugin-%s',
- description='Pidgin plugin %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, purple, '^lib(.*)\.so$',
- output_pattern='libpurple-protocol-%s',
- description='Libpurple protocol plugin for %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, purple, '^(ssl-.*)\.so$',
- output_pattern='libpurple-plugin-%s',
- description='libpurple plugin %s',
- prepend=True, extra_depends='libpurple-plugin-ssl')
-
- do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
- output_pattern='libpurple-plugin-%s',
- description='libpurple plugin %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
- output_pattern='finch-plugin-%s',
- description='Finch plugin %s',
- prepend=True, extra_depends='')
-
-
-}
+++ /dev/null
---- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200
-+++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200
-@@ -8,8 +8,7 @@
-
- if GCONF_SCHEMAS_INSTALL
- install-data-local:
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
-- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1
- else
- install-data-local:
- endif
+++ /dev/null
---- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000
-+++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000
-@@ -4,7 +4,7 @@
- _GenericName=Internet Messenger
- _Comment=Send instant messages over multiple protocols
- Exec=pidgin
--Icon=pidgin
-+Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png
- StartupNotify=true
- Terminal=false
- Type=Application
+++ /dev/null
---- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200
-+++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200
-@@ -472,7 +472,7 @@
- if test "x$enable_consoleui" = "xyes"; then
- dnl # Some distros put the headers in ncursesw/, some don't
- found_ncurses_h=no
-- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
-+ for location in $ac_ncurses_includes $NCURSES_HEADERS
- do
- f="$location/ncurses.h"
- AC_CHECK_HEADER($f,[
-@@ -1860,10 +1860,6 @@
- KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV"
- fi
- KRB4_LDFLAGS="-L${kerberos}/lib"
-- elif test -d /usr/local/include/kerberosIV ; then
-- KRB4_CFLAGS="-I/usr/local/include/kerberosIV"
-- elif test -d /usr/include/kerberosIV ; then
-- KRB4_CFLAGS="-I/usr/include/kerberosIV"
- fi
- AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
-
-@@ -1896,10 +1892,6 @@
- ZEPHYR_LDFLAGS="-L${zephyr}/lib"
- elif test -d /usr/athena/include/zephyr ; then
- ZEPHYR_CFLAGS="-I/usr/athena/include"
-- elif test -d /usr/include/zephyr ; then
-- ZEPHYR_CFLAGS="-I/usr/include"
-- elif test -d /usr/local/include/zephyr ; then
-- ZEPHYR_CFLAGS="-I/usr/local/include"
- fi
- AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.])
- AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
+++ /dev/null
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- "
-
-PR = "r1"
+++ /dev/null
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- file://purple-OE-branding.patch;patch=1 \
- "
-
-PR = "r0"
+++ /dev/null
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- file://purple-OE-branding.patch;patch=1 \
- "
-
-PR = "r0"
PACKAGES = ""
# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
--with-newlib \
--disable-shared \
--disable-threads \
SECTION = "devel"
LICENSE = "GPL"
require gcc_${PV}.bb
-PR = "r0"
+PR = "r1"
inherit sdk
SECTION = "devel"
LICENSE = "GPL"
require gcc_${PV}.bb
-PR = "r2"
+PR = "r3"
inherit sdk
SECTION = "devel"
LICENSE = "GPL"
require gcc_${PV}.bb
-PR = "r1"
+PR = "r2"
inherit sdk
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
inherit sdk
-PR = "r4"
+PR = "r5"
inherit sdk
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
inherit sdk
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r12"
+PR = "r13"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r7"
+PR = "r8"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r3"
+PR = "r4"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r9"
+PR = "r10"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r4"
+PR = "r5"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r17"
+PR = "r18"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment this one too.
-PR = "r13"
+PR = "r14"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r10"
+PR = "r11"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r3"
+PR = "r5"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
gcclibdir ?= "${libdir}/gcc"
BINV ?= "${PV}"
-PACKAGES = "libgcc ${PN} ${PN}-symlinks \
- g++ g++-symlinks \
- cpp cpp-symlinks \
- g77 g77-symlinks \
- gfortran gfortran-symlinks \
- gcov gcov-symlinks \
- libmudflap libmudflap-dev \
- libstdc++ libg2c \
- libstdc++-dev libg2c-dev \
- ${PN}-doc"
+PACKAGES = "\
+ libgcc ${PN} ${PN}-symlinks \
+ g++ g++-symlinks \
+ cpp cpp-symlinks \
+ g77 g77-symlinks \
+ gfortran gfortran-symlinks \
+ gcov gcov-symlinks \
+ libmudflap libmudflap-dev \
+ libstdc++ libg2c \
+ libstdc++-dev libg2c-dev \
+ ${PN}-doc \
+"
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
- ${bindir}/${TARGET_PREFIX}gccbug \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
-FILES_${PN}-symlinks = "${bindir}/cc \
- ${bindir}/gcc \
- ${bindir}/gccbug"
-
-FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
-FILES_g77-symlinks = "${bindir}/g77 \
- ${bindir}/f77"
-
-FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
-FILES_gfortran-symlinks = "${bindir}/gfortran \
- ${bindir}/f95"
-
-FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
- ${base_libdir}/cpp"
+FILES_${PN} = "\
+ ${bindir}/${TARGET_PREFIX}gcc \
+ ${bindir}/${TARGET_PREFIX}gccbug \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+"
+FILES_${PN}-symlinks = "\
+ ${bindir}/cc \
+ ${bindir}/gcc \
+ ${bindir}/gccbug \
+"
+
+FILES_g77 = "\
+ ${bindir}/${TARGET_PREFIX}g77 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+FILES_g77-symlinks = "\
+ ${bindir}/g77 \
+ ${bindir}/f77 \
+"
+FILES_gfortran = "\
+ ${bindir}/${TARGET_PREFIX}gfortran \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
+"
+FILES_gfortran-symlinks = "\
+ ${bindir}/gfortran \
+ ${bindir}/f95"
+
+FILES_cpp = "\
+ ${bindir}/${TARGET_PREFIX}cpp \
+ ${base_libdir}/cpp \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
FILES_cpp-symlinks = "${bindir}/cpp"
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
-FILES_libg2c-dev = "${libdir}/libg2c.so \
- ${libdir}/libg2c.a \
- ${libdir}/libfrtbegin.a"
-
-FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
-FILES_g++-symlinks = "${bindir}/c++ \
- ${bindir}/g++"
+FILES_libg2c-dev = "\
+ ${libdir}/libg2c.so \
+ ${libdir}/libg2c.a \
+ ${libdir}/libfrtbegin.a \
+"
+
+FILES_g++ = "\
+ ${bindir}/${TARGET_PREFIX}g++ \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES_g++-symlinks = "\
+ ${bindir}/c++ \
+ ${bindir}/g++ \
+"
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
- ${libdir}/libstdc++.so \
- ${libdir}/libstdc++.la \
- ${libdir}/libstdc++.a \
- ${libdir}/libsupc++.la \
- ${libdir}/libsupc++.a"
+FILES_libstdc++-dev = "\
+ ${includedir}/c++/${BINV} \
+ ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++.a \
+ ${libdir}/libsupc++.la \
+ ${libdir}/libsupc++.a \
+"
FILES_libmudflap = "${libdir}/libmudflap*.so.*"
-FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
- ${libdir}/libmudflap*.a \
- ${libdir}/libmudflap*.a"
-
-
-FILES_${PN}-doc = "${infodir} \
- ${mandir} \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
+FILES_libmudflap-dev = "\
+ ${libdir}/libmudflap*.so \
+ ${libdir}/libmudflap*.a \
+ ${libdir}/libmudflap*.a \
+"
+
+FILES_${PN}-doc = "\
+ ${infodir} \
+ ${mandir} \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libgcc', 'libgcc1', d)
- bb.build.exec_func('package_do_package', d)
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+ bb.build.exec_func('package_do_package', d)
}
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
- --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+ --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+ --with-sysroot=${STAGING_DIR_TARGET} \
+ --with-build-sysroot=${STAGING_DIR_TARGET}"
do_configure_prepend () {
rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
rm -rf ${CROSS_DIR}/$d
done
+ # Hack to be removed when staging layout matches the target layout
+ if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then
+ ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr
+ fi
+
# Fix a few include links so cross builds are happier
if [ ! -e ${STAGING_INCDIR}/c++ ]; then
mkdir -p ${STAGING_INCDIR}
SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
-STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
-STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+STAGING_TARGET_INCDIR = "${STAGING_DIR_TARGET}${layout_includedir}"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR_TARGET}${layout_libdir}"
do_configure () {
(cd ${S} && gnu-configize) || die "failure running gnu-configize"
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
-SYSROOT = "${WORKDIR}/sysroot"
-EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
+EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}"
do_configure () {
- # Work around Hardcoded path assumptions in gcc
- mkdir -p ${SYSROOT}/usr/
- ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include
- ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib
+ # Hack to be removed when staging layout matches the target layout
+ if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then
+ ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr
+ fi
(cd ${S} && gnu-configize) || die "failure running gnu-configize"
(cd ${S}/libstdc++-v3 && autoreconf)
oe_runconf
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
inherit autotools gettext
SECTION = "devel"
LICENSE = "GPL"
DEPENDS = "mpfr gmp"
-PR = "r6"
+PR = "r7"
inherit autotools gettext
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
+
DEFAULT_PREFERENCE = "-1"
inherit autotools gettext
-PR = "r17"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r18"
inherit autotools gettext
LICENSE = "GPL"
# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment the -cross .bb PR too.
-PR = "r10"
+PR = "r11"
inherit autotools gettext
-PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r8"
inherit autotools gettext
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://904-flatten-switch-stmt-00.patch;patch=1 \
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://gfortran.patch;patch=1 \
- file://pr34130.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
"
SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
-PR = "r3"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r5"
inherit autotools gettext
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://801-arm-bigendian-eabi.patch;patch=1 \
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://gfortran.patch;patch=1 \
- file://gcc-4.0.2-e300c2c3.patch;patch=1 \
- file://pr34130.patch;patch=1 \
- file://fortran-static-linking.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
+ file://fortran-static-linking.patch;patch=1 \
"
SRC_URI_append_ep93xx = " \
}
do_stage () {
- oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+ oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers
# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
# so do them by hand. We can tolerate an empty stubs.h for the moment.
# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
- mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
- touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
- cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+ mkdir -p ${STAGING_INCDIR}/gnu
+ touch ${STAGING_INCDIR}/gnu/stubs.h
+ cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
}
do_install () {
# make sure there isn't a conflicting libc in staging
# this should be solved differently
rm -f ${STAGING_LIBDIR}/libc.so.6
- oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
- 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+ 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
'${STAGING_LIBDIR}/libc.so.6' \
install-headers install-lib
--- /dev/null
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+
+LICENSE = "GPL-2"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+
+
+EXTRA_OECONF = "--enable-gui=gtk \
+ --enable-renderer=cairo \
+ --enable-media=none \
+ --disable-klash \
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-boost-incl=${STAGING_INCDIR} \
+ --with-boost-lib=${STAGING_LIBDIR} \
+ --with-libxml-incl=${STAGING_INCDIR}/libxml2 \
+ --with-libxml-lib=${STAGING_LIBDIR} \
+ --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
+# --with-glib-lib=${STAGING_LIBDIR} \
+ --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
+ --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
+# --with-pango-lib=${STAGING_LIBDIR} \
+ --with-sdl-incl=${STAGING_INCDIR}/SDL \
+ --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
+ --with-Xft-incl=${STAGING_INCDIR}/X11 \
+ --with-expat-incl=${STAGING_INCDIR} \
+ --with-mad-incl=${STAGING_INCDIR} \
+ --with-cairo-incl=${STAGING_INCDIR}/cairo \
+ --with-curl-incl=${STAGING_INCDIR} \
+ --with-curl-lib=${STAGING_LIBDIR} \
+ "
+
+inherit autotools pkgconfig
+
+LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
+CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
+
+do_configure_append() {
+ for i in `find . -name Makefile` ; do
+ sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
+ done
+}
+
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+ oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+ 'ZLIB_INCLUDE=${STAGING_INCDIR}' \
+ 'ZLIB_LIBS=${STAGING_LIBDIR}' \
+ 'PNG_INCLUDE=${STAGING_INCDIR}' \
+ 'PNG_LIBS=${STAGING_LIBDIR}'
+}
+
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+do_stage() {
+ autotools_stage_all
+}
+
-DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
-LICENSE = "GPL-2"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
-
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
-
-
-EXTRA_OECONF = "--enable-gui=gtk \
- --enable-renderer=cairo \
- --enable-media=none \
- --disable-klash \
- --enable-z \
- --enable-jpeg \
- --disable-glext \
- --enable-Xft \
- --enable-expat \
- --enable-mad \
- --enable-cairo \
- --disable-plugin \
- --disable-cygnal \
- --with-boost-incl=${STAGING_INCDIR} \
- --with-boost-lib=${STAGING_LIBDIR} \
- --with-libxml-incl=${STAGING_INCDIR}/libxml2 \
- --with-libxml-lib=${STAGING_LIBDIR} \
- --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-# --with-glib-lib=${STAGING_LIBDIR} \
- --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
- --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-# --with-pango-lib=${STAGING_LIBDIR} \
- --with-sdl-incl=${STAGING_INCDIR}/SDL \
- --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
- --with-Xft-incl=${STAGING_INCDIR}/X11 \
- --with-expat-incl=${STAGING_INCDIR} \
- --with-mad-incl=${STAGING_INCDIR} \
- --with-cairo-incl=${STAGING_INCDIR}/cairo \
- --with-curl-incl=${STAGING_INCDIR} \
- --with-curl-lib=${STAGING_LIBDIR} \
- "
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
- for i in `find . -name Makefile` ; do
- sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
- done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
- oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
- 'ZLIB_INCLUDE=${STAGING_INCDIR}' \
- 'ZLIB_LIBS=${STAGING_LIBDIR}' \
- 'PNG_INCLUDE=${STAGING_INCDIR}' \
- 'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
-
-PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
-
-FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
-FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
-FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
-FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
-FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
-FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
-FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
-
-do_stage() {
- autotools_stage_all
-}
-
+require gnash.inc
--- /dev/null
+require gnash.inc
---- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200
-+++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200
-@@ -1,3 +1,8 @@
- key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=???XF86PowerDown:-:/usr/bin/apm --suspend
- key=???Held XF86PowerDown:-:bl toggle
+--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200
++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200
+@@ -1,3 +1,9 @@
+ key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
+ key=????XF86PowerDown:-:/usr/bin/apm --suspend
+ key=????Held XF86PowerDown:-:bl toggle
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
+key=...*Escape:-:~/etc/init.d/gpe-dm stop
++
upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=125
+status: accepted in 0.91
Lock screen when device goes to suspend, not after some time has passed
since resume and they stole your data from the unprotected screen.
--- /dev/null
+--- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200
++++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200
+@@ -1,3 +1,8 @@
+ key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
+ key=???XF86PowerDown:-:/usr/bin/apm --suspend
+ key=???Held XF86PowerDown:-:bl toggle
++
++# VT changing
++key=...*Left:-:~chvt 1
++key=...*Right:-:~chvt 3
++key=...*Escape:-:~/etc/init.d/gpe-dm stop
+++ /dev/null
---- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
--- /dev/null
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
+SRC_URI += " file://size-autolock-properly.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
--without-sdl --disable-video --enable-alsa \
- --with-osip=${STAGING_DIR}/${HOST_SYS} \
- --with-readline=${STAGING_DIR}/${HOST_SYS} \
+ --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
--disable-truespeech --disable-manual \
--disable-glibtest --disable-glib --disable-strict"
--- /dev/null
+DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications"
+HOMEPAGE = "http://www.gnupg.org/gpgme.html"
+LICENSE = "GPL"
+DEPENDS = "libgpg-error pth libassuan"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
+
+EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+
+LEAD_SONAME = "libgpgme.so"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_includes
+
+ install -d ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
+
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN} = "${libdir}/libgpgme*.so.*"
+FILES_${PN}-dev += "${bindir}/gpgme-config"
-LICENSE = "GPL"
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
-PR = "r1"
-
-DEPENDS = "libgpg-error pth libassuan"
-
-EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
-
-inherit autotools binconfig
-
-do_stage() {
- autotools_stage_includes
-
- install -d ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
-
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
-}
+require gpgme.inc
+PR = "r2"
-LICENSE = "GPL"
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
-PR = "r1"
-
-DEPENDS = "libgpg-error pth libassuan"
-
-EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
-
-inherit autotools binconfig
-
-do_stage() {
- autotools_stage_includes
-
- install -d ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
-
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
-}
+require gpgme.inc
+PR = "r2"
-LICENSE = "GPL"
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2"
-PR = "r2"
-
-DEPENDS = "libgpg-error pth libassuan"
-
-EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
-
-inherit autotools binconfig
-
-do_stage() {
- autotools_stage_includes
-
- install -d ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
- oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
-
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-FILES_${PN} = "${libdir}/libgpgme*.so.*"
-FILES_${PN}-dev += "${bindir}/gpgme-config"
-
-LEAD_SONAME = "libgpgme"
+require gpgme.inc
+PR = "r3"
--- /dev/null
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+
+@@ -176,6 +177,25 @@
+ 15812 => 3 ,
+ 7906 => 2,
+ 3953 => 1
++ },
++ openstreetmap_tah => {
++ 256*576000 => 1,
++ 128*576000 => 2,
++ 64*576000 => 3,
++ 32*576000 => 4,
++ 16*576000 => 5,
++ 8*576000 => 6,
++ 4*576000 => 7,
++ 2*576000 => 8,
++ 576000 => 9,
++ 288000 => 10,
++ 144000 => 11,
++ 72000 => 12,
++ 36000 => 13,
++ 18000 => 14,
++ 9000 => 15,
++ 4500 => 16,
++ 2250 => 17
+ }
+ };
+
+@@ -331,7 +351,6 @@
+ exit();
+ }
+
+-
+ # Verify that we have the options that we need
+ pod2usage(1) if (&error_check);
+
+@@ -417,6 +436,13 @@
+ print "+-----------------------------------------------------------+\n";
+ print "| Landsat Maps are Copyright, ..... |\n";
+ print "| They are free for non commercial use. |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++ print "+-----------------------------------------------------------+\n";
++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n";
++ print "| project. |\n";
++ print "| They are free for use under the terms of the |\n";
++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n";
++ print "| license. See http://www.openstreetmap.org for details. |\n";
+ } elsif ( ! $force) {
+ print "You are violating the map servers copyright!\n";
+ print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+ {
+ ($url,$mapscale)=googlemap_url($lati,$long,$scale);
+ }
++ elsif ( $mapserver eq 'openstreetmap_tah')
++ {
++ $filename=~s/\.gif/.png/;
++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++ }
+ else
+ {
+ print "Unknown map sever :", $mapserver, "\n";
+@@ -935,6 +966,37 @@
+ return ($url,$mapscale);
+ }
+
++#############################################################################
++sub openstreetmap_tah_url($$$){
++ my $lati = shift;
++ my $long = shift;
++ my $scale = shift;
++
++ my $mapscale = $scale;
++ my $zoom = undef;
++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++ next unless $s == $scale;
++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++ $mapscale = $s;
++ last;
++ }
++
++ unless ( $zoom ) {
++ print "Error calculating Zoomlevel for Scale: $scale\n";
++ return (undef,undef);
++ }
++
++ if ($debug) {
++ print "\n";
++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++ print "lat: $lati\n";
++ print "lon: $long\n";
++ }
++
++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++# print "$url\n";
++ return ($url,$mapscale);
++}
+
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs,
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+
+ landsat covers the whole world with satelite Photos
+
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see
++ http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+
+ incrementp for japanese Maps
--- /dev/null
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c (Revision 1699)
++++ aa/src/map_handler.c (Revision 1700)
+@@ -660,9 +660,12 @@
+ if (maploaded)
+ gdk_pixbuf_unref (image);
+
++#ifdef MAPNIK
+ if ( !strcmp (filename,"mapnik") ) {
+ limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+- } else {
++ } else
++#endif
++ {
+ limage = gdk_pixbuf_new_from_file (filename, NULL);
+ if (limage == NULL)
+ {
--- /dev/null
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ -DLIBDIR=\"${libdir}\" \
+ -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+- -I/usr/include/ \
+- -I/usr/local/include \
+- -I/opt/boost_1_35/include/boost-1_35 \
+- -I/usr/local/include/freetype2 \
+- -I/usr/include/freetype2 \
++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++# -I/usr/include/ \
++# -I/usr/local/include \
++# -I/opt/boost_1_35/include/boost-1_35 \
++# -I/usr/local/include/freetype2 \
++# -I/usr/include/freetype2 \
+ -I. \
+- -L/usr/local/lib
++# -L/usr/local/lib
+
+ # -I/usr/include/dbus-1.0/
+
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ # Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
+
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+
+ ac_perl_modules="File::Basename "
+ # Make sure we have perl
+@@ -37840,11 +37843,11 @@
+ # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
+ #fi
+
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
+diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
+--- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100
+@@ -662,9 +662,12 @@
+ # Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ AC_SUBST(PERL_PACKAGE_DIR)
+
+ AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename))
+@@ -719,11 +722,11 @@
+ # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
+ #fi
+
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
--- /dev/null
+[Desktop Entry]
+Encoding=UTF-8
+Name=GPSDrive
+Comment=GPS map software
+Exec=gpsdrive -M pda -1
+Icon=gpsicon
+Terminal=false
+Type=Application
+Categories=Graphics;Network;Geography;Application;Other
+StartupNotify=true
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "http://www.gpsdrive.de/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
file://gpsdrive.desktop"
CFLAGS += "-D_GNU_SOURCE"
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
file://gpsdrive.desktop"
CFLAGS += "-D_GNU_SOURCE"
--- /dev/null
+DESCRIPTION = "GPS navigation/map display software"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
+PR = "r1"
+
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
+ file://gpsdrive_2.10pre4.desktop \
+ file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
+ file://gpsdrive-ifdef-mapnik.patch;patch=1 \
+ file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
+do_install_append () {
+ mkdir -p ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
+ mkdir -p ${D}${datadir}/pixmaps
+ cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
+ # remove stuff we don't want to package
+ rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
+ rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
+ rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
+}
+
+PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
+
+FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
+FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"
+FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
+FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
+FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
+FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+DEFAULT_PREFERENCE = "1"
GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
fi
GSM_DEV="/dev/ttySAC0"
+ GSM_DL="/sys/devices/platform/neo1973-pm-gsm.0/download"
;;
"htc_apache"|"htc_blueangel"|"htc_universal")
GSMD_OPTS="-s 115200 -F"
+++ /dev/null
-#!/bin/sh
-#
-# gsmd This shell script starts and stops gsmd.
-#
-# chkconfig: 345 90 40
-# description: Gsmd manages access to a serial- or USB-connected GSM
-# processname: gsmd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-
-case "$1" in
- start)
- stty -F "$GSM_DEV" -crtscts
- [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
- stty -F "$GSM_DEV" -echo
- [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
- [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
- [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
-
- echo -n "Starting GSM daemon: "
- start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
-
- if [ $? = 0 ]; then
- echo "gsmd."
- else
- echo "(failed.)"
- fi
- ;;
- stop)
- echo -n "Stopping GSM daemon: "
- start-stop-daemon -K -x /usr/sbin/gsmd
- stty -F "$GSM_DEV" -crtscts
- [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
- echo "gsmd."
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- *)
- echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
- exit 1
- ;;
-esac
-
-exit 0
case "$1" in
start)
+ [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 )
[ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
[ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
[ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
PROVIDES += "gsmd"
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
PV = "0.1+svnr${SRCREV}"
-PR = "r41"
+PR = "r42"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
do_stage() {
oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
- cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr
+ cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix}
autotools_stage_includes
# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include
# install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
# file://gtk-doc.patch;patch=1 \
"
EXTRA_OECONF =" \
- --prefix=${STAGING_DIR} \
+ --prefix=${STAGING_DIR_HOST}${layout_prefix} \
--with-gdktarget=directfb \
--without-x \
--without-libtiff \
EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
--libdir=${STAGING_LIBDIR} \
--disable-xinetest \
- --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+ --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
LDFLAGS += "-lxine"
EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
--libdir=${STAGING_LIBDIR} \
--disable-xinetest \
- --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+ --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
LDFLAGS += "-lxine"
--- /dev/null
+#------------------------------------------------------
+# Moko Underground OS Image Recipe
+#------------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+ADD_INSTALL = "\
+ fontconfig \
+ \
+ ttf-dejavu-common \
+ ttf-dejavu-sans \
+ ttf-dejavu-serif \
+ \
+"
+
+IMAGE_INSTALL = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-base \
+ netbase \
+ sysfsutils \
+ modutils-initscripts \
+ module-init-tools-depmod \
+ rsync \
+ screen \
+ fbset \
+ fbset-modes \
+ \
+ matchbox-wm \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ \
+ gsm0710muxd \
+ pyneod \
+ pyneog \
+ \
+ ${ADD_INSTALL} \
+"
+
+DEPENDS = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-pyneo \
+"
+
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r3"
+PR = "r4"
do_compile() {
cat > init.sh << EOF
#!/bin/sh
/bin/mount -t proc proc /proc
-/bin/mount -t ${ROOTFS} /dev/${ROOTDEV} /mnt
+/bin/mount -t ${ROOTFS} ${ROOTDEV} /mnt
/usr/sbin/kexec -l /mnt/zImage
/usr/sbin/kexec -e
EOF
FILES_${PN} = "/init /proc /mnt"
-ROOTDEV = "mtdblock2"
+ROOTDEV = "mtd2"
ROOTFS = "jffs2"
-set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200"
+set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0"
-set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200"
+set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0"
DESCRIPTION = "Kernel boot parameters for HH.org bootldr"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
COMPATIBLE_MACHINE = "(h3600|h3800|h3900|h5000|simpad)"
# --disable-threads is needed on epia/x86 with uclibc
do_configure() {
gnu-configize
- oe_runconf --exec-prefix=${STAGING_DIR} --disable-threads
+ oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix} --disable-threads
}
do_compile() {
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r15"
+PR = "r16"
inherit native
if opt_s:
sys.exit(0)
-@@ -154,7 +177,7 @@ if packages_filename:
- os.rename(tmp_packages_filename, packages_filename)
- os.rename(tmp_gzip_filename, gzip_filename)
-
--if verbose:
-+if verbose:
- sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()
----
- arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py | 106 ++++++++++++++++++++++++++---------------------------
- setup.py | 2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200
@@ -0,0 +1,124 @@
+"""
+arfile - A module to parse GNU ar archives.
+
+ f2 = tarf.extractfile("control")
+ print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- platforms = 'POSIX',
- keywords = 'ipkg familiar',
- url = 'http://www.handhelds.org/sources.html/',
-- py_modules = [ 'ipkg' ],
-+ py_modules = [ 'ipkg', 'arfile' ],
- scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
- )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
import string
import commands
from stat import ST_SIZE
class Version:
"""A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
self.section = None
self.filename_header = None
self.file_list = []
- self.size = stat[ST_SIZE]
+
self.filename = os.path.basename(fn)
-+ assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported"
-+
## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,))
- if self.isdeb:
- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
- self.__dict__[name] = value
- else:
- line = control.readline()
++ if self.isdeb:
++ ar = arfile.ArFile(f)
++ tarStream = ar.open("control.tar.gz")
++ tarf = tarfile.open("control.tar.gz", "r", tarStream)
++
++ try:
++ control = tarf.extractfile("control")
++ except KeyError:
++ control = tarf.extractfile("./control")
++ else:
++ control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
+
-+ ar = arfile.ArFile(f)
-+ tarStream = ar.open("control.tar.gz")
-+ tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+
-+ try:
-+ control = tarf.extractfile("control")
-+ except KeyError:
-+ control = tarf.extractfile("./control")
+ self.read_control(control)
control.close()
- if self.isdeb:
self.scratch_dir = None
self.file_dir = None
self.meta_dir = None
-
++
+ def __getattr__(self, name):
+ if name == "md5":
+ self._computeFileMD5()
+ sum.update(data)
+ f.close()
+ self.md5 = sum.hexdigest()
-+
+
def read_control(self, control):
import os
-
-@@ -221,9 +203,15 @@ class Package:
+@@ -221,9 +207,15 @@ class Package:
value = value + '\n' + line
if name == 'size':
self.size = int(value)
return # consumes one blank line at end of package descriptoin
else:
line = control.readline()
-@@ -314,6 +302,16 @@ class Package:
+@@ -314,7 +306,27 @@ class Package:
return self.section
def get_file_list(self):
+- return self.file_list
+ if not self.fn:
+ return []
-+ f = open(self.fn, "rb")
-+ ar = arfile.ArFile(f)
-+ tarStream = ar.open("data.tar.gz")
-+ tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+ self.file_list = tarf.getnames()
++
++ if self.isdeb:
++ f = open(self.fn, "rb")
++ ar = arfile.ArFile(f)
++ tarStream = ar.open("data.tar.gz")
++ tarf = tarfile.open("data.tar.gz", "r", tarStream)
++ self.file_list = tarf.getnames()
++ f.close()
++ else:
++ f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r")
++ while 1:
++ line = f.readline()
++ if not line: break
++ self.file_list.append(string.rstrip(line))
++ f.close()
++
++ # Make sure that filelist has consistent format regardless of tar version
+ self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+
-+ f.close()
- return self.file_list
++ return self.file_list
def write_package(self, dirname):
+ buf = self.render_control()
+diff -r 720080c24d2f setup.py
+--- a/setup.py Sun Jan 27 23:13:26 2008 +0200
++++ b/setup.py Sun Jan 27 23:26:35 2008 +0200
+@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+ platforms = 'POSIX',
+ keywords = 'ipkg familiar',
+ url = 'http://www.handhelds.org/sources.html/',
+- py_modules = [ 'ipkg' ],
++ py_modules = [ 'ipkg', 'arfile' ],
+ scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
+ )
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r17"
+PR = "r18"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
SECTION = "console/utils"
-DESCRIPTION = "Joe's own editor."
+DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
+HOMEPAGE = "http://joe-editor.sourceforge.net/"
LICENSE ="GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+PR = "r1"
inherit autotools
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
--- ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:30:53 1.1
+++ ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:31:08
@@ -351,7 +351,7 @@
-diff --git a/kabc/secrecy.h b/kabc/secrecy.h
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+diff --git
+a/kabc/secrecy.h b/kabc/secrecy.h
index 21e22f2..3011ae9 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
-diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+diff --git
+a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index cccd485..65d82e2 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
--- /dev/null
+DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA"
+DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool"
+DESCRIPTION_kopi-applet = "KDE Pim/PI applet"
+DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook"
+DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde"
+DESCRIPTION_libmicrokcal = "KDE Pim/PI library - microkcal"
+DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc"
+DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu"
+DESCRIPTION_kammu = "KDE Pim/PI fork of gammu"
+
+SECTION = "opie/pim"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+# we can't build:
+# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library)
+# kabc/plugins/ldap - wants ldap libs (?)
+# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE)
+# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/kdepim"
+
+EXTRA_QMAKEVARS_POST += " \
+INCLUDEPATH+=../ \
+OBJECTS_DIR=obj/ MOC_DIR=moc/ \
+DESTDIR=${S}/dest \
+LIBS+=-L${S}/dest/ \
+LIBS-=-lzlib \
+LIBS+=-lz \
+"
+# That changes will be needed for KMicroMail/PI to get it build with OE libs
+#
+# LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \
+
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="qtcompat libical/src/libical libical/src/libicalss microkde libkcal libkdepim \
+ kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \
+ kabc/formats/binary kabc/plugins/qtopia \
+ gammu/emb/common \
+ gammu/emb/gammu \
+# pwmanager/libcrypt/mpi \
+# pwmanager/libcrypt/error \
+# pwmanager/libcrypt/cipher \
+# pwmanager/libcrypt/zlib \
+# pwmanager/pwmanager \
+ "
+
+inherit palmtop
+
+do_configure_prepend() {
+ mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro
+ echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
+ for d in ${SUBDIRS}
+ do
+ if [ -f ${d}/`basename ${d}`E.pro ];
+ then
+ mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+ fi
+ done
+}
+
+do_compile() {
+ export KDEPIMDIR=${S}
+ oe_runmake
+}
+
+HEADERS_DIRS = "qtcompat \
+microkde \
+microkde/kdecore \
+microkde/kdeui \
+microkde/kio \
+microkde/kresources \
+microkde/kutils \
+microkde/opie2 \
+kabc \
+libkcal \
+libkdepim "
+
+do_unstage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
+ done
+}
+
+addtask unstage before do_configure
+
+do_stage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${STAGING_INCDIR}/kdepimpi/$dir
+ install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
+ done
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/lib \
+ ${D}${palmtopdir}/apps/1Pim \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+ ${D}${palmtopdir}/plugins/applets
+
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer
+ install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16
+ install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini
+ install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop
+
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22
+ install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
+ done
+
+ install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
+ install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
+
+ install -d ${D}${bindir} ${D}${libdir}
+ install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
+ oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets
+ done
+}
+
+
+PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu"
+
+FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
+FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
+FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
+FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
+FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
+FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
+FILES_kammu = "${bindir}/kammu"
+FILES_libmicrokammu = "${libdir}/libmicrokammu*"
--- /dev/null
+DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA - X11 version"
+DESCRIPTION_kopi-x11 = "Korganizer/PI is a powerful calendar and ToDo Tool - X11 version"
+DESCRIPTION_kopi-applet-x11 = "KDE Pim/PI applet - X11 version"
+DESCRIPTION_kapi-x11 = "KAddressbook/PI is a port of KDE addressbook - X11 version"
+DESCRIPTION_libmicrokdelibs-x11 = "KDE Pim/PI library - microkde - X11 version"
+DESCRIPTION_libmicrokcal-x11 = "KDE Pim/PI library - microkcal - X11 version"
+DESCRIPTION_libmicrokabc-x11 = "KDE Pim/PI library - microkabc - X11 version"
+DESCRIPTION_libmicrokammu-x11 = "KDE Pim/PI fork of libGammu - X11 version"
+DESCRIPTION_kammu-x11 = "KDE Pim/PI fork of gammu - X11 version"
+
+SECTION = "x11/pim"
+
+inherit qmake qt3x11
+
+QMAKE_PROFILES= "kdepim-desktop.pro"
+
+do_install() {
+ oe_runmake install
+}
+
+do_install-broken() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/lib \
+ ${D}${palmtopdir}/apps/1Pim \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+ ${D}${palmtopdir}/plugins/applets
+
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer
+ install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16
+ install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini
+ install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop
+
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16
+ install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22
+ install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
+ done
+
+ install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
+ install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
+
+ install -d ${D}${bindir} ${D}${libdir}
+ install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
+ oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets
+ done
+}
+
+PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11"
+
+FILES_kopi-x11 = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
+FILES_kapi-x11 = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
+FILES_kopi-applet-x11 = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
+FILES_libmicrokabc-x11 = "${palmtopdir}/lib/libmicrokabc*"
+FILES_libmicrokcal-x11 = "${palmtopdir}/lib/libmicrokcal*"
+FILES_libmicrokdelibs-x11 = "${palmtopdir}/lib/*"
+FILES_kammu-x11 = "${bindir}/kammu"
+FILES_libmicrokammu-x11 = "${libdir}/libmicrokammu*"
--- /dev/null
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/kaddressbook/kaddressbook.pro~kabc
++++ kdepim/kaddressbook/kaddressbook.pro
+@@ -31,10 +31,10 @@
+ LIBS += ../libical/lib/libicalss.a
+
+ } else {
+-LIBS += ../bin/libmicrokdepim.so
+-LIBS += ../bin/libmicrokde.so
+-LIBS += ../bin/libmicrokabc.so
+-LIBS += ../bin/libmicrokcal.so
++LIBS += $(DESTDIR)/libmicrokdepim.so
++LIBS += $(DESTDIR)/libmicrokde.so
++LIBS += $(DESTDIR)/libmicrokabc.so
++LIBS += $(DESTDIR)/libmicrokcal.so
+ #LIBS += -lldap
+ }
+ OBJECTS_DIR = obj/unix
--- /dev/null
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/gammu/emb/gammu/gammu.pro~kammu
++++ kdepim/gammu/emb/gammu/gammu.pro
+@@ -47,7 +47,7 @@
+ depend/nokia/dct3trac/wmx-util.c \
+ depend/nokia/dct3trac/wmx.c
+ unix : {
+-LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
++LIBS += $(DESTDIR)/libmicrogammu.so
+ # bluetooth disabled for now
+ #/usr/lib/libbluetooth.so /usr/lib/libsdp.so
+ OBJECTS_DIR = obj/unix
--- /dev/null
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/korganizer/korganizer.pro~korganizer
++++ kdepim/korganizer/korganizer.pro
+@@ -34,10 +34,10 @@
+ LIBS += ../libical/lib/libical.a
+ LIBS += ../libical/lib/libicalss.a
+ } else {
+-LIBS += ../bin/libmicrokdepim.so
+-LIBS += ../bin/libmicrokcal.so
+-LIBS += ../bin/libmicrokde.so
+-LIBS += ../bin/libmicrokabc.so
++LIBS += $(DESTDIR)/libmicrokdepim.so
++LIBS += $(DESTDIR)/libmicrokcal.so
++LIBS += $(DESTDIR)/libmicrokde.so
++LIBS += $(DESTDIR)/libmicrokabc.so
+ #LIBS += -lbluetooth
+ #LIBS += -lsdp
+
--- /dev/null
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+--- kdepim/libkcal/libkcal.pro~paths 2005-01-30 00:23:34.000000000 +0100
++++ kdepim/libkcal/libkcal.pro 2005-10-03 11:09:49.000000000 +0200
+@@ -11,8 +11,8 @@
+ DESTDIR = ../bin
+ DEFINES += DESKTOP_VERSION
+ unix: {
+-LIBS += ../libical/lib/libical.a
+-LIBS += ../libical/lib/libicalss.a
++LIBS += ../dest$(LIBICAL_PATH)/libical.a
++LIBS += ../dest$(LIBICAL_PATH)/libicalss.a
+ OBJECTS_DIR = obj/unix
+ MOC_DIR = moc/unix
+ }
--- /dev/null
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/kdepim-desktop.pro~nomail
++++ kdepim/kdepim-desktop.pro
+@@ -15,7 +15,7 @@
+ }
+ unix:{
+ !staticlib: {
+-SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
++SUBDIRS += pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
+ }
+ }
+
--- /dev/null
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
+file://libkcal.patch;patch=1 \
+file://kabc.patch;patch=1 \
+file://kammu.patch;patch=1 \
+file://korganizer.patch;patch=1 \
+file://nomail.patch;patch=1 \
+"
+
+include kdepimpi-base.inc
+include kdepimpi-x11.inc
--- /dev/null
+DESCRIPTION = "Kphone/Pi is a 'Voice Over Internet' phone which uses the Session Initiation Protocol (SIP)."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/html/kp_pi.html"
+DEPENDS ="openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kphone_pi_${PV}.tar.gz"
+
+S = "${WORKDIR}/kphone_pi"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+QMAKE_PROFILES= "kphone_piE.pro"
+
+do_configure_prepend() {
+ mkdir ${S}/dest/
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/apps/Applications \
+ ${D}${palmtopdir}/pics/kphone/
+
+ install -m 0644 ${S}/bin/kdepim/kphone/*.png ${D}${palmtopdir}/pics/kphone/
+ install -m 0644 ${S}/kphone.desktop ${D}${palmtopdir}/apps/Applications/
+
+ install -m 0755 ${S}/dest/kppi ${D}${palmtopdir}/bin/kppi
+}
--- /dev/null
+DESCRIPTION = "Time tracking program"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/ktimetracker_pi097.tar.gz"
+
+S = "${WORKDIR}/ktimetracker_pi"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+QMAKE_PROFILES= "ktimetracker_piE.pro"
+
+do_configure_prepend() {
+ mkdir ${S}/dest/
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/apps/1Pim \
+ ${D}${palmtopdir}/pics/
+
+ install -m 0644 ${S}/ktimetracker.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/ktimetracker.desktop ${D}${palmtopdir}/apps/1Pim/
+
+ install -m 0755 ${S}/dest/ktpi ${D}${palmtopdir}/bin/ktpi
+}
--- /dev/null
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-22 20:45:15.907610333 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-22 20:45:27.508612989 +0100
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "../../kexec.h"
+ #include "../../kexec-elf.h"
+
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2008-02-22 20:45:15.959611260 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2008-02-22 20:45:27.508612989 +0100
+@@ -110,13 +110,13 @@
+ }
+
+ fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
+- if (ferror(fp)) {
++/* if (ferror(fp)) {
+ fprintf(stderr, "Cannot read %s: %s\n",
+ fn, strerror(errno));
+ fclose(fp);
+ return NULL;
+ }
+-
++*/
+ fclose(fp);
+ return (struct tag *) buf;
+ }
+Index: kexec-tools-1.101/kexec/ifdown.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/ifdown.c 2004-06-09 20:55:31.000000000 +0200
++++ kexec-tools-1.101/kexec/ifdown.c 2008-02-22 20:45:27.508612989 +0100
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #include <net/if.h>
+ #include <netinet/in.h>
+Index: kexec-tools-1.101/purgatory/Makefile
+===================================================================
+--- kexec-tools-1.101.orig/purgatory/Makefile 2005-01-08 23:36:32.000000000 +0100
++++ kexec-tools-1.101/purgatory/Makefile 2008-02-22 20:45:27.516611391 +0100
+@@ -13,7 +13,7 @@
+
+ PCFLAGS += $(call cc-option, -ffreestanding)
+ PCFLAGS += $(call cc-option, -fnobuiltin)
+-PCFLAGS += $(call cc-option, -fnostdinc)
++PCFLAGS += $(call cc-option, -nostdinc)
+ PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss)
+
+ PURGATORY_C_SRCS:=
+Index: kexec-tools-1.101/kexec/kexec-elf-rel.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec-elf-rel.c 2005-01-13 14:04:21.000000000 +0100
++++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2008-02-22 20:45:27.524612027 +0100
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include "elf.h"
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include "kexec.h"
+ #include "kexec-elf.h"
+Index: kexec-tools-1.101/kexec/kexec-syscall.h
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec-syscall.h 2008-02-22 20:45:15.923611048 +0100
++++ kexec-tools-1.101/kexec/kexec-syscall.h 2008-02-22 20:45:27.524612027 +0100
+@@ -2,7 +2,7 @@
+ #define KEXEC_SYSCALL_H
+
+ #define __LIBRARY__
+-#include <syscall.h>
++/*#include <syscall.h>*/
+ #include <sys/syscall.h>
+ #include <unistd.h>
+
+@@ -21,7 +21,7 @@
+ #define LINUX_REBOOT_CMD_KEXEC_OLD 0x81726354
+ #define LINUX_REBOOT_CMD_KEXEC_OLD2 0x18263645
+ #define LINUX_REBOOT_CMD_KEXEC 0x45584543
+-
++/*
+ #ifdef __i386__
+ #define __NR_kexec_load 283
+ #endif
+@@ -43,18 +43,19 @@
+ #ifndef __NR_kexec_load
+ #error Unknown processor architecture. Needs a kexec_load syscall number.
+ #endif
+-
++*/
+ struct kexec_segment;
+-
++/*
+ static inline long kexec_load(void *entry, unsigned long nr_segments,
+ struct kexec_segment *segments, unsigned long flags)
+ {
+ return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags);
+ }
+-
++*/
+ static inline long kexec_reboot(void)
+ {
+- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
++ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
++ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
+ }
+
+
+Index: kexec-tools-1.101/kexec/kexec.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec.c 2008-02-22 20:45:15.923611048 +0100
++++ kexec-tools-1.101/kexec/kexec.c 2008-02-22 20:45:38.847612035 +0100
+@@ -29,9 +29,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+-#ifdef HAVE_ZLIB_H
+-#include <zlib.h>
+-#endif
++#include "zlib.h"
+ #include <sha256.h>
+ #include "kexec.h"
+ #include "kexec-syscall.h"
+@@ -383,7 +381,7 @@
+ return buf;
+ }
+
+-#if HAVE_ZLIB_H
++#if 1
+ char *slurp_decompress_file(const char *filename, off_t *r_size)
+ {
+ gzFile fp;
+# the binaries are statical linked against klibc
require kexec-tools.inc
-PR = "r0"
+PR = "r3"
+DEPENDS = "klibc"
-SRC_URI += "file://kexec-static.patch;patch=1"
+SRC_URI += "file://kexec-klibc.patch;patch=1"
S = "${WORKDIR}/kexec-tools-${PV}"
+EXTRA_OECONF = " --without-zlib"
+
+export CC=${TARGET_PREFIX}klcc
+
+# standart oe cflags don't work with klcc
+export CFLAGS=""
+export CPPFLAGS=""
+export LDFLAGS=""
+
PACKAGES =+ "kexec-static kdump-static"
FILES_kexec-static = "${sbindir}/kexec"
inherit autotools
-export LDFLAGS = "-L${STAGING_LIBDIR}"
-EXTRA_OECONF = " --with-zlib=yes"
SRC_URI = "http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-${PV}.tar.gz \
file://kexec-tools-arm.patch;patch=1 \
require kexec-tools.inc
+export LDFLAGS = "-L${STAGING_LIBDIR}"
+EXTRA_OECONF = " --with-zlib=yes"
-PR = "r4"
+PR = "r5"
+++ /dev/null
-# These are OE specific patches which make the install stuff work
-# in the OE build environment and fix the problem that the gzip
-# stuff should be all links to one executable but end up being
-# copies
---- klibc-1.1.1/Makefile.orig 2005-12-29 14:20:09.080981353 -0800
-+++ klibc-1.1.1/Makefile 2005-12-29 14:20:25.634022970 -0800
-@@ -61,7 +61,7 @@ local-install: $(CROSS)klcc
- mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)include/$$d ; \
- for r in $(KRNLSRC)/include $(KRNLOBJ)/include $(KRNLOBJ)/include2 ; do \
- [ ! -d $$r/$$d ] || \
-- cp -rfL $$r/$$d/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
-+ cp -rf $$r/$$d/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
- done ; \
- done
- cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(ARCH) asm
---- klibc-1.1.1/gzip/Makefile.orig 2005-12-29 18:10:00.787869930 -0800
-+++ klibc-1.1.1/gzip/Makefile 2005-12-29 18:11:21.084922705 -0800
-@@ -70,9 +70,12 @@ clean:
- spotless: clean
- rm -f *~
-
--# These should presumably be shared...
- install: all
-- $(INSTALL_EXEC) gzip gunzip zcat $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin
-+ $(INSTALL_EXEC) gzip $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin
-+ rm -f $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/gunzip
-+ ln $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/gzip $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/gunzip
-+ rm -f $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/zcat
-+ ln $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/gzip $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin/zcat
-
- ifneq ($(wildcard .*.d),)
- include $(wildcard .*.d)
---- klibc-1.1.1/klibc/Makefile.orig 2005-12-30 10:39:04.504930675 -0800
-+++ klibc-1.1.1/klibc/Makefile 2005-12-30 10:39:52.755966921 -0800
-@@ -184,6 +184,7 @@ install: all
- $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)lib
- $(INSTALL_EXEC) klibc-`cat $(SOLIB).hash`.so \
- $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)lib
-+ test -z "$(INSTALLROOT)" || \
- $(INSTALL_EXEC) klibc-`cat $(SOLIB).hash`.so \
- $(INSTALLROOT)/$(SHLIBDIR)
-
--- /dev/null
+--- klibc-1.5/usr/klibc/SYSCALLS.def 2007-03-04 02:52:10.000000000 +0100
++++ klibc.clean/usr/klibc/SYSCALLS.def 2008-02-22 17:12:23.663612084 +0100
+@@ -13,6 +13,8 @@
+ #include <asm/unistd.h>
+ #include <klibc/sysconfig.h>
+ #include <bitsize.h>
++#include <asm/kexec.h>
++long kexec_load(void *, unsigned long , struct kexec_segment *, unsigned long );
+
+ /*
+ * Process-related syscalls
--- /dev/null
+Index: klibc-1.5/Makefile
+===================================================================
+--- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100
+@@ -33,7 +33,7 @@
+ export PERL := perl
+
+ # Location for installation
+-export prefix = /usr
++export prefix = $(INST)
+ export bindir = $(prefix)/bin
+ export libdir = $(prefix)/lib
+ export mandir = $(prefix)/man
+Index: klibc-1.5/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100
+@@ -88,25 +88,21 @@
+ header:
+ $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+ $(Q)mkdir -p $(INSTALLROOT)$(bindir)
+- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
+- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
+ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
+ $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
+ mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+ for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ $(KLIBCKERNELOBJ)/include2 ; do \
+ [ ! -d $$r/$$d ] || \
+- cp -rfL $$r/$$d/. \
++ cp -rfd $$r/$$d/. \
+ $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
+ done ; \
+ done
+ $(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
+ $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+
+ footer: header
+Index: klibc-1.5/usr/dash/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100
+@@ -107,5 +107,3 @@
+ $(obj)/arith.c: $(obj)/arith.h
+ $(Q):
+
+-# Targets to install
+-install-y := sh.shared
+Index: klibc-1.5/usr/gzip/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ targets := gzip gzip.g gunzip zcat
+
+-# Targets to install
+-install-y := gzip gunzip zcat
+Index: klibc-1.5/usr/kinit/fstype/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ clean-dirs := static shared
+
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/ipconfig/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100
+@@ -27,5 +27,3 @@
+ # Cleaning
+ clean-dirs := static shared
+
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100
+@@ -33,5 +33,3 @@
+ subdir- := fstype ipconfig nfsmount resume run-init
+
+
+-# install binary
+-install-y := kinit kinit.shared
+Index: klibc-1.5/usr/kinit/nfsmount/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100
+@@ -23,5 +23,3 @@
+
+ clean-dirs := static shared
+
+-# Install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/resume/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100
+@@ -26,5 +26,3 @@
+ # Cleaning
+ clean-dirs := static shared
+
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/run-init/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ clean-dirs := static shared
+
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/klibc/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100
+@@ -175,5 +175,3 @@
+ $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
+ $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+ $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
+- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+- $(INSTALLROOT)$(SHLIBDIR)
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100
+@@ -64,5 +64,3 @@
+ # Clean deletes the static and shared dir
+ clean-dirs := static shared
+
+-# install only install the shared binaries
+-install-y := $(shared-y) shared/reboot shared/poweroff
use with initramfs. It is deliberately written for small size, \
minimal entaglement, and portability, not speed."
LICENSE = "BSD-ADV"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
-SRC_URI += "file://install.patch;patch=1"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \
+ file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
+ "
S = "${WORKDIR}/klibc-${PV}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-# for the correct kernel staging path
-# inherit module-base
-
-EXTRA_OEMAKE = "'ARCH=${KLIBC_ARCH}' \
- 'CROSS=${TARGET_PREFIX}' \
- 'CC=${HOST_PREFIX}gcc' \
- 'LD=${HOST_PREFIX}ld' \
- 'AR=${AR}' \
- 'RANLIB=${RANLIB}' \
- 'NM=${TARGET_PREFIX}nm' \
- 'STRIP=echo' \
- 'SHLIBDIR=/lib' \
- 'HOST_CC=${BUILD_CC}' \
- 'HOST_CFLAGS=${BUILD_CFLAGS}' \
- 'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
- 'HOST_LIBS=' \
- 'LDFLAGS=' \
- 'ARCHREQFLAGS=${HOST_CC_ARCH}' \
- 'OPTFLAGS=${TARGET_CFLAGS}' \
- 'mandir=${mandir}'"
-
KLIBC_ARCH = '${TARGET_ARCH}'
KLIBC_ARCH_armeb = 'arm'
KLIBC_ARCH_mipsel = 'mips'
# could be fixed, but for the moment:
ARM_INSTRUCTION_SET = "arm"
-TARGET_CFLAGS := "${@oe_filter_out('-I\S+', '${TARGET_CFLAGS}', d)} -I${STAGING_KERNEL_DIR}/include"
-
-INSTALLDIR = "/usr/lib/klibc"
-INSTALLPREFIX = "${INSTALLDIR}/${TARGET_PREFIX}"
-INSTALLBINDIR = "${INSTALLPREFIX}bin"
-INSTALLLIBDIR = "${INSTALLPREFIX}lib"
-INSTALLINCDIR = "${INSTALLPREFIX}include"
+SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1 \
+ "
+SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1 \
+ "
-PACKAGES = "${PN}-dbg ${PN} ${PN}-dev ${PN}-doc"
-
-FILES_${PN} = "/lib/*.so* ${INSTALLBINDIR}"
-FILES_${PN}-dev = "/usr/bin ${INSTALLINCDIR} ${INSTALLLIBDIR}"
+EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
+ 'CROSS_COMPILE=${TARGET_PREFIX}' \
+ "
do_configure () {
ln -sf ${STAGING_KERNEL_DIR} linux
}
-do_install() {
- # The installed -dev won't work because it has the cross compiler
- # path compiled in.
- oe_runmake 'INSTALLROOT=${D}' install
-}
require klibc-common.inc
-PR = "r3"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
-
-SRC_URI_append_linux-gnueabi = "\
- file://klibc-config-eabi.patch;patch=1"
-
-EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
- 'CROSS_COMPILE=${TARGET_PREFIX}' \
- "
+PR = "r7"
+# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
install -d ${D}${base_bindir}
install -m 755 usr/dash/sh ${D}${base_bindir}
install -m 755 usr/gzip/gzip ${D}${base_bindir}
- ln -s ${D}${base_bindir}/gzip ${D}${base_bindir}/gunzip
- ln -s ${D}${base_bindir}/gzip ${D}${base_bindir}/zcat
+ install -m 755 usr/kinit/kinit ${D}${base_bindir}
+ install -m 755 usr/kinit/fstype/static/fstype ${D}${base_bindir}
+ install -m 755 usr/kinit/ipconfig/static/ipconfig ${D}${base_bindir}
+ install -m 755 usr/kinit/nfsmount/static/nfsmount ${D}${base_bindir}
+ install -m 755 usr/kinit/resume/static/resume ${D}${base_bindir}
+ install -m 755 usr/kinit/run-init/static/run-init ${D}${base_bindir}
install -m 755 usr/utils/static/cat ${D}${base_bindir}
install -m 755 usr/utils/static/chroot ${D}${base_bindir}
install -m 755 usr/utils/static/cpio ${D}${base_bindir}
install -m 755 usr/utils/static/ln ${D}${base_bindir}
install -m 755 usr/utils/static/minips ${D}${base_bindir}
install -m 755 usr/utils/static/mkdir ${D}${base_bindir}
+ install -m 755 usr/utils/static/mkfifo ${D}${base_bindir}
install -m 755 usr/utils/static/mknod ${D}${base_bindir}
install -m 755 usr/utils/static/mount ${D}${base_bindir}
install -m 755 usr/utils/static/nuke ${D}${base_bindir}
install -m 755 usr/utils/static/pivot_root ${D}${base_bindir}
+ install -m 755 usr/utils/static/poweroff ${D}${base_bindir}
install -m 755 usr/utils/static/readlink ${D}${base_bindir}
+ install -m 755 usr/utils/static/reboot ${D}${base_bindir}
install -m 755 usr/utils/static/sleep ${D}${base_bindir}
install -m 755 usr/utils/static/true ${D}${base_bindir}
install -m 755 usr/utils/static/umount ${D}${base_bindir}
install -m 755 usr/utils/static/uname ${D}${base_bindir}
+ cd ${D}${base_bindir}
+ ln -s gzip gunzip
+ ln -s gzip zcat
+ cd -
}
PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
- klibc-utils-static-cat klibc-utils-static-chroot \
+ klibc-utils-static-kinit klibc-utils-static-fstype \
+ klibc-utils-static-ipconfig klibc-utils-static-nfsmount \
+ klibc-utils-static-resume klibc-utils-static-run-init \
+ klibc-utils-static-cat klibc-utils-static-chroot \
klibc-utils-static-cpio klibc-utils-static-dd \
klibc-utils-static-false klibc-utils-static-halt \
klibc-utils-static-insmod klibc-utils-static-kill \
klibc-utils-static-ln klibc-utils-static-minips \
- klibc-utils-static-mkdir klibc-utils-static-mknod \
- klibc-utils-static-mount klibc-utils-static-nuke \
- klibc-utils-static-pivot-root klibc-utils-static-readlink \
- klibc-utils-static-sleep klibc-utils-static-true \
- klibc-utils-static-umount klibc-utils-static-uname "
+ klibc-utils-static-mkdir klibc-utils-static-mkfifo \
+ klibc-utils-static-mknod klibc-utils-static-mount \
+ klibc-utils-static-nuke klibc-utils-static-pivot-root \
+ klibc-utils-static-poweroff klibc-utils-static-readlink \
+ klibc-utils-static-reboot klibc-utils-static-sleep \
+ klibc-utils-static-true klibc-utils-static-umount \
+ klibc-utils-static-uname \
+ "
FILES_klibc-utils-static-sh = "${base_bindir}/sh"
FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
+FILES_klibc-utils-static-kinit = "${base_bindir}/kinit"
+FILES_klibc-utils-static-fstype = "${base_bindir}/fstype"
+FILES_klibc-utils-static-ipconfig = "${base_bindir}/ipconfig"
+FILES_klibc-utils-static-nfsmount = "${base_bindir}/nfsmount"
+FILES_klibc-utils-static-resume = "${base_bindir}/resume"
+FILES_klibc-utils-static-run-init = "${base_bindir}/run-init"
FILES_klibc-utils-static-cat = "${base_bindir}/cat"
FILES_klibc-utils-static-chroot = "${base_bindir}/chroot"
FILES_klibc-utils-static-cpio = "${base_bindir}/cpio"
FILES_klibc-utils-static-ln = "${base_bindir}/ln"
FILES_klibc-utils-static-minips = "${base_bindir}/minips"
FILES_klibc-utils-static-mkdir = "${base_bindir}/mkdir"
+FILES_klibc-utils-static-mkfifo = "${base_bindir}/mkfifo"
FILES_klibc-utils-static-mknod = "${base_bindir}/mknod"
FILES_klibc-utils-static-mount = "${base_bindir}/mount"
FILES_klibc-utils-static-nuke = "${base_bindir}/nuke"
FILES_klibc-utils-static-pivot-root = "${base_bindir}/pivot_root"
+FILES_klibc-utils-static-poweroff = "${base_bindir}/poweroff"
FILES_klibc-utils-static-readlink = "${base_bindir}/readlink"
+FILES_klibc-utils-static-reboot = "${base_bindir}/reboot"
FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
FILES_klibc-utils-static-true = "${base_bindir}/true"
FILES_klibc-utils-static-umount = "${base_bindir}/umount"
require klibc-common.inc
-STAGING_KLIBC_DIR = "${STAGING_DIR_HOST}/klibc"
+SRC_URI += "file://staging.patch;patch=1 \
+ file://klibc_kexecsyscall.patch;patch=1 \
+ "
+# we want only the shared programms and the lib so we chose them manually
+do_install() {
+ install -d ${D}${base_bindir}
+ install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh
+ install -m 755 usr/gzip/gzip ${D}${base_bindir}
+ install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit
+ install -m 755 usr/kinit/fstype/shared/fstype ${D}${base_bindir}
+ install -m 755 usr/kinit/ipconfig/shared/ipconfig ${D}${base_bindir}
+ install -m 755 usr/kinit/nfsmount/shared/nfsmount ${D}${base_bindir}
+ install -m 755 usr/kinit/resume/shared/resume ${D}${base_bindir}
+ install -m 755 usr/kinit/run-init/shared/run-init ${D}${base_bindir}
+ install -m 755 usr/utils/shared/cat ${D}${base_bindir}
+ install -m 755 usr/utils/shared/chroot ${D}${base_bindir}
+ install -m 755 usr/utils/shared/cpio ${D}${base_bindir}
+ install -m 755 usr/utils/shared/dd ${D}${base_bindir}
+ install -m 755 usr/utils/shared/false ${D}${base_bindir}
+ install -m 755 usr/utils/shared/halt ${D}${base_bindir}
+ install -m 755 usr/utils/shared/insmod ${D}${base_bindir}
+ install -m 755 usr/utils/shared/kill ${D}${base_bindir}
+ install -m 755 usr/utils/shared/ln ${D}${base_bindir}
+ install -m 755 usr/utils/shared/minips ${D}${base_bindir}
+ install -m 755 usr/utils/shared/mkdir ${D}${base_bindir}
+ install -m 755 usr/utils/shared/mkfifo ${D}${base_bindir}
+ install -m 755 usr/utils/shared/mknod ${D}${base_bindir}
+ install -m 755 usr/utils/shared/mount ${D}${base_bindir}
+ install -m 755 usr/utils/shared/nuke ${D}${base_bindir}
+ install -m 755 usr/utils/shared/pivot_root ${D}${base_bindir}
+ install -m 755 usr/utils/shared/poweroff ${D}${base_bindir}
+ install -m 755 usr/utils/shared/readlink ${D}${base_bindir}
+ install -m 755 usr/utils/shared/reboot ${D}${base_bindir}
+ install -m 755 usr/utils/shared/sleep ${D}${base_bindir}
+ install -m 755 usr/utils/shared/true ${D}${base_bindir}
+ install -m 755 usr/utils/shared/umount ${D}${base_bindir}
+ install -m 755 usr/utils/shared/uname ${D}${base_bindir}
+
+ install -d ${D}${base_libdir}
+ install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
+ cd ${D}${base_libdir}
+ ln -s klibc-*.so klibc.so
+ cd -
+ cd ${D}${base_bindir}
+ ln -s gzip gunzip
+ ln -s gzip zcat
+ cd -
+}
+
+export INST=${STAGING_DIR_TARGET}
do_stage() {
- rm -rf "${STAGING_KLIBC_DIR}"
- oe_runmake 'prefix=${STAGING_KLIBC_DIR}' \
- 'bindir=${STAGING_BINDIR}' \
- 'mandir=${STAGING_DIR_HOST}${layout_mandir}' \
- install
- # The following is sufficient, at least in klibc 1.1.1 to make klcc
- # use the staged libraries and include files.
- sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
- '${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
- # Perhaps other binaries need to be moved to cross?
- mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}'
+ oe_runmake install
+ cp '${STAGING_DIR_TARGET}/bin/klcc' '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc'
}
+
+PACKAGES = "${PN} klibc-utils-sh klibc-utils-kinit \
+ klibc-utils-fstype klibc-utils-ipconfig \
+ klibc-utils-nfsmount klibc-utils-resume \
+ klibc-utils-run-init klibc-utils-cat \
+ klibc-utils-chroot klibc-utils-cpio \
+ klibc-utils-dd klibc-utils-false \
+ klibc-utils-halt klibc-utils-insmod \
+ klibc-utils-kill klibc-utils-ln \
+ klibc-utils-minips klibc-utils-mkdir \
+ klibc-utils-mkfifo klibc-utils-mknod \
+ klibc-utils-mount klibc-utils-nuke \
+ klibc-utils-pivot-root klibc-utils-poweroff \
+ klibc-utils-readlink klibc-utils-reboot \
+ klibc-utils-sleep klibc-utils-true \
+ klibc-utils-umount klibc-utils-uname \
+ klibc-utils-gzip"
+
+FILES_${PN} = "${base_libdir}/klibc*.so"
+FILES_klibc-utils-sh = "${base_bindir}/sh"
+FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
+FILES_klibc-utils-kinit = "${base_bindir}/kinit"
+FILES_klibc-utils-fstype = "${base_bindir}/fstype"
+FILES_klibc-utils-ipconfig = "${base_bindir}/ipconfig"
+FILES_klibc-utils-nfsmount = "${base_bindir}/nfsmount"
+FILES_klibc-utils-resume = "${base_bindir}/resume"
+FILES_klibc-utils-run-init = "${base_bindir}/run-init"
+FILES_klibc-utils-cat = "${base_bindir}/cat"
+FILES_klibc-utils-chroot = "${base_bindir}/chroot"
+FILES_klibc-utils-cpio = "${base_bindir}/cpio"
+FILES_klibc-utils-dd = "${base_bindir}/dd"
+FILES_klibc-utils-false = "${base_bindir}/false"
+FILES_klibc-utils-halt = "${base_bindir}/halt"
+FILES_klibc-utils-insmod = "${base_bindir}/insmod"
+FILES_klibc-utils-kill = "${base_bindir}/kill"
+FILES_klibc-utils-ln = "${base_bindir}/ln"
+FILES_klibc-utils-minips = "${base_bindir}/minips"
+FILES_klibc-utils-mkdir = "${base_bindir}/mkdir"
+FILES_klibc-utils-mkfifo = "${base_bindir}/mkfifo"
+FILES_klibc-utils-mknod = "${base_bindir}/mknod"
+FILES_klibc-utils-mount = "${base_bindir}/mount"
+FILES_klibc-utils-nuke = "${base_bindir}/nuke"
+FILES_klibc-utils-pivot-root = "${base_bindir}/pivot_root"
+FILES_klibc-utils-poweroff = "${base_bindir}/poweroff"
+FILES_klibc-utils-readlink = "${base_bindir}/readlink"
+FILES_klibc-utils-reboot = "${base_bindir}/reboot"
+FILES_klibc-utils-sleep = "${base_bindir}/sleep"
+FILES_klibc-utils-true = "${base_bindir}/true"
+FILES_klibc-utils-umount = "${base_bindir}/umount"
+FILES_klibc-utils-uname = "${base_bindir}/uname"
+
+# Yes we want exactly the klibc that was compiled with the utils
+RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-kinit = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-fstype = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-ipconfig = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-nfsmount = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-resume = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-run-init = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-insmod = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-ln = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-minips = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-mkdir = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-mkfifo = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-mknod = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-mount = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-nuke = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-pivot-root = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
+++ /dev/null
-require klibc.inc
+++ /dev/null
-require klibc.inc
-
-PR = "r1"
--- /dev/null
+require klibc.inc
+PR = "r5"
--- /dev/null
+/* XPM */
+static char * fighter_48_xpm[] = {
+"40 40 399 2",
+" c None",
+". c #C8E2CD",
+"+ c #8AB7A3",
+"@ c #408474",
+"# c #023D3D",
+"$ c #F2FBEA",
+"% c #CEE5D1",
+"& c #7DB09B",
+"* c #063E32",
+"= c #002320",
+"- c #D0E6D2",
+"; c #F6FEEE",
+"> c #C7E0CC",
+", c #639C89",
+"' c #054137",
+") c #002629",
+"! c #A6C9B3",
+"~ c #E8F6E4",
+"{ c #EEF8E8",
+"] c #92BDA9",
+"^ c #3A7F6F",
+"/ c #074847",
+"( c #002924",
+"_ c #00286F",
+": c #9CC2AD",
+"< c #F0F9E9",
+"[ c #C8E0CC",
+"} c #6FA894",
+"| c #377F6E",
+"1 c #105251",
+"2 c #002F23",
+"3 c #002863",
+"4 c #ACCDB8",
+"5 c #F0F8E8",
+"6 c #ABCDB8",
+"7 c #62A28E",
+"8 c #3B8572",
+"9 c #195B5D",
+"0 c #003729",
+"a c #002750",
+"b c #8AB4A0",
+"c c #C4DDC9",
+"d c #E8F4E3",
+"e c #99C1AC",
+"f c #569D89",
+"g c #3D8876",
+"h c #23645D",
+"i c #013F3A",
+"j c #00273F",
+"k c #81B09C",
+"l c #CAE1CE",
+"m c #D1E7D3",
+"n c #86B4A0",
+"o c #4E9885",
+"p c #3F8A76",
+"q c #2A6C60",
+"r c #064646",
+"s c #002831",
+"t c #7AAD99",
+"u c #C8E1CD",
+"v c #BAD8C3",
+"w c #77AC98",
+"x c #4B9783",
+"y c #408B77",
+"z c #307465",
+"A c #094B4E",
+"B c #002A24",
+"C c #7EB09C",
+"D c #CCE4D0",
+"E c #AFD0BB",
+"F c #6BA693",
+"G c #489581",
+"H c #418E7A",
+"I c #337868",
+"J c #0D4F54",
+"K c #002C22",
+"L c #7AAE9A",
+"M c #C4E0CB",
+"N c #A4C8B2",
+"O c #66A490",
+"P c #46947F",
+"Q c #428F7A",
+"R c #357C6B",
+"S c #115355",
+"T c #002E22",
+"U c #002869",
+"V c #88B9A8",
+"W c #87B6A2",
+"X c #C5E1CC",
+"Y c #9FC4AF",
+"Z c #5DA08D",
+"` c #428F7B",
+" . c #377E6D",
+".. c #135555",
+"+. c #003124",
+"@. c #00275F",
+"#. c #001B3C",
+"$. c #8DBCAE",
+"%. c #7EB19D",
+"&. c #B9D9C2",
+"*. c #95BDA8",
+"=. c #5A9988",
+"-. c #4F7666",
+";. c #466F5F",
+">. c #357868",
+",. c #18595A",
+"'. c #003426",
+"). c #00275D",
+"!. c #001931",
+"~. c #9CC4B8",
+"{. c #75AC98",
+"]. c #AFD1BB",
+"^. c #8CAD9A",
+"/. c #B2ACA7",
+"(. c #C08F8E",
+"_. c #792D2C",
+":. c #271C19",
+"<. c #174A50",
+"[. c #003628",
+"}. c #00275C",
+"|. c #02202F",
+"1. c #D3E4DE",
+"2. c #80B5A4",
+"3. c #73AA97",
+"4. c #A9CBB6",
+"5. c #BDB3AC",
+"6. c #F7F0F0",
+"7. c #CB9B9B",
+"8. c #6B2222",
+"9. c #1B0404",
+"0. c #131112",
+"a. c #012E23",
+"b. c #002559",
+"c. c #042C31",
+"d. c #01120F",
+"e. c #ECEEEA",
+"f. c #C5DAD1",
+"g. c #76B09E",
+"h. c #75AC97",
+"i. c #A6AA9B",
+"j. c #E2C8C8",
+"k. c #DEC0C0",
+"l. c #AE6C6C",
+"m. c #460E0E",
+"n. c #150303",
+"o. c #110303",
+"p. c #07120D",
+"q. c #001F47",
+"r. c #042E2B",
+"s. c #03231D",
+"t. c #01110D",
+"u. c #E3E9E4",
+"v. c #82B7A5",
+"w. c #78B19E",
+"x. c #78AD98",
+"y. c #A88E86",
+"z. c #BF8686",
+"A. c #8D3E3E",
+"B. c #2F0808",
+"C. c #140303",
+"D. c #0D0604",
+"E. c #000F22",
+"F. c #04251F",
+"G. c #052D25",
+"H. c #032B23",
+"I. c #EFEFEC",
+"J. c #8ABCAB",
+"K. c #82B6A4",
+"L. c #7BB2A0",
+"M. c #79AB98",
+"N. c #A56F6B",
+"O. c #B77878",
+"P. c #AD6868",
+"Q. c #7C2A2A",
+"R. c #2C0707",
+"S. c #100403",
+"T. c #000A15",
+"U. c #041411",
+"V. c #052922",
+"W. c #064034",
+"X. c #04362C",
+"Y. c #EBEDEA",
+"Z. c #92C0B1",
+"`. c #7CB3A1",
+" + c #7EB4A2",
+".+ c #76A391",
+"++ c #9F5B5A",
+"@+ c #AA6363",
+"#+ c #A35959",
+"$+ c #742323",
+"%+ c #2A0707",
+"&+ c #020B13",
+"*+ c #050F0C",
+"=+ c #05201B",
+"-+ c #063D32",
+";+ c #095747",
+">+ c #064135",
+",+ c #DDE6E1",
+"'+ c #8ABBAA",
+")+ c #80B5A3",
+"!+ c #6EA18F",
+"~+ c #975150",
+"{+ c #A65E5E",
+"]+ c #9F5353",
+"^+ c #712020",
+"/+ c #280606",
+"(+ c #130303",
+"_+ c #280707",
+":+ c #030B13",
+"<+ c #050E0B",
+"[+ c #051914",
+"}+ c #06352B",
+"|+ c #095545",
+"1+ c #0A5A4A",
+"2+ c #084E3F",
+"3+ c #BAD5CB",
+"4+ c #81B6A5",
+"5+ c #80B6A3",
+"6+ c #6FA795",
+"7+ c #8A4846",
+"8+ c #9A4C4C",
+"9+ c #974747",
+"0+ c #671A1A",
+"a+ c #220606",
+"b+ c #120303",
+"c+ c #631818",
+"d+ c #030B15",
+"e+ c #050E0C",
+"f+ c #051712",
+"g+ c #052C24",
+"h+ c #074D3F",
+"i+ c #0A5C4C",
+"j+ c #0A5848",
+"k+ c #0A5C4B",
+"l+ c #0A6350",
+"m+ c #8DBFAE",
+"n+ c #84B8A7",
+"o+ c #7FB5A2",
+"p+ c #7BB3A0",
+"q+ c #7AB2A0",
+"r+ c #7DB4A2",
+"s+ c #81B6A3",
+"t+ c #6CA996",
+"u+ c #6F4C45",
+"v+ c #792222",
+"w+ c #802A2A",
+"x+ c #591111",
+"y+ c #1D0505",
+"z+ c #420D0D",
+"A+ c #572020",
+"B+ c #020D14",
+"C+ c #051512",
+"D+ c #052720",
+"E+ c #095A4B",
+"F+ c #095646",
+"G+ c #0A5849",
+"H+ c #0A5B4B",
+"I+ c #0A5A49",
+"J+ c #7FB5A3",
+"K+ c #6BA795",
+"L+ c #6E8173",
+"M+ c #470F0E",
+"N+ c #571010",
+"O+ c #3B0A0A",
+"P+ c #170404",
+"Q+ c #1C0505",
+"R+ c #5A1111",
+"S+ c #200E10",
+"T+ c #030C12",
+"U+ c #051612",
+"V+ c #05251F",
+"W+ c #063A2F",
+"X+ c #095848",
+"Y+ c #0A5949",
+"Z+ c #085142",
+"`+ c #7BB3A1",
+" @ c #6EA997",
+".@ c #74A794",
+"+@ c #423430",
+"@@ c #1C0404",
+"#@ c #360909",
+"$@ c #280909",
+"%@ c #010A12",
+"&@ c #030D10",
+"*@ c #050F0D",
+"=@ c #051814",
+"-@ c #052721",
+";@ c #06382E",
+">@ c #095546",
+",@ c #074C3E",
+"'@ c #58A894",
+")@ c #6CAE9B",
+"!@ c #81B6A4",
+"~@ c #6DA695",
+"{@ c #5B9B88",
+"]@ c #789888",
+"^@ c #221715",
+"/@ c #2C0808",
+"(@ c #2D0A0A",
+"_@ c #040D0A",
+":@ c #000B18",
+"<@ c #040D0F",
+"[@ c #05110F",
+"}@ c #051C16",
+"|@ c #063A30",
+"1@ c #095344",
+"2@ c #0A5B4A",
+"3@ c #095647",
+"4@ c #074B3D",
+"5@ c #053D32",
+"6@ c #18866E",
+"7@ c #3C9681",
+"8@ c #6DAE9B",
+"9@ c #7DB3A1",
+"0@ c #70A998",
+"a@ c #428776",
+"b@ c #82B09C",
+"c@ c #658E7D",
+"d@ c #342E28",
+"e@ c #3E1A17",
+"f@ c #141616",
+"g@ c #000E0A",
+"h@ c #000C1E",
+"i@ c #040E0E",
+"j@ c #051511",
+"k@ c #063E33",
+"l@ c #085344",
+"m@ c #084C3E",
+"n@ c #042F26",
+"o@ c #021F19",
+"p@ c #084D3E",
+"q@ c #0C5344",
+"r@ c #2F806E",
+"s@ c #60A895",
+"t@ c #75AD9B",
+"u@ c #307365",
+"v@ c #6DA793",
+"w@ c #76AA97",
+"x@ c #4C7E6F",
+"y@ c #34332C",
+"z@ c #091616",
+"A@ c #000C0D",
+"B@ c #000C21",
+"C@ c #041311",
+"D@ c #051B16",
+"E@ c #052821",
+"F@ c #05362C",
+"G@ c #032C24",
+"H@ c #021D18",
+"I@ c #02211B",
+"J@ c #042B23",
+"K@ c #145345",
+"L@ c #38806F",
+"M@ c #5DA592",
+"N@ c #72AE9C",
+"O@ c #24635D",
+"P@ c #4C927F",
+"Q@ c #70A995",
+"R@ c #529784",
+"S@ c #29524A",
+"T@ c #021B19",
+"U@ c #000E1A",
+"V@ c #00112E",
+"W@ c #041916",
+"X@ c #031B16",
+"Y@ c #021B16",
+"Z@ c #011411",
+"`@ c #011915",
+" # c #021E19",
+".# c #021C17",
+"+# c #03221C",
+"@# c #083B31",
+"## c #11525B",
+"$# c #2C7166",
+"%# c #5FA08D",
+"&# c #559A87",
+"*# c #195957",
+"=# c #00281E",
+"-# c #001B46",
+";# c #00173B",
+"># c #010C0B",
+",# c #010F0C",
+"'# c #01110F",
+")# c #023637",
+"!# c #0D5058",
+"~# c #377D6D",
+"{# c #2E7369",
+"]# c #05443F",
+"^# c #002742",
+"/# c #00276C",
+"(# c #001D42",
+"_# c #003E2F",
+":# c #05413A",
+"<# c #023930",
+"[# c #002A31",
+"}# c #00286B",
+"|# c #002727",
+"1# c #002651",
+"2# c #00286C",
+" ",
+" ",
+" . + @ # ",
+" . $ % & * = ",
+" - ; > , ' ) ",
+" ! ~ { ] ^ / ( _ ",
+" : < [ } | 1 2 3 ",
+" 4 5 6 7 8 9 0 a ",
+" b c d e f g h i j _ ",
+" k l m n o p q r s _ ",
+" t u v w x y z A B _ ",
+" C D E F G H I J K _ ",
+" L M N O P Q R S T U ",
+" V W X Y Z P ` ...+.@.#. ",
+" $.%.&.*.=.-.;.>.,.'.).!. ",
+" ~.{.].^./.(._.:.<.[.}.|. ",
+" 1.2.3.4.5.6.7.8.9.0.a.b.c.d. ",
+" e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t. ",
+" u.v.w.x.y.7.z.A.B.C.o.D.E.F.G.H. ",
+" I.J.K.L.M.N.O.P.Q.R.C.o.S.T.U.V.W.X. ",
+" Y.Z.`. + +.+++@+#+$+%+C.o.o.&+*+=+-+;+>+ ",
+" ,+'+`.)+`.)+!+~+{+]+^+/+(+(+_+:+<+[+}+|+1+2+ ",
+" I.3+4+K.`.)+L.5+6+7+8+9+0+a+b+a+c+d+e+f+g+h+i+j+k+l+ ",
+" m+n+o+`.p+q+r+s+`.t+u+v+w+x+y+b+z+A+B+e+C+D+W.E+F+G+H+I+ ",
+" J+`.K.q+)+L.)+ +q+K+L+M+N+O+P+Q+R+S+T+*+U+V+W+X+Y+;+i+Z+ ",
+" q+`.`+`+o+ +`.J+`+ @.@+@%+@@(+#@$@%@&@*@=@-@;@>@Y+X+i+,@ ",
+" '@)@`.!@`+r+`+J+r+~@{@]@^@(+/@(@_@:@<@[@}@V.|@1@2@3@4@5@ ",
+" 6@7@8@q+)+`. +9@0@a@b@c@d@e@f@g@h@i@j@=+g+k@l@m@n@o@ ",
+" p@q@r@s@r+L.5+t@u@v@w@x@y@z@A@B@C@D@E@G.F@G@o@H@ ",
+" I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ # ",
+" .#+#@###$#%#&#*#=#-#;#>#,#'# ",
+" )#!#~#{#]#^#/#(# ",
+" _#:#<#[#}#_ ",
+" |#1#2#_ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
AUTHOR = "David Olofson <david@olofson.net>"
HOMEPAGE = "http://olofson.net/kobodl"
-PR = "r3"
+PR = "r4"
DEPENDS = "libsdl-image virtual/libsdl"
RDEPENDS_${PN} = "${PN}-data"
SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
+ file://fighter-48.xpm \
file://debian-kobo.patch;patch=1 \
file://kobodeluxe-putenv.patch;patch=1 \
file://kobodeluxe-sysconf-support.patch;patch=1 \
S = "${WORKDIR}/KoboDeluxe-${PV}"
-inherit autotools
+inherit autotools sdl
-export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+APPIMAGE = "${WORKDIR}/fighter-48.xpm"
+APPNAME = "kobodl"
EXTRA_OECONF = "--disable-opengl --disable-sdltest --enable-touchscreen"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
do_configure_prepend() {
sed -i \
-e "s|width WIDTH_HERE|width ${MACHINE_DISPLAY_WIDTH_PIXELS}|" \
--with-extra-includes=${STAGING_INCDIR} \
--with-extra-libs=${STAGING_LIBDIR} \
--with-ssl-version=0.9.7e \
- --with-ssl-dir=${STAGING_LIBDIR}/.. \
- --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
- --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+ --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+ --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
--enable-fontsubs \
--with-konq-tmp-prefix=/tmp/kde-cache \
# --enable-static \
--with-extra-libs=${STAGING_LIBDIR} \
--with-qtopia-dir=${OPIEDIR} \
--with-ssl-version=0.9.7e \
- --with-ssl-dir=${STAGING_LIBDIR}/.. \
- --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
- --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+ --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+ --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
--with-qt-dir=${QTDIR} \
--enable-fontsubs \
--with-konq-tmp-prefix=/tmp/kde-cache \
+++ /dev/null
-DESCRIPTION = "Kphone/Pi is a 'Voice Over Internet' phone which uses the Session Initiation Protocol (SIP)."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.pi-sync.net/html/kp_pi.html"
-DEPENDS ="openssl"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kphone_pi_${PV}.tar.gz"
-
-S = "${WORKDIR}/kphone_pi"
-
-inherit palmtop
-
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
-QMAKE_PROFILES= "kphone_piE.pro"
-
-do_configure_prepend() {
- mkdir ${S}/dest/
-}
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/kphone/
-
- install -m 0644 ${S}/bin/kdepim/kphone/*.png ${D}${palmtopdir}/pics/kphone/
- install -m 0644 ${S}/kphone.desktop ${D}${palmtopdir}/apps/Applications/
-
- install -m 0755 ${S}/dest/kppi ${D}${palmtopdir}/bin/kppi
-}
+++ /dev/null
-DESCRIPTION = "Time tracking program"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.pi-sync.net"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/ktimetracker_pi097.tar.gz"
-
-S = "${WORKDIR}/ktimetracker_pi"
-
-inherit palmtop
-
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
-QMAKE_PROFILES= "ktimetracker_piE.pro"
-
-do_configure_prepend() {
- mkdir ${S}/dest/
-}
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/1Pim \
- ${D}${palmtopdir}/pics/
-
- install -m 0644 ${S}/ktimetracker.png ${D}${palmtopdir}/pics/
- install -m 0644 ${S}/ktimetracker.desktop ${D}${palmtopdir}/apps/1Pim/
-
- install -m 0755 ${S}/dest/ktpi ${D}${palmtopdir}/bin/ktpi
-}
+++ /dev/null
-require lemon.inc
-inherit native
-
-do_stage() {
- install -d ${STAGING_BINDIR}
- install -m 0755 lemon ${STAGING_BINDIR}/
- install -d ${STAGING_DATADIR}/lemon
- install -m 0644 lempar.c ${STAGING_DATADIR}/lemon/
-}
--- /dev/null
+require lemon.inc
+
+PR = "r0"
+
+inherit native
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 lemon ${STAGING_BINDIR}
+ install -m 0644 lempar.c ${STAGING_BINDIR}
+}
SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
file://lemon.1"
+
S = "${WORKDIR}/sqlite-${PV}/tool"
do_compile() {
+++ /dev/null
-require lemon.inc
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 lemon ${D}${bindir}/
- install -d ${D}${datadir}/lemon
- install -m 0644 lempar.c ${D}${datadir}/lemon/
- install -d ${D}${mandir}/man1
- install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/
-}
--- /dev/null
+require lemon.inc
+
+PR = "r0"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 lemon ${D}${bindir}
+ install -m 0644 lempar.c ${D}${bindir}
+ install -d ${D}${mandir}/man1
+ install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/
+}
}
do_stage () {
- #make install prefix='${STAGING_DIR}/${TARGET_SYS}'
- install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h
+ #make install prefix='${STAGING_DIR_TARGET}${layout_prefix}'
+ install -D -m 644 src/libaio.h ${STAGING_INCDIR}/libaio.h
oe_libinstall -so -C src libaio ${STAGING_LIBDIR}
}
PRIORITY = "optional"
#DEPENDS = ""
LICENSE = "libgsm"
+
+PR = "r1"
+
inherit pkgconfig gpe
SRC_URI = "http://www.netsw.org/audio/convert/gsm-${PV}.tar.gz \
- file://${FILESDIR}/libgsm_patch;patch=1;pnum=0"
+ file://${FILESDIR}/libgsm_patch;patch=1;pnum=0"
S = "${WORKDIR}/gsm-1.0-pl10/"
do_stage () {
oe_libinstall -a -C lib libgsm ${STAGING_LIBDIR}
- mkdir -p ${STAGING_INCDIR}/gsm
- for h in ${headers}; do
- install -m 0644 ${S}/inc/$h ${STAGING_INCDIR}/gsm/$h
- done
+ mkdir -p ${STAGING_INCDIR}/gsm
+ for h in ${headers}; do
+ install -m 0644 ${S}/inc/$h ${STAGING_INCDIR}/gsm/$h
+ done
+ ln -s ${STAGING_INCDIR}/gsm/gsm.h ${STAGING_INCDIR}/gsm.h
}
#do_install () {
-# gpe_do_install
-# oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+# gpe_do_install
+# oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
#}
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
# strange reason - so we do some sed fu to fix the path there
do_stage() {
- oe_runmake install \
- prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- infodir=${STAGING_INFODIR}
+ autotools_stage_all
cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
BINCONFIG_GLOB = "*-config-2"
inherit autotools pkgconfig binconfig
-# Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
-# strange reason - so we do some sed fu to fix the path there
-
do_stage() {
autotools_stage_all
}
upstream: mailed to bakunin_at_autistici_dot_org by Laibsch
-status: pending
+status: committed in upstream CVS on Feb 26th 2008
comment: API addition to not manually setup the CURL connection and still
be able to get the transfered feed and save it to secondary storage. done
by zecke for the OpenMoko RSS reader.
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libpcap-0.9.3/Makefile.in~shared
-+++ libpcap-0.9.3/Makefile.in
-@@ -37,6 +37,15 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
-
-+# some defines for shared library compilation - FIXME, if not matching
-+MAJ=0.9
-+MIN=6
-+VERSION=$(MAJ).$(MIN)
-+LIBNAME=pcap
-+LIBRARY=lib$(LIBNAME).a
-+SOLIBRARY=lib$(LIBNAME).so
-+SHAREDLIB=$(SOLIBRARY).$(VERSION)
-+
- #
- # You shouldn't need to edit anything below.
- #
-@@ -50,6 +59,7 @@
-
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -70,6 +80,9 @@
- .c.o:
- @rm -f $@
- $(CC) $(CFLAGS) -c $(srcdir)/$*.c
-+%_pic.o: %.c
-+ @rm -f $@
-+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
-
- PSRC = pcap-@V_PCAP@.c
- FSRC = fad-@V_FINDALLDEVS@.c
-@@ -84,6 +97,7 @@
- # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
- # hack the extra indirection
- OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
-+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
- HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
- ethertype.h gencode.h gnuc.h
- GENHDR = \
-@@ -95,15 +109,22 @@
- TAGFILES = \
- $(SRC) $(HDR) $(TAGHDR)
-
--CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
-+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
-
--all: libpcap.a
-+all: libpcap.a $(SHAREDLIB)
-
- libpcap.a: $(OBJ)
- @rm -f $@
- ar rc $@ $(OBJ) $(LIBS)
- $(RANLIB) $@
-
-+$(SHAREDLIB): $(OBJ_PIC)
-+ -@rm -f $@
-+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
-+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
-+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
-+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
-+
- shared: libpcap.$(DYEXT)
-
- #
-@@ -129,6 +150,9 @@
- scanner.o: scanner.c tokdefs.h
- $(CC) $(CFLAGS) -c scanner.c
-
-+scanner_pic.o: scanner.c tokdefs.h
-+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
-+
- pcap.o: version.h
-
- tokdefs.h: grammar.c
-@@ -142,9 +166,16 @@
- @rm -f $@
- $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
-
-+grammer_pic.o: grammar.c
-+ @rm -f $@
-+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
-+
- version.o: version.c
- $(CC) $(CFLAGS) -c version.c
-
-+version_pic.o: version.c
-+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@
-+
- snprintf.o: $(srcdir)/missing/snprintf.c
- $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
-
-@@ -170,11 +201,17 @@
- bpf_filter.o: bpf_filter.c
- $(CC) $(CFLAGS) -c bpf_filter.c
-
-+bpf_filter_pic.o: bpf_filter.c
-+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
-+
- install: libpcap.a
- [ -d $(DESTDIR)$(libdir) ] || \
- (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
-+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
-+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
-+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
- [ -d $(DESTDIR)$(includedir) ] || \
- (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
- $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libpcap-0.9.3/Makefile.in~shared
++++ libpcap-0.9.3/Makefile.in
+@@ -37,6 +37,15 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+
++# some defines for shared library compilation - FIXME, if not matching
++MAJ=0.9
++MIN=6
++VERSION=$(MAJ).$(MIN)
++LIBNAME=pcap
++LIBRARY=lib$(LIBNAME).a
++SOLIBRARY=lib$(LIBNAME).so
++SHAREDLIB=$(SOLIBRARY).$(VERSION)
++
+ #
+ # You shouldn't need to edit anything below.
+ #
+@@ -50,6 +59,7 @@
+
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -70,6 +80,9 @@
+ .c.o:
+ @rm -f $@
+ $(CC) $(CFLAGS) -c $(srcdir)/$*.c
++%_pic.o: %.c
++ @rm -f $@
++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
+
+ PSRC = pcap-@V_PCAP@.c
+ FSRC = fad-@V_FINDALLDEVS@.c
+@@ -84,6 +97,7 @@
+ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
+ # hack the extra indirection
+ OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
+ HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
+ ethertype.h gencode.h gnuc.h
+ GENHDR = \
+@@ -95,15 +109,22 @@
+ TAGFILES = \
+ $(SRC) $(HDR) $(TAGHDR)
+
+-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
++CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
+
+-all: libpcap.a
++all: libpcap.a $(SHAREDLIB)
+
+ libpcap.a: $(OBJ)
+ @rm -f $@
+ ar rc $@ $(OBJ) $(LIBS)
+ $(RANLIB) $@
+
++$(SHAREDLIB): $(OBJ_PIC)
++ -@rm -f $@
++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
++
+ shared: libpcap.$(DYEXT)
+
+ #
+@@ -129,6 +150,9 @@
+ scanner.o: scanner.c tokdefs.h
+ $(CC) $(CFLAGS) -c scanner.c
+
++scanner_pic.o: scanner.c tokdefs.h
++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
++
+ pcap.o: version.h
+
+ tokdefs.h: grammar.c
+@@ -142,9 +166,16 @@
+ @rm -f $@
+ $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
+
++grammer_pic.o: grammar.c
++ @rm -f $@
++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
++
+ version.o: version.c
+ $(CC) $(CFLAGS) -c version.c
+
++version_pic.o: version.c
++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@
++
+ snprintf.o: $(srcdir)/missing/snprintf.c
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+
+@@ -170,11 +201,17 @@
+ bpf_filter.o: bpf_filter.c
+ $(CC) $(CFLAGS) -c bpf_filter.c
+
++bpf_filter_pic.o: bpf_filter.c
++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
++
+ install: libpcap.a
+ [ -d $(DESTDIR)$(libdir) ] || \
+ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
+ [ -d $(DESTDIR)$(includedir) ] || \
+ (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+ $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
+++ /dev/null
-require libpcap.inc
-
-PR = "r2"
--- /dev/null
+require libpcap.inc
+
+PR = "r2"
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
--- /dev/null
+OE goes to great lengths to set PATH correctly and this just breaks
+things since local sdl-config binaries will suddenly be preferred
+rather than those in staging.
+
+RP - 27/02/2008
+
+Index: SDL-1.2.9/sdl.m4
+===================================================================
+--- SDL-1.2.9.orig/sdl.m4 2008-02-27 10:08:38.000000000 +0000
++++ SDL-1.2.9/sdl.m4 2008-02-27 10:08:51.000000000 +0000
+@@ -33,7 +33,6 @@
+ fi
+
+ AC_REQUIRE([AC_CANONICAL_TARGET])
+- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+ min_sdl_version=ifelse([$1], ,0.11.0,$1)
+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "\
http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://extra-keys.patch;patch=1 \
file://pagesize.patch;patch=1 \
+ file://remove_path.patch;patch=1 \
file://acinclude.m4"
S = "${WORKDIR}/SDL-${PV}"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--enable-shared --disable-static \
--disable-fb --disable-alsa --disable-vcd \
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
done
- cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
- -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
+ cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \
+ -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
LICENSE = "GPL"
SECTION = "libs/multimedia"
DEPENDS = "libpng"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
S = "${WORKDIR}/zvbi-${PV}"
-inherit autotools
+inherit autotools pkgconfig
do_stage() {
autotools_stage_all
LICENSE = "GPL"
SECTION = "libs/multimedia"
DEPENDS = "libpng"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
S = "${WORKDIR}/zvbi-${PV}"
EXTRA_OECONF = "--without-x"
-inherit autotools
+inherit autotools pkgconfig
do_stage() {
autotools_stage_all
}
-
EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
--without-sdl --disable-video --enable-alsa \
- --with-osip=${STAGING_DIR}/${HOST_SYS} \
- --with-readline=${STAGING_DIR}/${HOST_SYS} \
- --with-speex=${STAGING_DIR}/${HOST_SYS} \
+ --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
--disable-truespeech --disable-manual \
--disable-glibtest --disable-glib"
EXTRA_OECONF = "--disable-gtk-doc \
--without-ffmpeg --disable-video --without-sdl \
--enable-alsa \
- --with-osip=${STAGING_DIR}/${HOST_SYS} \
- --with-readline=${STAGING_DIR}/${HOST_SYS} \
- --with-speex=${STAGING_DIR}/${HOST_SYS} \
+ --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
--disable-truespeech --disable-manual \
--disable-gnome_ui"
-diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig
---- linux-2.6.24.orig/drivers/leds/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/leds/Kconfig 2008-02-08 08:12:01.000000000 +0100
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100
@@ -114,6 +114,12 @@
help
This option enables support for the CM-X270 LEDs.
comment "LED Triggers"
config LEDS_TRIGGERS
-diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c
---- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c 2008-02-08 08:12:01.000000000 +0100
-@@ -0,0 +1,171 @@
+Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100
+@@ -0,0 +1,173 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
-+ * Copyright (C) 2007 Jeremy Laine <jeremy.laine@bolloretelecom.eu>
-+ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com>
++ * Copyright (C) 2007-2008 Jeremy Laine <jeremy.laine@bolloretelecom.eu>
++ * Copyright (C) 2007-2008 Leon Woestenberg <leon@sidebranch.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+#include <linux/err.h>
+#include <asm/io.h>
+
++/* note the board is not wired for read access from the LED buffer */
+#define LEDS_BASE 0xfa000000
+#define LEDS_SIZE 0x2
+
+ iowrite8(led_state, led_io);
+}
+
++/* led0 is red, led1 is yellow, led2-7 are green */
+static struct mpc8313_led mpc8313_leds[] = {
+ {
+ .cdev = {
+ .name = "mpc8313:led0",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 1,
++ .bitmask = 128,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led1",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 2,
++ .bitmask = 64,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led2",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 4,
++ .bitmask = 32,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led3",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 8,
++ .bitmask = 16,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led4",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 16,
++ .bitmask = 8,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led5",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 32,
++ .bitmask = 4,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led6",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 64,
++ .bitmask = 2,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led7",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 128,
++ .bitmask = 1,
+ },
+};
+
+MODULE_AUTHOR("Jeremy Laine <jeremy.laine@bolloretelecom.eu>");
+MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
+MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
---- linux-2.6.24.orig/drivers/leds/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/leds/Makefile 2008-02-08 08:12:38.000000000 +0100
+Index: linux-2.6.24.3/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100
@@ -19,6 +19,7 @@
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
LICENSE = "GPL"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)'
+COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)"
# SRC_URI *must* be overriden in includer, but this is a good reference
SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
}
+do_compile_prepend() {
+ if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
+ if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
+ echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
+ exit 1
+ fi
+ cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz
+ fi
+}
+
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
#
CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L1_COMPAT is not set
+CONFIG_VIDEO_V4L1_COMPAT is not set
CONFIG_VIDEO_V4L2=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
#
CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L1_COMPAT is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
--- /dev/null
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21-omap1
+# Wed Feb 6 17:40:31 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+# CONFIG_ARCH_OMAP1 is not set
+CONFIG_ARCH_OMAP2=y
+
+#
+# OMAP Feature Selections
+#
+CONFIG_MACH_OMAP2420_DVFS=y
+CONFIG_ARCH_OMAP2420_DEBUG=y
+CONFIG_ARCH_OMAP2420_OBSERVABILITY=m
+CONFIG_ARCH_OMAP2420_PEEK_N_POKE=m
+CONFIG_ARCH_OMAP2420_SNAPSHOT=m
+CONFIG_ARCH_OMAP2420_DMA_DRAIN=y
+CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_BOOT_TAG=y
+CONFIG_OMAP_BOOT_REASON=y
+CONFIG_OMAP_COMPONENT_VERSION=y
+CONFIG_OMAP_GPIO_SWITCH=y
+# CONFIG_OMAP_MUX is not set
+CONFIG_OMAP_STI=y
+CONFIG_OMAP_STI_CONSOLE=y
+# CONFIG_OMAP_MCBSP is not set
+CONFIG_OMAP_MMU_FWK=y
+CONFIG_OMAP_MBOX_FWK=y
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_LL_DEBUG_UART1 is not set
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+CONFIG_OMAP_LL_DEBUG_UART3=y
+CONFIG_OMAP_DSP=y
+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set
+CONFIG_OMAP_DSP_TASK_MULTIOPEN=y
+CONFIG_OMAP_DSP_FBEXPORT=y
+CONFIG_OMAP_DSP_PAUSING=y
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP Core Type
+#
+CONFIG_ARCH_OMAP24XX=y
+CONFIG_ARCH_OMAP2420=y
+# CONFIG_ARCH_OMAP2430 is not set
+
+#
+# OMAP Board Type
+#
+CONFIG_MACH_NOKIA_N800=y
+CONFIG_MACH_NOKIA_RX44=y
+CONFIG_MACH_OMAP2_TUSB6010=y
+# CONFIG_MACH_OMAP_H4 is not set
+# CONFIG_MACH_OMAP_APOLLON is not set
+# CONFIG_MACH_OMAP_2430SDP is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V6=y
+# CONFIG_CPU_32v6K is not set
+CONFIG_CPU_32v6=y
+CONFIG_CPU_ABRT_EV6=y
+CONFIG_CPU_CACHE_V6=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=128
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_LEDS=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x10C08000
+CONFIG_ZBOOT_ROM_BSS=0x10200000
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 ro console=tty0"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_NULL=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_NULL=y
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_VFP=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_IP_NF_TARGET_IDLETIMER=y
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=y
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIUSB is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBRF6150 is not set
+CONFIG_BT_HCIH4P=y
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IEEE80211 is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+CONFIG_MTD_ONENAND=y
+# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OMAP2=y
+CONFIG_MTD_ONENAND_OTP=y
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+CONFIG_MII=y
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_BSDCOMP=y
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_OMAP is not set
+# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_TSC2301=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_TSC2005=y
+CONFIG_TOUCHSCREEN_TSC2301=y
+# CONFIG_TOUCHSCREEN_TSC2046 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_OMAP_WATCHDOG=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_ISP1301_OMAP is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_SENSORS_TLV320AIC23 is not set
+CONFIG_SENSORS_TSL2563=y
+# CONFIG_GPIOEXPANDER_OMAP is not set
+CONFIG_LM8323=y
+CONFIG_LP5521=y
+CONFIG_MENELAUS=y
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_OMAP_PAUSING=y
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_TSC2005 is not set
+# CONFIG_SPI_TSC2101 is not set
+# CONFIG_SPI_TSC2102 is not set
+CONFIG_SPI_TSC2301=y
+CONFIG_SPI_TSC2301_AUDIO=y
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+CONFIG_SENSORS_TMP105=y
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# LED devices
+#
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_OMAP_DEBUG is not set
+# CONFIG_LEDS_OMAP is not set
+CONFIG_LEDS_OMAP_PWM=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=y
+# CONFIG_VIDEO_V4L1 is not set
+# CONFIG_VIDEO_V4L1_COMPAT is not set
+CONFIG_VIDEO_V4L2=y
+
+#
+# Video Capture Adapters
+#
+
+#
+# Video Capture Adapters
+#
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+
+#
+# V4L USB devices
+#
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_USBVISION is not set
+CONFIG_VIDEO_OMAP_CAMERA=y
+# CONFIG_VIDEO_CAMERA_SENSOR_OV9640 is not set
+CONFIG_VIDEO_CAMERA_SENSOR_TCM825X=y
+
+#
+# Radio Adapters
+#
+CONFIG_RADIO_TEA5761=y
+# CONFIG_USB_DSBR is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+CONFIG_VIDEO_BUF=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_OMAP=y
+CONFIG_FB_OMAP_LCDC_EXTERNAL=y
+# CONFIG_FB_OMAP_LCDC_HWA742 is not set
+CONFIG_FB_OMAP_LCDC_BLIZZARD=y
+# CONFIG_FB_OMAP_MANUAL_UPDATE is not set
+CONFIG_FB_OMAP_LCD_MIPID=y
+CONFIG_FB_OMAP_BOOTLOADER_INIT=y
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4
+CONFIG_FB_OMAP_PAUSING=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+# CONFIG_SND_OMAP_AIC23 is not set
+CONFIG_SND_AIC33=y
+# CONFIG_SND_OMAP_TSC2101 is not set
+# CONFIG_SND_SX1 is not set
+# CONFIG_SND_OMAP_TSC2102 is not set
+CONFIG_SND_OMAP24XX_EAC=y
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_OTG=y
+CONFIG_USB_OTG_WHITELIST=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_TUSB6010=y
+CONFIG_USB_TUSB6010_TEST=y
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_PERIPHERAL is not set
+CONFIG_USB_MUSB_OTG=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC_HCD=y
+CONFIG_USB_MUSB_HSET=y
+# CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_INVENTRA_DMA is not set
+# CONFIG_USB_TI_CPPI_DMA is not set
+CONFIG_USB_TUSB_OMAP_DMA=y
+CONFIG_USB_MUSB_LOGLEVEL=1
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+CONFIG_USB_RTL8150=y
+# CONFIG_USB_USBNET_MII is not set
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_CDCETHER=y
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=y
+CONFIG_USB_NET_PLUSB=y
+# CONFIG_USB_NET_MCS7830 is not set
+CONFIG_USB_NET_RNDIS_HOST=y
+CONFIG_USB_NET_CDC_SUBSET=y
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=y
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=y
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_FILE_STORAGE_TEST=y
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_OMAP=y
+CONFIG_MMC_PAUSING=y
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# CBUS support
+#
+CONFIG_CBUS=y
+CONFIG_CBUS_TAHVO=y
+CONFIG_CBUS_TAHVO_USER=y
+# CONFIG_CBUS_TAHVO_USB is not set
+CONFIG_CBUS_RETU=y
+CONFIG_CBUS_RETU_USER=y
+CONFIG_CBUS_RETU_POWERBUTTON=y
+CONFIG_CBUS_RETU_RTC=y
+CONFIG_CBUS_RETU_WDT=y
+CONFIG_CBUS_RETU_HEADSET=y
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=y
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_LL is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
+# CONFIG_SECURITY_CAPABILITIES is not set
+# CONFIG_SECURITY_ROOTPLUG is not set
+CONFIG_SECURITY_LOWMEM=y
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
--- /dev/null
+require linux-nokia800.inc
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_nokia800 = "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 \
+ file://defconfig"
+
+S = "${WORKDIR}/linux-2.6.21"
+
+do_stage_append () {
+ mkdir -p ${STAGING_KERNEL_DIR}/drivers/media/video/omap/
+ cp -f drivers/media/video/omap/tcm825x.h ${STAGING_KERNEL_DIR}/drivers/media/video/omap/
+}
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rt1
-# Fri Feb 15 20:51:04 2008
+# Linux kernel version: 2.6.24.3-rt3
+# Fri Feb 29 00:48:47 2008
#
# CONFIG_PPC64 is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAIR_USER_SCHED is not set
-# CONFIG_FAIR_CGROUP_SCHED is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_GEN_PROBE=y
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-# CONFIG_MTD_CFI_NOSWAP is not set
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_SPI is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS=m
#
# LED drivers
#
+CONFIG_LEDS_MPC8313E_RDB=m
#
# LED Triggers
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_EVENT_TRACE is not set
-# CONFIG_FUNCTION_TRACE is not set
-# CONFIG_WAKEUP_TIMING is not set
-# CONFIG_CRITICAL_PREEMPT_TIMING is not set
-# CONFIG_CRITICAL_IRQSOFF_TIMING is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_FAULT_INJECTION is not set
-CONFIG_HAVE_MCOUNT=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_PREEMPT_TRACE is not set
# CONFIG_SAMPLES is not set
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
--- /dev/null
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100
+@@ -114,6 +114,12 @@
+ help
+ This option enables support for the CM-X270 LEDs.
+
++config LEDS_MPC8313E_RDB
++ tristate "LED Support for MPC8313E-RDB LEDs"
++ depends on LEDS_CLASS && PPC_83xx
++ help
++ This option enables support for the LEDs on MPC8313E-RDB board.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100
+@@ -0,0 +1,173 @@
++/*
++ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007-2008 Jeremy Laine <jeremy.laine@bolloretelecom.eu>
++ * Copyright (C) 2007-2008 Leon Woestenberg <leon@sidebranch.com>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ * MPC8313E-RDB LEDs driver
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/ioport.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++
++/* note the board is not wired for read access from the LED buffer */
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
++
++static struct platform_device *leds_pdev = NULL;
++static struct resource *led_mem = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
++
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
++};
++
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
++{
++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++ if (value)
++ led_state &= ~led_dev->bitmask;
++ else
++ led_state |= led_dev->bitmask;
++ iowrite8(led_state, led_io);
++}
++
++/* led0 is red, led1 is yellow, led2-7 are green */
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led5",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led6",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led7",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++};
++
++static int mpc8313leds_probe(struct platform_device *pdev)
++{
++ int i;
++ int ret;
++
++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++ ret = led_classdev_register(&pdev->dev,
++ &mpc8313_leds[i].cdev);
++ }
++
++ if (ret < 0 && i > 1) {
++ for (i = i - 2; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++ }
++
++ return ret;
++}
++
++static int mpc8313leds_remove(struct platform_device *pdev)
++{
++ int i;
++
++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++
++ return 0;
++}
++
++static struct platform_driver mpc8313leds_driver = {
++ .driver = {
++ .name = "mpc8313-leds",
++ .owner = THIS_MODULE,
++ },
++ .probe = mpc8313leds_probe,
++ .remove = mpc8313leds_remove,
++};
++
++static int __init mpc8313leds_init(void)
++{
++ if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++ return -ENOMEM;
++ if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
++ {
++ release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ return -ENOMEM;
++ }
++ iowrite8(led_state, led_io);
++
++ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
++
++ return platform_driver_register(&mpc8313leds_driver);
++}
++
++static void __exit mpc8313leds_exit(void)
++{
++ if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ platform_driver_unregister(&mpc8313leds_driver);
++
++ platform_device_unregister(leds_pdev);
++}
++
++module_init(mpc8313leds_init);
++module_exit(mpc8313leds_exit);
++
++MODULE_AUTHOR("Jeremy Laine <jeremy.laine@bolloretelecom.eu>");
++MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
++MODULE_LICENSE("GPL");
+Index: linux-2.6.24.3/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
+ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
++obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
--- /dev/null
+Index: linux-2.6.24.3/kernel/sysctl.c
+===================================================================
+--- linux-2.6.24.3.orig/kernel/sysctl.c 2008-02-29 00:52:45.000000000 +0100
++++ linux-2.6.24.3/kernel/sysctl.c 2008-02-29 00:52:59.000000000 +0100
+@@ -47,6 +47,7 @@
+ #include <linux/acpi.h>
+ #include <linux/reboot.h>
+ #include <linux/ftrace.h>
++#include <linux/profile.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/processor.h>
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r2"
+PR = "r3"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
- ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.3-rt3.bz2;patch=1;p=1 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+ file://sysctl_missing_include.patch;patch=1 \
file://powerpc-clockres.patch;patch=1 \
file://defconfig"
-S = "${WORKDIR}/linux-2.6.24"
+S = "${WORKDIR}/linux-2.6.24.3"
-#SRC_URI_append_mpc8313e-rdb = "\
-# file://mpc8313e-rdb-leds.patch;patch=1"
+SRC_URI_append_mpc8313e-rdb = "\
+ file://mpc8313e-rdb-leds.patch;patch=1"
# file://mpc831x-nand.patch;patch=1 \
# file://mpc8313e-rdb-rtc.patch;patch=1 "
INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \
INSTALL_DIR='$(INSTALL) -p -d -m 0755' "
-export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}"
do_configure_prepend() {
ln -sf ./linux-gnu sysdeps/linux-gnueabi
-PR = "r0"
+PR = "r1"
LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
}
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ autotools_stage_all
}
-PR = "r0"
+PR = "r1"
LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ autotools_stage_all
}
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r2"
inherit sdk meta
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
-SDK_SUFFIX = "toolchain"
-
-FEED_ARCH ?= "${TARGET_ARCH}"
IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
+IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
+FEED_ARCH ?= "${TARGET_ARCH}"
+SDK_SUFFIX = "toolchain"
+TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}"
RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
${IPKG_TARGET} update
${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
- mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
- cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
- rm -rf ${SDK_OUTPUT}/${prefix}/usr/
-
- cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
- rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share
+ mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
+ if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ fi
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/share/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share/
+ cp -pPR ${SDK_OUTPUT}/temp-target/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
+ if [ -d ${SDK_OUTPUT}/temp-target/lib/.debug ]; then
+ cp -pPR ${SDK_OUTPUT}/temp-target/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ fi
+ rm -rf ${SDK_OUTPUT}/temp-target/
for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do
if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then
fi
done
- mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib
-
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
# remove unwanted housekeeping files
- mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
- rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
rm -Rf ${SDK_OUTPUT}/usr/lib
# extract and store ipks, pkgdata and shlibs data
target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '`
- mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/
- mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/
- mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/ipk/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/runtime/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/
for pkg in $target_pkgs ; do
for arch in $revipkgarchs; do
pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
if [ -e $pkgnames ]; then
oenote "Found $pkgnames"
- cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
+ cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/
orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
- pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
- for aarch in $revipkgarchs; do
- if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
- pkg_subdir="${aarch}${pkg_subdir_postfix}"
- break
- fi
- done
- oenote "Original package in ${pkg_subdir}"
- mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
- cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
+ pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime
+ cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/
subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
for subpkg in $subpkgs; do
- cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/
+ cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/
if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then
- cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/
+ cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/
fi
if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
- cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+ cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/
fi
done
break
# gcc-cross-sdk get built :( (30/11/07)
ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
- # remove unwanted executables
- rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
-
- # remove broken .la files
+ # Remove broken .la files
rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
+ # Generate link for sysroot use
+ # /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr -> .
+ cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
+ ln -sf . usr
+
# fix pkgconfig data files
if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then
cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
done
fi
- # package it up
+
+ # Setup site file for external use
+ siteconfig=${SDK_OUTPUT}/${prefix}/site-config
+ touch $siteconfig
+ for sitefile in ${CONFIG_SITE} ; do
+ cat $sitefile >> $siteconfig
+ done
+
+ # Create environment setup script
+ script=${SDK_OUTPUT}/${prefix}/environment-setup
+ touch $script
+ echo 'export PATH=${prefix}/bin:$PATH' >> $script
+ echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script
+ echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}/lib/pkgconfig' >> $script
+ echo 'export CONFIG_SITE=${prefix}/site-config' >> $script
+
+ # Add version information
+ versionfile=${SDK_OUTPUT}/${prefix}/version
+ touch $versionfile
+ echo 'Distro: ${DISTRO}' >> $versionfile
+ echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
+ echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
+ echo 'Timestamp: ${DATETIME}' >> $versionfile
+
+ # Package it up
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+ cd ${SDK_OUTPUT2}
+ fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r47"
+PR = "r48"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
glib-2.0 \
gnu-config \
gphoto2 \
+ gpsd \
grep \
groff \
gtk-doc \
procps \
psmisc \
puppy \
+ pvrusb2-mci \
python \
quilt \
reiserfsprogs reiser4progs \
lirc-modules lirc \
madfu \
openldap \
- pvrusb2-mci \
pwc \
qc-usb-messenger \
syslog-ng \
calls to monodis --assembly and monodis --assemblyref) which assemblies are
provided and required by a particular package. mono_do_clilibs then
puts the information about provided assemblies into
-${STAGING_DIR}/clilibs/${packagename}.list and information about the
+${CLILIBSDIR}/${packagename}.list and information about the
required packages into ${PKGDEST}/{packagename}.clilibdeps where it
will later be picked up by read_shlibdeps.
cd ${D}
rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz
tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz .
- install -d ${STAGING_DIR}/share/mono-mcs
- cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/
+ install -d ${STAGING_DATADIR}/mono-mcs
+ cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/
}
do_package_write_ipk() {
do_install_prepend() {
install -d ${D}
pushd ${D}
- tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+ tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz
popd
}
do_install_prepend() {
install -d ${D}
pushd ${D}
- tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+ tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz
popd
}
do_install_prepend() {
install -d ${D}
pushd ${D}
- tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+ tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz
popd
}
+++ /dev/null
-DESCRIPTION = "Motion - a motion detection program"
-HOMEPAGE = "http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-PRIORITY = "optional"
-PR = "r0"
-LICENSE = "GPL"
-DEPENDS = "jpeg"
-PRIORITY = "optional"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/motion/motion-3.2.6.tar.gz"
-
-inherit autotools
-
--- /dev/null
+DESCRIPTION = "Motion - a motion detection program"
+HOMEPAGE = "http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+AUTHOR = "Kenneth Lavrsen motion-user@lists.sourceforge.net"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "jpeg ffmpeg mysql postgresql"
+
+RSUGGESTS = "mysql-client postgresql-client"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \
+ --with-mysql-lib=${STAGING_LIBDIR} \
+ --with-mysql-include=${STAGING_INCDIR}/mysql \
+ --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} "
SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+
PACKAGES =+ "firefox-inspector"
FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \
# work around requirement for root access on first startup
chmod -R a+w ${libdir}/firefox*
}
+
+do_stage() {
+ autotools_stage_all
+
+
+
+}
+
-PR = "r0"
+PR = "r2"
+
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://xptcstubs.patch;patch=1 \
file://no-xmb.patch;patch=1 \
file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
file://xptcinvoke-arm.patch;patch=1 \
file://mozilla-eabi.patch;patch=1"
-
S = "${WORKDIR}/mozilla"
-inherit mozilla
-
+inherit autotools mozilla
+
require firefox.inc
EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
do_compile_prepend() {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
}
-
file://no-xmb.patch;patch=1 \
file://jsautocfg.h \
file://extensions-hack.patch;patch=1 \
- file://security-cross.patch;patch=1 \
- file://jsautocfg-dontoverwrite.patch;patch=1 \
- file://xptcinvoke-arm.patch;patch=1 \
- file://eabi-fix.patch;patch=1 \
- file://eabi-fix2.patch;patch=1 \
- file://eabi-fix3.patch;patch=1 \
- file://linkage-problem.patch;patch=1 \
- "
+ file://security-cross.patch;patch=1 \
+ file://jsautocfg-dontoverwrite.patch;patch=1 \
+ file://xptcinvoke-arm.patch;patch=1 \
+ file://eabi-fix.patch;patch=1 \
+ file://eabi-fix2.patch;patch=1 \
+ file://eabi-fix3.patch;patch=1 \
+ file://linkage-problem.patch;patch=1 \
+"
S = "${WORKDIR}/mozilla"
DEFAULT_PREFERENCE = "-1"
inherit mozilla
-
require firefox.inc
do_compile_prepend() {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-
sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
}
do_stage() {
-
- install -d ${STAGING_INCDIR}/${P}
+ install -d ${STAGING_INCDIR}/firefox-${PV}
cd dist/sdk/include
+ rm -rf obsolete
headers=`find . -name "*.h"`
for f in $headers
do
- install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f
+ install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/
done
# removes 2 lines that call absent headers
- sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
+ sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h
}
S = "${WORKDIR}/mpfr-${PV}"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- infodir=${STAGING_DIR}/${HOST_SYS}/info
+ autotools_stage_all
}
S = "${WORKDIR}/mpfr-${PV}"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
S = "${WORKDIR}/trunk"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
--- /dev/null
+#!/bin/sh
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+ if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+ CMD="multitap-pad -d -o landscape"
+ elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+ CMD="multitap-pad -d -o portrait"
+ fi
+else
+ CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+ (sleep 2 && $CMD) &
+fi
--- /dev/null
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+ file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+ ${libdir} \
+ ${sysconfdir} \
+ ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+ ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+ ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+ ${libdir}/matchbox-panel/*.a \
+ ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+++ /dev/null
-require navit.inc
-
-PR = "r5"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
--- /dev/null
+require navit.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
require navit.inc
-PV = "0.0.4+cvs${SRCDATE}"
-PR = "r5"
+PV = "0.1.0+cvs${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/navit"
do_configure () {
autoreconf
- ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_DIR}/${TARGET_SYS}/lib" ./configure \
+ ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_LIBDIR}" ./configure \
--build=${BUILD_SYS} \
--host=${HOST_SYS} \
--target=${TARGET_SYS} \
--prefix=${prefix} \
- --with-bdb=${STAGING_DIR}/${TARGET_SYS} \
- --with-ssl-dir=${STAGING_DIR}/${TARGET_SYS} \
+ --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \
+ --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix} \
--without-shadow \
--sysconfdir=${sysconfdir} \
--disable-nls \
--- /dev/null
+[Desktop Entry]
+Type=Application
+Name=NetSurf
+Comment=NetSurf Web Browser
+GenericName=Web Browser
+Icon=netsurf
+Exec=netsurf
+Terminal=false
+StartupNotify=false
+Categories=Network;WebBrowser;
--- /dev/null
+DESCRIPTION = "Lightweight web browser capable of handling many of the \
+web standards in use today."
+HOMEPAGE = "http://www.netsurf-browser.org/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+PV = "1.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=netsurf \
+ file://netsurf.desktop"
+S = "${WORKDIR}/netsurf"
+
+DEPENDS = "gtk+ (>=2.8) lemon-native re2c-native libxml2 librsvg jpeg \
+ libmng curl openssl libglade (>=2.0)"
+
+do_compile() {
+ make -f Makefile.unix
+}
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -d ${D}/${libdir}/netsurf
+ install -d ${D}/${datadir}/netsurf
+ install -d ${D}/${datadir}/applications
+ install -d ${D}/${datadir}/pixmaps
+ install -m 0755 nsgtk ${D}/${libdir}/netsurf
+ install -m 0644 gtk/res/*.css ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/ca-bundle.txt ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/netsurf.glade ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/netsurf-logo.png ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/netsurf.xpm ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/throbber.gif ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/messages ${D}/${datadir}/netsurf
+ install -m 0644 gtk/res/netsurf.xpm ${D}/${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/netsurf.desktop ${D}/${datadir}/applications
+ cat >${D}/${bindir}/netsurf <<EOF
+#!/bin/sh
+NETSURFRES=${datadir}/netsurf
+export NETSURFRES
+exec ${libdir}/netsurf/nsgtk "\$@"
+EOF
+ chmod 0755 ${D}/${bindir}/netsurf
+}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- httpd-2.0.47/./configure.in~configure 2003-05-21 00:46:00.000000000 -0400
-+++ httpd-2.0.47/./configure.in 2004-01-26 19:43:04.000000000 -0500
-@@ -4,8 +4,9 @@
- dnl Use ./buildconf to produce a configure script
- dnl
-
--AC_PREREQ(2.13)
--AC_INIT(ABOUT_APACHE)
-+AC_PREREQ(2.57)
-+AC_INIT
-+AC_CONFIG_SRCDIR([ABOUT_APACHE])
-
- AC_CONFIG_HEADER(include/ap_config_auto.h)
- AC_CONFIG_AUX_DIR(build)
-@@ -55,7 +56,7 @@
- dnl shared library support for these packages doesn't currently
- dnl work on some platforms
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
-
- orig_prefix="$prefix"
-
-@@ -209,7 +210,7 @@
- APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
- ;;
- *-solaris2*)
-- dnl This is a hack -- we should be using AC_TRY_RUN instead
-+ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead
- ap_platform_runtime_link_flag="-R"
- dnl solaris 8 and above don't have a thundering herd
- dnl not sure about rev's before this one.
-@@ -286,7 +287,7 @@
- dnl ## Check for typedefs, structures, and compiler characteristics.
-
- AC_C_CONST
--if test "$ac_cv_prog_gcc" = "yes"; then
-+if test "$ac_cv_c_compiler_gnu" = "yes"; then
- APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER)
- fi
-
-@@ -305,9 +306,8 @@
-
- dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
- AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
--[AC_TRY_COMPILE([#include <sys/types.h>
--#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
- if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
- AC_DEFINE(HAVE_GMTOFF)
- fi
-@@ -566,7 +566,9 @@
- dnl Ensure that docs/conf is created.
- test -d docs/conf||$mkdir_p docs/conf
-
--AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
-+AC_CONFIG_FILES([$APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk])
-+AC_CONFIG_COMMANDS([default],[[true]],[[
- APACHE_GEN_MAKEFILES
--])
-+]])
-+AC_OUTPUT
-
---- httpd-2.0.47/./srclib/apr/configure.in~configure 2003-06-11 11:20:33.000000000 -0400
-+++ httpd-2.0.47/./srclib/apr/configure.in 2004-01-26 19:39:34.000000000 -0500
-@@ -4,7 +4,8 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl Use ./buildconf to prepare build files and run autoconf for APR.
-
--AC_INIT(build/apr_common.m4)
-+AC_INIT
-+AC_CONFIG_SRCDIR([build/apr_common.m4])
- AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
- AC_CONFIG_AUX_DIR(build)
-
-@@ -29,7 +30,7 @@
- dnl
- APR_CONFIG_NICE(config.nice)
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- echo "Configuring APR library"
- echo "Platform: $host"
-
-@@ -510,18 +511,14 @@
- dnl Linux is silly as it has pthread_rwlock_init defined
- dnl but keeps the pthread_rwlock_t structure hidden unless
- dnl special things are defined.
-- AC_TRY_COMPILE([#include <sys/types.h>
--#include <pthread.h>],
-- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
-- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
- if test "$ac_cv_struct_pthread_rw" = "no"; then
-- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
- #define _BSD_SOURCE
- #define _SVID_SOURCE
- #include <sys/types.h>
--#include <pthread.h>],
-- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
-- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
-+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
- if test "$ac_cv_struct_pthread_rw" = "yes"; then
- APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE])
- APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE])
-@@ -602,7 +599,7 @@
- if test "$ac_cv_func_mmap" = "yes" &&
- test "$ac_cv_file__dev_zero" = "yes"; then
- AC_MSG_CHECKING(for mmap that can map /dev/zero)
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -625,7 +622,7 @@
- return 3;
- }
- return 0;
-- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-+ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no])
-
- AC_MSG_RESULT($ac_cv_file__dev_zero)
- fi
-@@ -829,7 +826,8 @@
- AC_SUBST(sendfile)
-
- AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
--AC_DECL_SYS_SIGLIST
-+AC_CHECK_DECLS([sys_siglist])
-+
-
- AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
- APR_CHECK_INET_ADDR
-@@ -936,12 +934,11 @@
- # being included by itself. Check for <netinet/tcp.h> manually,
- # including another header file first.
- AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h],
--[AC_TRY_CPP(
--[#ifdef HAVE_NETINET_IN_H
-+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #include <netinet/tcp.h>
--], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])])
-+]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])])
- if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
- netinet_tcph=1
- AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present])
-@@ -1012,7 +1009,7 @@
- if test "x$ac_cv_sizeof_voidp" != "x"; then
- voidp_size=$ac_cv_sizeof_voidp
- else
-- AC_ERROR([Cannot determine size of void*])
-+ AC_MSG_ERROR([Cannot determine size of void*])
- fi
-
- dnl Checks for integer size
-@@ -1351,7 +1348,7 @@
- fi
-
- AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -1361,10 +1358,10 @@
- limit.rlim_cur = 0;
- limit.rlim_max = 0;
- exit(0);
--}], [
-- ac_cv_struct_rlimit=yes ], [
-- ac_cv_struct_rlimit=no ], [
-- ac_cv_struct_rlimit=no ] ) ] )
-+}]])],[
-+ ac_cv_struct_rlimit=yes ],[
-+ ac_cv_struct_rlimit=no ],[
-+ ac_cv_struct_rlimit=no ]) ] )
- struct_rlimit=0
- test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
- AC_SUBST(struct_rlimit)
-@@ -1378,7 +1375,7 @@
-
- # Some systems return ENOSYS from sem_open.
- AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <errno.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -1397,22 +1394,21 @@
- sem_close(psem);
- sem_unlink(sem_name);
- exit(0);
--}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no],
--[ac_cv_func_sem_open=no])])
-+}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])])
-
- # It's stupid, but not all platforms have union semun, even those that need it.
- AC_MSG_CHECKING(for union semun in sys/sem.h)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/sem.h>
--],[
-+]], [[
- union semun arg;
- semctl(0, 0, 0, arg);
--], [have_union_semun="1" union_semun=yes ]
--msg=yes, [
-+]])],[have_union_semun="1" union_semun=yes
-+msg=yes],[
- have_union_semun="0"
--msg=no ] )
-+msg=no ])
- AC_MSG_RESULT([$msg])
- AC_SUBST(have_union_semun)
-
-@@ -1434,7 +1430,7 @@
- # Linux and older versions of AIX have this problem.
- APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
- AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <pthread.h>
- int main()
-@@ -1452,7 +1448,7 @@
- if (pthread_mutex_destroy(&mutex))
- exit(5);
- exit(0);
-- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
-+ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])])
- # Override detection of pthread_mutexattr_setpshared
- ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
-
-@@ -1461,15 +1457,15 @@
- if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then
- AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT],
- [apr_cv_setrobust_with_prio_inherit], [
-- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT
- #include <sys/types.h>
--#include <pthread.h>],[
-+#include <pthread.h>]], [[
- int main()
- {
- pthread_mutexattr_t attr;
- pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
- return 0;
-- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])])
-+ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])])
- if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then
- ac_cv_func_pthread_mutexattr_setrobust_np=yes
- APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT)
-@@ -1637,7 +1633,7 @@
- if test -r "$apr_devrandom"; then
- rand="1"
- else
-- AC_ERROR([$apr_devrandom not found or unreadable.])
-+ AC_MSG_ERROR([$apr_devrandom not found or unreadable.])
- fi
- fi
-
-@@ -1673,9 +1669,8 @@
- dnl ----------------------------- Checking for Time Support
- echo "${nl}Checking for Time Support..."
- AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
--[AC_TRY_COMPILE([#include <sys/types.h>
--#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
-
- if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
- AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
-@@ -1684,14 +1679,14 @@
- dnl ----------------------------- Checking for Networking Support
- echo "${nl}Checking for Networking support..."
- AC_MSG_CHECKING(for in_addr in netinet/in.h)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <netinet/in.h>
--],[
-+]], [[
- struct in_addr arg;
- arg.s_addr = htonl(INADDR_ANY);
--], [ have_in_addr="1"
--msg=yes ] , [ have_in_addr="0"
-+]])],[ have_in_addr="1"
-+msg=yes ],[ have_in_addr="0"
- msg=no ])
- AC_MSG_RESULT([$msg])
-
-@@ -1898,12 +1893,13 @@
- dir=include/arch/unix
- test -d $dir || $MKDIR $dir
-
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- $MAKEFILE1 $MAKEFILE2 $MAKEFILE3
- include/apr.h
- build/apr_rules.mk
- apr-config
--],[
-+])
-+AC_CONFIG_COMMANDS([default],[[
- for i in $SAVE_FILES; do
- if cmp -s $i $i.save 2>/dev/null; then
- mv $i.save $i
-@@ -1912,7 +1908,8 @@
- rm -f $i.save
- done
- chmod +x apr-config
--])
-+]],[[]])
-+AC_OUTPUT
-
- dnl ----------------------------- Fixup Makefiles for VPATH support
-
---- httpd-2.0.47/./srclib/pcre/configure.in~configure 2002-03-20 01:56:34.000000000 -0500
-+++ httpd-2.0.47/./srclib/pcre/configure.in 2004-01-26 19:43:27.000000000 -0500
-@@ -3,7 +3,8 @@
- dnl This is required at the start; the name is the name of a file
- dnl it should be seeing, to verify it is in the same directory.
-
--AC_INIT(dftables.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([dftables.c])
-
- dnl Arrange to build config.h from config.in. Note that pcre.h is
- dnl built differently, as it is just a "substitution" file.
-@@ -101,4 +102,6 @@
- AC_SUBST(PCRE_POSIXLIB_VERSION)
-
- dnl This must be last; it determines what files are written as well as config.h
--AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config])
-+AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config])
-+AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]])
-+AC_OUTPUT
---- httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in~configure 2001-07-08 22:31:04.000000000 -0400
-+++ httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in 2004-01-26 19:39:34.000000000 -0500
-@@ -10,7 +10,8 @@
- dnl in the file COPYING that comes with this distribution.
- dnl
-
--AC_INIT(Makefile.in)
-+AC_INIT
-+AC_CONFIG_SRCDIR([Makefile.in])
- AC_CONFIG_AUX_DIR(conftools)
-
- dnl
-@@ -45,7 +46,7 @@
-
- AC_CONFIG_HEADER(config.h)
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- case "$host_alias" in
- *os2*)
- # Use a custom made libtool replacement
-@@ -106,4 +107,5 @@
-
- AC_CHECK_FUNCS(memmove bcopy)
-
--AC_OUTPUT(Makefile lib/Makefile lib/expat.h)
-+AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h])
-+AC_OUTPUT
---- httpd-2.0.47/./srclib/apr-util/configure.in~configure 2003-06-12 03:27:10.000000000 -0400
-+++ httpd-2.0.47/./srclib/apr-util/configure.in 2004-01-26 19:39:34.000000000 -0500
-@@ -2,8 +2,9 @@
- dnl Process this file with autoconf to produce a configure script
- dnl
-
--AC_PREREQ(2.13)
--AC_INIT(export_vars.sh.in)
-+AC_PREREQ(2.57)
-+AC_INIT
-+AC_CONFIG_SRCDIR([export_vars.sh.in])
-
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-@@ -29,7 +30,7 @@
- USE_VPATH=1
- fi
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
-
- dnl
- dnl compute the top directory of the build
-@@ -191,13 +192,15 @@
- dnl
- dnl everthing is done.
- MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile"
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- export_vars.sh
- apu-config
- include/private/apu_select_dbm.h
- include/apr_ldap.h
- include/apu.h
- $MAKEFILES
-- ],[
-+ ])
-+AC_CONFIG_COMMANDS([default],[[
- chmod +x apu-config
--])
-+]],[[]])
-+AC_OUTPUT
---- httpd-2.0.47/acinclude.m4~configure 2002-11-29 06:05:57.000000000 -0500
-+++ httpd-2.0.47/acinclude.m4 2004-01-26 19:39:34.000000000 -0500
-@@ -4,25 +4,25 @@
- dnl AC_HELP_STRING, so let's try to call it if we can.
- dnl Note: this define must be on one line so that it can be properly returned
- dnl as the help string.
--AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
-+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
-
- dnl APACHE_SUBST(VARIABLE)
- dnl Makes VARIABLE available in generated files
- dnl (do not use @variable@ in Makefiles, but $(variable))
--AC_DEFUN(APACHE_SUBST,[
-+AC_DEFUN([APACHE_SUBST],[
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
- AC_SUBST($1)
- ])
-
- dnl APACHE_FAST_OUTPUT(FILENAME)
- dnl Perform substitutions on FILENAME (Makefiles only)
--AC_DEFUN(APACHE_FAST_OUTPUT,[
-+AC_DEFUN([APACHE_FAST_OUTPUT],[
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
- ])
-
- dnl APACHE_GEN_CONFIG_VARS
- dnl Creates config_vars.mk
--AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
-+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
- APACHE_SUBST(abs_srcdir)
- APACHE_SUBST(bindir)
- APACHE_SUBST(sbindir)
-@@ -104,14 +104,14 @@
-
- dnl APACHE_GEN_MAKEFILES
- dnl Creates Makefiles
--AC_DEFUN(APACHE_GEN_MAKEFILES,[
-+AC_DEFUN([APACHE_GEN_MAKEFILES],[
- $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
- ])
-
- dnl ## APACHE_OUTPUT(file)
- dnl ## adds "file" to the list of files generated by AC_OUTPUT
- dnl ## This macro can be used several times.
--AC_DEFUN(APACHE_OUTPUT, [
-+AC_DEFUN([APACHE_OUTPUT], [
- APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
- ])
-
-@@ -120,7 +120,7 @@
- dnl
- dnl If rlim_t is not defined, define it to int
- dnl
--AC_DEFUN(APACHE_TYPE_RLIM_T, [
-+AC_DEFUN([APACHE_TYPE_RLIM_T], [
- AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
- AC_TRY_COMPILE([
- #include <sys/types.h>
-@@ -138,7 +138,7 @@
- ])
-
- dnl APACHE_MODPATH_INIT(modpath)
--AC_DEFUN(APACHE_MODPATH_INIT,[
-+AC_DEFUN([APACHE_MODPATH_INIT],[
- current_dir=$1
- modpath_current=modules/$1
- modpath_static=
-@@ -147,7 +147,7 @@
- > $modpath_current/modules.mk
- ])dnl
- dnl
--AC_DEFUN(APACHE_MODPATH_FINISH,[
-+AC_DEFUN([APACHE_MODPATH_FINISH],[
- echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
- echo "static = $modpath_static" >> $modpath_current/modules.mk
- echo "shared = $modpath_shared" >> $modpath_current/modules.mk
-@@ -160,7 +160,7 @@
- ])dnl
- dnl
- dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
--AC_DEFUN(APACHE_MODPATH_ADD,[
-+AC_DEFUN([APACHE_MODPATH_ADD],[
- if test -z "$3"; then
- objects="mod_$1.lo"
- else
-@@ -203,7 +203,7 @@
- dnl setting. otherwise, fall under the "all" setting.
- dnl explicit yes/no always overrides.
- dnl
--AC_DEFUN(APACHE_MODULE,[
-+AC_DEFUN([APACHE_MODULE],[
- AC_MSG_CHECKING(whether to enable mod_$1)
- define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
- AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
-@@ -273,7 +273,7 @@
- dnl
- dnl APACHE_LAYOUT(configlayout, layoutname)
- dnl
--AC_DEFUN(APACHE_LAYOUT,[
-+AC_DEFUN([APACHE_LAYOUT],[
- if test ! -f $srcdir/config.layout; then
- echo "** Error: Layout file $srcdir/config.layout not found"
- echo "** Error: Cannot use undefined layout '$LAYOUT'"
-@@ -325,7 +325,7 @@
- dnl
- dnl APACHE_ENABLE_LAYOUT
- dnl
--AC_DEFUN(APACHE_ENABLE_LAYOUT,[
-+AC_DEFUN([APACHE_ENABLE_LAYOUT],[
- AC_ARG_ENABLE(layout,
- [ --enable-layout=LAYOUT],[
- LAYOUT=$enableval
-@@ -343,7 +343,7 @@
- dnl
- dnl APACHE_ENABLE_MODULES
- dnl
--AC_DEFUN(APACHE_ENABLE_MODULES,[
-+AC_DEFUN([APACHE_ENABLE_MODULES],[
- module_selection=default
- module_default=yes
-
-@@ -372,7 +372,7 @@
- ])
- ])
-
--AC_DEFUN(APACHE_REQUIRE_CXX,[
-+AC_DEFUN([APACHE_REQUIRE_CXX],[
- if test -z "$apache_cxx_done"; then
- AC_PROG_CXX
- AC_PROG_CXXCPP
-@@ -389,7 +389,7 @@
- dnl and then AC_TRY_LINK to test the libraries directly for the version,
- dnl but that will require someone who knows how to program openssl.
- dnl
--AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[
-+AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[
- if test "x$ap_ssltk_base" = "x"; then
- AC_MSG_CHECKING(for SSL/TLS toolkit base)
- ap_ssltk_base=""
-@@ -499,14 +499,14 @@
- dnl apache will use while generating scripts like autoconf and apxs and
- dnl the default config file.
-
--AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
-+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[
- APR_EXPAND_VAR(exp_$1, [$]$1)
- APACHE_SUBST(exp_$1)
- APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
- APACHE_SUBST(rel_$1)
- ])
-
--AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
-+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[
- APACHE_SUBST_EXPANDED_ARG(exec_prefix)
- APACHE_SUBST_EXPANDED_ARG(bindir)
- APACHE_SUBST_EXPANDED_ARG(sbindir)
---- httpd-2.0.47/srclib/apr/build/apr_common.m4~configure 2003-04-05 16:42:20.000000000 -0500
-+++ httpd-2.0.47/srclib/apr/build/apr_common.m4 2004-01-26 19:39:34.000000000 -0500
-@@ -6,7 +6,7 @@
- dnl
- dnl Saves a snapshot of the configure command-line for later reuse
- dnl
--AC_DEFUN(APR_CONFIG_NICE,[
-+AC_DEFUN([APR_CONFIG_NICE],[
- rm -f $1
- cat >$1<<EOF
- #! /bin/sh
-@@ -55,7 +55,7 @@
-
- dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
- dnl checks whether mkdir -p works
--AC_DEFUN(APR_MKDIR_P_CHECK,[
-+AC_DEFUN([APR_MKDIR_P_CHECK],[
- AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
- test -d conftestdir && rm -rf conftestdir
- mkdir -p conftestdir/somedir >/dev/null 2>&1
-@@ -93,7 +93,7 @@
- dnl Trying to optimize this is left as an exercise to the reader who wants
- dnl to put up with more autoconf craziness. I give up.
- dnl
--AC_DEFUN(APR_SUBDIR_CONFIG, [
-+AC_DEFUN([APR_SUBDIR_CONFIG], [
- # save our work to this point; this allows the sub-package to use it
- AC_CACHE_SAVE
-
-@@ -158,7 +158,7 @@
- dnl
- dnl Stores the variable (usually a Makefile macro) for later restoration
- dnl
--AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
-+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[
- apr_ste_save_$1="$$1"
- ])dnl
-
-@@ -170,7 +170,7 @@
- dnl and restoring the original variable contents. This makes it possible
- dnl for a user to override configure when it does something stupid.
- dnl
--AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
-+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[
- if test "x$apr_ste_save_$1" = "x"; then
- $2$1="$$1"
- $1=
-@@ -192,7 +192,7 @@
- dnl
- dnl Set variable iff it's currently null
- dnl
--AC_DEFUN(APR_SETIFNULL,[
-+AC_DEFUN([APR_SETIFNULL],[
- if test -z "$$1"; then
- echo " setting $1 to \"$2\""
- $1="$2"
-@@ -204,7 +204,7 @@
- dnl
- dnl Set variable no matter what
- dnl
--AC_DEFUN(APR_SETVAR,[
-+AC_DEFUN([APR_SETVAR],[
- echo " forcing $1 to \"$2\""
- $1="$2"
- ])dnl
-@@ -214,7 +214,7 @@
- dnl
- dnl Add value to variable
- dnl
--AC_DEFUN(APR_ADDTO,[
-+AC_DEFUN([APR_ADDTO],[
- if test "x$$1" = "x"; then
- echo " setting $1 to \"$2\""
- $1="$2"
-@@ -241,7 +241,7 @@
- dnl
- dnl Remove a value from a variable
- dnl
--AC_DEFUN(APR_REMOVEFROM,[
-+AC_DEFUN([APR_REMOVEFROM],[
- if test "x$$1" = "x$2"; then
- echo " nulling $1"
- $1=""
-@@ -265,7 +265,7 @@
- dnl
- dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
- dnl
--AC_DEFUN(APR_CHECK_DEFINE_FILES,[
-+AC_DEFUN([APR_CHECK_DEFINE_FILES],[
- AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
- ac_cv_define_$1=no
- for curhdr in $2
-@@ -287,7 +287,7 @@
- dnl
- dnl APR_CHECK_DEFINE(symbol, header_file)
- dnl
--AC_DEFUN(APR_CHECK_DEFINE,[
-+AC_DEFUN([APR_CHECK_DEFINE],[
- AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
- AC_EGREP_CPP(YES_IS_DEFINED, [
- #include <$2>
-@@ -304,7 +304,7 @@
- dnl
- dnl APR_CHECK_APR_DEFINE( symbol )
- dnl
--AC_DEFUN(APR_CHECK_APR_DEFINE,[
-+AC_DEFUN([APR_CHECK_APR_DEFINE],[
- apr_old_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $INCLUDES"
- AC_EGREP_CPP(YES_IS_DEFINED, [
-@@ -329,7 +329,7 @@
- fi])
- ])
-
--define(APR_IFALLYES,[dnl
-+define([APR_IFALLYES],[dnl
- ac_rc=yes
- for ac_spec in $1; do
- ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-@@ -364,14 +364,14 @@
- ])
-
-
--define(APR_BEGIN_DECISION,[dnl
-+define([APR_BEGIN_DECISION],[dnl
- ac_decision_item='$1'
- ac_decision_msg='FAILED'
- ac_decision=''
- ])
-
-
--define(APR_DECIDE,[dnl
-+define([APR_DECIDE],[dnl
- ac_decision='$1'
- ac_decision_msg='$2'
- ac_decision_$1=yes
-@@ -379,7 +379,7 @@
- ])
-
-
--define(APR_DECISION_OVERRIDE,[dnl
-+define([APR_DECISION_OVERRIDE],[dnl
- ac_decision=''
- for ac_item in $1; do
- eval "ac_decision_this=\$ac_decision_${ac_item}"
-@@ -391,13 +391,13 @@
- ])
-
-
--define(APR_DECISION_FORCE,[dnl
-+define([APR_DECISION_FORCE],[dnl
- ac_decision="$1"
- eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
- ])
-
-
--define(APR_END_DECISION,[dnl
-+define([APR_END_DECISION],[dnl
- if test ".$ac_decision" = .; then
- echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2
- exit 1
-@@ -417,7 +417,7 @@
- dnl A variant of AC_CHECK_SIZEOF which allows the checking of
- dnl sizes of non-builtin types
- dnl
--AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
-+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
- [changequote(<<,>>)dnl
- dnl The name to #define
- define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-@@ -450,7 +450,7 @@
- dnl Tries a compile test with warnings activated so that the result
- dnl is false if the code doesn't compile cleanly.
- dnl
--AC_DEFUN(APR_TRY_COMPILE_NO_WARNING,
-+AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
- [if test "x$CFLAGS_WARN" = "x"; then
- apr_tcnw_flags=""
- else
-@@ -489,7 +489,7 @@
- dnl string.
- dnl
- dnl
--AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
-+AC_DEFUN([APR_CHECK_STRERROR_R_RC],[
- AC_MSG_CHECKING(for type of return code from strerror_r)
- AC_TRY_RUN([
- #include <errno.h>
-@@ -522,7 +522,7 @@
- dnl Decide which of a couple of flavors of crypt_r() is necessary for
- dnl this platform.
- dnl
--AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[
-+AC_DEFUN([APR_CHECK_CRYPT_R_STYLE],[
- AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[
- dnl
- ac_cv_crypt_r_style=none
-@@ -576,7 +576,7 @@
- dnl structure on this platform. Single UNIX Spec says d_ino,
- dnl BSD uses d_fileno. Undef to find the real beast.
- dnl
--AC_DEFUN(APR_CHECK_DIRENT_INODE, [
-+AC_DEFUN([APR_CHECK_DIRENT_INODE], [
- AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
- apr_cv_dirent_inode=no
- AC_TRY_COMPILE([
-@@ -613,7 +613,7 @@
- dnl Note that this is worthless without DT_xxx macros, so
- dnl look for one while we are at it.
- dnl
--AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
-+AC_DEFUN([APR_CHECK_DIRENT_TYPE],[
- AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
- apr_cv_dirent_type=no
- AC_TRY_COMPILE([
-@@ -645,8 +645,8 @@
- dnl within each iteration.
- dnl
- changequote({,})
--define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
--define({APR_FOREACH},
-+define([{APR_COMMA_ARGS}],{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
-+define([{APR_FOREACH}],
- {ifelse($}{2,,,
- [define([eachval],
- $}{2)$}{1[]APR_FOREACH([$}{1],
-@@ -661,7 +661,7 @@
- dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of
- dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no.
- dnl
--AC_DEFUN(APR_FLAG_HEADERS,[
-+AC_DEFUN([APR_FLAG_HEADERS],[
- AC_CHECK_HEADERS($1)
- for aprt_i in $1
- do
-@@ -682,7 +682,7 @@
- dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
- dnl to yes or no.
- dnl
--AC_DEFUN(APR_FLAG_FUNCS,[
-+AC_DEFUN([APR_FLAG_FUNCS],[
- AC_CHECK_FUNCS($1)
- for aprt_j in $1
- do
-@@ -707,7 +707,7 @@
- dnl APR_EXPAND_VAR(fraz, $baz)
- dnl $fraz is now "1/2/3"
- dnl
--AC_DEFUN(APR_EXPAND_VAR,[
-+AC_DEFUN([APR_EXPAND_VAR],[
- ap_last=
- ap_cur="$2"
- while test "x${ap_cur}" != "x${ap_last}";
-@@ -726,7 +726,7 @@
- dnl orig_path="${prefix}/bar"
- dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
- dnl $final_path now contains "bar"
--AC_DEFUN(APR_PATH_RELATIVE,[
-+AC_DEFUN([APR_PATH_RELATIVE],[
- ap_stripped=`echo $2 | sed -e "s#^$3##"`
- # check if the stripping was successful
- if test "x$2" != "x${ap_stripped}"; then
-@@ -744,12 +744,12 @@
- dnl Note: this define must be on one line so that it can be properly returned
- dnl as the help string. When using this macro with a multi-line RHS, ensure
- dnl that you surround the macro invocation with []s
--AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])])
-+AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])])
-
- dnl
- dnl APR_LAYOUT(configlayout, layoutname [, extravars])
- dnl
--AC_DEFUN(APR_LAYOUT,[
-+AC_DEFUN([APR_LAYOUT],[
- if test ! -f $srcdir/config.layout; then
- echo "** Error: Layout file $srcdir/config.layout not found"
- echo "** Error: Cannot use undefined layout '$LAYOUT'"
-@@ -805,7 +805,7 @@
- dnl
- dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
- dnl
--AC_DEFUN(APR_ENABLE_LAYOUT,[
-+AC_DEFUN([APR_ENABLE_LAYOUT],[
- AC_ARG_ENABLE(layout,
- [ --enable-layout=LAYOUT],[
- LAYOUT=$enableval
-@@ -826,7 +826,7 @@
- dnl a reimplementation of autoconf's argument parser,
- dnl used here to allow us to co-exist layouts and argument based
- dnl set ups.
--AC_DEFUN(APR_PARSE_ARGUMENTS,[
-+AC_DEFUN([APR_PARSE_ARGUMENTS],[
- ac_prev=
- for ac_option
- do
-@@ -948,7 +948,7 @@
- dnl
- dnl Determine what program we can use to generate .deps-style dependencies
- dnl
--AC_DEFUN(APR_CHECK_DEPEND,[
-+AC_DEFUN([APR_CHECK_DEPEND],[
- dnl Try to determine what depend program we can use
- dnl All GCC-variants should have -MM.
- dnl If not, then we can check on those, too.
---- httpd-2.0.47/srclib/apr/build/find_apr.m4~configure 2002-11-05 17:09:19.000000000 -0500
-+++ httpd-2.0.47/srclib/apr/build/find_apr.m4 2004-01-26 19:39:34.000000000 -0500
-@@ -37,7 +37,7 @@
- dnl value of apr_config to fetch any necessary build/link information.
- dnl
-
--AC_DEFUN(APR_FIND_APR, [
-+AC_DEFUN([APR_FIND_APR], [
- apr_found="no"
-
- if test "$ac_cv_emxos2" = "yes"; then
---- httpd-2.0.47/srclib/apr-util/build/find_apu.m4~configure 2002-11-05 17:13:42.000000000 -0500
-+++ httpd-2.0.47/srclib/apr-util/build/find_apu.m4 2004-01-26 19:39:34.000000000 -0500
-@@ -41,7 +41,7 @@
- dnl value of apu_config to fetch any necessary build/link information.
- dnl
-
--AC_DEFUN(APR_FIND_APU, [
-+AC_DEFUN([APR_FIND_APU], [
- apu_found="no"
-
- AC_MSG_CHECKING(for APR-util)
+++ /dev/null
-#!/bin/sh
-#
-# apache Start the apache HTTP server.
-#
-
-NAME=apache
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/httpd
-SUEXEC=/usr/lib/apache/suexec
-PIDFILE=/var/run/$NAME.pid
-CONF=/etc/apache/httpd.conf
-APACHECTL=/usr/sbin/apachectl
-
-trap "" 1
-export LANG=C
-export PATH
-
-test -f $DAEMON || exit 0
-test -f $APACHECTL || exit 0
-
-# ensure we don't leak environment vars into apachectl
-APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL"
-
-if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF
-then
- exit 0
-fi
-
-case "$1" in
- start)
- echo -n "Starting web server: $NAME"
- start-stop-daemon -S -x $DAEMON
- ;;
-
- stop)
- echo -n "Stopping web server: $NAME"
- start-stop-daemon -K -x $DAEMON
- ;;
-
- reload)
- echo -n "Reloading $NAME configuration"
- start-stop-daemon -K --signal USR1 -x $DAEMON
- ;;
-
- reload-modules)
- echo -n "Reloading $NAME modules"
- start-stop-daemon -K
- start-stop-daemon -S -x $DAEMON
- ;;
-
- restart)
- $0 reload-modules
- exit $?
- ;;
-
- force-reload)
- $0 reload-modules
- exit $?
- ;;
-
- *)
- echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}"
- exit 1
- ;;
-esac
-
-if [ $? == 0 ]; then
- echo .
- exit 0
-else
- echo failed
- exit 1
-fi
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure
-+++ httpd-2.0.47/srclib/pcre/configure.in
-@@ -72,7 +72,8 @@
- AC_ARG_ENABLE(newline-is-cr,
- [ --enable-newline-is-cr use CR as the newline character],
- if test "$enableval" = "yes"; then
-- NEWLINE=-DNEWLINE=13
-+ AC_DEFINE(NEWLINE, 13)
-+# NEWLINE=-DNEWLINE=13
- fi
- )
-
-@@ -81,7 +82,8 @@
- AC_ARG_ENABLE(newline-is-lf,
- [ --enable-newline-is-lf use LF as the newline character],
- if test "$enableval" = "yes"; then
-- NEWLINE=-DNEWLINE=10
-+ AC_DEFINE(NEWLINE, 10)
-+# NEWLINE=-DNEWLINE=10
- fi
- )
-
-@@ -91,7 +93,7 @@
- AC_SUBST(HAVE_STRERROR)
- AC_SUBST(LIBTOOL)
- AC_SUBST(LIBSUFFIX)
--AC_SUBST(NEWLINE)
-+#AC_SUBST(NEWLINE)
- AC_SUBST(UTF8)
- AC_SUBST(PCRE_MAJOR)
- AC_SUBST(PCRE_MINOR)
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- httpd-2.0.48/./configure.in~configure
-+++ httpd-2.0.48/./configure.in
-@@ -4,8 +4,9 @@
- dnl Use ./buildconf to produce a configure script
- dnl
-
--AC_PREREQ(2.13)
--AC_INIT(ABOUT_APACHE)
-+AC_PREREQ(2.57)
-+AC_INIT
-+AC_CONFIG_SRCDIR([ABOUT_APACHE])
-
- AC_CONFIG_HEADER(include/ap_config_auto.h)
- AC_CONFIG_AUX_DIR(build)
-@@ -55,7 +56,7 @@
- dnl shared library support for these packages doesn't currently
- dnl work on some platforms
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
-
- orig_prefix="$prefix"
-
-@@ -209,7 +210,7 @@
- APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
- ;;
- *-solaris2*)
-- dnl This is a hack -- we should be using AC_TRY_RUN instead
-+ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead
- ap_platform_runtime_link_flag="-R"
- dnl solaris 8 and above don't have a thundering herd
- dnl not sure about rev's before this one.
-@@ -286,7 +287,7 @@
- dnl ## Check for typedefs, structures, and compiler characteristics.
-
- AC_C_CONST
--if test "$ac_cv_prog_gcc" = "yes"; then
-+if test "$ac_cv_c_compiler_gnu" = "yes"; then
- APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER)
- fi
-
-@@ -305,9 +306,8 @@
-
- dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
- AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
--[AC_TRY_COMPILE([#include <sys/types.h>
--#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
- if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
- AC_DEFINE(HAVE_GMTOFF)
- fi
---- httpd-2.0.48/./srclib/apr/configure.in~configure
-+++ httpd-2.0.48/./srclib/apr/configure.in
-@@ -4,7 +4,8 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl Use ./buildconf to prepare build files and run autoconf for APR.
-
--AC_INIT(build/apr_common.m4)
-+AC_INIT
-+AC_CONFIG_SRCDIR([build/apr_common.m4])
- AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
- AC_CONFIG_AUX_DIR(build)
-
-@@ -29,7 +30,7 @@
- dnl
- APR_CONFIG_NICE(config.nice)
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- echo "Configuring APR library"
- echo "Platform: $host"
-
-@@ -532,18 +533,14 @@
- dnl Linux is silly as it has pthread_rwlock_init defined
- dnl but keeps the pthread_rwlock_t structure hidden unless
- dnl special things are defined.
-- AC_TRY_COMPILE([#include <sys/types.h>
--#include <pthread.h>],
-- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
-- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
- if test "$ac_cv_struct_pthread_rw" = "no"; then
-- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
- #define _BSD_SOURCE
- #define _SVID_SOURCE
- #include <sys/types.h>
--#include <pthread.h>],
-- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
-- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
-+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
- if test "$ac_cv_struct_pthread_rw" = "yes"; then
- APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE])
- APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE])
-@@ -624,7 +621,7 @@
- if test "$ac_cv_func_mmap" = "yes" &&
- test "$ac_cv_file__dev_zero" = "yes"; then
- AC_MSG_CHECKING(for mmap that can map /dev/zero)
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -647,7 +644,7 @@
- return 3;
- }
- return 0;
-- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-+ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no])
-
- AC_MSG_RESULT($ac_cv_file__dev_zero)
- fi
-@@ -852,7 +849,8 @@
- AC_SUBST(sendfile)
-
- AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
--AC_DECL_SYS_SIGLIST
-+AC_CHECK_DECLS([sys_siglist])
-+
-
- AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
- APR_CHECK_INET_ADDR
-@@ -961,12 +959,11 @@
- # being included by itself. Check for <netinet/tcp.h> manually,
- # including another header file first.
- AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h],
--[AC_TRY_CPP(
--[#ifdef HAVE_NETINET_IN_H
-+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #include <netinet/tcp.h>
--], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])])
-+]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])])
- if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
- netinet_tcph=1
- AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present])
-@@ -1039,7 +1036,7 @@
- if test "x$ac_cv_sizeof_voidp" != "x"; then
- voidp_size=$ac_cv_sizeof_voidp
- else
-- AC_ERROR([Cannot determine size of void*])
-+ AC_MSG_ERROR([Cannot determine size of void*])
- fi
-
- dnl Checks for integer size
-@@ -1378,7 +1375,7 @@
- fi
-
- AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -1388,10 +1385,10 @@
- limit.rlim_cur = 0;
- limit.rlim_max = 0;
- exit(0);
--}], [
-- ac_cv_struct_rlimit=yes ], [
-- ac_cv_struct_rlimit=no ], [
-- ac_cv_struct_rlimit=no ] ) ] )
-+}]])],[
-+ ac_cv_struct_rlimit=yes ],[
-+ ac_cv_struct_rlimit=no ],[
-+ ac_cv_struct_rlimit=no ]) ] )
- struct_rlimit=0
- test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
- AC_SUBST(struct_rlimit)
-@@ -1405,7 +1402,7 @@
-
- # Some systems return ENOSYS from sem_open.
- AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <errno.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -1424,22 +1421,21 @@
- sem_close(psem);
- sem_unlink(sem_name);
- exit(0);
--}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no],
--[ac_cv_func_sem_open=no])])
-+}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])])
-
- # It's stupid, but not all platforms have union semun, even those that need it.
- AC_MSG_CHECKING(for union semun in sys/sem.h)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/sem.h>
--],[
-+]], [[
- union semun arg;
- semctl(0, 0, 0, arg);
--], [have_union_semun="1" union_semun=yes ]
--msg=yes, [
-+]])],[have_union_semun="1" union_semun=yes
-+msg=yes],[
- have_union_semun="0"
--msg=no ] )
-+msg=no ])
- AC_MSG_RESULT([$msg])
- AC_SUBST(have_union_semun)
-
-@@ -1461,7 +1457,7 @@
- # Linux and older versions of AIX have this problem.
- APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
- AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <pthread.h>
- int main()
-@@ -1479,7 +1475,7 @@
- if (pthread_mutex_destroy(&mutex))
- exit(5);
- exit(0);
-- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
-+ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])])
- # Override detection of pthread_mutexattr_setpshared
- ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
-
-@@ -1488,15 +1484,15 @@
- if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then
- AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT],
- [apr_cv_setrobust_with_prio_inherit], [
-- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT
- #include <sys/types.h>
--#include <pthread.h>],[
-+#include <pthread.h>]], [[
- int main()
- {
- pthread_mutexattr_t attr;
- pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
- return 0;
-- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])])
-+ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])])
- if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then
- ac_cv_func_pthread_mutexattr_setrobust_np=yes
- APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT)
-@@ -1664,7 +1660,7 @@
- if test -r "$apr_devrandom"; then
- rand="1"
- else
-- AC_ERROR([$apr_devrandom not found or unreadable.])
-+ AC_MSG_ERROR([$apr_devrandom not found or unreadable.])
- fi
- fi
-
-@@ -1700,9 +1696,8 @@
- dnl ----------------------------- Checking for Time Support
- echo "${nl}Checking for Time Support..."
- AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
--[AC_TRY_COMPILE([#include <sys/types.h>
--#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
-
- if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
- AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
-@@ -1711,14 +1706,14 @@
- dnl ----------------------------- Checking for Networking Support
- echo "${nl}Checking for Networking support..."
- AC_MSG_CHECKING(for in_addr in netinet/in.h)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <netinet/in.h>
--],[
-+]], [[
- struct in_addr arg;
- arg.s_addr = htonl(INADDR_ANY);
--], [ have_in_addr="1"
--msg=yes ] , [ have_in_addr="0"
-+]])],[ have_in_addr="1"
-+msg=yes ],[ have_in_addr="0"
- msg=no ])
- AC_MSG_RESULT([$msg])
-
-@@ -1920,12 +1915,13 @@
- dir=include/arch/unix
- test -d $dir || $MKDIR $dir
-
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- $MAKEFILE1 $MAKEFILE2 $MAKEFILE3
- include/apr.h
- build/apr_rules.mk
- apr-config
--],[
-+])
-+AC_CONFIG_COMMANDS([default],[[
- for i in $SAVE_FILES; do
- if cmp -s $i $i.save 2>/dev/null; then
- mv $i.save $i
-@@ -1934,7 +1930,8 @@
- rm -f $i.save
- done
- chmod +x apr-config
--])
-+]],[[]])
-+AC_OUTPUT
-
- dnl ----------------------------- Fixup Makefiles for VPATH support
-
---- httpd-2.0.48/./srclib/pcre/configure.in~configure
-+++ httpd-2.0.48/./srclib/pcre/configure.in
-@@ -3,7 +3,8 @@
- dnl This is required at the start; the name is the name of a file
- dnl it should be seeing, to verify it is in the same directory.
-
--AC_INIT(dftables.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([dftables.c])
-
- dnl Arrange to build config.h from config.in. Note that pcre.h is
- dnl built differently, as it is just a "substitution" file.
-@@ -101,4 +102,6 @@
- AC_SUBST(PCRE_POSIXLIB_VERSION)
-
- dnl This must be last; it determines what files are written as well as config.h
--AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config])
-+AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config])
-+AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]])
-+AC_OUTPUT
---- httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in~configure
-+++ httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in
-@@ -10,7 +10,8 @@
- dnl in the file COPYING that comes with this distribution.
- dnl
-
--AC_INIT(Makefile.in)
-+AC_INIT
-+AC_CONFIG_SRCDIR([Makefile.in])
- AC_CONFIG_AUX_DIR(conftools)
-
- dnl
-@@ -45,7 +46,7 @@
-
- AC_CONFIG_HEADER(config.h)
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- case "$host_alias" in
- *os2*)
- # Use a custom made libtool replacement
-@@ -106,4 +107,5 @@
-
- AC_CHECK_FUNCS(memmove bcopy)
-
--AC_OUTPUT(Makefile lib/Makefile lib/expat.h)
-+AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h])
-+AC_OUTPUT
---- httpd-2.0.48/./srclib/apr-util/configure.in~configure
-+++ httpd-2.0.48/./srclib/apr-util/configure.in
-@@ -2,8 +2,9 @@
- dnl Process this file with autoconf to produce a configure script
- dnl
-
--AC_PREREQ(2.13)
--AC_INIT(export_vars.sh.in)
-+AC_PREREQ(2.57)
-+AC_INIT
-+AC_CONFIG_SRCDIR([export_vars.sh.in])
-
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-@@ -30,7 +31,7 @@
- USE_VPATH=1
- fi
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
-
- dnl
- dnl compute the top directory of the build
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure
-+++ httpd-2.0.47/srclib/pcre/configure.in
-@@ -72,7 +72,8 @@
- AC_ARG_ENABLE(newline-is-cr,
- [ --enable-newline-is-cr use CR as the newline character],
- if test "$enableval" = "yes"; then
-- NEWLINE=-DNEWLINE=13
-+ AC_DEFINE(NEWLINE, 13)
-+# NEWLINE=-DNEWLINE=13
- fi
- )
-
-@@ -81,7 +82,8 @@
- AC_ARG_ENABLE(newline-is-lf,
- [ --enable-newline-is-lf use LF as the newline character],
- if test "$enableval" = "yes"; then
-- NEWLINE=-DNEWLINE=10
-+ AC_DEFINE(NEWLINE, 10)
-+# NEWLINE=-DNEWLINE=10
- fi
- )
-
-@@ -91,7 +93,7 @@
- AC_SUBST(HAVE_STRERROR)
- AC_SUBST(LIBTOOL)
- AC_SUBST(LIBSUFFIX)
--AC_SUBST(NEWLINE)
-+#AC_SUBST(NEWLINE)
- AC_SUBST(UTF8)
- AC_SUBST(PCRE_MAJOR)
- AC_SUBST(PCRE_MINOR)
+++ /dev/null
-BROKEN = "1"
-SECTION = "console/network"
-DEPENDS = "expat openssl"
-DESCRIPTION = "A high performance Unix-based HTTP server."
-LICENSE="Apache-2.0"
-
-SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://pcre-configure.patch;patch=1 \
- file://init \
- file://httpd.conf"
-S = "${WORKDIR}/httpd-${PV}"
-
-basesysconfdir := "${sysconfdir}"
-sysconfdir = "/etc/apache"
-
-inherit autotools
-
-FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \
- ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var"
-
-CFLAGS_append = " -DPATH_MAX=4096"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
-EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \
- --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \
- --with-gdbm=no --with-ndbm=no"
-do_configure () {
- (cd srclib/apr && ./buildconf)
- (cd srclib/apr-util && ./buildconf)
-
- cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
- srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
- srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
-
- (cd srclib/pcre && autoconf)
-
- aclocal -I build
- autoheader
- autoconf
- oe_runconf
-}
-
-do_compile () {
- touch srclib/apr-util/uri/gen_uri_delims.lo
- ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
- touch srclib/pcre/dftables.lo
- ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables
- cd server
- ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo
- ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo
- ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char
- /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo
- /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo
- touch gen_test_char
- cd ..
- oe_runmake
-}
-
-do_install_append () {
- set -x
- install -d ${D}${basesysconfdir}/init.d
- cat ${WORKDIR}/init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g; \
- s,/usr/bin/,${bindir}/,g; \
- s,/usr/lib,${libdir}/,g; \
- s,/etc/apache/,${sysconfdir}/,g; \
- s,/etc/,${basesysconfdir}/,g; \
- s,/usr/,${prefix}/,g;' > ${D}${basesysconfdir}/init.d/httpd
- chmod 755 ${D}${basesysconfdir}/init.d/httpd
- install -m 0644 ${WORKDIR}/httpd.conf ${D}${sysconfdir}/httpd.conf
-}
-
-pkg_postinst () {
- if test -n "${D}"; then
- D="-r $D"
- fi
- update-rc.d $D httpd defaults 91 20
-}
-
-pkg_prerm () {
- if test -n "${D}"; then
- D="-r $D"
- fi
- update-rc.d $D httpd remove
-}
+++ /dev/null
-#!/bin/sh
-#
-# apache Start the apache HTTP server.
-#
-
-NAME=apache
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/httpd
-SUEXEC=/usr/lib/apache/suexec
-PIDFILE=/var/run/$NAME.pid
-CONF=/etc/apache/httpd.conf
-APACHECTL=/usr/sbin/apachectl
-
-trap "" 1
-export LANG=C
-export PATH
-
-test -f $DAEMON || exit 0
-test -f $APACHECTL || exit 0
-
-# ensure we don't leak environment vars into apachectl
-APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL"
-
-if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF
-then
- exit 0
-fi
-
-case "$1" in
- start)
- echo -n "Starting web server: $NAME"
- start-stop-daemon -S -x $DAEMON
- ;;
-
- stop)
- echo -n "Stopping web server: $NAME"
- start-stop-daemon -K -x $DAEMON
- ;;
-
- reload)
- echo -n "Reloading $NAME configuration"
- start-stop-daemon -K --signal USR1 -x $DAEMON
- ;;
-
- reload-modules)
- echo -n "Reloading $NAME modules"
- start-stop-daemon -K
- start-stop-daemon -S -x $DAEMON
- ;;
-
- restart)
- $0 reload-modules
- exit $?
- ;;
-
- force-reload)
- $0 reload-modules
- exit $?
- ;;
-
- *)
- echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}"
- exit 1
- ;;
-esac
-
-if [ $? == 0 ]; then
- echo .
- exit 0
-else
- echo failed
- exit 1
-fi
+++ /dev/null
-SECTION = net
-DEPENDS = expat openssl
-
-SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/pcre-configure.patch;patch=1
-S = ${WORKDIR}/httpd-${PV}
-
-basesysconfdir := ${sysconfdir}
-sysconfdir = /etc/apache
-
-inherit autotools
-
-FILES_${PN}=${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \
- ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var
-
-CFLAGS_append = " -DPATH_MAX=4096"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
-EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \
- --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \
- --with-gdbm=no --with-ndbm=no"
-do_configure () {
- (cd srclib/apr && ./buildconf)
- (cd srclib/apr-util && ./buildconf)
-
- cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
- srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
- srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
-
- (cd srclib/pcre && autoconf)
-
- aclocal -I build
- autoheader
- autoconf
- oe_runconf
-}
-
-do_compile () {
- touch srclib/apr-util/uri/gen_uri_delims.lo
- ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
- touch srclib/pcre/dftables.lo
- ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables
- cd server
- ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo
- ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo
- ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char
- /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo
- /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo
- touch gen_test_char
- cd ..
- oe_runmake
-}
-
-do_install_append () {
- set -x
- install -d ${D}/${basesysconfdir}/init.d
- cat ${FILESDIR}/init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g; \
- s,/usr/bin/,${bindir}/,g; \
- s,/usr/lib,${libdir}/,g; \
- s,/etc/apache/,${sysconfdir}/,g; \
- s,/etc/,${basesysconfdir}/,g; \
- s,/usr/,${prefix}/,g;' > ${D}/${basesysconfdir}/init.d/httpd
- chmod 755 ${D}/${basesysconfdir}/init.d/httpd
- if test -e ${FILESDIR}/httpd.conf.${MACHINE}; then
- install -m 0644 ${FILESDIR}/httpd.conf.${MACHINE} ${D}/${sysconfdir}/httpd.conf
- fi
-}
-
-pkg_postinst () {
- if test -n "$D"; then
- D="-r $D"
- fi
- update-rc.d $D httpd defaults 91 20
-}
-
-pkg_prerm () {
- if test -n "$D"; then
- D="-r $D"
- fi
- update-rc.d $D httpd remove
-}
catalog.xml dbcentx.mod dbhierx.mod dbpoolx.mod docbook.dcl docbookx.dtd soextblx.dtd
do_stage () {
- install -d ${STAGING_DIR}/share/sgml/docbook_${PV}
+ install -d ${STAGING_DATADIR}/sgml/docbook_${PV}
for i in ${installfiles}; do
- install -m 0644 $i ${STAGING_DIR}/share/sgml/docbook_${PV}
+ install -m 0644 $i ${STAGING_DATADIR}/sgml/docbook_${PV}
done
}
+++ /dev/null
-DESCRIPTION = "evidence, an enlightenemt file manager"
-LICENSE = "GPL"
-# can support dbus, avifile, libmpeg3
-DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg libpcre curl taglib libvorbis libogg libxine-x11 emotion freetype"
-RDEPENDS += "examine"
-PR = "r0"
-
-inherit e
-
-SRC_URI = "cvs://anonymous@evidence.cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}"
-S = "${WORKDIR}/evidence"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
- --enable-ecore \
- --enable-ecore-ipc \
- --enable-canvas-evas2 \
- --enable-edje \
- --enable-x \
- --enable-tree-view \
- --enable-icon-view \
- --enable-browser-view \
- --with-libxine=${STAGING_LIBDIR}"
-
-do_compile_prepend() {
- sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile
-}
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
-
+++ /dev/null
-diff -Nur e~/configure.in e/configure.in
---- e~/configure.in 2005-09-29 13:17:29.000000000 -0700
-+++ e/configure.in 2005-09-29 13:19:35.000000000 -0700
-@@ -114,9 +114,7 @@
- AC_PATH_XTRA
- AC_CHECK_HEADER(X11/X.h,
- [
-- x_dir=${x_dir:-/usr/X11R6}
-- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+ x_libs="-lX11 -lXext";
- ],[
- AC_MSG_ERROR([Cannot find X headers and libraries.])
- ]
-diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
---- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700
-@@ -1,6 +1,5 @@
- MAINTAINERCLEANFILES = Makefile.in
--INCLUDES = -I$(includedir) \
-- -I$(top_srcdir) \
-+INCLUDES = -I$(top_srcdir) \
- -I$(top_srcdir)/src/bin \
- -I$(top_srcdir)/src/lib \
- @e_cflags@ \
-diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
---- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700
-@@ -1,6 +1,5 @@
- MAINTAINERCLEANFILES = Makefile.in
--INCLUDES = -I$(includedir) \
-- -I$(top_srcdir)/src/bin \
-+INCLUDES = -I$(top_srcdir)/src/bin \
- @e_cflags@
-
- lib_LTLIBRARIES = libe.la
-diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
---- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700
-@@ -2,7 +2,6 @@
-
- INCLUDES = -I. \
- -I$(top_srcdir) \
-- -I$(includedir) \
- -I$(top_srcdir)src/preload \
- @x_cflags@
- pkgdir = $(libdir)/enlightenment/preload
+++ /dev/null
-require ecore.inc
-PR = "r2"
-
-SRC_URI += "file://remove-bad-code.patch;patch=1"
-
-EXTRA_OECONF = "--enable-ecore-fb \
- --enable-ecore-job \
- --enable-ecore-file \
- --enable-poll \
- --enable-ecore-dbus \
- --enable-ecore-evas \
- --enable-ecore-evas-buffer \
- --enable-ecore-evas-fb \
- --disable-ecore-evas-x \
- --disable-ecore-evas-xrender \
- --disable-ecore-evas-gl \
- --enable-ecore-con \
- --enable-ecore-config \
- --enable-ecore-ipc \
- --enable-ecore-txt \
- --disable-ecore-x \
- --disable-curl \
- --without-curl-config \
- --enable-ecore-config \
- --enable-ecore-desktop \
- --disable-openssl"
-
-parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
- Ecore_Txt Ecore_Fb Ecore_Con \
- Ecore_Ipc Ecore_Evas Ecore_Config \
- Ecore_Desktop"
+++ /dev/null
-require ecore-fb_${PV}.bb
-inherit native
-# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
-# DEPENDS = "curl-native eet-native evas-native"
-DEPENDS = "eet-native evas-native"
-PROVIDES = "ecore-native"
\ No newline at end of file
+++ /dev/null
-require ecore.inc
-DEPENDS += "evas-x11"
-PR = "r3"
-
-SRC_URI += "file://configure-abstract-sockets.patch;patch=1"
-
-EXTRA_OECONF = "--disable-ecore-fb \
- --disable-ecore-dfb \
- --enable-ecore-job \
- --enable-ecore-file \
- --enable-ecore-dbus \
- --disable-ecore-evas-fb \
- --disable-ecore-evas-dfb \
- --enable-ecore-evas-x \
- --enable-ecore-evas-buffer \
- --disable-ecore-evas-gl \
- --enable-ecore-con \
- --enable-ecore-ipc \
- --enable-ecore-txt \
- --enable-ecore-x \
- --enable-ecore-config \
- --disable-openssl \
- --enable-ecore-desktop \
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} "
-
-parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
- Ecore_Txt Ecore_Fb Ecore_Con \
- Ecore_Ipc Ecore_Evas Ecore_Config \
- Ecore_X Ecore_Desktop"
+++ /dev/null
-DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
-foundation libraries. It makes makes doing selections, drag and drop, event loops, \
-timeouts and idle handlers fast, optimized, and convenient."
-LEAD_SONAME = "libecore.so"
-LICENSE = "MIT"
-# can also have openssl, dbus, iconv
-DEPENDS += "virtual/evas curl eet"
-PROVIDES += "virtual/ecore"
-
-inherit efl
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
- file://ecore_kernel_input_header.patch;patch=1 \
- ${E_CVS};module=e17/libs/ecore/m4;date=20070501"
-# file://fix-tslib-configure.patch;patch=1 \
-# file://configure.patch;patch=1 \
-
-S = "${WORKDIR}/ecore-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
-
-EXTRA_OECONF = "<override me>"
-
-libraries = ""
-headers = ""
-parts = "<override me>"
-
-do_configure_prepend() {
- if [ -e "${WORKDIR}/m4" ]; then
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
- fi
-}
-
-do_stage_append() {
- for p in ${parts}; do
- dir=`echo $p|tr A-Z a-z`
- install -m 0644 ${S}/src/lib/$dir/$p*.h ${STAGING_INCDIR}/
- oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
- done
- install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-# install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-FILES_${PN} += "${libdir}/ecore_config_ipc_ecore.so.*"
-FILES_${PN}-dev += "${libdir}/ecore_config_ipc_ecore.so"
+++ /dev/null
-
-#
-# tslib support for ecore, (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- ecore/src/lib/ecore_fb/ecore_fb.c~add-tslib-support.patch
-+++ ecore/src/lib/ecore_fb/ecore_fb.c
-@@ -4,6 +4,13 @@
- #include "Ecore_Fb.h"
- #include "ecore_private.h"
-
-+
-+#ifdef HAVE_TSLIB
-+#include <tslib.h>
-+#include <errno.h>
-+#endif
-+
-+
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-@@ -77,6 +84,11 @@
- unsigned char z;
- };
-
-+#ifdef HAVE_TSLIB
-+struct tsdev *_ecore_fb_tslib_tsdev = NULL;
-+struct ts_sample _ecore_fb_tslib_event;
-+#endif
-+
- static void _ecore_fb_size_get(int *w, int *h);
- static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
- static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-@@ -269,10 +281,39 @@
- ecore_fb_init(const char *name __UNUSED__)
- {
- int prev_flags;
-+#ifdef HAVE_TSLIB
-+ char *tslib_tsdevice = NULL;
-+#endif
-
- _ecore_fb_init_count++;
- if (_ecore_fb_init_count > 1) return _ecore_fb_init_count;
-+#ifdef HAVE_TSLIB
-+ if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL )
-+ {
-+ printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice );
-+ _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 = nonblocking, 0 = blocking */
-+
-+ if ( !_ecore_fb_tslib_tsdev )
-+ {
-+ printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) );
-+ return 0;
-+ }
-+
-+ if ( ts_config( _ecore_fb_tslib_tsdev ) )
-+ {
-+ printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) );
-+ return 0;
-+ }
-+ _ecore_fb_ts_fd = ts_fd( _ecore_fb_tslib_tsdev );
-+ if ( _ecore_fb_ts_fd < 0 )
-+ {
-+ printf( "ECORE_FB: Can't open touchscreen (%s)\n", strerror( errno ) );
-+ return 0;
-+ }
-+ }
-+#else
- _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY);
-+#endif
- if (_ecore_fb_ts_fd >= 0)
- {
- prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL);
-@@ -790,7 +831,21 @@
- char *ptr;
- double t;
- int did_triple = 0;
--
-+
-+#ifdef HAVE_TSLIB
-+ if ( _ecore_fb_ts_apply_cal )
-+ num = ts_read_raw( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
-+ else
-+ num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
-+ if ( num != 1 )
-+ {
-+ return 1; /* no more samples at this time */
-+ }
-+ x = _ecore_fb_tslib_event.x;
-+ y = _ecore_fb_tslib_event.y;
-+ pressure = _ecore_fb_tslib_event.pressure;
-+ v = 1; /* loop, there might be more samples */
-+#else
- ptr = (char *)&(_ecore_fb_ts_event);
- ptr += _ecore_fb_ts_event_byte_count;
- num = sizeof(Ecore_Fb_Ts_Event) - _ecore_fb_ts_event_byte_count;
-@@ -811,6 +866,7 @@
- y = _ecore_fb_ts_event.y;
- }
- pressure = _ecore_fb_ts_event.pressure;
-+#endif
- /* add event to queue */
- /* always add a move event */
- if ((pressure) || (prev_pressure))
+++ /dev/null
-Index: ecore-0.9.9.038/configure.in
-===================================================================
---- ecore-0.9.9.038.orig/configure.in
-+++ ecore-0.9.9.038/configure.in
-@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets,
- [ want_abstract_sockets="yes"]
- )
- if test "x$want_abstract_sockets" = "xyes"; then
-- AC_ABSTRACT_SOCKET_TEST(
-- [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])],
-- []
-- )
-+ HAVE_ABSTRACT_SOCKETS = 1
- fi
-
- ECORE_CHECK_MODULE([Con], [yes])
+++ /dev/null
---- ecore-0.9.9.036/configure.in.bak 2006-11-13 14:01:10.000000000 -0800
-+++ ecore-0.9.9.036/configure.in 2006-11-13 14:02:15.000000000 -0800
-@@ -16,7 +16,6 @@
- AC_CHECK_SIZEOF(long, 4)
- AM_ENABLE_SHARED
- AM_PROG_LIBTOOL
--AC_C___ATTRIBUTE__
-
- if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
-@@ -200,9 +199,7 @@
- AM_CONDITIONAL(BUILD_ECORE_X, true)
- AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
- have_ecore_x="yes"
-- x_dir=${x_dir:-/usr/X11R6}
-- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+ x_libs="-lX11 -lXext"
- ecore_x_libs="-lecore_x $x_libs";
- ],[
- AM_CONDITIONAL(BUILD_ECORE_X, false)
+++ /dev/null
-Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c
-===================================================================
---- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100
-+++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000
-@@ -1,6 +1,18 @@
- #include "Ecore_Fb.h"
- #include "ecore_fb_private.h"
-
-+struct input_absinfo {
-+ __s32 value;
-+ __s32 minimum;
-+ __s32 maximum;
-+ __s32 fuzz;
-+ __s32 flat;
-+};
-+
-+
-+#define EV_SYN 0x00
-+#define EV_PWR 0x16
-+#define EV_FF_STATUS 0x17
-
- /* Copyright (C) Brad Hards (1999-2002).
- * this macro is used to tell if "bit" is set in "array"
+++ /dev/null
-diff -Nur ecore-0.9.9.037~/configure.in ecore-0.9.9.037/configure.in
---- ecore-0.9.9.037~/configure.in 2007-01-14 20:21:42.000000000 -0800
-+++ ecore-0.9.9.037/configure.in 2007-01-14 20:22:18.000000000 -0800
-@@ -578,7 +578,7 @@
- if test "x$want_ecore_fb" = "xyes"; then
- AC_CHECK_HEADER(tslib.h,
- [
-- tslib_libs="-ltslib"
-+ tslib_libs="-lts"
- AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
- ]
- )
+++ /dev/null
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-@@ -19,8 +19,8 @@
- #define kernel_ulong_t unsigned long
- #define BITS_PER_LONG 32
- #include <linux/input.h>
-- #undef kernel_ulong_t <-added
-- #undef BITS_PER_LONG <-added
-+ #undef kernel_ulong_t
-+ #undef BITS_PER_LONG
- #else
- #include <linux/input.h>
- #endif
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-@@ -1,6 +1,6 @@
- #include "Ecore_Fb.h"
- #include "ecore_fb_private.h"
--
-+/*
- struct input_absinfo {
- __s32 value;
- __s32 minimum;
-@@ -8,7 +8,7 @@ struct input_absinfo {
- __s32 fuzz;
- __s32 flat;
- };
--
-+*/
-
- #define EV_SYN 0x00
- #define EV_PWR 0x16
+++ /dev/null
---- ecore/configure.in.~1.125.~ 2005-11-29 01:13:26.000000000 -0800
-+++ ecore/configure.in 2006-01-12 11:21:42.000000000 -0800
-@@ -101,12 +101,6 @@
- AC_CHECK_FUNCS(gettimeofday)
-
- tslib_libs=""
--AC_CHECK_HEADER(tslib.h,
-- [
-- tslib_libs="-ltslib"
-- AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module])
-- ]
--)
- AC_SUBST(tslib_libs)
-
- AC_CHECK_HEADERS(netinet/in.h)
+++ /dev/null
-diff -Nur edb-1.0.5.007~/configure.in edb-1.0.5.007/configure.in
---- edb-1.0.5.007~/configure.in 2007-01-15 01:01:31.000000000 -0800
-+++ edb-1.0.5.007/configure.in 2007-01-15 01:01:40.000000000 -0800
-@@ -404,7 +404,7 @@
- ncurses_ok=no
- gtk_ok=no
-
--GTK_CONFIG=`which gtk-config`
-+GTK_CONFIG=
- if test -x "$GTK_CONFIG"; then
- AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`)
- fi
+++ /dev/null
-require edb_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-SRC_URI += "file://no-gtk-forkbomb.patch;patch=1"
-
-EXTRA_OECONF += "--disable-gtk --disable-ncurses"
-
-do_stage_append () {
- install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
-}
+++ /dev/null
-DESCRIPTION = "EDB is a database convenience library wrapped around the \
-Berkeley DB 2.7.7 by Sleepycat Software."
-DEPENDS = "zlib ncurses"
-LICENSE = "BSD"
-PR = "r4"
-
-inherit efl
-
-EXTRA_OECONF += "--disable-gtk"
-
-PACKAGES = "${PN}-dbg edb-utils"
-FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
-RDEPENDS_${PN} += "ncurses"
-
-SRC_URI = "${E_URI}/edb-${PV}.tar.gz"
-S = "${WORKDIR}/edb-${PV}"
-
-libraries = ""
-headers = ""
+++ /dev/null
-DESCRIPTION = "EDB is a database convenience library wrapped around the \
-Berkeley DB 2.7.7 by Sleepycat Software."
-DEPENDS = "zlib ncurses"
-# can depend on gtk and tcl/tk
-LICENSE = "BSD"
-PR = "r4"
-
-inherit efl
-
-EXTRA_OECONF += "--disable-gtk"
-
-libdirectory = "src"
-
-FILES_${PN}-examples = ""
\ No newline at end of file
+++ /dev/null
-require edje_${PV}.bb
-PR = "r4"
-
-inherit native
-
-DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
-
-do_configure_prepend() {
- sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
- sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
- sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
-}
-
-do_install_append() {
- edje_data_dir=`${S}/edje-config --datadir`
- # could also use ${STAGING_DATADIR}/edje/include
- install -d $edje_data_dir/include
- install -m 0644 data/include/edje.inc $edje_data_dir/include
-}
+++ /dev/null
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-DEPENDS = "edje embryo-utils gcc"
-LICENSE = "MIT"
-PR = "r6"
-
-inherit efl
-
-PACKAGES = "${PN}-dbg edje-utils"
-FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
-RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks"
-
-SRC_URI = "${E_URI}/edje-${PV}.tar.gz \
- ${E_CVS};module=e17/libs/edje/m4;date=20060101"
-S = "${WORKDIR}/edje-${PV}"
-
-libraries = ""
-headers = ""
-
-do_configure_prepend() {
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
-}
+++ /dev/null
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
-DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native"
-LICENSE = "MIT"
-PR = "r7"
-
-## package.bbclass kills packages when there are duplicates, this means
-## that efl.bbclass can't have PACKAGES += and so the FILES for previous
-## packages take precedence over -utils
-#PACKAGES = "edje-utils"
-#RPROVIDES_edje-utils += "libedje-utils"
-#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
-#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks"
-
-inherit efl
-
-SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
-
-do_configure_prepend() {
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
-}
-
-LEAD_SONAME = "libedje.so"
-
-FILES_${PN}-examples = "${datadir}/edje/data/images \
- ${datadir}/edje/data/src \
- ${datadir}/edje/data/test \
- ${datadir}/edje/data/*.sh"
-
-FILES_${SRCNAME}-themes = ""
+++ /dev/null
-require eet_${PV}.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-
+++ /dev/null
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
-DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
-PR = "r2"
-
-inherit efl
+++ /dev/null
-inherit e
-
-SECTION = "e/libs"
-
-SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-INHIBIT_AUTO_STAGE_INCLUDES = "1"
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
-
-libdirectory = "src/lib"
-libraries = "lib${SRCNAME}"
-headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
-
-def efl_is_native(d):
- import bb
- return ["","-native"][bb.data.inherits_class('native', d)]
-
-do_stage_append () {
- for i in ${libraries}
- do
- oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR}
- done
- for i in ${headers}
- do
- install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
- done
-
- # Install binaries automatically for native builds
- if [ "${@efl_is_native(d)}" = "-native" ]
- then
-
- # Most EFL binaries start with the package name
- for i in src/bin/${SRCNAME}*
- do
- if [ -x $i -a -f $i ]
- then
-
- # Don't install anything with an extension (.so, etc)
- if echo $i | grep -v \\.
- then
- ${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR}
- fi
- fi
- done
- fi
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
-FILES_${PN}-examples = "${bindir} ${datadir}"
+++ /dev/null
-require efreet_${PV}.bb
-inherit native
-DEPENDS = "ecore-native"
+++ /dev/null
-DESCRIPTION = "An implementation of freedesktop.org specs for the EFL"
-DEPENDS = "virtual/ecore"
-LICENSE = "BSD"
-PR = "r0"
-
-inherit efl
-
-headers += "efreet_base.h efreet_desktop.h efreet_icon.h efreet_ini.h efreet_menu.h efreet_private.h efreet_utils.h efreet_xml.h"
+++ /dev/null
-require embryo_${PV}.bb
-inherit native
-
-do_stage_append() {
- install -d ${STAGING_DATADIR}/embryo/include
- install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include
-}
\ No newline at end of file
+++ /dev/null
-DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
-of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
-CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
-Embryo allows scripting capabilities in places that otherwise wouldn't support \
-basic programming structures such as in Edje EDCs."
-LICENSE = "MIT"
-PR = "r4"
-
-inherit efl
-
-SRC_URI = "${E_URI}/embryo-${PV}.tar.gz"
-S = "${WORKDIR}/embryo-${PV}"
-
-PACKAGES = "${PN}-dbg embryo-utils"
-FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
-
-libraries = ""
-headers = ""
+++ /dev/null
-DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
-of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
-CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
-Embryo allows scripting capabilities in places that otherwise wouldn't support \
-basic programming structures such as in Edje EDCs."
-LICENSE = "MIT"
-PR = "r4"
-
-inherit efl
-
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
\ No newline at end of file
+++ /dev/null
-DESCRIPTION = "Emotion is a multimedia library based on libxine"
-LICENSE = "MIT"
-DEPENDS = "eet virtual/evas edje virtual/ecore embryo gstreamer gst-plugins-base"
-# virtual/libxine
-#RPROVIDES += "emotion-themes emotion-plugins"
-RDEPENDS += "emotion-themes emotion-plugins"
-
-PR = "r1"
-
-#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11
-
-inherit efl
-
-SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}"
-S = "${WORKDIR}/emotion"
-
-PACKAGES += "emotion-plugins"
-FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so"
+++ /dev/null
-DESCRIPTION = "Engrave is an Edje Editing Library"
-LICENSE = "MIT"
-# also requires yacc and lex on host
-DEPENDS = "virtual/evas virtual/ecore"
-
-inherit efl
-
-SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}"
-S = "${WORKDIR}/engrave"
-
-do_stage_append() {
- for i in src/lib/engrave*.h
- do
- install -m 0644 $i ${STAGING_INCDIR}
- done
-}
-
+++ /dev/null
-DESCRIPTION = "EPDF is the EFL PDF rendering library based on poppler"
-DEPENDS = "etk poppler"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit efl
-
-SRC_URI = "${E_CVS};module=e17/proto/epdf;date=${PV}"
-S = "${WORKDIR}/epdf"
+++ /dev/null
-DESCRIPTION = "Epeg is a small library for handling thumbnails."
-LICENSE = "MIT"
-DEPENDS = "jpeg"
-
-inherit efl
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix
-+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c
-@@ -48,7 +48,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#include <math.h>
- #include <float.h>
- #include <ctype.h>
-
+++ /dev/null
---- /tmp/epsilon_private.h 2006-12-01 12:06:30.000000000 +0100
-+++ epsilon-0.3.0.007/src/include/epsilon_private.h 2006-12-01 12:07:10.928254000 +0100
-@@ -41,7 +41,7 @@
- Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status);
-
- int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
--int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
-+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg);
-
- Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end);
-
+++ /dev/null
-DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
-that is complient with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "GPL"
-DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
-PR = "r0"
-
-inherit efl1
-
-#SRC_URI += "file://compile-fix.patch;patch=1 \
-# ${E_CVS};module=e17/libs/epsilon/m4;date=20060101"
-# file://server-is-not-client.patch;patch=1 \
-
-#do_configure_prepend() {
-# install -d "${S}/m4"
-# install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-# aclocal -I m4
-#}
+++ /dev/null
-require esmart.inc
-PR = "r0"
-
-SRC_URI += "file://disable-x-only-features.patch;patch=1"
-
-myheaders = "esmart_container/Esmart_Container.h \
- esmart_draggies/Esmart_Draggies.h \
- esmart_file_dialog/Esmart_File_Dialog.h \
- esmart_text_entry/Esmart_Text_Entry.h \
- esmart_thumb/Esmart_Thumb.h"
-
-mylibraries = "esmart_container \
- esmart_draggies \
- esmart_file_dialog \
- esmart_text_entry \
- esmart_thumb"
+++ /dev/null
-require esmart.inc
-PR = "r2"
-
-SRC_URI += "file://include-stdio.patch;patch=1"
-
-myheaders = "esmart_container/Esmart_Container.h \
- esmart_draggies/Esmart_Draggies.h \
- esmart_file_dialog/Esmart_File_Dialog.h \
- esmart_text_entry/Esmart_Text_Entry.h \
- esmart_thumb/Esmart_Thumb.h \
- esmart_trans_x11/Esmart_Trans_X11.h"
-# esmart_textarea/Esmart_Textarea.h \
-
-mylibraries = "esmart_container \
- esmart_draggies \
- esmart_file_dialog \
- esmart_text_entry \
- esmart_thumb \
- esmart_trans_x11"
-# esmart_textarea \
-
-do_compile_prepend() {
- find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g'
-}
\ No newline at end of file
+++ /dev/null
-DESCRIPTION = "ESmart is a collection of smart Evas objects"
-LICENSE = "MIT"
-DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool"
-PROVIDES += "virtual/esmart"
-
-inherit efl
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \
- ${E_CVS};module=e17/libs/esmart/m4;date=20060101"
-
-do_configure_prepend() {
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
-}
-
-S = "${WORKDIR}/esmart-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/esmart"
-
-headers = ""
-libraries = ""
-
-myheaders = "<override me>"
-mylibraries = "<override me>"
-
-do_stage_append() {
- install -d ${STAGING_INCDIR}/Esmart/
- for i in ${myheaders}; do
- install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/
- done
- oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
- for i in ${mylibraries}; do
- oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/
- done
-}
-
-PACKAGES =+ "libesmart-textentry \
- libesmart-thumb \
- libesmart-container \
- libesmart-container-plugins \
- libesmart-file-dialog \
- libesmart-draggies \
- libesmart-trans-x11"
-FILES_libesmart-textentry = "${libdir}/libesmart_text_entry*.so*"
-FILES_libesmart-thumb = "${libdir}/libesmart_thumb*.so*"
-FILES_libesmart-container = "${libdir}/libesmart_container*"
-DEPENDS_libesmart-container += "libesmart-container-plugins"
-FILES_libesmart-container-plugins = "${libdir}/esmart/layout/*.so"
-FILES_libesmart-file-dialog = "${libdir}/libesmart_file_dialog*.so*"
-FILES_libesmart-draggies = "${libdir}/libesmart_draggies*.so*"
-FILES_libesmart-trans-x11 = "${libdir}/libesmart_trans_x11*.so*"
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- esmart-0.9.0.004/src/lib/esmart_container/esmart_container.c~compile-fix
-+++ esmart-0.9.0.004/src/lib/esmart_container/esmart_container.c
-@@ -30,7 +30,7 @@
- return _sort_func(o, oo);
- }
-
--void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *, Evas_Object *$))
-+void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *, Evas_Object *))
- {
- Container *cont;
-
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- esmart-0.9.0.007/src/lib/Makefile.am~disable-x-only-features.patch
-+++ esmart-0.9.0.007/src/lib/Makefile.am
-@@ -1,9 +1,7 @@
- SUBDIRS = \
- esmart_container \
-- esmart_draggies \
- esmart_text_entry \
- esmart_file_dialog \
-- esmart_thumb \
-- esmart_trans_x11
-+ esmart_thumb
-
- # esmart_textarea
---- esmart-0.9.0.007/src/Makefile.am~disable-x-only-features.patch
-+++ esmart-0.9.0.007/src/Makefile.am
-@@ -1,3 +1,3 @@
- MAINTAINERCLEANFILES = Makefile.in
-
--SUBDIRS = lib bin
-+SUBDIRS = lib
+++ /dev/null
---- esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c~ 2004-11-10 07:18:23.000000000 -0800
-+++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 11:22:52.000000000 -0700
-@@ -9,6 +9,7 @@
- #include <X11/Xlib.h>
- #include <Imlib2.h>
- #include <Ecore.h>
-+#include <Ecore_Data.h>
- #include <Ecore_X.h>
- #include <assert.h>
-
+++ /dev/null
-diff -Nur esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c
---- esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:09.000000000 -0700
-+++ esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:48.000000000 -0700
-@@ -8,6 +8,7 @@
- * $ esmart_file_dialog_test /path/to/my_custom/theme.eet
- * to test a custom theme you've written for it
- */
-+#include <stdio.h>
- #include <Ecore.h>
- #include <Edje.h>
- #include <Ecore_Evas.h>
-diff -Nur esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c
---- esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:09.000000000 -0700
-+++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:19.000000000 -0700
-@@ -4,6 +4,7 @@
- *
- ***************************************************************************/
-
-+#include <stdio.h>
- #include <stdlib.h>
- #include "config.h"
- #include <X11/Xlib.h>
+++ /dev/null
-DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
-DEPENDS = "evas-x11 ecore-x11 edje"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit efl
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/etk-${PV}.tar.gz"
-
-do_stage() {
- autotools_stage_all
-}
-
-FILES_${PN} += "${libdir}/etk/engines/*.so"
-FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
-FILES_${PN}-dbg += "${libdir}/etk/engines/*/.debug/"
-
+++ /dev/null
-require evas.inc
-PR = "r6"
-
-EXTRA_OECONF = "--enable-fb \
- --disable-directfb \
- --enable-buffer \
- --disable-software-qtopia \
- --disable-software-x11 \
- --disable-gl-x11 \
- --disable-xrender-x11 \
- --enable-image-loader-eet \
- --disable-image-loader-edb \
- --enable-image-loader-png \
- --enable-image-loader-jpeg \
- --enable-small-dither-mask \
- --enable-cpu-c \
- --enable-font-loader-eet \
- --enable-scale-sample \
- --enable-scale-smooth \
- --enable-convert-yuv \
- --enable-convert-8-rgb-332 \
- --enable-convert-8-rgb-666 \
- --enable-convert-8-rgb-232 \
- --enable-convert-8-rgb-222 \
- --enable-convert-8-rgb-221 \
- --enable-convert-8-rgb-121 \
- --enable-convert-8-rgb-111 \
- --enable-convert-16-rgb-565 \
- --enable-convert-16-rgb-555 \
- --enable-convert-16-rgb-444 \
- --enable-convert-16-rgb-ipq \
- --enable-convert-16-rgb-rot-0 \
- --enable-convert-16-rgb-rot-90 \
- --enable-convert-16-rgb-rot-270 \
- --enable-convert-24-rgb-888 \
- --enable-convert-24-bgr-888 \
- --enable-convert-32-rgb-8888 \
- --enable-convert-32-rgbx-8888 \
- --enable-convert-32-bgr-8888 \
- --enable-convert-32-bgrx-8888 \
- --enable-convert-32-rgb-rot-0 \
- --enable-convert-32-rgb-rot-90 \
- --enable-convert-32-rgb-rot-270"
-
-headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \
- ../modules/engines/fb/Evas_Engine_FB.h \
- Evas.h"
+++ /dev/null
-require evas-fb_${PV}.bb
-inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PROVIDES = "evas-native"
-
+++ /dev/null
-require evas.inc
-DEPENDS += "edb virtual/libx11 libxext freetype"
-PR = "r10"
-
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-fb \
- --disable-directfb \
- --enable-buffer \
- --disable-software-qtopia \
- --enable-software-x11 \
- --enable-software-16-x11 \
- --disable-gl-x11 \
- --enable-image-loader-eet \
- --enable-image-loader-edb \
- --enable-image-loader-png \
- --enable-image-loader-jpeg \
- --enable-small-dither-mask \
- --enable-cpu-c \
- --enable-font-loader-eet \
- --enable-scale-sample \
- --enable-scale-smooth \
- --enable-convert-yuv \
- --disable-image-loader-svg \
- --disable-convert-8-rgb-332 \
- --disable-convert-8-rgb-666 \
- --disable-convert-8-rgb-232 \
- --disable-convert-8-rgb-222 \
- --disable-convert-8-rgb-221 \
- --disable-convert-8-rgb-121 \
- --disable-convert-8-rgb-111 \
- --enable-convert-16-rgb-565 \
- --disable-convert-16-rgb-555 \
- --disable-convert-16-rgb-444 \
- --disable-convert-16-rgb-ipq \
- --enable-convert-16-rgb-rot-0 \
- --enable-convert-16-rgb-rot-90 \
- --enable-convert-16-rgb-rot-270 \
- --disable-convert-24-rgb-888 \
- --disable-convert-24-bgr-888 \
- --disable-convert-32-rgb-8888 \
- --disable-convert-32-rgbx-8888 \
- --enable-convert-32-bgr-8888 \
- --enable-convert-32-bgrx-8888 \
- --disable-convert-32-rgb-rot-0 \
- --disable-convert-32-rgb-rot-90 \
- --disable-convert-32-rgb-rot-270"
-
-headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \
- ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \
- ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \
- ../modules/engines/buffer/Evas_Engine_Buffer.h \
- ../modules/engines/fb/Evas_Engine_FB.h \
- Evas.h"
-
+++ /dev/null
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
-LICENSE = "MIT"
-# can also depend on valgrind (?)
-DEPENDS = "freetype libpng jpeg eet"
-PROVIDES += "virtual/evas"
-
-inherit efl lib_package
-
-export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
- file://fix-configure.patch;patch=1 \
- ${E_CVS};module=e17/libs/evas/m4;date=20060101"
-# file://pagesize.patch;patch=1 \
-
-S = "${WORKDIR}/evas-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
-
-EXTRA_OECONF = "<override me>"
-
-do_configure_prepend() {
- if [ -e "${WORKDIR}/m4" ]; then
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
- fi
-}
-
-#do_install_append() {
-# find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
-#}
-
-do_stage_append() {
- cd src
- modules=`find modules -name ".libs"`
- for module in $modules
- do
- install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}
- install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so
- done
-}
-
-headers = "<override me>"
-libraries = "libevas"
-FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so"
-FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
+++ /dev/null
-diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in
---- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800
-+++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800
-@@ -161,9 +161,7 @@
- AC_CHECK_HEADER(X11/X.h,
- [
- AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
-- x_dir=${x_dir:-/usr/X11R6}
-- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+ x_libs="-lX11 -lXext"
- ],
- [
- AC_MSG_RESULT(disabling software X11 engine)
-@@ -407,10 +405,10 @@
- AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
- AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
- AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
-- x_dir=${x_dir:-/usr/X11R6};
-+ x_dir=${x_dir:-};
- x_cflags=${x_cflags:--I$x_dir/include}
- x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
-- gl_cflags="-I/usr/include"
-+ gl_cflags=""
- gl_libs="-lGL -lGLU -lpthread"
- gl_dir=""
- ], [
-@@ -471,7 +469,7 @@
- AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
- AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
- AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
-- x_dir="/usr/X11R6";
-+ x_dir="";
- x_cflags="-I"$x_dir"/include"
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
- ], [
+++ /dev/null
-diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
-index e26c171..75e0743 100644
---- a/src/modules/engines/fb/evas_fb_main.c
-+++ b/src/modules/engines/fb/evas_fb_main.c
-@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
- fb_cleanup();
- exit(1);
- }
-- mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
-+ mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
- mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
- PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
- if ((int)mode->mem == -1)
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ewl-0.0.4.003/configure.in~fix-configure
-+++ ewl-0.0.4.003/configure.in
-@@ -13,7 +13,6 @@
- AC_C_CONST
- AM_ENABLE_SHARED
- AM_PROG_LIBTOOL
--AC_C___ATTRIBUTE__
-
- dnl Check for Solaris or other OS
- case "$host" in
+++ /dev/null
-diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h.in ewl-0.0.4.004/src/lib/Ewl.h.in
---- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 18:26:11.000000000 -0700
-+++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 18:26:55.000000000 -0700
-@@ -254,6 +254,14 @@
- extern"C" {
- #endif
-
-+#ifndef MAX
-+#define MAX(a, b) (a > b ? a : b)
-+#endif
-+
-+#ifndef MIN
-+#define MIN(a, b) (a < b ? a : b)
-+#endif
-+
- #include <Evas.h>
- #include <Edje.h>
- #include <Ecore.h>
+++ /dev/null
-diff -Nur ewl-0.0.4.004~/src/Makefile.am ewl-0.0.4.004/src/Makefile.am
---- ewl-0.0.4.004~/src/Makefile.am 2005-09-29 18:21:52.000000000 -0700
-+++ ewl-0.0.4.004/src/Makefile.am 2005-09-29 18:22:17.000000000 -0700
-@@ -1,5 +1,5 @@
-
--SUBDIRS = lib bin
-+SUBDIRS = lib
-
- MAINTAINERCLEANFILES = Makefile.in
-
-diff -Nur ewl-0.0.4.004~/src/Makefile.in ewl-0.0.4.004/src/Makefile.in
---- ewl-0.0.4.004~/src/Makefile.in 2005-09-29 18:21:52.000000000 -0700
-+++ ewl-0.0.4.004/src/Makefile.in 2005-09-29 18:22:07.000000000 -0700
-@@ -108,7 +108,7 @@
- ewl_media_include = @ewl_media_include@
- requirements = @requirements@
-
--SUBDIRS = lib bin
-+SUBDIRS = lib
-
- MAINTAINERCLEANFILES = Makefile.in
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+++ /dev/null
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-DEPENDS = "edb virtual/evas virtual/ecore edje"
-# emotion
-RDEPENDS += "ewl-themes"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit efl
-
-SRC_URI += "file://ewl-configure.patch;patch=1 \
- file://no-examples.patch;patch=1 \
- file://minmax.patch;patch=1 \
- ${E_CVS};module=e17/libs/evas/m4;date=20060501"
-
-do_configure_prepend() {
- if [ -e "${WORKDIR}/m4" ]; then
- install -d "${S}/m4"
- install "${WORKDIR}/m4/"*.m4 "${S}/m4"
- aclocal -I m4
- fi
-}
-
-do_stage_append() {
- for i in src/lib/ewl_*.h
- do
- install -m 0644 $i ${STAGING_INCDIR}
- done
-}
+++ /dev/null
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
- fi
-
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
-
-
+++ /dev/null
-require imlib2.inc
-PR = "r2"
-
-EXTRA_OECONF = "--without-x \
- --disable-mmx"
-
+++ /dev/null
-require imlib2.inc
-inherit native
-PROVIDES = "imlib2-native"
-DEPENDS = "freetype-native libpng-native jpeg-native"
-PR = "r2"
-
-EXTRA_OECONF = "--disable-mmx \
- --without-x"
+++ /dev/null
-require imlib2.inc
-DEPENDS += "virtual/libx11 libxext"
-PR = "r3"
-
-EXTRA_OECONF = "--disable-mmx \
- --with-x \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR}"
+++ /dev/null
-DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
-LICENSE = "BSD"
-# can also depend on tiff34, ungif or gif, z, bz2, id3tag
-DEPENDS = "freetype libpng jpeg"
-PROVIDES += "virtual/imlib2"
-
-inherit efl
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz"
-S = "${WORKDIR}/imlib2-${PV}"
-
-libraries = ""
-headers = ""
-
-do_stage_append() {
- oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
- install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-
- install -d ${STAGING_LIBDIR}/imlib2/loaders
- for i in src/modules/loaders/.libs/*.so
- do
- install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
- done
-
- install -d ${STAGING_LIBDIR}/imlib2/filters
- for i in src/modules/filters/.libs/*.so
- do
- install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
- done
-}
-
-do_install() {
- install -d "${D}${includedir}"
- oe_libinstall -C src/lib libImlib2 ${D}${libdir}/
- install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/
-
- install -d ${D}${libdir}/imlib2/loaders
- for i in src/modules/loaders/.libs/*.so
- do
- install -m 0755 $i ${D}${libdir}/imlib2/loaders
- done
-
- install -d ${D}${libdir}/imlib2/filters
- for i in src/modules/filters/.libs/*.so
- do
- install -m 0755 $i ${D}${libdir}/imlib2/filters
- done
-}
-
-PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/"
-FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
-FILES_imlib2-bin = "${bindir}"
-FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
-FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
-FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
-FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- src/mediabutton.C~mediabutton
-+++ src/mediabutton.C
-@@ -23,6 +23,7 @@
- #include <qwidget.h>
- #include <qdrawutil.h>
- #include "bluebutton.h"
-+#include "mediabutton.h"
-
- extern QApplication *app;
-
+++ /dev/null
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
-#endif
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING (yyerrflag!=0)
-extern int yyparse(void);
-#define yyparse parserparse
-#define yylex parserlex
-#define yyerror parsererror
-#define yychar parserchar
-#define yyval parserval
-#define yylval parserlval
-#define yydebug parserdebug
-#define yynerrs parsernerrs
-#define yyerrflag parsererrflag
-#define yyss parserss
-#define yyssp parserssp
-#define yyvs parservs
-#define yyvsp parservsp
-#define yylhs parserlhs
-#define yylen parserlen
-#define yydefred parserdefred
-#define yydgoto parserdgoto
-#define yysindex parsersindex
-#define yyrindex parserrindex
-#define yygindex parsergindex
-#define yytable parsertable
-#define yycheck parsercheck
-#define yyname parsername
-#define yyrule parserrule
-#define YYPREFIX "parser"
-#line 2 "parser.y"
-/**/
-/* (C) Copyright 2001 by Thomas Driemeyer <thomas@bitrot.de> www.bitrot.de.*/
-/**/
-/* This is free software; you can redistribute it and/or modify it under the*/
-/* terms of the GNU Library General Public License as published by the Free*/
-/* Software Foundation; either version 2 of the License, or (at your option)*/
-/* any later version. This library is distributed in the hope that it will*/
-/* be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of*/
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library*/
-/* General Public License for more details.*/
-/**/
-/* expression language grammar, compiled to parser.C by yacc*/
-/**/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include <qmessagebox.h>
-#include "form.h"
-#include "section.h"
-#include "database.h"
-#include "evaluate.h"
-#include "util.h"
-
-#define yyparse Evaluate::yyeparse
-#line 32 "parser.y"
-typedef union { int ival; double dval; char *sval; Arg *aval; } YYSTYPE;
-#line 68 "y.tab.c"
-#define NUMBER 257
-#define STRING 258
-#define SYMBOL 259
-#define FIELD 260
-#define VAR 261
-#define EQ 262
-#define NEQ 263
-#define LE 264
-#define GE 265
-#define SHR 266
-#define SHL 267
-#define AND 268
-#define OR 269
-#define IN 270
-#define PLA 271
-#define MIA 272
-#define MUA 273
-#define MOA 274
-#define DVA 275
-#define ANA 276
-#define ORA 277
-#define INC 278
-#define DEC_ 279
-#define APP 280
-#define AVG 281
-#define DEV 282
-#define AMIN 283
-#define AMAX 284
-#define SUM 285
-#define QAVG 286
-#define QDEV 287
-#define QMIN_ 288
-#define QMAX_ 289
-#define QSUM 290
-#define SAVG 291
-#define SDEV 292
-#define SMIN 293
-#define SMAX 294
-#define SSUM 295
-#define ABS 296
-#define INT 297
-#define BOUND 298
-#define LEN 299
-#define CHOP 300
-#define TR 301
-#define SUBSTR 302
-#define SQRT 303
-#define EXP 304
-#define LOG 305
-#define LN 306
-#define POW 307
-#define RANDOM 308
-#define SIN 309
-#define COS 310
-#define TAN 311
-#define ASIN 312
-#define ACOS 313
-#define ATAN 314
-#define ATAN2 315
-#define DATE 316
-#define TIME 317
-#define DURATION 318
-#define EXPAND 319
-#define YEAR 320
-#define MONTH 321
-#define DAY 322
-#define HOUR 323
-#define MINUTE 324
-#define SECOND 325
-#define LEAP 326
-#define JULIAN 327
-#define SECTION_ 328
-#define DBASE_ 329
-#define FORM_ 330
-#define PREVFORM 331
-#define SWITCH 332
-#define THIS 333
-#define LAST 334
-#define DISP 335
-#define FOREACH 336
-#define HOST 337
-#define USER 338
-#define UID 339
-#define GID 340
-#define SYSTEM 341
-#define ACCESS 342
-#define BEEP 343
-#define ERROR 344
-#define PRINTF 345
-#define UMINUS 346
-#define YYERRCODE 256
-short parserlhs[] = { -1,
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 3, 3, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1,
-};
-short parserlen[] = { 2,
- 1, 1, 3, 3, 3, 1, 3, 3, 3, 5,
- 3, 3, 3, 3, 3, 3, 3, 1, 4, 3,
- 6, 4, 2, 4, 6, 8, 1, 1, 1, 1,
- 4, 1, 1, 6, 4, 6, 1, 1, 4, 4,
- 4, 4, 7, 4, 1, 4, 1, 3, 1, 3,
- 3, 1, 4, 3, 6, 1, 3, 3, 3, 3,
- 3, 3, 3, 3, 2, 2, 2, 2, 2, 2,
- 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 5,
- 3, 1, 1, 1, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 8, 4, 4, 4, 4, 4, 6, 1, 4,
- 4, 4, 4, 4, 4, 6, 1, 4, 1, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 1, 1, 6,
-};
-short parserdefred[] = { 0,
- 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 33, 32, 29, 0, 0, 27, 28, 0, 45,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 49, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 119, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 92, 93, 94, 141, 142, 0,
- 0, 0, 0, 0, 0, 0, 23, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 65, 66, 0, 67, 68,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 69, 70, 71, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 0, 24, 0, 0, 40, 39, 41, 42, 0, 31,
- 0, 0, 35, 22, 0, 46, 44, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 50, 51, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 80, 81, 77, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 0,
- 113, 114, 115, 116, 117, 0, 120, 121, 122, 123,
- 124, 125, 0, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 140, 139, 128, 0, 0, 0, 0, 25,
- 0, 0, 34, 36, 0, 0, 0, 0, 0, 0,
- 0, 43, 0, 0, 118, 126, 143, 26, 0, 112,
-};
-short parserdgoto[] = { 26,
- 106, 133, 134,
-};
-short parsersindex[] = { 230,
- 0, -59, -52, -36, -35, -28, -25, -18, -11, -3,
- -75, 0, 0, 0, 16, 28, 0, 0, 38, 0,
- 39, 49, 230, 159, -231, 0, 3062, 230, 159, 230,
- 230, 230, 230, 230, 159, 159, 159, -217, 159, 230,
- 230, 230, 230, 230, 263, 0, -50, 235, -178, -170,
- 53, 54, 55, 56, 64, 65, 66, 67, 80, 82,
- 83, 84, 85, 87, 88, 89, 90, 91, 93, 94,
- 96, 114, 115, 126, 0, 128, 156, 160, 162, 163,
- 166, 168, 173, 175, 178, 180, 186, 187, 189, 190,
- 195, 196, 197, 26, 0, 0, 0, 0, 0, 208,
- 159, 159, 159, 230, 159, 727, 0, 230, 230, 230,
- 230, 230, 230, 230, 230, 230, 230, 147, 968, 147,
- 147, 846, 1194, 2176, 979, 1006, 1033, -38, 1044, 3031,
- 614, 1408, 3062, -17, 3, 0, 159, 159, 159, 159,
- 159, 159, 159, 159, 159, 0, 0, 159, 0, 0,
- -4, -2, -1, 2, 5, 7, 9, 12, 21, 23,
- 24, 29, 30, 31, 34, 159, 159, 159, 230, 159,
- 159, 159, 159, 159, 159, 159, 159, 159, 159, 159,
- 159, 230, 230, 230, 159, 159, 159, 159, 159, 159,
- 159, 159, 159, 230, 0, 0, 0, 1701, 1128, 159,
- 159, 159, 159, 159, 159, 159, 159, 159, 159, 159,
- 159, 159, 159, 159, 159, 159, 159, 159, 159, 0,
- 15, 15, 203, 203, 107, 594, 2956, 203, 203, 0,
- 199, 0, 230, 159, 0, 0, 0, 0, 159, 0,
- 230, 230, 0, 0, 230, 0, 0, 2528, 1277, 2528,
- 2528, 2528, 2528, 2528, 2528, 2528, 2528, 216, 220, 227,
- 233, 247, 257, 270, 271, 272, 274, 275, 277, 279,
- 283, 287, 1155, 1288, 2203, 1926, 1315, 1342, 1388, 1400,
- 2256, 1436, 1472, 1582, 1648, 1683, 1711, 2330, 2937, 2971,
- 2980, 1738, 1749, 1776, 1834, 1845, 2010, 2021, 2079, 2093,
- 3095, 0, 0, 1882, 1882, 20, 20, 43, 43, 2886,
- 2727, 2517, 2120, -12, 2917, 2278, 20, 20, 50, 50,
- 0, 0, 0, 230, 230, 2991, 2365, 2132, 3011, 3022,
- 3062, 268, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 159,
- 0, 0, 0, 0, 0, 159, 0, 0, 0, 0,
- 0, 0, 159, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 159, 159, 594, 147, 0,
- 159, 289, 0, 0, 159, 2517, 2415, 2443, 2168, 2517,
- 2454, 0, 2528, 159, 0, 0, 0, 0, 2489, 0,
-};
-short parserrindex[] = { 0,
- 0, 273, 459, 0, 0, 0, 539, 550, 0, 0,
- 570, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 337, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -24, 699, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 856, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 883, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 747, 0, 911,
- 1219, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 10, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 234, 590, 603, 40, 577, 0, 626, 672, 0,
- 579, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 299, 0, 300,
- 320, 338, 736, 737, 787, 1071, 1118, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2864, 2874, 2760, 2797, 1223, 2609, 153,
- 154, 310, 0, 77, 336, 8, 2841, 2851, 2563, 2601,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 14, 941, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 659, 1558, 0,
- 0, 0, 0, 0, 0, 294, 294, 294, 0, 346,
- 294, 0, 1119, 0, 0, 0, 0, 0, 294, 0,
-};
-short parsergindex[] = { 0,
- -29, 191, 295,
-};
-#define YYTABLESIZE 3365
-short parsertable[] = { 119,
- 13, 28, 238, 32, 33, 125, 126, 127, 31, 129,
- 137, 34, 52, 52, 35, 39, 52, 52, 52, 52,
- 52, 36, 52, 246, 219, 212, 245, 107, 37, 217,
- 216, 29, 215, 52, 218, 52, 38, 52, 52, 17,
- 138, 13, 128, 247, 13, 72, 245, 213, 72, 214,
- 47, 72, 239, 47, 48, 40, 219, 48, 13, 13,
- 117, 217, 216, 13, 215, 72, 218, 41, 52, 52,
- 72, 195, 196, 197, 115, 199, 116, 42, 43, 219,
- 17, 211, 149, 17, 217, 216, 219, 215, 44, 218,
- 150, 217, 151, 152, 153, 154, 218, 17, 17, 52,
- 72, 72, 17, 155, 156, 157, 158, 248, 249, 250,
- 251, 252, 253, 254, 255, 256, 193, 74, 257, 159,
- 74, 160, 161, 162, 163, 13, 164, 165, 166, 167,
- 168, 72, 169, 170, 74, 171, 273, 274, 275, 74,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 117, 172, 173, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 17, 174, 115, 175, 116, 74,
- 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 317, 318, 319, 320, 321, 322, 323,
- 27, 102, 117, 88, 89, 176, 88, 89, 105, 177,
- 74, 178, 179, 101, 327, 180, 115, 181, 116, 328,
- 88, 89, 182, 45, 183, 88, 89, 184, 118, 185,
- 120, 121, 122, 123, 124, 186, 187, 30, 188, 189,
- 130, 131, 132, 14, 190, 191, 192, 52, 52, 52,
- 52, 52, 52, 52, 52, 88, 89, 194, 117, 200,
- 201, 202, 203, 204, 205, 258, 333, 259, 260, 325,
- 334, 261, 13, 13, 262, 25, 263, 335, 264, 24,
- 13, 265, 18, 336, 14, 72, 72, 14, 110, 111,
- 266, 104, 267, 268, 103, 204, 205, 337, 269, 270,
- 271, 14, 14, 272, 198, 148, 14, 338, 221, 222,
- 223, 224, 225, 226, 227, 228, 229, 230, 117, 17,
- 339, 340, 341, 18, 342, 343, 18, 344, 18, 345,
- 386, 113, 115, 346, 116, 114, 387, 347, 385, 392,
- 18, 18, 18, 388, 18, 18, 1, 91, 135, 54,
- 58, 0, 54, 58, 74, 74, 389, 390, 0, 0,
- 91, 391, 23, 91, 0, 393, 54, 58, 14, 276,
- 59, 54, 58, 59, 399, 0, 0, 91, 108, 109,
- 110, 111, 289, 290, 291, 0, 73, 59, 60, 73,
- 0, 60, 59, 0, 301, 0, 90, 136, 0, 90,
- 0, 54, 58, 73, 0, 60, 0, 18, 73, 0,
- 60, 0, 91, 90, 0, 0, 0, 0, 108, 109,
- 110, 111, 59, 0, 0, 46, 112, 0, 47, 48,
- 88, 88, 89, 326, 0, 0, 0, 0, 73, 73,
- 60, 329, 330, 0, 0, 331, 49, 50, 90, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 6, 73,
- 0, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 0, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 1, 0, 2,
- 3, 95, 96, 97, 0, 14, 14, 98, 99, 6,
- 100, 0, 6, 14, 6, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 378, 379, 6, 6, 6, 0,
- 6, 6, 0, 0, 108, 109, 110, 111, 0, 4,
- 5, 6, 112, 0, 18, 18, 18, 18, 38, 0,
- 0, 0, 18, 0, 0, 7, 8, 9, 10, 37,
- 0, 0, 0, 0, 0, 0, 0, 11, 12, 13,
- 14, 15, 0, 0, 0, 16, 17, 18, 0, 30,
- 19, 0, 20, 21, 22, 0, 4, 0, 19, 38,
- 0, 0, 38, 6, 38, 0, 0, 0, 0, 15,
- 37, 0, 0, 37, 0, 37, 38, 38, 38, 0,
- 38, 38, 16, 73, 73, 0, 0, 37, 37, 37,
- 30, 37, 37, 30, 0, 30, 0, 4, 0, 19,
- 4, 0, 19, 0, 19, 11, 0, 30, 30, 30,
- 15, 30, 30, 15, 4, 4, 19, 19, 19, 117,
- 19, 19, 0, 16, 0, 0, 16, 15, 15, 15,
- 0, 15, 15, 115, 243, 116, 114, 242, 10, 117,
- 16, 16, 16, 38, 16, 16, 11, 0, 0, 11,
- 0, 12, 113, 115, 37, 116, 114, 0, 0, 0,
- 0, 0, 0, 11, 11, 11, 0, 11, 11, 0,
- 0, 0, 0, 0, 30, 0, 0, 0, 0, 10,
- 0, 4, 10, 19, 0, 0, 0, 0, 0, 0,
- 0, 0, 12, 0, 15, 12, 10, 10, 0, 0,
- 6, 6, 6, 6, 0, 0, 0, 16, 6, 12,
- 12, 12, 0, 12, 12, 56, 56, 0, 0, 56,
- 56, 56, 56, 56, 0, 56, 20, 0, 0, 0,
- 11, 0, 0, 0, 0, 0, 56, 0, 56, 0,
- 56, 56, 0, 219, 212, 0, 0, 220, 217, 216,
- 208, 215, 0, 218, 0, 0, 62, 61, 0, 62,
- 61, 0, 0, 10, 0, 0, 213, 20, 214, 209,
- 20, 56, 56, 62, 61, 0, 12, 0, 62, 61,
- 38, 38, 38, 38, 20, 20, 0, 0, 38, 20,
- 0, 37, 37, 37, 37, 0, 0, 0, 0, 37,
- 211, 0, 56, 0, 0, 0, 0, 63, 62, 61,
- 63, 30, 30, 30, 30, 0, 0, 0, 0, 30,
- 19, 19, 19, 19, 63, 0, 0, 0, 19, 63,
- 210, 15, 15, 15, 15, 108, 109, 110, 111, 15,
- 0, 0, 0, 112, 16, 16, 16, 16, 0, 0,
- 0, 20, 16, 0, 0, 108, 109, 110, 111, 63,
- 0, 0, 0, 112, 0, 0, 232, 11, 11, 11,
- 11, 117, 129, 129, 0, 11, 129, 129, 129, 129,
- 129, 0, 129, 0, 113, 115, 0, 116, 114, 0,
- 7, 0, 0, 129, 0, 129, 0, 129, 129, 127,
- 127, 0, 0, 127, 127, 127, 127, 127, 0, 127,
- 0, 0, 0, 12, 12, 12, 12, 0, 0, 0,
- 127, 12, 127, 0, 127, 127, 0, 0, 129, 129,
- 0, 7, 0, 0, 7, 0, 0, 0, 0, 0,
- 56, 56, 56, 56, 56, 56, 56, 56, 7, 7,
- 0, 0, 0, 7, 0, 127, 127, 53, 53, 129,
- 0, 53, 53, 53, 53, 53, 0, 53, 200, 201,
- 202, 203, 204, 205, 206, 207, 0, 0, 53, 0,
- 53, 0, 53, 53, 219, 212, 127, 0, 0, 217,
- 216, 208, 215, 0, 218, 219, 212, 0, 0, 235,
- 217, 216, 208, 215, 0, 218, 0, 213, 0, 214,
- 209, 0, 0, 53, 53, 7, 0, 0, 213, 0,
- 214, 209, 219, 212, 0, 0, 236, 217, 216, 208,
- 215, 0, 218, 0, 0, 0, 0, 0, 0, 0,
- 231, 211, 0, 0, 53, 213, 0, 214, 209, 219,
- 212, 0, 211, 237, 217, 216, 208, 215, 0, 218,
- 219, 212, 0, 0, 0, 217, 216, 208, 215, 0,
- 218, 210, 213, 0, 214, 209, 0, 0, 0, 211,
- 0, 0, 210, 213, 0, 214, 209, 108, 109, 110,
- 111, 64, 0, 0, 64, 112, 0, 129, 129, 129,
- 129, 129, 129, 129, 129, 0, 211, 0, 64, 210,
- 0, 0, 0, 64, 0, 0, 240, 211, 0, 0,
- 0, 0, 0, 0, 127, 127, 127, 127, 127, 127,
- 127, 127, 0, 0, 0, 0, 210, 0, 57, 55,
- 0, 57, 55, 64, 219, 212, 0, 210, 303, 217,
- 216, 208, 215, 0, 218, 57, 55, 0, 0, 0,
- 57, 55, 0, 0, 0, 0, 0, 213, 0, 214,
- 209, 219, 212, 0, 0, 348, 217, 216, 208, 215,
- 0, 218, 53, 53, 53, 53, 53, 53, 53, 53,
- 57, 55, 0, 0, 213, 0, 214, 209, 8, 0,
- 0, 211, 0, 0, 0, 0, 0, 0, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 233, 0, 117,
- 200, 201, 202, 203, 204, 205, 206, 207, 211, 0,
- 0, 210, 113, 115, 0, 116, 114, 0, 0, 8,
- 76, 0, 8, 76, 0, 0, 76, 200, 201, 202,
- 203, 204, 205, 206, 207, 0, 8, 8, 210, 0,
- 76, 8, 76, 0, 76, 76, 0, 0, 0, 0,
- 0, 0, 0, 0, 200, 201, 202, 203, 204, 205,
- 206, 207, 0, 0, 0, 200, 201, 202, 203, 204,
- 205, 206, 207, 219, 212, 76, 76, 0, 217, 216,
- 208, 215, 0, 218, 219, 212, 0, 0, 349, 217,
- 216, 208, 215, 0, 218, 0, 213, 0, 214, 209,
- 0, 0, 0, 8, 0, 0, 76, 213, 0, 214,
- 209, 219, 212, 0, 0, 352, 217, 216, 208, 215,
- 0, 218, 0, 0, 0, 0, 0, 0, 0, 332,
- 211, 0, 0, 0, 213, 0, 214, 209, 219, 212,
- 0, 211, 353, 217, 216, 208, 215, 0, 218, 200,
- 201, 202, 203, 204, 205, 206, 207, 0, 0, 0,
- 210, 213, 0, 214, 209, 0, 0, 0, 211, 0,
- 0, 210, 0, 0, 0, 0, 200, 201, 202, 203,
- 204, 205, 206, 207, 219, 212, 0, 0, 354, 217,
- 216, 208, 215, 0, 218, 211, 219, 212, 210, 0,
- 355, 217, 216, 208, 215, 0, 218, 213, 244, 214,
- 209, 0, 0, 117, 0, 108, 109, 110, 111, 213,
- 0, 214, 209, 112, 0, 210, 113, 115, 0, 116,
- 114, 0, 219, 212, 0, 0, 357, 217, 216, 208,
- 215, 211, 218, 0, 76, 76, 76, 76, 76, 76,
- 76, 76, 0, 211, 0, 213, 0, 214, 209, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 219, 212,
- 0, 210, 358, 217, 216, 208, 215, 0, 218, 0,
- 0, 0, 0, 210, 0, 0, 0, 0, 0, 211,
- 0, 213, 0, 214, 209, 0, 0, 0, 200, 201,
- 202, 203, 204, 205, 206, 207, 0, 0, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 21, 0, 210,
- 0, 0, 0, 0, 0, 211, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 200, 201, 202, 203,
- 204, 205, 206, 207, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 210, 0, 0, 21, 0,
- 0, 21, 0, 200, 201, 202, 203, 204, 205, 206,
- 207, 0, 0, 0, 0, 21, 21, 0, 219, 212,
- 21, 0, 359, 217, 216, 208, 215, 0, 218, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 213, 0, 214, 209, 0, 0, 0, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 0, 0, 0,
- 0, 200, 201, 202, 203, 204, 205, 206, 207, 108,
- 109, 110, 111, 0, 0, 211, 0, 112, 0, 0,
- 0, 0, 21, 0, 219, 212, 0, 0, 360, 217,
- 216, 208, 215, 0, 218, 0, 0, 200, 201, 202,
- 203, 204, 205, 206, 207, 210, 0, 213, 0, 214,
- 209, 0, 0, 0, 0, 0, 0, 0, 0, 219,
- 212, 0, 0, 361, 217, 216, 208, 215, 0, 218,
- 0, 0, 0, 200, 201, 202, 203, 204, 205, 206,
- 207, 211, 213, 0, 214, 209, 117, 219, 212, 0,
- 0, 362, 217, 216, 208, 215, 0, 218, 0, 113,
- 115, 0, 116, 114, 0, 0, 0, 0, 0, 0,
- 213, 210, 214, 209, 219, 212, 211, 0, 367, 217,
- 216, 208, 215, 0, 218, 219, 212, 0, 0, 368,
- 217, 216, 208, 215, 0, 218, 0, 213, 0, 214,
- 209, 0, 0, 0, 211, 0, 210, 0, 213, 0,
- 214, 209, 219, 212, 0, 0, 369, 217, 216, 208,
- 215, 0, 218, 0, 0, 302, 0, 0, 0, 0,
- 0, 211, 0, 0, 210, 213, 0, 214, 209, 0,
- 0, 0, 211, 200, 201, 202, 203, 204, 205, 206,
- 207, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 210, 0, 0, 0, 0, 0, 0, 0, 211,
- 219, 212, 210, 0, 370, 217, 216, 208, 215, 0,
- 218, 219, 212, 0, 0, 371, 217, 216, 208, 215,
- 0, 218, 0, 213, 0, 214, 209, 0, 0, 210,
- 0, 0, 0, 0, 213, 0, 214, 209, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 0, 219, 0,
- 0, 0, 0, 217, 216, 0, 215, 211, 218, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 211, 0,
- 0, 213, 0, 214, 200, 201, 202, 203, 204, 205,
- 206, 207, 0, 0, 0, 0, 0, 210, 0, 0,
- 0, 0, 108, 109, 110, 111, 351, 0, 210, 0,
- 112, 117, 200, 201, 202, 203, 204, 205, 206, 207,
- 0, 0, 0, 0, 113, 115, 0, 116, 114, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 0, 0, 0,
- 200, 201, 202, 203, 204, 205, 206, 207, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 200, 201, 202,
- 203, 204, 205, 206, 207, 0, 219, 212, 0, 0,
- 372, 217, 216, 208, 215, 0, 218, 219, 212, 0,
- 0, 373, 217, 216, 208, 215, 0, 218, 0, 213,
- 0, 214, 209, 0, 0, 0, 0, 0, 0, 0,
- 213, 0, 214, 209, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 200, 201, 202, 203, 204,
- 205, 206, 207, 211, 0, 0, 200, 201, 202, 203,
- 204, 205, 206, 207, 211, 219, 212, 0, 0, 374,
- 217, 216, 208, 215, 0, 218, 0, 0, 0, 219,
- 212, 0, 0, 210, 217, 216, 208, 215, 213, 218,
- 214, 209, 0, 0, 210, 202, 203, 204, 205, 0,
- 0, 0, 213, 0, 214, 209, 219, 212, 0, 0,
- 0, 217, 216, 208, 215, 0, 218, 0, 219, 212,
- 0, 0, 211, 217, 216, 208, 215, 377, 218, 213,
- 0, 214, 209, 0, 0, 375, 211, 108, 109, 110,
- 111, 213, 0, 214, 209, 112, 0, 0, 0, 0,
- 0, 0, 210, 0, 219, 212, 0, 0, 397, 217,
- 216, 208, 215, 211, 218, 0, 210, 0, 0, 234,
- 0, 117, 0, 0, 382, 211, 0, 213, 0, 214,
- 209, 0, 0, 0, 113, 115, 0, 116, 114, 219,
- 212, 0, 0, 210, 217, 216, 350, 215, 0, 218,
- 0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
- 0, 211, 213, 0, 214, 209, 0, 0, 0, 0,
- 0, 200, 201, 202, 203, 204, 205, 206, 207, 0,
- 0, 0, 200, 201, 202, 203, 204, 205, 206, 207,
- 0, 210, 219, 212, 0, 0, 211, 217, 216, 356,
- 215, 0, 218, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 219, 213, 0, 214, 209, 217,
- 216, 0, 215, 0, 218, 0, 210, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 213, 0, 214,
- 200, 201, 202, 203, 204, 205, 206, 207, 0, 211,
- 0, 0, 0, 0, 200, 201, 202, 203, 204, 205,
- 206, 207, 0, 0, 0, 0, 219, 212, 0, 0,
- 0, 217, 216, 363, 215, 0, 218, 0, 0, 210,
- 0, 200, 201, 202, 203, 204, 205, 206, 207, 213,
- 0, 214, 209, 200, 201, 202, 203, 204, 205, 206,
- 207, 219, 212, 0, 0, 0, 217, 216, 381, 215,
- 0, 218, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 211, 213, 0, 214, 209, 0, 200,
- 201, 202, 203, 204, 205, 206, 207, 108, 109, 110,
- 111, 0, 0, 0, 0, 112, 0, 0, 0, 0,
- 0, 219, 212, 210, 0, 395, 217, 216, 211, 215,
- 0, 218, 0, 0, 200, 201, 202, 203, 204, 205,
- 206, 207, 0, 0, 213, 0, 214, 209, 0, 219,
- 212, 0, 0, 396, 217, 216, 0, 215, 210, 218,
- 219, 212, 0, 0, 398, 217, 216, 0, 215, 0,
- 218, 0, 213, 0, 214, 209, 0, 0, 211, 0,
- 0, 0, 0, 213, 0, 214, 209, 200, 201, 202,
- 203, 204, 205, 206, 207, 219, 212, 0, 0, 400,
- 217, 216, 0, 215, 0, 218, 211, 0, 210, 200,
- 201, 202, 203, 204, 205, 0, 0, 211, 213, 0,
- 214, 209, 0, 219, 212, 0, 0, 0, 217, 216,
- 0, 215, 0, 218, 219, 212, 210, 0, 0, 217,
- 216, 0, 215, 0, 218, 0, 213, 210, 214, 209,
- 0, 0, 211, 0, 0, 0, 0, 213, 0, 214,
- 0, 200, 201, 202, 203, 204, 205, 206, 207, 0,
- 79, 0, 0, 79, 0, 79, 79, 79, 0, 0,
- 211, 0, 210, 0, 0, 0, 0, 0, 0, 0,
- 79, 211, 79, 0, 79, 79, 200, 201, 202, 203,
- 204, 205, 206, 207, 0, 0, 0, 0, 78, 0,
- 210, 78, 0, 78, 78, 78, 75, 0, 0, 75,
- 0, 210, 75, 0, 0, 79, 79, 0, 78, 0,
- 78, 0, 78, 78, 0, 0, 75, 0, 75, 0,
- 75, 75, 0, 0, 0, 0, 200, 201, 202, 203,
- 204, 205, 206, 207, 0, 0, 79, 0, 0, 0,
- 0, 0, 0, 78, 78, 0, 0, 0, 0, 0,
- 0, 75, 75, 0, 200, 201, 202, 203, 204, 205,
- 206, 207, 0, 0, 0, 200, 201, 202, 203, 204,
- 205, 206, 207, 0, 78, 0, 0, 0, 0, 0,
- 0, 0, 75, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 200, 201, 202, 203, 204, 205, 206, 207, 0, 0,
- 0, 0, 0, 219, 212, 0, 0, 0, 217, 216,
- 0, 215, 0, 218, 0, 0, 0, 0, 200, 201,
- 202, 203, 204, 205, 206, 207, 213, 0, 214, 200,
- 201, 202, 203, 204, 205, 206, 207, 86, 0, 0,
- 86, 0, 0, 86, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 86, 0, 86,
- 211, 86, 86, 0, 79, 79, 79, 79, 79, 79,
- 79, 79, 0, 0, 87, 0, 0, 87, 0, 0,
- 87, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 210, 0, 86, 86, 87, 0, 87, 0, 87, 87,
- 0, 0, 78, 78, 78, 78, 78, 78, 78, 78,
- 75, 75, 75, 75, 75, 75, 75, 75, 82, 0,
- 0, 82, 0, 86, 82, 0, 0, 0, 83, 87,
- 87, 83, 0, 0, 83, 0, 0, 0, 82, 0,
- 82, 84, 82, 82, 84, 0, 0, 84, 83, 0,
- 83, 85, 83, 83, 85, 0, 0, 85, 0, 0,
- 87, 84, 219, 212, 0, 0, 84, 217, 216, 0,
- 215, 85, 218, 82, 82, 0, 85, 0, 0, 0,
- 0, 0, 0, 83, 83, 213, 0, 214, 0, 0,
- 0, 0, 0, 219, 212, 0, 84, 84, 217, 216,
- 0, 215, 0, 218, 82, 0, 85, 85, 0, 0,
- 0, 0, 0, 0, 83, 0, 213, 364, 214, 211,
- 0, 0, 117, 0, 0, 0, 0, 84, 200, 201,
- 202, 203, 204, 205, 206, 113, 115, 85, 116, 114,
- 0, 117, 0, 0, 0, 0, 0, 0, 0, 210,
- 0, 365, 0, 324, 113, 115, 117, 116, 114, 0,
- 366, 86, 86, 86, 86, 117, 0, 86, 86, 113,
- 115, 380, 116, 114, 0, 0, 117, 0, 113, 115,
- 0, 116, 114, 0, 0, 0, 0, 0, 0, 113,
- 115, 383, 116, 114, 0, 0, 117, 0, 87, 87,
- 87, 87, 384, 0, 87, 87, 0, 117, 0, 113,
- 115, 0, 116, 114, 241, 0, 117, 0, 0, 0,
- 113, 115, 0, 116, 114, 0, 0, 0, 0, 113,
- 115, 0, 116, 114, 0, 0, 0, 0, 0, 0,
- 0, 0, 82, 82, 82, 82, 0, 117, 82, 82,
- 0, 0, 83, 83, 83, 83, 0, 0, 83, 83,
- 113, 115, 0, 116, 114, 84, 84, 0, 0, 0,
- 0, 84, 84, 0, 0, 85, 85, 0, 376, 0,
- 117, 85, 85, 0, 0, 0, 0, 200, 201, 202,
- 203, 204, 205, 113, 115, 0, 116, 114, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 200, 201,
- 202, 203, 204, 205, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 108, 109,
- 110, 111, 0, 0, 0, 0, 112, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 108, 109, 110,
- 111, 0, 0, 0, 0, 112, 0, 0, 0, 0,
- 0, 0, 108, 109, 110, 111, 0, 0, 0, 0,
- 112, 108, 109, 110, 111, 0, 0, 0, 0, 112,
- 0, 0, 108, 109, 110, 111, 0, 0, 0, 0,
- 112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 108, 109, 110, 111, 0, 0, 0, 0,
- 112, 0, 0, 108, 109, 110, 111, 0, 0, 0,
- 0, 112, 108, 109, 110, 111, 0, 0, 0, 0,
- 112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 108, 109, 110, 111, 0, 0, 0,
- 0, 112, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 108, 109, 110, 111,
- 0, 0, 0, 0, 112,
-};
-short parsercheck[] = { 29,
- 0, 61, 41, 40, 40, 35, 36, 37, 61, 39,
- 61, 40, 37, 38, 40, 91, 41, 42, 43, 44,
- 45, 40, 47, 41, 37, 38, 44, 259, 40, 42,
- 43, 91, 45, 58, 47, 60, 40, 62, 63, 0,
- 91, 41, 260, 41, 44, 38, 44, 60, 41, 62,
- 41, 44, 91, 44, 41, 40, 37, 44, 58, 59,
- 46, 42, 43, 63, 45, 58, 47, 40, 93, 94,
- 63, 101, 102, 103, 60, 105, 62, 40, 40, 37,
- 41, 94, 261, 44, 42, 43, 37, 45, 40, 47,
- 261, 42, 40, 40, 40, 40, 47, 58, 59, 124,
- 93, 94, 63, 40, 40, 40, 40, 137, 138, 139,
- 140, 141, 142, 143, 144, 145, 91, 41, 148, 40,
- 44, 40, 40, 40, 40, 125, 40, 40, 40, 40,
- 40, 124, 40, 40, 58, 40, 166, 167, 168, 63,
- 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
- 180, 181, 46, 40, 40, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 125, 40, 60, 40, 62, 93,
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
- 0, 33, 46, 41, 41, 40, 44, 44, 40, 40,
- 124, 40, 40, 45, 234, 40, 60, 40, 62, 239,
- 58, 58, 40, 23, 40, 63, 63, 40, 28, 40,
- 30, 31, 32, 33, 34, 40, 40, 280, 40, 40,
- 40, 41, 42, 0, 40, 40, 40, 262, 263, 264,
- 265, 266, 267, 268, 269, 93, 93, 40, 46, 262,
- 263, 264, 265, 266, 267, 260, 41, 260, 260, 61,
- 41, 260, 262, 263, 260, 36, 260, 41, 260, 40,
- 270, 260, 0, 41, 41, 268, 269, 44, 264, 265,
- 260, 123, 260, 260, 126, 266, 267, 41, 260, 260,
- 260, 58, 59, 260, 104, 61, 63, 41, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 46, 270,
- 41, 41, 41, 41, 41, 41, 44, 41, 46, 41,
- 350, 59, 60, 41, 62, 63, 356, 41, 61, 41,
- 58, 59, 60, 363, 62, 63, 0, 44, 44, 41,
- 41, -1, 44, 44, 268, 269, 376, 377, -1, -1,
- 41, 381, 123, 44, -1, 385, 58, 58, 125, 169,
- 41, 63, 63, 44, 394, -1, -1, 58, 262, 263,
- 264, 265, 182, 183, 184, -1, 41, 58, 41, 44,
- -1, 44, 63, -1, 194, -1, 41, 125, -1, 44,
- -1, 93, 93, 58, -1, 58, -1, 125, 63, -1,
- 63, -1, 93, 58, -1, -1, -1, -1, 262, 263,
- 264, 265, 93, -1, -1, 257, 270, -1, 260, 261,
- 268, 269, 269, 233, -1, -1, -1, -1, 93, 94,
- 93, 241, 242, -1, -1, 245, 278, 279, 93, 281,
- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, 0, 124,
- -1, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, -1, 320, 321,
- 322, 323, 324, 325, 326, 327, 328, 258, -1, 260,
- 261, 333, 334, 335, -1, 262, 263, 339, 340, 41,
- 342, -1, 44, 270, 46, 271, 272, 273, 274, 275,
- 276, 277, 278, 279, 324, 325, 58, 59, 60, -1,
- 62, 63, -1, -1, 262, 263, 264, 265, -1, 300,
- 301, 302, 270, -1, 262, 263, 264, 265, 0, -1,
- -1, -1, 270, -1, -1, 316, 317, 318, 319, 0,
- -1, -1, -1, -1, -1, -1, -1, 328, 329, 330,
- 331, 332, -1, -1, -1, 336, 337, 338, -1, 0,
- 341, -1, 343, 344, 345, -1, 0, -1, 0, 41,
- -1, -1, 44, 125, 46, -1, -1, -1, -1, 0,
- 41, -1, -1, 44, -1, 46, 58, 59, 60, -1,
- 62, 63, 0, 268, 269, -1, -1, 58, 59, 60,
- 41, 62, 63, 44, -1, 46, -1, 41, -1, 41,
- 44, -1, 44, -1, 46, 0, -1, 58, 59, 60,
- 41, 62, 63, 44, 58, 59, 58, 59, 60, 46,
- 62, 63, -1, 41, -1, -1, 44, 58, 59, 60,
- -1, 62, 63, 60, 41, 62, 63, 44, 0, 46,
- 58, 59, 60, 125, 62, 63, 41, -1, -1, 44,
- -1, 0, 59, 60, 125, 62, 63, -1, -1, -1,
- -1, -1, -1, 58, 59, 60, -1, 62, 63, -1,
- -1, -1, -1, -1, 125, -1, -1, -1, -1, 41,
- -1, 125, 44, 125, -1, -1, -1, -1, -1, -1,
- -1, -1, 41, -1, 125, 44, 58, 59, -1, -1,
- 262, 263, 264, 265, -1, -1, -1, 125, 270, 58,
- 59, 60, -1, 62, 63, 37, 38, -1, -1, 41,
- 42, 43, 44, 45, -1, 47, 0, -1, -1, -1,
- 125, -1, -1, -1, -1, -1, 58, -1, 60, -1,
- 62, 63, -1, 37, 38, -1, -1, 41, 42, 43,
- 44, 45, -1, 47, -1, -1, 41, 41, -1, 44,
- 44, -1, -1, 125, -1, -1, 60, 41, 62, 63,
- 44, 93, 94, 58, 58, -1, 125, -1, 63, 63,
- 262, 263, 264, 265, 58, 59, -1, -1, 270, 63,
- -1, 262, 263, 264, 265, -1, -1, -1, -1, 270,
- 94, -1, 124, -1, -1, -1, -1, 41, 93, 93,
- 44, 262, 263, 264, 265, -1, -1, -1, -1, 270,
- 262, 263, 264, 265, 58, -1, -1, -1, 270, 63,
- 124, 262, 263, 264, 265, 262, 263, 264, 265, 270,
- -1, -1, -1, 270, 262, 263, 264, 265, -1, -1,
- -1, 125, 270, -1, -1, 262, 263, 264, 265, 93,
- -1, -1, -1, 270, -1, -1, 41, 262, 263, 264,
- 265, 46, 37, 38, -1, 270, 41, 42, 43, 44,
- 45, -1, 47, -1, 59, 60, -1, 62, 63, -1,
- 0, -1, -1, 58, -1, 60, -1, 62, 63, 37,
- 38, -1, -1, 41, 42, 43, 44, 45, -1, 47,
- -1, -1, -1, 262, 263, 264, 265, -1, -1, -1,
- 58, 270, 60, -1, 62, 63, -1, -1, 93, 94,
- -1, 41, -1, -1, 44, -1, -1, -1, -1, -1,
- 262, 263, 264, 265, 266, 267, 268, 269, 58, 59,
- -1, -1, -1, 63, -1, 93, 94, 37, 38, 124,
- -1, 41, 42, 43, 44, 45, -1, 47, 262, 263,
- 264, 265, 266, 267, 268, 269, -1, -1, 58, -1,
- 60, -1, 62, 63, 37, 38, 124, -1, -1, 42,
- 43, 44, 45, -1, 47, 37, 38, -1, -1, 41,
- 42, 43, 44, 45, -1, 47, -1, 60, -1, 62,
- 63, -1, -1, 93, 94, 125, -1, -1, 60, -1,
- 62, 63, 37, 38, -1, -1, 41, 42, 43, 44,
- 45, -1, 47, -1, -1, -1, -1, -1, -1, -1,
- 93, 94, -1, -1, 124, 60, -1, 62, 63, 37,
- 38, -1, 94, 41, 42, 43, 44, 45, -1, 47,
- 37, 38, -1, -1, -1, 42, 43, 44, 45, -1,
- 47, 124, 60, -1, 62, 63, -1, -1, -1, 94,
- -1, -1, 124, 60, -1, 62, 63, 262, 263, 264,
- 265, 41, -1, -1, 44, 270, -1, 262, 263, 264,
- 265, 266, 267, 268, 269, -1, 94, -1, 58, 124,
- -1, -1, -1, 63, -1, -1, 93, 94, -1, -1,
- -1, -1, -1, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, -1, -1, 124, -1, 41, 41,
- -1, 44, 44, 93, 37, 38, -1, 124, 41, 42,
- 43, 44, 45, -1, 47, 58, 58, -1, -1, -1,
- 63, 63, -1, -1, -1, -1, -1, 60, -1, 62,
- 63, 37, 38, -1, -1, 41, 42, 43, 44, 45,
- -1, 47, 262, 263, 264, 265, 266, 267, 268, 269,
- 93, 93, -1, -1, 60, -1, 62, 63, 0, -1,
- -1, 94, -1, -1, -1, -1, -1, -1, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, 44, -1, 46,
- 262, 263, 264, 265, 266, 267, 268, 269, 94, -1,
- -1, 124, 59, 60, -1, 62, 63, -1, -1, 41,
- 38, -1, 44, 41, -1, -1, 44, 262, 263, 264,
- 265, 266, 267, 268, 269, -1, 58, 59, 124, -1,
- 58, 63, 60, -1, 62, 63, -1, -1, -1, -1,
- -1, -1, -1, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, -1, 262, 263, 264, 265, 266,
- 267, 268, 269, 37, 38, 93, 94, -1, 42, 43,
- 44, 45, -1, 47, 37, 38, -1, -1, 41, 42,
- 43, 44, 45, -1, 47, -1, 60, -1, 62, 63,
- -1, -1, -1, 125, -1, -1, 124, 60, -1, 62,
- 63, 37, 38, -1, -1, 41, 42, 43, 44, 45,
- -1, 47, -1, -1, -1, -1, -1, -1, -1, 93,
- 94, -1, -1, -1, 60, -1, 62, 63, 37, 38,
- -1, 94, 41, 42, 43, 44, 45, -1, 47, 262,
- 263, 264, 265, 266, 267, 268, 269, -1, -1, -1,
- 124, 60, -1, 62, 63, -1, -1, -1, 94, -1,
- -1, 124, -1, -1, -1, -1, 262, 263, 264, 265,
- 266, 267, 268, 269, 37, 38, -1, -1, 41, 42,
- 43, 44, 45, -1, 47, 94, 37, 38, 124, -1,
- 41, 42, 43, 44, 45, -1, 47, 60, 41, 62,
- 63, -1, -1, 46, -1, 262, 263, 264, 265, 60,
- -1, 62, 63, 270, -1, 124, 59, 60, -1, 62,
- 63, -1, 37, 38, -1, -1, 41, 42, 43, 44,
- 45, 94, 47, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, 94, -1, 60, -1, 62, 63, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 37, 38,
- -1, 124, 41, 42, 43, 44, 45, -1, 47, -1,
- -1, -1, -1, 124, -1, -1, -1, -1, -1, 94,
- -1, 60, -1, 62, 63, -1, -1, -1, 262, 263,
- 264, 265, 266, 267, 268, 269, -1, -1, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, 0, -1, 124,
- -1, -1, -1, -1, -1, 94, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 262, 263, 264, 265,
- 266, 267, 268, 269, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 124, -1, -1, 41, -1,
- -1, 44, -1, 262, 263, 264, 265, 266, 267, 268,
- 269, -1, -1, -1, -1, 58, 59, -1, 37, 38,
- 63, -1, 41, 42, 43, 44, 45, -1, 47, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 60, -1, 62, 63, -1, -1, -1, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, -1, -1, -1,
- -1, 262, 263, 264, 265, 266, 267, 268, 269, 262,
- 263, 264, 265, -1, -1, 94, -1, 270, -1, -1,
- -1, -1, 125, -1, 37, 38, -1, -1, 41, 42,
- 43, 44, 45, -1, 47, -1, -1, 262, 263, 264,
- 265, 266, 267, 268, 269, 124, -1, 60, -1, 62,
- 63, -1, -1, -1, -1, -1, -1, -1, -1, 37,
- 38, -1, -1, 41, 42, 43, 44, 45, -1, 47,
- -1, -1, -1, 262, 263, 264, 265, 266, 267, 268,
- 269, 94, 60, -1, 62, 63, 46, 37, 38, -1,
- -1, 41, 42, 43, 44, 45, -1, 47, -1, 59,
- 60, -1, 62, 63, -1, -1, -1, -1, -1, -1,
- 60, 124, 62, 63, 37, 38, 94, -1, 41, 42,
- 43, 44, 45, -1, 47, 37, 38, -1, -1, 41,
- 42, 43, 44, 45, -1, 47, -1, 60, -1, 62,
- 63, -1, -1, -1, 94, -1, 124, -1, 60, -1,
- 62, 63, 37, 38, -1, -1, 41, 42, 43, 44,
- 45, -1, 47, -1, -1, 125, -1, -1, -1, -1,
- -1, 94, -1, -1, 124, 60, -1, 62, 63, -1,
- -1, -1, 94, 262, 263, 264, 265, 266, 267, 268,
- 269, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 124, -1, -1, -1, -1, -1, -1, -1, 94,
- 37, 38, 124, -1, 41, 42, 43, 44, 45, -1,
- 47, 37, 38, -1, -1, 41, 42, 43, 44, 45,
- -1, 47, -1, 60, -1, 62, 63, -1, -1, 124,
- -1, -1, -1, -1, 60, -1, 62, 63, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, -1, 37, -1,
- -1, -1, -1, 42, 43, -1, 45, 94, 47, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 94, -1,
- -1, 60, -1, 62, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, -1, -1, -1, 124, -1, -1,
- -1, -1, 262, 263, 264, 265, 41, -1, 124, -1,
- 270, 46, 262, 263, 264, 265, 266, 267, 268, 269,
- -1, -1, -1, -1, 59, 60, -1, 62, 63, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, -1, -1, -1,
- 262, 263, 264, 265, 266, 267, 268, 269, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 262, 263, 264,
- 265, 266, 267, 268, 269, -1, 37, 38, -1, -1,
- 41, 42, 43, 44, 45, -1, 47, 37, 38, -1,
- -1, 41, 42, 43, 44, 45, -1, 47, -1, 60,
- -1, 62, 63, -1, -1, -1, -1, -1, -1, -1,
- 60, -1, 62, 63, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 262, 263, 264, 265, 266,
- 267, 268, 269, 94, -1, -1, 262, 263, 264, 265,
- 266, 267, 268, 269, 94, 37, 38, -1, -1, 41,
- 42, 43, 44, 45, -1, 47, -1, -1, -1, 37,
- 38, -1, -1, 124, 42, 43, 44, 45, 60, 47,
- 62, 63, -1, -1, 124, 264, 265, 266, 267, -1,
- -1, -1, 60, -1, 62, 63, 37, 38, -1, -1,
- -1, 42, 43, 44, 45, -1, 47, -1, 37, 38,
- -1, -1, 94, 42, 43, 44, 45, 58, 47, 60,
- -1, 62, 63, -1, -1, 93, 94, 262, 263, 264,
- 265, 60, -1, 62, 63, 270, -1, -1, -1, -1,
- -1, -1, 124, -1, 37, 38, -1, -1, 41, 42,
- 43, 44, 45, 94, 47, -1, 124, -1, -1, 44,
- -1, 46, -1, -1, 93, 94, -1, 60, -1, 62,
- 63, -1, -1, -1, 59, 60, -1, 62, 63, 37,
- 38, -1, -1, 124, 42, 43, 44, 45, -1, 47,
- -1, -1, -1, -1, -1, 124, -1, -1, -1, -1,
- -1, 94, 60, -1, 62, 63, -1, -1, -1, -1,
- -1, 262, 263, 264, 265, 266, 267, 268, 269, -1,
- -1, -1, 262, 263, 264, 265, 266, 267, 268, 269,
- -1, 124, 37, 38, -1, -1, 94, 42, 43, 44,
- 45, -1, 47, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 37, 60, -1, 62, 63, 42,
- 43, -1, 45, -1, 47, -1, 124, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 60, -1, 62,
- 262, 263, 264, 265, 266, 267, 268, 269, -1, 94,
- -1, -1, -1, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, -1, -1, 37, 38, -1, -1,
- -1, 42, 43, 44, 45, -1, 47, -1, -1, 124,
- -1, 262, 263, 264, 265, 266, 267, 268, 269, 60,
- -1, 62, 63, 262, 263, 264, 265, 266, 267, 268,
- 269, 37, 38, -1, -1, -1, 42, 43, 44, 45,
- -1, 47, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 94, 60, -1, 62, 63, -1, 262,
- 263, 264, 265, 266, 267, 268, 269, 262, 263, 264,
- 265, -1, -1, -1, -1, 270, -1, -1, -1, -1,
- -1, 37, 38, 124, -1, 41, 42, 43, 94, 45,
- -1, 47, -1, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, 60, -1, 62, 63, -1, 37,
- 38, -1, -1, 41, 42, 43, -1, 45, 124, 47,
- 37, 38, -1, -1, 41, 42, 43, -1, 45, -1,
- 47, -1, 60, -1, 62, 63, -1, -1, 94, -1,
- -1, -1, -1, 60, -1, 62, 63, 262, 263, 264,
- 265, 266, 267, 268, 269, 37, 38, -1, -1, 41,
- 42, 43, -1, 45, -1, 47, 94, -1, 124, 262,
- 263, 264, 265, 266, 267, -1, -1, 94, 60, -1,
- 62, 63, -1, 37, 38, -1, -1, -1, 42, 43,
- -1, 45, -1, 47, 37, 38, 124, -1, -1, 42,
- 43, -1, 45, -1, 47, -1, 60, 124, 62, 63,
- -1, -1, 94, -1, -1, -1, -1, 60, -1, 62,
- -1, 262, 263, 264, 265, 266, 267, 268, 269, -1,
- 38, -1, -1, 41, -1, 43, 44, 45, -1, -1,
- 94, -1, 124, -1, -1, -1, -1, -1, -1, -1,
- 58, 94, 60, -1, 62, 63, 262, 263, 264, 265,
- 266, 267, 268, 269, -1, -1, -1, -1, 38, -1,
- 124, 41, -1, 43, 44, 45, 38, -1, -1, 41,
- -1, 124, 44, -1, -1, 93, 94, -1, 58, -1,
- 60, -1, 62, 63, -1, -1, 58, -1, 60, -1,
- 62, 63, -1, -1, -1, -1, 262, 263, 264, 265,
- 266, 267, 268, 269, -1, -1, 124, -1, -1, -1,
- -1, -1, -1, 93, 94, -1, -1, -1, -1, -1,
- -1, 93, 94, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, -1, 262, 263, 264, 265, 266,
- 267, 268, 269, -1, 124, -1, -1, -1, -1, -1,
- -1, -1, 124, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 262, 263, 264, 265, 266, 267, 268, 269, -1, -1,
- -1, -1, -1, 37, 38, -1, -1, -1, 42, 43,
- -1, 45, -1, 47, -1, -1, -1, -1, 262, 263,
- 264, 265, 266, 267, 268, 269, 60, -1, 62, 262,
- 263, 264, 265, 266, 267, 268, 269, 38, -1, -1,
- 41, -1, -1, 44, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 58, -1, 60,
- 94, 62, 63, -1, 262, 263, 264, 265, 266, 267,
- 268, 269, -1, -1, 38, -1, -1, 41, -1, -1,
- 44, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 124, -1, 93, 94, 58, -1, 60, -1, 62, 63,
- -1, -1, 262, 263, 264, 265, 266, 267, 268, 269,
- 262, 263, 264, 265, 266, 267, 268, 269, 38, -1,
- -1, 41, -1, 124, 44, -1, -1, -1, 38, 93,
- 94, 41, -1, -1, 44, -1, -1, -1, 58, -1,
- 60, 38, 62, 63, 41, -1, -1, 44, 58, -1,
- 60, 38, 62, 63, 41, -1, -1, 44, -1, -1,
- 124, 58, 37, 38, -1, -1, 63, 42, 43, -1,
- 45, 58, 47, 93, 94, -1, 63, -1, -1, -1,
- -1, -1, -1, 93, 94, 60, -1, 62, -1, -1,
- -1, -1, -1, 37, 38, -1, 93, 94, 42, 43,
- -1, 45, -1, 47, 124, -1, 93, 94, -1, -1,
- -1, -1, -1, -1, 124, -1, 60, 41, 62, 94,
- -1, -1, 46, -1, -1, -1, -1, 124, 262, 263,
- 264, 265, 266, 267, 268, 59, 60, 124, 62, 63,
- -1, 46, -1, -1, -1, -1, -1, -1, -1, 124,
- -1, 41, -1, 58, 59, 60, 46, 62, 63, -1,
- 41, 262, 263, 264, 265, 46, -1, 268, 269, 59,
- 60, 41, 62, 63, -1, -1, 46, -1, 59, 60,
- -1, 62, 63, -1, -1, -1, -1, -1, -1, 59,
- 60, 41, 62, 63, -1, -1, 46, -1, 262, 263,
- 264, 265, 41, -1, 268, 269, -1, 46, -1, 59,
- 60, -1, 62, 63, 44, -1, 46, -1, -1, -1,
- 59, 60, -1, 62, 63, -1, -1, -1, -1, 59,
- 60, -1, 62, 63, -1, -1, -1, -1, -1, -1,
- -1, -1, 262, 263, 264, 265, -1, 46, 268, 269,
- -1, -1, 262, 263, 264, 265, -1, -1, 268, 269,
- 59, 60, -1, 62, 63, 262, 263, -1, -1, -1,
- -1, 268, 269, -1, -1, 262, 263, -1, 44, -1,
- 46, 268, 269, -1, -1, -1, -1, 262, 263, 264,
- 265, 266, 267, 59, 60, -1, 62, 63, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 262, 263,
- 264, 265, 266, 267, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 262, 263,
- 264, 265, -1, -1, -1, -1, 270, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 262, 263, 264,
- 265, -1, -1, -1, -1, 270, -1, -1, -1, -1,
- -1, -1, 262, 263, 264, 265, -1, -1, -1, -1,
- 270, 262, 263, 264, 265, -1, -1, -1, -1, 270,
- -1, -1, 262, 263, 264, 265, -1, -1, -1, -1,
- 270, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 262, 263, 264, 265, -1, -1, -1, -1,
- 270, -1, -1, 262, 263, 264, 265, -1, -1, -1,
- -1, 270, 262, 263, 264, 265, -1, -1, -1, -1,
- 270, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 262, 263, 264, 265, -1, -1, -1,
- -1, 270, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 262, 263, 264, 265,
- -1, -1, -1, -1, 270,
-};
-#define YYFINAL 26
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 346
-#if YYDEBUG
-char *parsername[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"'!'",0,0,"'$'","'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'","'.'","'/'",0,
-0,0,0,0,0,0,0,0,0,"':'","';'","'<'","'='","'>'","'?'",0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,"'{'","'|'","'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"NUMBER",
-"STRING","SYMBOL","FIELD","VAR","EQ","NEQ","LE","GE","SHR","SHL","AND","OR",
-"IN","PLA","MIA","MUA","MOA","DVA","ANA","ORA","INC","DEC_","APP","AVG","DEV",
-"AMIN","AMAX","SUM","QAVG","QDEV","QMIN_","QMAX_","QSUM","SAVG","SDEV","SMIN",
-"SMAX","SSUM","ABS","INT","BOUND","LEN","CHOP","TR","SUBSTR","SQRT","EXP","LOG",
-"LN","POW","RANDOM","SIN","COS","TAN","ASIN","ACOS","ATAN","ATAN2","DATE",
-"TIME","DURATION","EXPAND","YEAR","MONTH","DAY","HOUR","MINUTE","SECOND","LEAP",
-"JULIAN","SECTION_","DBASE_","FORM_","PREVFORM","SWITCH","THIS","LAST","DISP",
-"FOREACH","HOST","USER","UID","GID","SYSTEM","ACCESS","BEEP","ERROR","PRINTF",
-"UMINUS",
-};
-char *parserrule[] = {
-"$accept : stmt",
-"stmt : string",
-"string : STRING",
-"string : '{' string '}'",
-"string : string ';' string",
-"string : string '.' string",
-"string : VAR",
-"string : VAR APP string",
-"string : VAR '=' string",
-"string : '(' number ')'",
-"string : string '?' string ':' string",
-"string : string '<' string",
-"string : string '>' string",
-"string : string EQ string",
-"string : string NEQ string",
-"string : string LE string",
-"string : string GE string",
-"string : string IN string",
-"string : FIELD",
-"string : FIELD '[' number ']'",
-"string : FIELD '=' string",
-"string : FIELD '[' number ']' '=' string",
-"string : SYSTEM '(' string ')'",
-"string : '$' SYMBOL",
-"string : CHOP '(' string ')'",
-"string : TR '(' string ',' string ')'",
-"string : SUBSTR '(' string ',' number ',' number ')'",
-"string : HOST",
-"string : USER",
-"string : PREVFORM",
-"string : SECTION_",
-"string : SECTION_ '[' number ']'",
-"string : FORM_",
-"string : DBASE_",
-"string : SWITCH '(' string ',' string ')'",
-"string : FOREACH '(' string ')'",
-"string : FOREACH '(' string ',' string ')'",
-"string : TIME",
-"string : DATE",
-"string : TIME '(' number ')'",
-"string : DATE '(' number ')'",
-"string : DURATION '(' number ')'",
-"string : EXPAND '(' FIELD ')'",
-"string : EXPAND '(' FIELD '[' number ']' ')'",
-"string : PRINTF '(' args ')'",
-"string : BEEP",
-"string : ERROR '(' args ')'",
-"args : string",
-"args : args ',' string",
-"number : NUMBER",
-"number : '{' string '}'",
-"number : '(' number ')'",
-"number : FIELD",
-"number : FIELD '[' number ']'",
-"number : FIELD '=' number",
-"number : FIELD '[' number ']' '=' number",
-"number : VAR",
-"number : VAR '=' number",
-"number : VAR PLA number",
-"number : VAR MIA number",
-"number : VAR MUA number",
-"number : VAR DVA number",
-"number : VAR MOA number",
-"number : VAR ANA number",
-"number : VAR ORA number",
-"number : VAR INC",
-"number : VAR DEC_",
-"number : INC VAR",
-"number : DEC_ VAR",
-"number : '-' number",
-"number : '!' number",
-"number : '~' number",
-"number : number '&' number",
-"number : number '^' number",
-"number : number '|' number",
-"number : number SHL number",
-"number : number SHR number",
-"number : number '%' number",
-"number : number '+' number",
-"number : number '-' number",
-"number : number '*' number",
-"number : number '/' number",
-"number : number '<' number",
-"number : number '>' number",
-"number : number EQ number",
-"number : number NEQ number",
-"number : number LE number",
-"number : number GE number",
-"number : number AND number",
-"number : number OR number",
-"number : number '?' number ':' number",
-"number : number ',' number",
-"number : THIS",
-"number : LAST",
-"number : DISP",
-"number : AVG '(' FIELD ')'",
-"number : DEV '(' FIELD ')'",
-"number : AMIN '(' FIELD ')'",
-"number : AMAX '(' FIELD ')'",
-"number : SUM '(' FIELD ')'",
-"number : QAVG '(' FIELD ')'",
-"number : QDEV '(' FIELD ')'",
-"number : QMIN_ '(' FIELD ')'",
-"number : QMAX_ '(' FIELD ')'",
-"number : QSUM '(' FIELD ')'",
-"number : SAVG '(' FIELD ')'",
-"number : SDEV '(' FIELD ')'",
-"number : SMIN '(' FIELD ')'",
-"number : SMAX '(' FIELD ')'",
-"number : SSUM '(' FIELD ')'",
-"number : ABS '(' number ')'",
-"number : INT '(' number ')'",
-"number : BOUND '(' number ',' number ',' number ')'",
-"number : LEN '(' string ')'",
-"number : SQRT '(' number ')'",
-"number : EXP '(' number ')'",
-"number : LOG '(' number ')'",
-"number : LN '(' number ')'",
-"number : POW '(' number ',' number ')'",
-"number : RANDOM",
-"number : SIN '(' number ')'",
-"number : COS '(' number ')'",
-"number : TAN '(' number ')'",
-"number : ASIN '(' number ')'",
-"number : ACOS '(' number ')'",
-"number : ATAN '(' number ')'",
-"number : ATAN2 '(' number ',' number ')'",
-"number : SECTION_",
-"number : SECTION_ '[' number ']'",
-"number : DATE",
-"number : DATE '(' string ')'",
-"number : TIME '(' string ')'",
-"number : DURATION '(' string ')'",
-"number : YEAR '(' number ')'",
-"number : MONTH '(' number ')'",
-"number : DAY '(' number ')'",
-"number : HOUR '(' number ')'",
-"number : MINUTE '(' number ')'",
-"number : SECOND '(' number ')'",
-"number : JULIAN '(' number ')'",
-"number : LEAP '(' number ')'",
-"number : UID",
-"number : GID",
-"number : ACCESS '(' string ',' number ')'",
-};
-#endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-yyparse(void)
-{
- register int yym, yyn, yystate;
-#if YYDEBUG
- register char *yys;
- extern char *getenv();
-
- if (yys = getenv("YYDEBUG"))
- {
- yyn = *yys;
- if (yyn >= '0' && yyn <= '9')
- yydebug = yyn - '0';
- }
-#endif
-
- yynerrs = 0;
- yyerrflag = 0;
- yychar = (-1);
-
- yyssp = yyss;
- yyvsp = yyvs;
- *yyssp = yystate = 0;
-
-yyloop:
- if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("%sdebug: state %d, reading %d (%s)\n",
- YYPREFIX, yystate, yychar, yys);
- }
-#endif
- }
- if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: state %d, shifting to state %d\n",
- YYPREFIX, yystate, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- yychar = (-1);
- if (yyerrflag > 0) --yyerrflag;
- goto yyloop;
- }
- if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
- yyn = yytable[yyn];
- goto yyreduce;
- }
- if (yyerrflag) goto yyinrecovery;
-#ifdef lint
- goto yynewerror;
-#endif
-yynewerror:
- yyerror("syntax error");
-#ifdef lint
- goto yyerrlab;
-#endif
-yyerrlab:
- ++yynerrs;
-yyinrecovery:
- if (yyerrflag < 3)
- {
- yyerrflag = 3;
- for (;;)
- {
- if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
- {
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- goto yyloop;
- }
- else
- {
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: error recovery discarding state %d\n",
- YYPREFIX, *yyssp);
-#endif
- if (yyssp <= yyss) goto yyabort;
- --yyssp;
- --yyvsp;
- }
- }
- }
- else
- {
- if (yychar == 0) goto yyabort;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
- YYPREFIX, yystate, yychar, yys);
- }
-#endif
- yychar = (-1);
- goto yyloop;
- }
-yyreduce:
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: state %d, reducing by rule %d (%s)\n",
- YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
- yym = yylen[yyn];
- yyval = yyvsp[1-yym];
- switch (yyn)
- {
-case 1:
-#line 71 "parser.y"
-{ yyret = yyvsp[0].sval; }
-break;
-case 2:
-#line 74 "parser.y"
-{ yyval.sval = yyvsp[0].sval; }
-break;
-case 3:
-#line 75 "parser.y"
-{ yyval.sval = yyvsp[-1].sval; }
-break;
-case 4:
-#line 76 "parser.y"
-{ yyval.sval = yyvsp[0].sval; f_free(yyvsp[-2].sval); }
-break;
-case 5:
-#line 77 "parser.y"
-{ char *s=yyvsp[-2].sval, *t=yyvsp[0].sval, *r=new
- char[f_len(s)+f_len(t)+1]; *r=0;
- if (s) strcpy(r, s); f_free(s);
- if (t) strcat(r, t); f_free(t);
- yyval.sval = r; }
-break;
-case 6:
-#line 82 "parser.y"
-{ yyval.sval = f_getsvar(yyvsp[0].ival); }
-break;
-case 7:
-#line 83 "parser.y"
-{ int v=yyvsp[-2].ival;
- char *s=f_getsvar(v), *t=yyvsp[0].sval, *r=new
- char[f_len(s)+f_len(t)+1]; *r=0;
- if (s) strcpy(r, s); f_free(s);
- if (t) strcat(r, t); f_free(t);
- yyval.sval = f_setsvar(v, r); }
-break;
-case 8:
-#line 89 "parser.y"
-{ yyval.sval = f_setsvar(yyvsp[-2].ival, yyvsp[0].sval);}
-break;
-case 9:
-#line 90 "parser.y"
-{ yyval.sval = f_str(yyvsp[-1].dval); }
-break;
-case 10:
-#line 91 "parser.y"
-{ yyval.sval = f_num(yyvsp[-4].sval) ? yyvsp[-2].sval : yyvsp[0].sval; }
-break;
-case 11:
-#line 92 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) < 0));}
-break;
-case 12:
-#line 94 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) > 0));}
-break;
-case 13:
-#line 96 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) == 0));}
-break;
-case 14:
-#line 98 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) != 0));}
-break;
-case 15:
-#line 100 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) <= 0));}
-break;
-case 16:
-#line 102 "parser.y"
-{ yyval.sval = f_str((double)
- (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) >= 0));}
-break;
-case 17:
-#line 104 "parser.y"
-{ yyval.sval = f_str((double)f_instr(yyvsp[-2].sval, yyvsp[0].sval));}
-break;
-case 18:
-#line 105 "parser.y"
-{ yyval.sval = f_field(yyvsp[0].ival,database->getrow());}
-break;
-case 19:
-#line 106 "parser.y"
-{ yyval.sval = f_field(yyvsp[-3].ival, (int)yyvsp[-1].dval); }
-break;
-case 20:
-#line 107 "parser.y"
-{ yyval.sval = f_assign(yyvsp[-2].ival,
- database->getrow(), yyvsp[0].sval);
- assigned = 1; }
-break;
-case 21:
-#line 111 "parser.y"
-{ yyval.sval = f_assign(yyvsp[-5].ival, (int)yyvsp[-3].dval, yyvsp[0].sval);
- assigned = 1; }
-break;
-case 22:
-#line 113 "parser.y"
-{ yyval.sval = f_system(yyvsp[-1].sval); }
-break;
-case 23:
-#line 114 "parser.y"
-{ yyval.sval = copystring(getenv(yyvsp[0].sval)); }
-break;
-case 24:
-#line 115 "parser.y"
-{ char *s=yyvsp[-1].sval; if (s) { int n=strlen(s);
- if (n && s[n-1]=='\n') s[n-1] = 0; }
- yyval.sval = s; }
-break;
-case 25:
-#line 118 "parser.y"
-{ yyval.sval = f_tr(yyvsp[-3].sval, yyvsp[-1].sval); }
-break;
-case 26:
-#line 120 "parser.y"
-{ yyval.sval = f_substr(yyvsp[-5].sval, (int)yyvsp[-3].dval, (int)yyvsp[-1].dval);}
-break;
-case 27:
-#line 121 "parser.y"
-{ char s[80]; if (gethostname(s, 80))
- *s=0; s[80-1]=0; yyval.sval = copystring(s);}
-break;
-case 28:
-#line 123 "parser.y"
-{ yyval.sval = copystring(getenv("USER")); }
-break;
-case 29:
-#line 124 "parser.y"
-{ yyval.sval = copystring(prev_form); }
-break;
-case 30:
-#line 125 "parser.y"
-{ yyval.sval = !database ? 0 : copystring(
- sections->at(sections->curr())->name);}
-break;
-case 31:
-#line 127 "parser.y"
-{ yyval.sval = copystring(sections->at(
- f_section((int)yyvsp[-1].dval))->name);}
-break;
-case 32:
-#line 129 "parser.y"
-{ yyval.sval = form && form->name ?
- copystring(resolve_tilde
- (form->memindex,
- form->name, "gf")):0;}
-break;
-case 33:
-#line 133 "parser.y"
-{ yyval.sval = form && form->dbase ?
- copystring(resolve_tilde
- (form->memindex,
- form->dbase,
- form->proc ?
- 0 : "db")) :0;}
-break;
-case 34:
-#line 140 "parser.y"
-{ char *name = yyvsp[-3].sval, *expr = yyvsp[-1].sval;
- f_free(switch_name);
- f_free(switch_expr);
- switch_name = copystring(name);
- switch_expr = copystring(expr);
- f_free(name); f_free(expr); yyval.sval = 0; }
-break;
-case 35:
-#line 146 "parser.y"
-{ f_foreach(0, yyvsp[-1].sval); yyval.sval = 0; }
-break;
-case 36:
-#line 148 "parser.y"
-{ f_foreach(yyvsp[-3].sval, yyvsp[-1].sval); yyval.sval = 0; }
-break;
-case 37:
-#line 149 "parser.y"
-{ yyval.sval = copystring(mktimestring
- (time(0), FALSE)); }
-break;
-case 38:
-#line 151 "parser.y"
-{ yyval.sval = copystring(mkdatestring
- (time(0))); }
-break;
-case 39:
-#line 153 "parser.y"
-{ yyval.sval = copystring(mktimestring
- ((time_t)yyvsp[-1].dval, FALSE)); }
-break;
-case 40:
-#line 155 "parser.y"
-{ yyval.sval = copystring(mkdatestring
- ((time_t)yyvsp[-1].dval)); }
-break;
-case 41:
-#line 157 "parser.y"
-{ yyval.sval = copystring(mktimestring
- ((time_t)yyvsp[-1].dval, TRUE)); }
-break;
-case 42:
-#line 159 "parser.y"
-{ yyval.sval = f_expand(yyvsp[-1].ival,
- database->getrow()); }
-break;
-case 43:
-#line 162 "parser.y"
-{ yyval.sval = f_expand(yyvsp[-4].ival, (int)yyvsp[-2].dval); }
-break;
-case 44:
-#line 163 "parser.y"
-{ yyval.sval = f_printf(yyvsp[-1].aval); }
-break;
-case 45:
-#line 164 "parser.y"
-{ /*<<< XBell(display, 0);*/ yyval.sval = 0; }
-break;
-case 46:
-#line 165 "parser.y"
-{ char *s = f_printf(yyvsp[-1].aval);
- QMessageBox::warning(0, "KGrok", s);
- f_free(s); yyval.sval = 0; }
-break;
-case 47:
-#line 170 "parser.y"
-{ yyval.aval = f_addarg(0, yyvsp[0].sval); }
-break;
-case 48:
-#line 171 "parser.y"
-{ yyval.aval = f_addarg(yyvsp[-2].aval, yyvsp[0].sval); }
-break;
-case 49:
-#line 174 "parser.y"
-{ yyval.dval = yyvsp[0].dval; }
-break;
-case 50:
-#line 175 "parser.y"
-{ yyval.dval = f_num(yyvsp[-1].sval); }
-break;
-case 51:
-#line 176 "parser.y"
-{ yyval.dval = yyvsp[-1].dval; }
-break;
-case 52:
-#line 177 "parser.y"
-{ yyval.dval = f_num(f_field(yyvsp[0].ival,
- database->getrow())); }
-break;
-case 53:
-#line 179 "parser.y"
-{ yyval.dval = f_num(f_field(yyvsp[-3].ival, (int)yyvsp[-1].dval)); }
-break;
-case 54:
-#line 180 "parser.y"
-{ f_free(f_assign(yyvsp[-2].ival, database->
- getrow(), f_str(yyval.dval = yyvsp[0].dval)));
- assigned = 1; }
-break;
-case 55:
-#line 184 "parser.y"
-{ f_free(f_assign(yyvsp[-5].ival, (int)yyvsp[-3].dval,
- f_str(yyval.dval = yyvsp[0].dval))); assigned = 1; }
-break;
-case 56:
-#line 186 "parser.y"
-{ yyval.dval = f_getnvar(yyvsp[0].ival); }
-break;
-case 57:
-#line 187 "parser.y"
-{ yyval.dval = f_setnvar(yyvsp[-2].ival, yyvsp[0].dval); }
-break;
-case 58:
-#line 188 "parser.y"
-{ int v = yyvsp[-2].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)+yyvsp[0].dval); }
-break;
-case 59:
-#line 190 "parser.y"
-{ int v = yyvsp[-2].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)-yyvsp[0].dval); }
-break;
-case 60:
-#line 192 "parser.y"
-{ int v = yyvsp[-2].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)*yyvsp[0].dval); }
-break;
-case 61:
-#line 194 "parser.y"
-{ int v = yyvsp[-2].ival; double d=yyvsp[0].dval; if(d==0)d=1;
- yyval.dval = f_setnvar(v, f_getnvar(v)/d); }
-break;
-case 62:
-#line 196 "parser.y"
-{ int v = yyvsp[-2].ival; double d=yyvsp[0].dval; if(d==0)d=1;
- yyval.dval = f_setnvar(v, (double)((int)
- f_getnvar(v)%(int)d));}
-break;
-case 63:
-#line 199 "parser.y"
-{ int v = yyvsp[-2].ival;
- yyval.dval = f_setnvar(v, (double)((int)yyvsp[0].dval &
- (int)f_getnvar(v)));}
-break;
-case 64:
-#line 202 "parser.y"
-{ int v = yyvsp[-2].ival;
- yyval.dval = f_setnvar(v, (double)((int)yyvsp[0].dval |
- (int)f_getnvar(v)));}
-break;
-case 65:
-#line 205 "parser.y"
-{ int v = yyvsp[-1].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)+1)-1;}
-break;
-case 66:
-#line 207 "parser.y"
-{ int v = yyvsp[-1].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)-1)+1;}
-break;
-case 67:
-#line 209 "parser.y"
-{ int v = yyvsp[0].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)+1); }
-break;
-case 68:
-#line 211 "parser.y"
-{ int v = yyvsp[0].ival;
- yyval.dval = f_setnvar(v, f_getnvar(v)-1); }
-break;
-case 69:
-#line 213 "parser.y"
-{ yyval.dval = - yyvsp[0].dval; }
-break;
-case 70:
-#line 214 "parser.y"
-{ yyval.dval = ! yyvsp[0].dval; }
-break;
-case 71:
-#line 215 "parser.y"
-{ yyval.dval = ~ (int)yyvsp[0].dval; }
-break;
-case 72:
-#line 216 "parser.y"
-{ yyval.dval = (int)yyvsp[-2].dval & (int)yyvsp[0].dval; }
-break;
-case 73:
-#line 217 "parser.y"
-{ yyval.dval = (int)yyvsp[-2].dval ^ (int)yyvsp[0].dval; }
-break;
-case 74:
-#line 218 "parser.y"
-{ yyval.dval = (int)yyvsp[-2].dval | (int)yyvsp[0].dval; }
-break;
-case 75:
-#line 219 "parser.y"
-{ yyval.dval = (int)yyvsp[-2].dval << (int)yyvsp[0].dval; }
-break;
-case 76:
-#line 220 "parser.y"
-{ yyval.dval = (int)yyvsp[-2].dval >> (int)yyvsp[0].dval; }
-break;
-case 77:
-#line 221 "parser.y"
-{ int i=(int)yyvsp[0].dval; if (i==0) i=1;
- yyval.dval = (int)yyvsp[-2].dval % i; }
-break;
-case 78:
-#line 223 "parser.y"
-{ yyval.dval = yyvsp[-2].dval + yyvsp[0].dval; }
-break;
-case 79:
-#line 224 "parser.y"
-{ yyval.dval = yyvsp[-2].dval - yyvsp[0].dval; }
-break;
-case 80:
-#line 225 "parser.y"
-{ yyval.dval = yyvsp[-2].dval * yyvsp[0].dval; }
-break;
-case 81:
-#line 226 "parser.y"
-{ double d=yyvsp[0].dval; if (d==0) d=1;
- yyval.dval = yyvsp[-2].dval / d; }
-break;
-case 82:
-#line 228 "parser.y"
-{ yyval.dval = yyvsp[-2].dval < yyvsp[0].dval; }
-break;
-case 83:
-#line 229 "parser.y"
-{ yyval.dval = yyvsp[-2].dval > yyvsp[0].dval; }
-break;
-case 84:
-#line 230 "parser.y"
-{ yyval.dval = yyvsp[-2].dval == yyvsp[0].dval; }
-break;
-case 85:
-#line 231 "parser.y"
-{ yyval.dval = yyvsp[-2].dval != yyvsp[0].dval; }
-break;
-case 86:
-#line 232 "parser.y"
-{ yyval.dval = yyvsp[-2].dval <= yyvsp[0].dval; }
-break;
-case 87:
-#line 233 "parser.y"
-{ yyval.dval = yyvsp[-2].dval >= yyvsp[0].dval; }
-break;
-case 88:
-#line 234 "parser.y"
-{ yyval.dval = yyvsp[-2].dval && yyvsp[0].dval; }
-break;
-case 89:
-#line 235 "parser.y"
-{ yyval.dval = yyvsp[-2].dval || yyvsp[0].dval; }
-break;
-case 90:
-#line 236 "parser.y"
-{ yyval.dval = yyvsp[-4].dval ? yyvsp[-2].dval : yyvsp[0].dval; }
-break;
-case 91:
-#line 237 "parser.y"
-{ yyval.dval = yyvsp[0].dval; }
-break;
-case 92:
-#line 238 "parser.y"
-{ yyval.dval = database->getrow() > 0 ?
- database->getrow() : 0; }
-break;
-case 93:
-#line 240 "parser.y"
-{ yyval.dval = database ?
- database->rowcount() - 1 : -1; }
-break;
-case 94:
-#line 242 "parser.y"
-{ /*<<<$$ = database && card->disprow >= 0
- && card->disprow <
- database->rowcount()
- ? card->disprow : -1; <<<*/ }
-break;
-case 95:
-#line 246 "parser.y"
-{ yyval.dval = f_avg(yyvsp[-1].ival); }
-break;
-case 96:
-#line 247 "parser.y"
-{ yyval.dval = f_dev(yyvsp[-1].ival); }
-break;
-case 97:
-#line 248 "parser.y"
-{ yyval.dval = f_min(yyvsp[-1].ival); }
-break;
-case 98:
-#line 249 "parser.y"
-{ yyval.dval = f_max(yyvsp[-1].ival); }
-break;
-case 99:
-#line 250 "parser.y"
-{ yyval.dval = f_sum(yyvsp[-1].ival); }
-break;
-case 100:
-#line 251 "parser.y"
-{ yyval.dval = f_qavg(yyvsp[-1].ival); }
-break;
-case 101:
-#line 252 "parser.y"
-{ yyval.dval = f_qdev(yyvsp[-1].ival); }
-break;
-case 102:
-#line 253 "parser.y"
-{ yyval.dval = f_qmin(yyvsp[-1].ival); }
-break;
-case 103:
-#line 254 "parser.y"
-{ yyval.dval = f_qmax(yyvsp[-1].ival); }
-break;
-case 104:
-#line 255 "parser.y"
-{ yyval.dval = f_qsum(yyvsp[-1].ival); }
-break;
-case 105:
-#line 256 "parser.y"
-{ yyval.dval = f_savg(yyvsp[-1].ival); }
-break;
-case 106:
-#line 257 "parser.y"
-{ yyval.dval = f_sdev(yyvsp[-1].ival); }
-break;
-case 107:
-#line 258 "parser.y"
-{ yyval.dval = f_smin(yyvsp[-1].ival); }
-break;
-case 108:
-#line 259 "parser.y"
-{ yyval.dval = f_smax(yyvsp[-1].ival); }
-break;
-case 109:
-#line 260 "parser.y"
-{ yyval.dval = f_ssum(yyvsp[-1].ival); }
-break;
-case 110:
-#line 261 "parser.y"
-{ yyval.dval = fabs(yyvsp[-1].dval); }
-break;
-case 111:
-#line 262 "parser.y"
-{ yyval.dval = (int)(yyvsp[-1].dval); }
-break;
-case 112:
-#line 264 "parser.y"
-{ register double a=yyvsp[-5].dval, b=yyvsp[-3].dval, c=yyvsp[-1].dval;
- yyval.dval = a < b ? b : a > c ? c : a; }
-break;
-case 113:
-#line 266 "parser.y"
-{ char *a=yyvsp[-1].sval; yyval.dval = a ? f_len(a) : 0;
- f_free(a); }
-break;
-case 114:
-#line 268 "parser.y"
-{ yyval.dval = sqrt(fabs(yyvsp[-1].dval)); }
-break;
-case 115:
-#line 269 "parser.y"
-{ yyval.dval = exp(yyvsp[-1].dval); }
-break;
-case 116:
-#line 270 "parser.y"
-{ double a=yyvsp[-1].dval; yyval.dval = a<=0 ? 0:log10(a);}
-break;
-case 117:
-#line 271 "parser.y"
-{ double a=yyvsp[-1].dval; yyval.dval = a<=0 ? 0:log(a); }
-break;
-case 118:
-#line 273 "parser.y"
-{ yyval.dval = pow(yyvsp[-3].dval, yyvsp[-1].dval); }
-break;
-case 119:
-#line 274 "parser.y"
-{ yyval.dval = drand48(); }
-break;
-case 120:
-#line 275 "parser.y"
-{ yyval.dval = sin(yyvsp[-1].dval); }
-break;
-case 121:
-#line 276 "parser.y"
-{ yyval.dval = cos(yyvsp[-1].dval); }
-break;
-case 122:
-#line 277 "parser.y"
-{ yyval.dval = tan(yyvsp[-1].dval); }
-break;
-case 123:
-#line 278 "parser.y"
-{ yyval.dval = asin(yyvsp[-1].dval); }
-break;
-case 124:
-#line 279 "parser.y"
-{ yyval.dval = acos(yyvsp[-1].dval); }
-break;
-case 125:
-#line 280 "parser.y"
-{ yyval.dval = atan(yyvsp[-1].dval); }
-break;
-case 126:
-#line 282 "parser.y"
-{ yyval.dval = atan2(yyvsp[-3].dval, yyvsp[-1].dval); }
-break;
-case 127:
-#line 283 "parser.y"
-{ yyval.dval = database ? sections->curr() :0;}
-break;
-case 128:
-#line 284 "parser.y"
-{ yyval.dval = f_section((int)yyvsp[-1].dval); }
-break;
-case 129:
-#line 285 "parser.y"
-{ yyval.dval = time(0); }
-break;
-case 130:
-#line 286 "parser.y"
-{ yyval.dval = parse_datetimestring(yyvsp[-1].sval); }
-break;
-case 131:
-#line 287 "parser.y"
-{ yyval.dval = parse_timestring(yyvsp[-1].sval, FALSE); }
-break;
-case 132:
-#line 288 "parser.y"
-{ yyval.dval = parse_timestring(yyvsp[-1].sval, TRUE); }
-break;
-case 133:
-#line 289 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_year; }
-break;
-case 134:
-#line 291 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_mon+1; }
-break;
-case 135:
-#line 293 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_mday; }
-break;
-case 136:
-#line 295 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_hour; }
-break;
-case 137:
-#line 297 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_min; }
-break;
-case 138:
-#line 299 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_sec; }
-break;
-case 139:
-#line 301 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- yyval.dval = localtime(&t)->tm_yday; }
-break;
-case 140:
-#line 303 "parser.y"
-{ const time_t t = (time_t)yyvsp[-1].dval;
- int y=localtime(&t)->tm_year;
- yyval.dval = !(y%4) ^ !(y%100) ^ !(y%400); }
-break;
-case 141:
-#line 306 "parser.y"
-{ yyval.dval = getuid(); }
-break;
-case 142:
-#line 307 "parser.y"
-{ yyval.dval = getgid(); }
-break;
-case 143:
-#line 309 "parser.y"
-{ char *a = yyvsp[-3].sval;
- yyval.dval = a ? access(a, (int)yyvsp[-1].dval) : 0;
- f_free(a); }
-break;
-#line 1993 "y.tab.c"
- }
- yyssp -= yym;
- yystate = *yyssp;
- yyvsp -= yym;
- yym = yylhs[yyn];
- if (yystate == 0 && yym == 0)
- {
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
- yystate = YYFINAL;
- *++yyssp = YYFINAL;
- *++yyvsp = yyval;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("%sdebug: state %d, reading %d (%s)\n",
- YYPREFIX, YYFINAL, yychar, yys);
- }
-#endif
- }
- if (yychar == 0) goto yyaccept;
- goto yyloop;
- }
- if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
- yystate = yytable[yyn];
- else
- yystate = yydgoto[yym];
-#if YYDEBUG
- if (yydebug)
- printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate;
- *++yyvsp = yyval;
- goto yyloop;
-yyoverflow:
- yyerror("yacc stack overflow");
-yyabort:
- return (1);
-yyaccept:
- return (0);
-}
+++ /dev/null
-#define NUMBER 257
-#define STRING 258
-#define SYMBOL 259
-#define FIELD 260
-#define VAR 261
-#define EQ 262
-#define NEQ 263
-#define LE 264
-#define GE 265
-#define SHR 266
-#define SHL 267
-#define AND 268
-#define OR 269
-#define IN 270
-#define PLA 271
-#define MIA 272
-#define MUA 273
-#define MOA 274
-#define DVA 275
-#define ANA 276
-#define ORA 277
-#define INC 278
-#define DEC_ 279
-#define APP 280
-#define AVG 281
-#define DEV 282
-#define AMIN 283
-#define AMAX 284
-#define SUM 285
-#define QAVG 286
-#define QDEV 287
-#define QMIN_ 288
-#define QMAX_ 289
-#define QSUM 290
-#define SAVG 291
-#define SDEV 292
-#define SMIN 293
-#define SMAX 294
-#define SSUM 295
-#define ABS 296
-#define INT 297
-#define BOUND 298
-#define LEN 299
-#define CHOP 300
-#define TR 301
-#define SUBSTR 302
-#define SQRT 303
-#define EXP 304
-#define LOG 305
-#define LN 306
-#define POW 307
-#define RANDOM 308
-#define SIN 309
-#define COS 310
-#define TAN 311
-#define ASIN 312
-#define ACOS 313
-#define ATAN 314
-#define ATAN2 315
-#define DATE 316
-#define TIME 317
-#define DURATION 318
-#define EXPAND 319
-#define YEAR 320
-#define MONTH 321
-#define DAY 322
-#define HOUR 323
-#define MINUTE 324
-#define SECOND 325
-#define LEAP 326
-#define JULIAN 327
-#define SECTION_ 328
-#define DBASE_ 329
-#define FORM_ 330
-#define PREVFORM 331
-#define SWITCH 332
-#define THIS 333
-#define LAST 334
-#define DISP 335
-#define FOREACH 336
-#define HOST 337
-#define USER 338
-#define UID 339
-#define GID 340
-#define SYSTEM 341
-#define ACCESS 342
-#define BEEP 343
-#define ERROR 344
-#define PRINTF 345
-#define UMINUS 346
-typedef union { int ival; double dval; char *sval; Arg *aval; } YYSTYPE;
-extern YYSTYPE parserlval;
+++ /dev/null
-DESCRIPTION = "Palmtop Data Manager \
-KGrok is a shared flatfile database visualization engine. Simple application \
-scripts turn it into a phone list, todo list, notepad, and others. Encryption \
-optionally secures personal data."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>"
-HOMEPAGE = "http://www.bitrot.de/pda_kgrok.html"
-APPNAME = "kgrok"
-APPTYPE = "binary"
-APPDESKTOP = "${S}/apps/KGrok"
-
-SRC_URI = "ftp://ftp.bitrot.de/pub/kgrok/kgrok-src_1.5.tar.gz \
- file://parser_yacc.* \
- file://mediabutton.patch;patch=1"
-S = "${WORKDIR}/src/"
-
-inherit opie
-
-EXTRA_QMAKEVARS_POST += "DEFINES+=ORDER_DCBA YACCSOURCES= SOURCES+=parser_yacc.cpp"
-QMAKE_PROFILES = "src.pro"
-
-do_configure_prepend() {
- cd ${S} && qmake -project
-}
-
-do_compile_prepend() {
- install -m 0655 ${WORKDIR}/parser_yacc.* ${S}
-}
-
-do_install () {
- install -d ${D}/${palmtopdir}/pics/
- install -m 0644 src/temtor.png ${D}/${palmtopdir}/pics/
-}
-
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- lftp-2.6.11/m4/pty.m4~pty
-+++ lftp-2.6.11/m4/pty.m4
-@@ -4,14 +4,20 @@
- *-*-sco3.2v4*) no_dev_ptmx=1;;
- *-*-sco3.2v5*) no_dev_ptmx=1;;
- esac
-+AC_SEARCH_LIBS(openpty,util,
-+ [
-+ AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])
-+ no_dev_ptc=yes
-+ no_dev_ptmx=yes
-+ ])
-+AC_CHECK_FUNCS([_getpty])
- if test -z "$no_dev_ptmx" ; then
- AC_CHECK_FILE("/dev/ptmx", [
- AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])])
- fi
-+if test -z "$no_dev_ptc" ; then
- AC_CHECK_FILE("/dev/ptc", [
- AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])])
-+fi
- AC_CHECK_HEADERS([util.h sys/stropts.h pty.h])
--AC_SEARCH_LIBS(openpty,util,
-- [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])])
--AC_CHECK_FUNCS([_getpty])
- ])
+++ /dev/null
-DESCRIPTION = "lftp is a sophisticated command line based file \
-transfer program. Supported protocols include FTP, HTTP, and FISH."
-HOMEPAGE = "http://lftp.yar.ru"
-SECTION = "console/network"
-DEPENDS = "readline"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-${PV}.tar.bz2 \
- file://pty.patch;patch=1"
-S = "${WORKDIR}/lftp-${PV}"
-
-EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
-
-inherit autotools gettext
-
-PARALLEL_MAKE = ""
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
-
+++ /dev/null
-LICENSE = "LGPL"
-
-DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmutil0 openssl"
-
-inherit autotools
-
-SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz"
-S="${WORKDIR}/libmikey-${PV}"
-
-
-
-FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
-
-do_stage() {
- oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmikey
- install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
-}
+++ /dev/null
-LICENSE = "GPL"
-DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol."
-HOMEPAGE = "http://minisip.org/libmikey"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "openssl"
-
-SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz"
-S = "${WORKDIR}/libmikey-0.1"
-
-inherit autotools
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
-
-do_stage() {
- oe_libinstall -so libmikey ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmikey
- install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/
-}
+++ /dev/null
-LICENSE = "LGPL"
-
-DESCRIPTION = "Networking class library for C++ programming"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmutil0 openssl"
-
-inherit autotools
-
-SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz"
-S="${WORKDIR}/libmnetutil-${PV}"
-
-
-
-FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
-
-do_stage() {
- oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmnetutil
- install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
-}
+++ /dev/null
-LICENSE = "LGPL"
-
-DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmnetutil0 libmutil0"
-
-inherit autotools
-
-SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz"
-S="${WORKDIR}/libmsip-${PV}"
-
-
-
-FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
-
-do_stage() {
- oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmsip
- install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
-}
SRC_URI = "${SOURCEFORGE_MIRROR}/lufs/lufs-${PV}.tar.gz"
S = "${WORKDIR}/lufs-${PV}"
-inherit autotools
+inherit autotools module
-KERNEL_VERSION = "`cat ${STAGING_DIR}/target/kernel/kernel-version`"
-KERNEL_SOURCE = "`cat ${STAGING_DIR}/target/kernel/kernel-source`"
-KERNEL_PATH = "${STAGING_DIR}/target/kernel"
+KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"
+KERNEL_PATH = "${STAGING_KERNEL_DIR}"
-EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_DIR}/target/kernel/include"
+EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_KERNEL_DIR}/include"
+++ /dev/null
-DESCRIPTION = "LZMA is a compression algorithm, based on the famous \
-Lempel Ziff compression method. The windows only open source tool 7-zip \
-is another tool which uses this algorithm."
-SECTION = "libs"
-PRIORITY = "optional"
-
-SRC_URI = "http://students.fhs-hagenberg.ac.at/se/se00001/lzma-0.01.tar.bz2"
-S = "${WORKDIR}/"
-
-inherit qmake
-
-do_configure_prepend() {
- ${STAGING_BINDIR_NATIVE}/qmake -project -o lzma.pro
-}
-
-do_install_append () {
- # Make install doesn't properly install these
- oe_libinstall -so -C shlib libhistory ${D}/${libdir}
- oe_libinstall -so -C shlib libreadline ${D}/${libdir}
-}
-
-do_stage() {
- oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
- oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/readline
- for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \
- rlconf.h rltypedefs.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/readline/
- done
-
-}
+++ /dev/null
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-
-DESCRIPTION = "SIP user agent, with focus on security"
-DEPENDS = "libglademm libmsip0 libmikey0"
-SRC_URI = "http://www.minisip.org/snapshots/minisip-${PV}.tar.gz"
-
-
-FILES_${PN} += "${datadir}/minisip"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-ipaq"
-
-do_install_append () {
- install -d ${D}${datadir}/pixmaps
- install -d ${D}${datadir}/applications
- install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
- install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
-}
+++ /dev/null
-/* per-machine configuration. this file is automatically generated. */
-
-#ifndef _ODE_CONFIG_H_
-#define _ODE_CONFIG_H_
-
-/* standard system headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-#include <malloc.h>
-#include <alloca.h>
-#include <values.h>
-#include <float.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* is this a pentium on a gcc-based platform? */
-#undef PENTIUM
-
-/* integer types (we assume int >= 32 bits) */
-typedef char int8;
-typedef unsigned char uint8;
-typedef short int16;
-typedef unsigned short uint16;
-typedef int int32;
-typedef unsigned int uint32;
-
-/* an integer type that we can safely cast a pointer to and
- * from without loss of bits.
- */
-typedef unsigned int intP;
-
-/* select the base floating point type */
-#define dDOUBLE 1
-
-/* the floating point infinity */
-#define dInfinity DBL_MAX
-
-/* available functions */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+++ /dev/null
-DESCRIPTION = "ODE is an Open Source Physics Engine."
-SECTION = "libs"
-HOMEPAGE = "http://www.ode.org"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
- file://config.h"
-
-inherit autotools
-
-#do_configure() {
-# touch configurator.exe
-# chmod a+rx configurator.exe
-# install -m 0644 ${WORKDIR}/config.h include/ode/
-#}
-
-#do_compile() {
-# oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
-#}
-
-#do_stage() {
-# install -d ${STAGING_INCDIR}/ode/
-# install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
-# oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
-#}
-
-#do_install() {
-# :
-#}
if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi
oe_runmake $CONFIG
- oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all
+ oe_runmake MWDIR=${STAGING_DIR_TARGET} "TARGET_CROSS=${TARGET_PREFIX}" all
}
do_install() {
+++ /dev/null
-DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \
-tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \
-processing, date/time processing and web site programming."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "EGENIX"
-SRCNAME = "egenix-mx-base"
-PR = "r1"
-
-SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \
- file://gcc4.patch;patch=1"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}"
-export LIB = "${STAGING_LIBDIR}"
-
-FILES_${PN} += "${datadir}"
- self.prefix = self.get_gsl_info('--prefix').strip()
- self.cflags = self.get_gsl_info('--cflags').strip()
-+ self.prefix = os.getenv( "STAGING" )+"/target"
-+ self.cflags = self.get_gsl_info('--cflags').strip() + " -I%s/python2.3/include" % os.getenv( "STAGING" )
++ self.prefix = os.getenv( "STAGING_DIR" )+"/target"
++ self.cflags = self.get_gsl_info('--cflags').strip() + " -I%s/python2.5/include" % os.getenv( "STAGING_DIR" )
self.libs = self.get_gsl_info('--libs').strip()
self.version = self._split_version(self.get_gsl_info('--version').strip())
inherit distutils
-export STAGING=${STAGING_DIR}
+export STAGING_DIR := "${STAGING_DIR}"
+++ /dev/null
---- M2Crypto/SSL/Connection.py.org Wed Mar 31 08:49:57 2004
-+++ M2Crypto/SSL/Connection.py Wed Mar 31 08:50:45 2004
-@@ -143,11 +143,11 @@
- """Set this connection's underlying socket to _mode_."""
- self.socket.setblocking(mode)
- if mode:
-- self.send = self.write = self._write_bio
-- self.recv = self.read = self._read_bio
-+ self.send = self.write = Connection._write_bio
-+ self.recv = self.read = Connection._read_bio
- else:
-- self.send = self.write = self._write_nbio
-- self.recv = self.read = self._read_nbio
-+ self.send = self.write = Connection._write_nbio
-+ self.recv = self.read = Connection._read_nbio
-
- def fileno(self):
- return self.socket.fileno()
---- M2Crypto/DSA.py.org Wed Mar 31 08:53:16 2004
-+++ M2Crypto/DSA.py Wed Mar 31 08:53:35 2004
-@@ -35,7 +35,7 @@
-
- def __getattr__(self, name):
- if name in ['p', 'q', 'g', 'pub', 'priv']:
-- method = getattr(m2, 'm2.dsa_get_%s' % (name,))
-+ method = getattr(m2, 'dsa_get_%s' % (name,))
- assert m2.dsa_type_check(self.dsa), "'dsa' type error"
- return method(self.dsa)
- else:
---- M2Crypto/_version.py.org Wed Mar 31 12:25:21 2004
-+++ M2Crypto/_version.py Wed Mar 31 12:24:18 2004
-@@ -1,8 +1,8 @@
- """M2Crypto Version Info"""
-
--RCS_id='$Id: _version.py,v 1.2 2004/03/25 06:33:29 ngps Exp $'
-+RCS_id='$Id: _version.py,v 1.3 2004/03/31 01:30:58 ngps Exp $'
-
- import string
--version_info = (0, 13)
-+version_info = (0, 13, 1)
- version = string.join(map(lambda x: "%s" % x, version_info), ".")
-
+++ /dev/null
-DESCRIPTION = "A Python crypto and SSL toolkit"
-SECTION = "devel/python"
-PRIORITY = "optional"
-DEPENDS = "openssl swig-native"
-LICENSE = "BSD"
-SRCNAME = "M2Crypto"
-
-SRC_URI = "http://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip \
- file://0.13p1.patch;patch=1;pnum=0"
-S = "${WORKDIR}/m2crypto-0.13"
-
-inherit distutils
-
+++ /dev/null
-DESCRIPTION = "Python Packet Capture Library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-RDEPENDS = "python-core"
-DEPENDS = "libpcap-0.7.2 libnet-1.1.1"
-SRCNAME = "pycap"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
+++ /dev/null
-DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \
-an open-source physics engine. PyODE also includes an XODE parser."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "ode"
-SRCNAME = "PyODE"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-do_configure_prepend() {
- ln -s ${STAGING_LIBDIR}/.. ../ode
-}
-
+++ /dev/null
---- xc/programs/xterm/util.c.orig 2003-03-18 00:24:46.000000000 +0000
-+++ xc/programs/xterm/util.c 2003-03-18 00:21:37.000000000 +0000
-@@ -1336,7 +1336,7 @@
- }
- #endif
- ReverseOldColors();
-- update_reversevideo();
-+ // update_reversevideo();
- }
-
- void
-@@ -2111,10 +2111,12 @@
- {
-+ /*
- update_delete_del();
- update_old_fkeys();
- update_hp_fkeys();
- update_sco_fkeys();
- update_sun_fkeys();
- update_sun_kbd();
-+ */
- }
-
- void
-@@ -2145,8 +2147,8 @@
- }
-
- if (save != term->keyboard.type) {
-- update_keyboard_type();
-- }
-+ //update_keyboard_type();
-+ }
- }
-
- void
+++ /dev/null
-#define KDriveXServer YES
-#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension -fexpensive-optimizations -fomit-frame-pointer -O2 -march=armv4 -mtune=xscale -mapcs-32
-#define TinyXServer YES
-#define CrossCompiling YES
-#define TouchScreen YES
-#define ItsyCompilerBug YES
-#undef BuildRandR
-#define BuildRandR YES
-#define BuildXInputLib YES
-#define ProjectRoot /usr/X11R6
-#define Freetype2Dir $(TOP)/extras/freetype2
-#define Freetype2LibDir $(TOP)/exports/lib
-#define BuildXTrueType YES
-#define BuildScreenSaverExt YES
-#define BuildScreenSaverLibrary YES
-#define SharedLibXss YES
-#define ServerXdmcpDefines
-#define XfbdevServer YES
-#define HasTsLib YES
-#define BuildXResExt YES
-#define XResExtension YES
-#define BuildXcursorgen NO
+++ /dev/null
---- xc/programs/Xserver/hw/kdrive/linux/keyboard.c.orig 2001-11-08 10:26:24.000000000 +0000
-+++ xc/programs/Xserver/hw/kdrive/linux/keyboard.c 2003-03-11 21:13:09.000000000 +0000
-@@ -397,12 +397,13 @@
- static struct termios LinuxTermios;
- static int LinuxKbdType;
-
--void
-+int
- LinuxKeyboardEnable (int fd, void *closure)
- {
- struct termios nTty;
- unsigned char buf[256];
- int n;
-+ int fd_orig_flags;
-
- ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
- tcgetattr (fd, &LinuxTermios);
-@@ -420,9 +421,18 @@
- tcsetattr(fd, TCSANOW, &nTty);
- /*
- * Flush any pending keystrokes
-+ *
-+ * Also set to nonblock, just to be safe
- */
-+ fd_orig_flags = fcntl( fd , F_GETFL, 0 );
-+ fcntl ( fd, F_SETFL, fd_orig_flags | O_NONBLOCK );
-+
- while ((n = read (fd, buf, sizeof (buf))) > 0)
-- ;
-+ ;
-+
-+ fcntl ( fd , F_SETFL, fd_orig_flags );
-+
-+ return fd;
- }
-
- void
+++ /dev/null
---- xc/programs/Xserver/hw/kdrive/linux/tslib.c.orig 2002-11-05 05:28:06.000000000 +0000
-+++ xc/programs/Xserver/hw/kdrive/linux/tslib.c 2003-03-11 21:11:37.000000000 +0000
-@@ -119,6 +119,29 @@
- int TsInputType;
-
- int
-+TslibEnable (int not_needed_fd, void *closure)
-+{
-+ KdMouseInfo *mi = closure;
-+ int fd = 0;
-+
-+ if(!(tsDev = ts_open(mi->name, 0))) {
-+ fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name );
-+ return -1; /* XXX Not sure what to return here */
-+ }
-+
-+ ts_config(tsDev);
-+ fd=ts_fd(tsDev);
-+
-+ return fd;
-+}
-+
-+void
-+TslibDisable (int fd, void *closure)
-+{
-+ ts_close(tsDev);
-+}
-+
-+int
- TslibInit (void)
- {
- int i;
-@@ -128,7 +151,7 @@
-
- if (!TsInputType)
- TsInputType = KdAllocInputType ();
--
-+
- for (mi = kdMouseInfo; mi; mi = next)
- {
- next = mi->next;
-@@ -148,14 +171,25 @@
- break;
- }
- }
-+ } else {
-+
-+ if(!(tsDev = ts_open(mi->name,0)))
-+ continue;
-+ ts_config(tsDev);
-+ fd=ts_fd(tsDev);
-+
- }
-
- if (fd > 0 && tsDev != 0)
- {
- mi->driver = (void *) fd;
- mi->inputType = TsInputType;
-- if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
-- n++;
-+ if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
-+ n++;
-+
-+ /* Set callbacks for vt switches etc */
-+ KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable);
-+
- }
- else
- if (fd > 0) close(fd);
+++ /dev/null
-SECTION = "base"
-PRIORITY = "required"
-DEPENDS = "zlib tslib ncurses"
-
-SRC_URI = "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz;"
-SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz;"
-SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;"
-SRC_URI_append =" file://${FILESDIR}/tinyx-kbd-enable-fix.patch;patch=1"
-SRC_URI_append =" file://${FILESDIR}/tinyx-tslib-reset-and-vt-switch-fixes.patch;patch=1"
-SRC_URI_append =" file://${FILESDIR}/dirty-3.2-xterm-breakage-fix.patch;patch=1"
-
-S = "${WORKDIR}/xc"
-
-
-do_configure() {
- rm -fr ${WORKDIR}/XXcompiler;
- mkdir -p ${WORKDIR}/XXcompiler
- pushd ./
- cd ${CROSS_DIR}/bin/;
- echo ${CC}
- for i in *; do
- echo " linking ${WORKDIR}/XXcompiler/$i to $i";
- ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ;
- toolname=`echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
- echo `echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
- echo " linking ${WORKDIR}/XXcompiler/$i to $toolname";
- ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname;
- done
- echo "#!/bin/sh" > ${WORKDIR}/XXcompiler/cc
- echo "${CC} \$*" >> ${WORKDIR}/XXcompiler/cc
- chmod 755 ${WORKDIR}/XXcompiler/cc
- popd ;
-
-
-}
-
-XCURSORGEN=/usr/local/X11R6/bin/xcursorgen
-EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
- CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \
- EXTRA_LDOPTIONS='${LDFLAGS}' \
- EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' "
-do_compile() {
- sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def;
-
- oe_runmake World
-
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-
-}
+++ /dev/null
-SECTION = "x11/base"
-require libx11_${PV}.bb
-
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
- file://xim.patch;patch=1"
-
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-PRIORITY = "optional"
-DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-DESCRIPTION = "Base X libs."
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-PR = "r4"
-
-SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
- file://errordb-keysymdb-path-fix.patch;patch=1 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit autotools pkgconfig
-
-do_compile() {
- (
- unset CC LD CXX CCLD
-# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
- )
- oe_runmake
-}
-
-do_stage() {
- install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
- install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
- install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
- install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
- install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
- install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
- install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
- install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
- install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
-
- oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-DEPENDS = "xproto"
-PROVIDES = "xau"
-DESCRIPTION = "Authorization Protocol for X."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXau-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-DESCRIPTION = "X Cursor library"
-DEPENDS = "libxfixes"
-PR = "r2"
-
-SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXcursor-${PV}"
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE= "MIT"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-PR = "r1"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-# "+" is missing due to bug in Familiar
-PV = "0.0cvs${SRCDATE}"
-PR = "r1"
-LICENSE= "MIT"
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto virtual/libx11 xextensions"
-PROVIDES = "xext"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
-S = "${WORKDIR}/Xext"
-
-inherit autotools pkgconfig
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "virtual/libx11 fixesext"
-DESCRIPTION = "X Fixes extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXfixes-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-PROVIDES = "xft"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXft-${PV}"
-
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
-python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_${PN}', 'libxft2', d)
- bb.build.exec_func('package_do_package', d)
-}
-
+++ /dev/null
-SECTION = "libs"
-DEPENDS = "renderext virtual/libx11"
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXrender-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DESCRIPTION = "various extension headers."
-
-SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2"
-S = "${WORKDIR}/xextensions-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "MIT"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
-S = "${WORKDIR}/libXtrans-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
--- /dev/null
+Index: gaim/src/gtkblist.c
+===================================================================
+--- gaim.orig/src/gtkblist.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200
+@@ -873,16 +873,23 @@
+ void
+ gaim_gtk_blist_joinchat_show(void)
+ {
+- GtkWidget *hbox, *vbox;
++ GtkWidget *vbox;
+ GtkWidget *rowbox;
+ GtkWidget *label;
++ GtkWidget *pri_label;
+ GaimGtkBuddyList *gtkblist;
++ GtkWidget *sw;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img = NULL;
++#endif
+ GaimGtkJoinChatData *data = NULL;
+
+ gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
++#if ICONS_IN_DIALOGS
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
++#endif
+ data = g_new0(GaimGtkJoinChatData, 1);
+
+ data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
+@@ -897,6 +904,7 @@
+ GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE);
+ gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
+
++#if ICONS_IN_DIALOGS
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+@@ -905,6 +913,9 @@
+ vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
+ gtk_container_add(GTK_CONTAINER(hbox), vbox);
++#else
++ vbox = GTK_DIALOG(data->window)->vbox;
++#endif
+
+ label = gtk_label_new(_("Please enter the appropriate information "
+ "about the chat you would like to join.\n"));
+@@ -4304,9 +4315,13 @@
+ {
+ GtkWidget *table;
+ GtkWidget *label;
++ GtkWidget *pri_label;
+ GtkWidget *hbox;
+ GtkWidget *vbox;
++ GtkWidget *sw;
++#if ICONS_IN_DIALOGS
+ GtkWidget *img;
++#endif
+ GaimGtkBuddyList *gtkblist;
+ GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1);
+
+@@ -4315,8 +4330,10 @@
+ ? account
+ : gaim_connection_get_account(gaim_connections_get_all()->data));
+
++#if ICONS_IN_DIALOGS
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
++#endif
+
+ gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
+@@ -4335,6 +4352,7 @@
+ gtk_window_set_type_hint(GTK_WINDOW(data->window),
+ GDK_WINDOW_TYPE_HINT_DIALOG);
+
++#if ICONS_IN_DIALOGS
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+@@ -4342,6 +4360,9 @@
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(hbox), vbox);
++#else
++ vbox = GTK_DIALOG(data->window)->vbox;
++#endif
+
+ label = gtk_label_new(
+ _("Please enter the screen name of the person you would like "
+@@ -4663,10 +4684,14 @@
+ GList *l;
+ GaimConnection *gc;
+ GtkWidget *label;
++ GtkWidget *pri_label;
+ GtkWidget *rowbox;
+- GtkWidget *hbox;
+ GtkWidget *vbox;
++ GtkWidget *sw;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+
+ if (account != NULL) {
+ gc = gaim_account_get_connection(account);
+@@ -4698,8 +4723,10 @@
+ data->account = account;
+ data->default_chat_name = g_strdup(name);
+
++#if ICONS_IN_DIALOGS
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
++#endif
+
+ gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
+@@ -4720,6 +4747,7 @@
+ gtk_window_set_type_hint(GTK_WINDOW(data->window),
+ GDK_WINDOW_TYPE_HINT_DIALOG);
+
++#if ICONS_IN_DIALOGS
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+@@ -4727,6 +4755,9 @@
+
+ vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_add(GTK_CONTAINER(hbox), vbox);
++#else
++ vbox = GTK_DIALOG(data->window)->vbox;
++#endif
+
+ label = gtk_label_new(
+ _("Please enter an alias, and the appropriate information "
+Index: gaim/src/gtkconn.c
+===================================================================
+--- gaim.orig/src/gtkconn.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkconn.c 2005-08-19 23:27:18.000000000 +0200
+@@ -371,7 +371,10 @@
+
+ /* Build the window if it isn't there yet */
+ if (!disconnect_window) {
+- GtkWidget *hbox, *vbox, *img;
++ GtkWidget *hbox, *vbox;
++ #if ICONS_IN_DIALOGS
++ GtkWidget *img;
++ #endif
+ GtkCellRenderer *rend, *rend2;
+
+ disconnect_window = g_new0(struct disconnect_window, 1);
+@@ -384,6 +387,7 @@
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE);
+
++#if ICONS_IN_DIALOGS
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox);
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+@@ -392,6 +396,9 @@
+
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
++#else
++ vbox = GTK_DIALOG(disconnect_window->window)->vbox;
++#endif
+
+ disconnect_window->label = gtk_label_new(label_text);
+
+Index: gaim/src/gtkconv.c
+===================================================================
+--- gaim.orig/src/gtkconv.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkconv.c 2005-08-19 23:27:18.000000000 +0200
+@@ -847,10 +847,12 @@
+ GtkWidget *label;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *table;
++#if ICONS_IN_DIALOGS
+ GtkWidget *img;
+
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
++#endif
+
+ info = g_new0(InviteBuddyInfo, 1);
+ info->conv = conv;
+@@ -880,6 +882,7 @@
+ gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the inner hbox and put the dialog's icon in it. */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(vbox), hbox);
+@@ -889,6 +892,7 @@
+ /* Setup the right vbox. */
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(hbox), vbox);
++#endif
+
+ /* Put our happy label in it. */
+ label = gtk_label_new(_("Please enter the name of the user you wish "
+@@ -1107,8 +1111,10 @@
+ GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
+ GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+ GtkWidget *hbox;
++#if ICONS_IN_DIALOGS
+ GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
++#endif
+ GtkWidget *label;
+ struct _search *s;
+
+@@ -1139,9 +1145,11 @@
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
+ hbox);
++#if ICONS_IN_DIALOGS
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+
+ gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
++#endif
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search),
+ GTK_RESPONSE_OK, FALSE);
+
+Index: gaim/src/gtkdebug.c
+===================================================================
+--- gaim.orig/src/gtkdebug.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200
+@@ -149,7 +149,10 @@
+ static void
+ find_cb(GtkWidget *w, DebugWindow *win)
+ {
+- GtkWidget *hbox, *img, *label;
++ GtkWidget *hbox, *label;
++#if ICONS_IN_DIALOGS
++ GtkWidget *img;
++#endif
+ struct _find *f;
+
+ if(win->find)
+@@ -179,11 +182,13 @@
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
+ hbox);
++#if ICONS_IN_DIALOGS
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+
+ gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
++#endif
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find),
+ GTK_RESPONSE_OK, FALSE);
+
+Index: gaim/src/gtkdialogs.c
+===================================================================
+--- gaim.orig/src/gtkdialogs.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkdialogs.c 2005-08-19 23:27:18.000000000 +0200
+@@ -534,7 +534,9 @@
+ GtkWidget *window;
+ GtkWidget *hbox;
+ GtkWidget *label;
++#if ICONS_IN_DIALOGS
+ GtkWidget *img;
++#endif
+ gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
+
+ label = gtk_label_new(NULL);
+@@ -582,8 +584,10 @@
+
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
++#if ICONS_IN_DIALOGS
+ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL));
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
++#endif
+
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+Index: gaim/src/gtkgaim.h
+===================================================================
+--- gaim.orig/src/gtkgaim.h 2005-08-19 23:26:29.000000000 +0200
++++ gaim/src/gtkgaim.h 2005-08-21 02:32:29.270335816 +0200
+@@ -61,5 +61,10 @@
+ #define GAIM_HIG_BORDER 12
+ #define GAIM_HIG_BOX_SPACE 6
+
++/**
++ * Do we want icons in dialogs?
++ */
++#define ICONS_IN_DIALOGS 1
++
+ #endif /* _GAIM_GTKGAIM_H_ */
+
+Index: gaim/src/gtknotify.c
+===================================================================
+--- gaim.orig/src/gtknotify.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtknotify.c 2005-08-21 02:32:03.765213184 +0200
+@@ -125,7 +125,9 @@
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *label;
++#if ICONS_IN_DIALOGS
+ GtkWidget *img = NULL;
++#endif
+ char label_text[2048];
+ const char *icon_name = NULL;
+ char *primary_esc, *secondary_esc;
+@@ -149,11 +151,13 @@
+ break;
+ }
+
++#if ICONS_IN_DIALOGS
+ if (icon_name != NULL)
+ {
+ img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+ }
++#endif
+
+ dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE,
+ NULL, 0, GTK_STOCK_CLOSE,
+@@ -173,8 +177,10 @@
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+
++#if ICONS_IN_DIALOGS
+ if (img != NULL)
+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
++#endif
+
+ primary_esc = g_markup_escape_text(primary, -1);
+ secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
+@@ -218,9 +224,11 @@
+ GaimNotifyMailData *data;
+ GtkWidget *dialog;
+ GtkWidget *vbox;
+- GtkWidget *hbox;
+ GtkWidget *label;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+ char *detail_text;
+ char *label_text;
+
+@@ -248,6 +256,7 @@
+ gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the main horizontal box */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+@@ -262,6 +271,9 @@
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
++#else
++ vbox = GTK_DIALOG(dialog)->vbox;
++#endif
+
+ /* Descriptive label */
+ detail_text = g_strdup_printf(ngettext("%s has %d new message.",
+Index: gaim/src/gtkrequest.c
+===================================================================
+--- gaim.orig/src/gtkrequest.c 2005-08-19 23:23:45.000000000 +0200
++++ gaim/src/gtkrequest.c 2005-08-21 02:32:15.943361824 +0200
+@@ -281,10 +281,12 @@
+ GaimGtkRequestData *data;
+ GtkWidget *dialog;
+ GtkWidget *vbox;
+- GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *entry;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+ GtkWidget *toolbar;
+ char *label_text;
+ char *primary_esc, *secondary_esc;
+@@ -318,6 +320,7 @@
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the main horizontal box */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+@@ -332,6 +335,9 @@
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
++#else
++ vbox = GTK_DIALOG(dialog)->vbox;
++#endif
+
+ /* Descriptive label */
+ primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
+@@ -435,9 +441,11 @@
+ GaimGtkRequestData *data;
+ GtkWidget *dialog;
+ GtkWidget *vbox, *vbox2;
+- GtkWidget *hbox;
+ GtkWidget *label;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+ GtkWidget *radio = NULL;
+ char *label_text;
+ char *radio_text;
+@@ -475,6 +483,7 @@
+ gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the main horizontal box */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+@@ -488,6 +497,9 @@
+ /* Vertical box */
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
++#else
++ vbox = GTK_DIALOG(dialog)->vbox;
++#endif
+
+ /* Descriptive label */
+ primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
+@@ -536,9 +548,11 @@
+ GaimGtkRequestData *data;
+ GtkWidget *dialog;
+ GtkWidget *vbox;
+- GtkWidget *hbox;
+ GtkWidget *label;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+ void **buttons;
+ char *label_text;
+ char *primary_esc, *secondary_esc;
+@@ -584,6 +598,7 @@
+ gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the main horizontal box */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+@@ -597,7 +612,10 @@
+ /* Vertical box */
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
+-
++#else
++ vbox = GTK_DIALOG(dialog)->vbox;
++#endif
++
+ /* Descriptive label */
+ primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
+ secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
+@@ -620,10 +638,12 @@
+
+
+ if (default_action == GAIM_DEFAULT_ACTION_NONE) {
++#if ICONS_IN_DIALOGS
+ GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT);
+ GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS);
+ gtk_widget_grab_focus(img);
+ gtk_widget_grab_default(img);
++#endif
+ } else
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action);
+
+@@ -1351,13 +1371,15 @@
+ GtkWidget *win;
+ GtkWidget *vbox;
+ GtkWidget *vbox2;
+- GtkWidget *hbox;
+ GtkWidget *bbox;
+ GtkWidget *frame;
+ GtkWidget *label;
+ GtkWidget *table;
+ GtkWidget *button;
++#if ICONS_IN_DIALOGS
++ GtkWidget *hbox;
+ GtkWidget *img;
++#endif
+ GtkWidget *sw;
+ GtkSizeGroup *sg;
+ GList *gl, *fl;
+@@ -1392,6 +1414,7 @@
+ g_signal_connect(G_OBJECT(win), "delete_event",
+ G_CALLBACK(destroy_multifield_cb), data);
+
++#if ICONS_IN_DIALOGS
+ /* Setup the main horizontal box */
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(win), hbox);
+@@ -1407,6 +1430,10 @@
+ /* Setup the vbox */
+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
++#else
++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
++ gtk_container_add(GTK_CONTAINER(win), vbox);
++#endif
+ gtk_widget_show(vbox);
+
+ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
--- /dev/null
+Identiske underkataloger: src2/CVS og src/CVS
+Identiske underkataloger: src2/.deps og src/.deps
+Index: gaim/src/gtkgaim.h
+===================================================================
+--- gaim.orig/src/gtkgaim.h 2005-08-19 21:46:09.550560256 +0200
++++ gaim/src/gtkgaim.h 2005-08-19 21:47:37.276223928 +0200
+@@ -66,5 +66,11 @@
+ */
+ #define ICONS_IN_DIALOGS 0
+
++/**
++ * How many fields is there screen-space for vertically, before a scrollbar is needed?
++ */
++#define VERT_ITEMS 0
++
++
+ #endif /* _GAIM_GTKGAIM_H_ */
+
+Index: gaim/src/gtkrequest.c
+===================================================================
+--- gaim.orig/src/gtkrequest.c 2005-08-19 21:46:09.550560256 +0200
++++ gaim/src/gtkrequest.c 2005-08-19 21:53:46.782050504 +0200
+@@ -1381,6 +1381,8 @@
+ GtkWidget *img;
+ #endif
+ GtkWidget *sw;
++ GtkWidget *pri_label;
++ GtkWidget *sec_label;
+ GtkSizeGroup *sg;
+ GList *gl, *fl;
+ GaimRequestFieldGroup *group;
+@@ -1450,6 +1452,7 @@
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+ gtk_widget_show(label);
++ pri_label = label;
+ g_free(label_text);
+ }
+
+@@ -1457,7 +1460,7 @@
+ gl = gl->next)
+ total_fields += g_list_length(gaim_request_field_group_get_fields(gl->data));
+
+- if(total_fields > 9) {
++ if(total_fields > VERT_ITEMS) {
+ sw = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+@@ -1484,6 +1487,7 @@
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
+ gtk_widget_show(label);
++ sec_label = label;
+ }
+
+ for (gl = gaim_request_fields_get_groups(fields);
+@@ -1718,6 +1722,59 @@
+
+ gtk_widget_show(win);
+
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust widgets accordingly
++ int w, h, field_labels_w;
++ GtkRequisition sg_labels_req;
++ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
++ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
++
++ printf("%d / %d\n", field_labels_w, w);
++
++ w = w - GAIM_HIG_BORDER * 2;
++ if (primary) gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
++ if (secondary) gtk_widget_set_size_request(GTK_WIDGET(sec_label), w, -1);
++
++ //Determine what to do - add a scrollbar or resize the input fields?
++ if ((float)field_labels_w / w > 0.5) //if the labels fill more than half the screen add a horizontal scrollbar
++ {
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++ }
++ else //resize the input fields
++ {
++ for (gl = gaim_request_fields_get_groups(fields);
++ gl != NULL;
++ gl = gl->next)
++ {
++ GList *field_list;
++ size_t field_count = 0;
++ size_t cols = 1;
++ size_t rows;
++ size_t col_num;
++ size_t row_num = 0;
++
++ group = gl->data;
++ field_list = gaim_request_field_group_get_fields(group);
++
++ for (row_num = 0, fl = field_list;
++ row_num < rows && fl != NULL;
++ row_num++)
++ {
++ for (col_num = 0;
++ col_num < cols && fl != NULL;
++ col_num++, fl = fl->next)
++ {
++ field = fl->data;
++ gtk_widget_set_size_request(GTK_WIDGET(field->ui_data), w-field_labels_w, -1);
++ }
++ }
++ }
++ }
++
+ return data;
+ }
+
--- /dev/null
+Identiske underkataloger: src2/CVS og src/CVS
+Identiske underkataloger: src2/.deps og src/.deps
+Index: gaim/src/gtkblist.c
+===================================================================
+--- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200
++++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200
+@@ -825,6 +825,15 @@
+ joinchat_set_sensitive_if_input_cb(NULL, data);
+
+ gtk_widget_show_all(data->entries_box);
++
++ GList* children;
++ children = GTK_BOX(data->entries_box)->children;
++ while (children)
++ {
++ //Let the prilabel handle the maxsize
++ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
++ children = children->next;
++ }
+ }
+
+ static void
+@@ -916,12 +925,26 @@
+ #else
+ vbox = GTK_DIALOG(data->window)->vbox;
+ #endif
++
++ //Make a scrollview to accomodate it all
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ gtk_widget_set_size_request(sw, -1, 200);
++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
++ gtk_widget_show(sw);
++
++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
+
+ label = gtk_label_new(_("Please enter the appropriate information "
+ "about the chat you would like to join.\n"));
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
++ pri_label = label;
+
+ rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0);
+@@ -955,6 +978,22 @@
+ g_object_unref(data->sg);
+
+ gtk_widget_show_all(data->window);
++
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust widgets accordingly
++ int w, h;
++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
++
++ // Window_border Scrollbar (FFH)
++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
++
++ //Let the prilabel handle the maxsize
++ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
+ }
+
+ static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
+@@ -4364,6 +4403,19 @@
+ vbox = GTK_DIALOG(data->window)->vbox;
+ #endif
+
++ //Make a scrollview to accomodate it all
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ gtk_widget_set_size_request(sw, -1, 200);
++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
++ gtk_widget_show(sw);
++
++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
++
+ label = gtk_label_new(
+ _("Please enter the screen name of the person you would like "
+ "to add to your buddy list. You may optionally enter an alias, "
+@@ -4374,6 +4426,7 @@
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
++ pri_label = label;
+
+ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
+ gtk_container_add(GTK_CONTAINER(vbox), hbox);
+@@ -4446,6 +4499,25 @@
+
+ if (group != NULL)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group);
++
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust widgets accordingly
++ int w, h, field_labels_w;
++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
++ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
++
++ // Window_border Scrollbar (FFH)
++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
++ //Set the size of the input fields
++ gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1);
++
+ }
+
+ static void
+@@ -4572,6 +4644,9 @@
+ GHashTable *defaults = NULL;
+ struct proto_chat_entry *pce;
+ gboolean focus = TRUE;
++ GtkWidget *label;
++ GtkWidget *rowbox;
++ GtkWidget *input;
+
+ g_return_if_fail(data->account != NULL);
+
+@@ -4596,10 +4671,6 @@
+
+ for (tmp = list; tmp; tmp = tmp->next)
+ {
+- GtkWidget *label;
+- GtkWidget *rowbox;
+- GtkWidget *input;
+-
+ pce = tmp->data;
+
+ rowbox = gtk_hbox_new(FALSE, 5);
+@@ -4657,6 +4728,15 @@
+ addchat_set_sensitive_if_input_cb(NULL, data);
+
+ gtk_widget_show_all(data->entries_box);
++
++ GList* children;
++ children = GTK_BOX(data->entries_box)->children;
++ while (children)
++ {
++ //Let the prilabel handle the maxsize
++ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
++ children = children->next;
++ }
+ }
+
+ static void
+@@ -4759,6 +4839,19 @@
+ vbox = GTK_DIALOG(data->window)->vbox;
+ #endif
+
++ //Make a scrollview to accomodate it all
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ gtk_widget_set_size_request(sw, -1, 200);
++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
++ gtk_widget_show(sw);
++
++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
++
+ label = gtk_label_new(
+ _("Please enter an alias, and the appropriate information "
+ "about the chat you would like to add to your buddy list.\n"));
+@@ -4766,7 +4859,8 @@
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+-
++ pri_label = label;
++
+ rowbox = gtk_hbox_new(FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
+
+@@ -4825,6 +4919,24 @@
+ G_CALLBACK(add_chat_resp_cb), data);
+
+ gtk_widget_show_all(data->window);
++
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust the label accordingly
++ int w, h;
++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
++
++ // Window_border Scrollbar (FFH)
++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
++ //Let the prilabel handle the maxsize
++ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1);
++ gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1);
++
+ }
+
+ static void
+Index: gaim/src/gtkrequest.c
+===================================================================
+--- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200
++++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200
+@@ -650,6 +650,17 @@
+ /* Show everything. */
+ gtk_widget_show_all(dialog);
+
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust widgets accordingly
++ int w, h;
++ gtk_window_get_size(GTK_WINDOW(dialog), &w, &h);
++
++ w = w - GAIM_HIG_BORDER * 2;
++ gtk_widget_set_size_request(GTK_WIDGET(label), w, -1);
++
+ return data;
+ }
+
--- /dev/null
+Identiske underkataloger: src2/CVS og src/CVS
+Identiske underkataloger: src2/.deps og src/.deps
+Index: gaim/src/gtksavedstatuses.c
+===================================================================
+--- gaim.orig/src/gtksavedstatuses.c 2005-08-13 07:54:33.000000000 +0200
++++ gaim/src/gtksavedstatuses.c 2005-08-19 21:20:41.806812608 +0200
+@@ -417,6 +417,7 @@
+ bbox = gtk_hbutton_box_new();
+ gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
++ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
+ gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
+ gtk_widget_show(bbox);
+
+@@ -449,12 +450,13 @@
+ G_CALLBACK(status_window_delete_cb), dialog);
+
+ /* Close button */
+- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
++ //We can do without the close button to save screen estate
++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(status_window_close_cb), dialog);
++ G_CALLBACK(status_window_close_cb), dialog);*/
+
+ gtk_widget_show(win);
+ }
+@@ -790,7 +792,8 @@
+ disclosure = gaim_disclosure_new(_("Use a different status for some accounts"),
+ _("Use a different status for some accounts"));
+ gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0);
+- gtk_widget_show(disclosure);
++ //For now, do without the custom messages - not implemented yet
++ //gtk_widget_show(disclosure);
+
+ /* Setup the box that the disclosure will cover */
+ dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
--- /dev/null
+--- gaim.ori/src/gtkstatusbox.c 2005-09-04 20:42:29.000000000 +0200
++++ gaim/src/gtkstatusbox.c 2005-09-05 08:44:13.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ text_rend = gtk_cell_renderer_text_new();
+ icon_rend = gtk_cell_renderer_pixbuf_new();
+- icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);
++ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
+
+ status_box->imhtml_visible = FALSE;
+ status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE,
--- /dev/null
+Index: gaim/src/gtkaccount.c
+===================================================================
+--- gaim.orig/src/gtkaccount.c 2005-08-25 17:16:44.000000000 +0200
++++ gaim/src/gtkaccount.c 2005-08-29 22:34:25.511003600 +0200
+@@ -857,7 +857,6 @@
+ {
+ GtkWidget *frame;
+ GtkWidget *vbox;
+- GtkWidget *vbox2;
+ GtkWidget *hbox;
+ GtkWidget *hbox2;
+ GtkWidget *button;
+@@ -901,12 +900,8 @@
+ gaim_set_accessible_label (dialog->icon_entry, label);
+ dialog->icon_path = NULL;
+
+- vbox2 = gtk_vbox_new(FALSE, 0);
+- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
+- gtk_widget_show(vbox2);
+-
+ hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
+- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
++ gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
+ gtk_widget_show(hbox2);
+
+ button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
+@@ -1275,7 +1270,18 @@
+ gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown));
+ #endif
+
+- add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
++ GtkWidget *label;
++ label = gtk_label_new_with_mnemonic(_("Proxy _type:"));
++ gtk_size_group_add_widget(dialog->sg, label);
++ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
++ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
++ gtk_widget_show(label);
++
++ gtk_box_pack_start(GTK_BOX(vbox), dialog->proxy_dropdown, TRUE, TRUE, GAIM_HIG_BORDER);
++ gtk_widget_show(dialog->proxy_dropdown);
++ gaim_set_accessible_label (dialog->proxy_dropdown, label);
++
++ //add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
+
+ /* Setup the second vbox, which may be hidden at times. */
+ dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
+@@ -1643,6 +1649,7 @@
+ AccountPrefsDialog *dialog;
+ GtkWidget *win;
+ GtkWidget *main_vbox;
++ GtkWidget *sw;
+ GtkWidget *vbox;
+ GtkWidget *bbox;
+ GtkWidget *dbox;
+@@ -1709,10 +1716,19 @@
+ gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
+
+ /* Setup the inner vbox */
++ //With a scrollbox
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ gtk_widget_set_size_request(sw, -1, -1);
++ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
++ gtk_label_new_with_mnemonic("_Basic"));
++ gtk_widget_show(sw);
+ dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER);
+- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
+- gtk_label_new_with_mnemonic("_Basic"));
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
+ gtk_widget_show(vbox);
+
+ /* Setup the top frames. */
+@@ -1720,10 +1736,20 @@
+ add_user_options(dialog, vbox);
+
+ /* Setup the page with 'Advanced'. */
++ //With a scrollbox
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ gtk_widget_set_size_request(sw, -1, -1);
++ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
++ gtk_label_new_with_mnemonic("_Advanced"));
++ gtk_widget_show(sw);
+ dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER);
+- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
+- gtk_label_new_with_mnemonic("_Advanced"));
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), dbox);
++ gtk_widget_show(dbox);
+
+ /** Setup the bottom frames. */
+ add_protocol_options(dialog, dbox);
+@@ -1731,46 +1757,50 @@
+ add_proxy_options(dialog, dbox);
+
+ /* Setup the button box */
+- bbox = gtk_hbutton_box_new();
++ //bbox = gtk_hbutton_box_new();
++ //Replaced with a hbox, otherwise the Register-button doesn't fit (same size required)
++ bbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
+ gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
+- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+ gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0);
+ gtk_widget_show(bbox);
+
+- /* Register button */
+- button = gtk_button_new_with_label(_("Register"));
+- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+- gtk_widget_show(button);
+-
+- g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(register_account_prefs_cb), dialog);
+-
+- dialog->register_button = button;
+-
++ /* Save button */
++ button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
++
+ if (dialog->account == NULL)
+ gtk_widget_set_sensitive(button, FALSE);
+
+- if (!dialog->prpl_info || !dialog->prpl_info->register_user)
+- gtk_widget_hide(button);
++ gtk_widget_show(button);
++
++ dialog->ok_button = button;
++
++ g_signal_connect(G_OBJECT(button), "clicked",
++ G_CALLBACK(ok_account_prefs_cb), dialog);
+
+ /* Cancel button */
+ button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cancel_account_prefs_cb), dialog);
+
+- /* Save button */
+- button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
++ /* Register button */
++ button = gtk_button_new_with_label(_("Register"));
++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
++ gtk_widget_show(button);
++
++ g_signal_connect(G_OBJECT(button), "clicked",
++ G_CALLBACK(register_account_prefs_cb), dialog);
++
++ dialog->register_button = button;
+
+ if (dialog->account == NULL)
+ gtk_widget_set_sensitive(button, FALSE);
+
+- gtk_widget_show(button);
+-
+- dialog->ok_button = button;
++ if (!dialog->prpl_info || !dialog->prpl_info->register_user)
++ gtk_widget_hide(button);
+
+ /* Set up DND */
+ gtk_drag_dest_set(dialog->window,
+@@ -1783,11 +1813,20 @@
+ g_signal_connect(G_OBJECT(dialog->window), "drag_data_received",
+ G_CALLBACK(account_dnd_recv), dialog);
+
+- g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(ok_account_prefs_cb), dialog);
+-
+ /* Show the window. */
+ gtk_widget_show(win);
++
++ //Wait for the window to have recieved its "configure_event",
++ //which means it has been resized by the WM
++ while (gtk_events_pending ()) gtk_main_iteration ();
++
++ //Get allocated size, and adjust widgets accordingly
++ int w, h;
++ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
++
++ w = w - GAIM_HIG_BORDER * 2;
++ gtk_widget_set_size_request(GTK_WIDGET(dialog->protocol_menu), w, -1);
++
+ }
+
+ /**************************************************************************
+@@ -2389,6 +2428,7 @@
+ bbox = gtk_hbutton_box_new();
+ gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
++ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
+ gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
+ gtk_widget_show(bbox);
+
+@@ -2421,12 +2461,13 @@
+ G_CALLBACK(ask_delete_account_cb), dialog);
+
+ /* Close button */
+- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
++ //We can do without the close button to save screen estate
++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(close_accounts_cb), dialog);
++ G_CALLBACK(close_accounts_cb), dialog);*/
+
+ /* Setup some gaim signal handlers. */
+ gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
--- /dev/null
+Index: gaim/src/gtkroomlist.c
+===================================================================
+--- gaim.orig/src/gtkroomlist.c 2005-08-13 01:53:28.000000000 +0200
++++ gaim/src/gtkroomlist.c 2005-08-19 21:37:26.225117816 +0200
+@@ -129,7 +129,9 @@
+ gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree);
+
+ gtk_widget_set_sensitive(dialog->stop_button, TRUE);
++ gtk_widget_show(dialog->stop_button);
+ gtk_widget_set_sensitive(dialog->list_button, FALSE);
++ gtk_widget_hide(dialog->list_button);
+ gtk_widget_set_sensitive(dialog->join_button, FALSE);
+ }
+
+@@ -141,7 +143,9 @@
+ gtk_widget_set_sensitive(dialog->account_widget, TRUE);
+
+ gtk_widget_set_sensitive(dialog->stop_button, FALSE);
++ gtk_widget_hide(dialog->stop_button);
+ gtk_widget_set_sensitive(dialog->list_button, TRUE);
++ gtk_widget_show(dialog->list_button);
+ gtk_widget_set_sensitive(dialog->join_button, FALSE);
+ }
+
+@@ -396,7 +400,7 @@
+ g_signal_connect(G_OBJECT(dialog->stop_button), "clicked",
+ G_CALLBACK(stop_button_cb), dialog);
+ gtk_widget_set_sensitive(dialog->stop_button, FALSE);
+- gtk_widget_show(dialog->stop_button);
++ //gtk_widget_show(dialog->stop_button);
+
+ /* list button */
+ dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List"));
+@@ -415,11 +419,12 @@
+ gtk_widget_show(dialog->join_button);
+
+ /* close button */
+- dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
++ //We can do without the close button to save screen estate
++ /*dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ gtk_box_pack_start(GTK_BOX(bbox), dialog->close_button, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(dialog->close_button), "clicked",
+ G_CALLBACK(close_button_cb), dialog);
+- gtk_widget_show(dialog->close_button);
++ gtk_widget_show(dialog->close_button);*/
+
+ /* show the dialog window and return the dialog */
+ gtk_widget_show(dialog->window);
+@@ -683,14 +688,18 @@
+ if (rl->dialog->account_widget)
+ gtk_widget_set_sensitive(rl->dialog->account_widget, FALSE);
+ gtk_widget_set_sensitive(rl->dialog->stop_button, TRUE);
++ gtk_widget_show(rl->dialog->stop_button);
+ gtk_widget_set_sensitive(rl->dialog->list_button, FALSE);
++ gtk_widget_hide(rl->dialog->list_button);
+ } else {
+ rl->dialog->pg_needs_pulse = FALSE;
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(rl->dialog->progress), 0.0);
+ if (rl->dialog->account_widget)
+ gtk_widget_set_sensitive(rl->dialog->account_widget, TRUE);
+ gtk_widget_set_sensitive(rl->dialog->stop_button, FALSE);
++ gtk_widget_hide(rl->dialog->stop_button);
+ gtk_widget_set_sensitive(rl->dialog->list_button, TRUE);
++ gtk_widget_show(rl->dialog->list_button);
+ }
+ }
+
--- /dev/null
+--- gaim.ori/src/gtkprefs.c 2005-09-05 08:28:17.000000000 +0200
++++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200
+@@ -2108,12 +2108,18 @@
+ if (icon)
+ g_object_unref(icon);
+
+-#if GTK_CHECK_VERSION(2,4,0)
+- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
+-#else
+- gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
+- return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
+-#endif
++ //Add a scrolled window around the page contents
++ GtkWidget *sw;
++ sw = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
++ GTK_SHADOW_NONE);
++ //gtk_widget_set_size_request(sw, -1, 200);
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page);
++
++
++ return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text));
+ }
+
+ static void prefs_notebook_init() {
+@@ -2146,9 +2152,9 @@
+ void gaim_gtk_prefs_show(void)
+ {
+ GtkWidget *vbox;
+- GtkWidget *bbox;
++ //GtkWidget *bbox;
+ GtkWidget *notebook;
+- GtkWidget *button;
++ //GtkWidget *button;
+
+ if (prefs) {
+ gtk_window_present(GTK_WINDOW(prefs));
+@@ -2176,11 +2182,13 @@
+
+ /* The notebook */
+ prefsnotebook = notebook = gtk_notebook_new ();
+- gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
++ gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE);
++ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
+
+
+ /* The buttons to press! */
+- bbox = gtk_hbutton_box_new();
++ //To save screen estate we will do without a close button
++ /*bbox = gtk_hbutton_box_new();
+ gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+ gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+@@ -2190,7 +2198,7 @@
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy), prefs);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+- gtk_widget_show(button);
++ gtk_widget_show(button);*/
+
+ prefs_notebook_init();
+
--- /dev/null
+Index: gaim/src/gtkft.c
+===================================================================
+--- gaim.orig/src/gtkft.c 2005-08-21 01:59:50.000000000 +0200
++++ gaim/src/gtkft.c 2005-08-29 23:05:02.000000000 +0200
+@@ -772,24 +772,26 @@
+ G_CALLBACK(open_button_cb), dialog);
+
+ /* Pause button */
+- button = gtk_button_new_with_mnemonic(_("_Pause"));
++ /* Pause button has no function*/
++ /*button = gtk_button_new_with_mnemonic(_("_Pause"));
+ gtk_widget_set_sensitive(button, FALSE);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+ dialog->pause_button = button;
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(pause_button_cb), dialog);
++ G_CALLBACK(pause_button_cb), dialog);*/
+
+ /* Resume button */
+- button = gtk_button_new_with_mnemonic(_("_Resume"));
++ /* Resume button has no function */
++ /*button = gtk_button_new_with_mnemonic(_("_Resume"));
+ gtk_widget_set_sensitive(button, FALSE);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+ dialog->resume_button = button;
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(resume_button_cb), dialog);
++ G_CALLBACK(resume_button_cb), dialog);*/
+
+ /* Remove button */
+ button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+@@ -811,13 +813,14 @@
+ G_CALLBACK(stop_button_cb), dialog);
+
+ /* Close button */
+- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
++ /* Do without a close button to save screen estate */
++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_show(button);
+ dialog->close_button = button;
+
+ g_signal_connect(G_OBJECT(button), "clicked",
+- G_CALLBACK(close_button_cb), dialog);
++ G_CALLBACK(close_button_cb), dialog);*/
+
+ return dialog;
+ }
--- /dev/null
+Index: gaim/src/gtkconv.c
+===================================================================
+--- gaim.orig/src/gtkconv.c 2005-08-25 17:16:50.000000000 +0200
++++ gaim/src/gtkconv.c 2005-08-29 23:56:48.142463528 +0200
+@@ -6126,7 +6126,7 @@
+ gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE);
+ gaim_prefs_add_bool("/gaim/gtk/conversations/show_incoming_formatting", TRUE);
+
+- gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
++ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", FALSE);
+ gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE);
+
+ gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
--- /dev/null
+Index: gaim/src/gtkgaim.h
+===================================================================
+--- gaim.orig/src/gtkgaim.h 2005-08-25 17:29:42.000000000 +0200
++++ gaim/src/gtkgaim.h 2005-08-25 19:00:37.335318168 +0200
+@@ -57,14 +57,14 @@
+ * Spacings between components, as defined by the
+ * Gnome Human Interface Guidelines.
+ */
+-#define GAIM_HIG_CAT_SPACE 18
+-#define GAIM_HIG_BORDER 12
+-#define GAIM_HIG_BOX_SPACE 6
++#define GAIM_HIG_CAT_SPACE 9
++#define GAIM_HIG_BORDER 6
++#define GAIM_HIG_BOX_SPACE 3
+
+ /**
+ * Do we want icons in dialogs?
+ */
+-#define ICONS_IN_DIALOGS 1
++#define ICONS_IN_DIALOGS 0
+
+ /**
+ * How many fields is there screen-space for vertically, before a scrollbar is needed?
+Index: gaim/src/gtkutils.c
+===================================================================
+--- gaim.orig/src/gtkutils.c 2005-08-25 19:01:19.630888264 +0200
++++ gaim/src/gtkutils.c 2005-08-25 19:02:05.067980776 +0200
+@@ -398,7 +398,7 @@
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show(hbox);
+
+- label = gtk_label_new(" ");
++ label = gtk_label_new(" ");
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+
--- /dev/null
+Index: gaim/gaim.desktop
+===================================================================
+--- gaim.orig/gaim.desktop 2005-06-06 03:40:46.000000000 +0200
++++ gaim/gaim.desktop 2005-08-21 02:00:18.525853592 +0200
+@@ -33,21 +33,7 @@
+ GenericName[sq]=Lajmësjellës Internet
+ GenericName[sv]=Meddelandeklient
+ GenericName[zh_CN]=互联网通讯程序
+-Name=Gaim Internet Messenger
+-Name[da]=Gaim - internet beskeder
+-Name[de]=Gaim Internet Messenger
+-Name[fr]=Gaim Messagerie Instantanée
+-Name[hu]=Gaim IM
+-Name[it]=Gaim Internet Messenger
+-Name[ko]=게임 메신저
+-Name[nb]=Gaim lynmeldingsklient
+-Name[nl]=Gaim - Expresberichten
+-Name[pl]=Komunikator Internetowy Gaim
+-Name[pt]=Mensageiro Internet Gaim
+-Name[sl]=Gaim - spletni sel
+-Name[sq]=Lajmësjellësi Internet Gaim
+-Name[sv]=Gaim Internet Messenger
+-Name[zh_CN]=Gaim 互联网通讯程序
++Name=Gaim
+ Exec=gaim
+ Icon=gaim.png
+ StartupNotify=true
--- /dev/null
+--- gaim-1.0.3/gaim.desktop.old 2005-01-01 16:48:58.000000000 +0000
++++ gaim-1.0.3/gaim.desktop 2005-01-01 16:49:15.000000000 +0000
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[de]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
+ Name[fr]=Gaim Messagerie Instantanée
--- /dev/null
+--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
--- /dev/null
+--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
--- /dev/null
+Index: gaim/plugins/docklet/docklet-x11.c
+===================================================================
+--- gaim.orig/plugins/docklet/docklet-x11.c 2005-04-02 17:23:28.000000000 +0200
++++ gaim/plugins/docklet/docklet-x11.c 2005-08-21 02:06:51.869056336 +0200
+@@ -112,7 +112,7 @@
+ break;
+ }
+
+- gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
++ gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+ #if 0
+ GdkPixbuf *p;
--- /dev/null
+--- /tmp/irc.h 2005-10-04 14:10:59.699874560 +0200
++++ gaim/src/protocols/irc/irc.h 2005-10-04 14:13:10.135045400 +0200
+@@ -35,7 +35,7 @@
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+ #define IRC_DEFAULT_ALIAS "gaim"
+
+-#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE
++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
+
+ #define IRC_INITIAL_BUFSIZE 1024
+
--- /dev/null
+--- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100
++++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100
+@@ -38,17 +38,12 @@
+
+-#include <libedata-book/Evolution-DataServer-Addressbook.h>
+
+-#include <libebook/e-book-listener.h>
+-#include <libedata-book/e-data-book-factory.h>
+-#include <bonobo/bonobo-main.h>
++#include <libebook/e-book-view-listener.h>
++#include <libebook/e-data-book-factory-bindings.h>
+
+ #include <glib.h>
+
+ #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution"
+
+-#define E_DATA_BOOK_FACTORY_OAF_ID \
+- "OAFIID:GNOME_Evolution_DataServer_BookFactory"
+-
+ enum
+ {
+ COLUMN_AUTOADD,
+@@ -324,8 +320,6 @@
+ static gboolean
+ plugin_load(GaimPlugin *plugin)
+ {
+- bonobo_activate();
+-
+ backup_blist_ui_ops = gaim_blist_get_ui_ops();
+
+ blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps));
+@@ -370,7 +364,6 @@
+ static void
+ plugin_destroy(GaimPlugin *plugin)
+ {
+- bonobo_debug_shutdown();
+ }
+
+ static void
+@@ -563,13 +556,6 @@
+ * So, in conclusion, this is an evil hack, but it doesn't harm anything
+ * and it works.
+ */
+- g_module_make_resident(plugin->handle);
+-
+- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
+- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
+- {
+- gaim_debug_error("evolution", "Unable to initialize bonobo.\n");
+- }
+ }
+
+ GAIM_INIT_PLUGIN(gevolution, init_plugin, info)
--- /dev/null
+--- gaim/configure.ac.orig 2005-12-19 23:04:14 +0100
++++ gaim/configure.ac 2005-12-19 23:04:49 +0100
+@@ -442,10 +442,6 @@
+ fi
+ fi
+
+-if test "x$enable_deprecated" = "xno"; then
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+-
+ if test "x$GCC" = "xyes"; then
+ DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
+ CFLAGS="-g $CFLAGS"
--- /dev/null
+Index: gaim/src/gtkstock.c
+===================================================================
+--- gaim.orig/src/gtkstock.c 2005-08-15 08:52:45.000000000 +0200
++++ gaim/src/gtkstock.c 2005-08-19 18:13:26.550881552 +0200
+@@ -214,12 +214,12 @@
+
+ pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+
+ g_free(filename);
+
+- if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
+- gaim_gtk_stock_versionize(&pixbuf, win);
++ /*if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
++ gaim_gtk_stock_versionize(&pixbuf, win);*/
+
+ iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
+
+ g_object_unref(G_OBJECT(pixbuf));
+ }
--- /dev/null
+no-superimposed-version-on-logo.patch
+01-optional-icons-in-dialogs.patch
+02-request-field-dialogs.patch
+03-blist-dialogs.patch
+04-saved-status-dialogs.patch
+05-statusbox-icon-size.patch
+06-account-dialogs.patch
+07-roomlist-dialog.patch
+define-pda-mode.patch
+desktop-name-2.0.0.patch
+docklet-icon-size.patch
+08-prefs-dialog.patch
+09-filetransfer-dialog.patch
+10-pda-default-settings.patch
--- /dev/null
+SECTION = "x11/network"
+DESCRIPTION = "multi-protocol instant messaging client"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+ gnutls virtual/libintl"
+RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet"
+
+EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
+
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+ /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
+ ${datadir}/pixmaps ${datadir}/applications \
+ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+ ${libdir}/bonobo/servers"
+FILES_${PN}-dev += "${libdir}/gaim/*.la"
+
+inherit autotools gettext
+
+PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*"
+
+python populate_packages_prepend () {
+ root = bb.data.expand('${libdir}/gaim', d)
+
+ do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
+ output_pattern='gaim-plugin-%s',
+ description='GAIM plugin %s',
+ prepend=True)
+
+ do_split_packages(d, root, '^lib(.*)\.so$',
+ output_pattern='gaim-protocol-%s',
+ description='GAIM protocol plugin for %s',
+ prepend=True,
+ aux_files_pattern=['${datadir}/pixmaps/gaim/status/default/%s.png', '${datadir}/pixmaps/gaim/smileys/default/%s_*'])
+}
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name.patch;patch=1"
+
+require gaim.inc
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name.patch;patch=1"
+
+require gaim.inc
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name.patch;patch=1"
+
+require gaim.inc
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name.patch;patch=1"
+
+require gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name_1.4.0.patch;patch=1"
+
+require gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
--- /dev/null
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name.patch;patch=1"
+
+require gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
--- /dev/null
+PR = "r3"
+SRCDATE_${PN} = "20050904"
+#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
+PV = "2.0.0-cvs-mco1-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
+
+SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \
+ ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \
+ ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \
+ ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \
+ ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \
+ ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \
+ ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \
+ ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \
+ ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \
+ ${WEBCVSURL}/define-pda-mode.patch;patch=1 \
+ ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \
+ ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \
+ ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \
+ ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \
+ ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \
+ file://gaim-OE-branding.patch;patch=1 \
+ "
+
+require gaim.inc
+
+S = "${WORKDIR}/gaim"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+
+DEPENDS += "startup-notification"
+
+#include autopoint (gettext)
+EXTRA_AUTORECONF = ""
+
+#disable "X Session Management"... It is EVIL
+EXTRA_OECONF += "--disable-sm --enable-startup-notification \
+ --with-gnutls-includes=${STAGING_INCDIR}"
+
+
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-DESCRIPTION = "XCalibrate extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt"
-S = "${WORKDIR}/XCalibrateExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
--- /dev/null
+DESCRIPTION = "ODE is an Open Source Physics Engine."
+SECTION = "libs"
+HOMEPAGE = "http://www.ode.org"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
+ file://config.h"
+
+inherit autotools
+
+#do_configure() {
+# touch configurator.exe
+# chmod a+rx configurator.exe
+# install -m 0644 ${WORKDIR}/config.h include/ode/
+#}
+
+#do_compile() {
+# oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
+#}
+
+#do_stage() {
+# install -d ${STAGING_INCDIR}/ode/
+# install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
+# oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
+#}
+
+#do_install() {
+# :
+#}
--- /dev/null
+DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
+DEPENDS = "libnotify"
+RDEPENDS = "openmoko-dialer2"
+PV = "0.0.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko-panel-plugin
--- /dev/null
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800
++++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800
+@@ -38,7 +38,7 @@
+
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+ #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+
+ struct _MokoNotifyPrivate
+ {
--- /dev/null
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051)
++++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy)
+@@ -37,8 +37,8 @@
+ MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
+
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+
+ struct _MokoNotifyPrivate
+ {
SECTION = "openmoko/pim"
DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
PE = "1"
inherit openmoko2
+SRC_URI_append_fic-gta01 = " file://kernel-2.6.24.patch;patch=1"
+SRC_URI_append_fic-gta02 = " file://kernel-2.6.24.patch;patch=1"
+
EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r63"
+PR = "r64"
SRC_URI = "\
file://etc \
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
matchbox-panel-2 --start-applets systray,startup \
- --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar &
+ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar &
exec neod
--- /dev/null
+Index: openttd-0.6.0-beta4/config.lib
+===================================================================
+--- openttd-0.6.0-beta4.orig/config.lib 2008-02-20 20:24:58.000000000 +0100
++++ openttd-0.6.0-beta4/config.lib 2008-02-20 20:26:55.000000000 +0100
+@@ -1255,7 +1255,7 @@
+ if [ -z "$6" ]; then
+ compiler="$3"
+ else
+- compiler="$3-$6"
++ compiler="$4"
+ fi
+ machine=`eval $compiler $9 2>/dev/null`
+ ret=$?
+@@ -1271,11 +1271,6 @@
+ exit 1
+ fi
+
+- if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
+- log 1 "checking $1... expected $3, found $machine"
+- log 1 "the compiler suggests it doesn't build code for the machine you specified"
+- exit 1
+- fi
+ elif [ -n "$4" ]; then
+ # Check for manual compiler
+ machine=`$4 $9 2>/dev/null`
--- /dev/null
+# Note: OpenTTD's build system changed considerably in 0.6.x
+# This include file is written towards the newer versions.
+
+DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
+HOMEPAGE = "http://openttd.sf.net"
+LICENSE = "GPLv2"
+
+DEPENDS = "libsdl-net libpng zlib freetype fontconfig"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.bz2"
+
+APPIMAGE = "media/openttd.48.png"
+
+inherit siteinfo sdl
+
+do_configure() {
+ # The way the OTTD configure system handles the application's directories
+ # isn't the way autotools does it. Mainly prefix is always prepended even if
+ # absolute binary-dir and data-dir is given. Sigh ...
+
+ # Disabling MIDI feature for now.
+ ./configure \
+ --build=${BUILD_SYS} \
+ --host=${TARGET_SYS} \
+ --windres=${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+ --os=UNIX \
+ --endian=${SITEINFO_ENDIANESS} \
+ --prefix-dir=${prefix} \
+ --binary-dir=bin \
+ --with-midi=/bin/true \
+ --with-zlib \
+ --with-png \
+ --with-freetype \
+ --cc-build=gcc \
+ --cc-host=${TARGET_SYS}-gcc \
+ --cxx-build=g++ \
+ --cxx-host=${TARGET_SYS}-g++ \
+ --strip=${TARGET_SYS}-strip \
+ --install-dir=${D}
+}
+
+do_install() {
+ oe_runmake install
+}
+
+FILES_${PN} += "${datadir}/*"
-DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
-HOMEPAGE = "http://openttd.sf.net"
-LICENSE = "GPLv2"
-PR = "r1"
+require openttd.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.gz"
-
-APPIMAGE = "media/openttd.48.png"
+PR = "r2"
EXTRA_OEMAKE = "WITH_ZLIB=1 \
WITH_PNG=1 \
CC_HOST=gcc \
CC_TARGET=${TARGET_SYS}-gcc"
-inherit sdl
+do_configure() {
+ :
+}
do_install() {
oe_runmake install DESTDIR="${D}"
install -m 0644 ${S}/data/*.grf ${D}${datadir}/games/openttd/data/
}
-FILES_${PN} += "${datadir}/*"
--- /dev/null
+require openttd.inc
+
+PR = "r0"
+
+SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1"
+
+
+
+++ /dev/null
-SECTION = "libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-DESCRIPTION = "PanoramiX extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/man
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-SECTION = "libs"
-PRIORITY = "optional"
-DESCRIPTION = "PanoramiX extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt"
-S = "${WORKDIR}/PanoramiXExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/man
-}
require pax-utils_${PV}.bb
do_stage() {
- oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install
+ oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
}
+
+do_install() {
+ :
+}
+
--- /dev/null
+SECTION = "libs"
+
+inherit native
+
+require libwww-perl_${PV}.bb
--- /dev/null
+DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
+SECTION = "libs"
+LICENSE = "Artistic"
+DEPENDS = "liburi-perl-native"
+RDEPENDS = "liburi-perl"
+PR = "r1"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
+
+S = "${WORKDIR}/libwww-perl-${PV}"
+
+inherit cpan
--enable-embedded-mysqli \
--enable-magic-quotes \
--with-zlib \
- --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \
+ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
--with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
"
--- /dev/null
+SECTION = "x11/network"
+DESCRIPTION = "multi-protocol instant messaging client"
+LICENSE = "GPL"
+
+DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
+RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
+
+EXTRA_OECONF = " \
+ --disable-audio \
+ --disable-perl \
+ --disable-tcl \
+ --disable-deprecated \
+ --disable-gevolution \
+ --x-includes=${STAGING_INCDIR} \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-gnutls=yes \
+ --with-ncurses-headers=${STAGING_INCDIR} \
+ --with-gnutls-includes=${STAGING_INCDIR} \
+ --with-gnutls-libs=${STAGING_LIBDIR} \
+ "
+
+OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
+OE_LT_RPATH_ALLOW[export]="1"
+
+PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
+
+
+LEAD_SONAME = "libpurple.so.0"
+FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*"
+FILES_libpurple-dev = "${libdir}/libpurple* \
+ ${libdir}/purple-2/*.la "
+FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
+ ${libdir}/purple-2/.debug"
+FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*"
+FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*"
+FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so"
+FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*"
+FILES_finch-dev = "${libdir}/finch/*.la"
+FILES_finch-dbg = "${bindir}/.debug/finch \
+ ${libdir}/finch/.debug"
+
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+ /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
+ ${datadir}/pixmaps ${datadir}/applications \
+ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+ ${libdir}/bonobo/servers ${datadir}/icons"
+FILES_${PN}-dev += "${libdir}/pidgin/*.la"
+
+inherit autotools gettext pkgconfig gconf
+
+PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
+
+python populate_packages_prepend () {
+ root = bb.data.expand('${libdir}/pidgin', d)
+ purple = bb.data.expand('${libdir}/purple-2', d)
+ finch = bb.data.expand('${libdir}/finch', d)
+
+ do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
+ output_pattern='pidgin-plugin-%s',
+ description='Pidgin plugin %s',
+ prepend=True, extra_depends='')
+
+ do_split_packages(d, purple, '^lib(.*)\.so$',
+ output_pattern='libpurple-protocol-%s',
+ description='Libpurple protocol plugin for %s',
+ prepend=True, extra_depends='')
+
+ do_split_packages(d, purple, '^(ssl-.*)\.so$',
+ output_pattern='libpurple-plugin-%s',
+ description='libpurple plugin %s',
+ prepend=True, extra_depends='libpurple-plugin-ssl')
+
+ do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
+ output_pattern='libpurple-plugin-%s',
+ description='libpurple plugin %s',
+ prepend=True, extra_depends='')
+
+ do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
+ output_pattern='finch-plugin-%s',
+ description='Finch plugin %s',
+ prepend=True, extra_depends='')
+
+
+}
--- /dev/null
+--- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200
++++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200
+@@ -8,8 +8,7 @@
+
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
+- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1
+ else
+ install-data-local:
+ endif
--- /dev/null
+--- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000
++++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000
+@@ -4,7 +4,7 @@
+ _GenericName=Internet Messenger
+ _Comment=Send instant messages over multiple protocols
+ Exec=pidgin
+-Icon=pidgin
++Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png
+ StartupNotify=true
+ Terminal=false
+ Type=Application
--- /dev/null
+--- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200
++++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200
+@@ -35,9 +35,9 @@
+ #define IRC_DEFAULT_SSL_PORT 994
+
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+-#define IRC_DEFAULT_ALIAS "purple"
++#define IRC_DEFAULT_ALIAS "OE-user"
+
+-#define IRC_DEFAULT_QUIT "Leaving."
++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
+
+ #define IRC_INITIAL_BUFSIZE 1024
+
--- /dev/null
+--- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200
++++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200
+@@ -472,7 +472,7 @@
+ if test "x$enable_consoleui" = "xyes"; then
+ dnl # Some distros put the headers in ncursesw/, some don't
+ found_ncurses_h=no
+- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
++ for location in $ac_ncurses_includes $NCURSES_HEADERS
+ do
+ f="$location/ncurses.h"
+ AC_CHECK_HEADER($f,[
+@@ -1860,10 +1860,6 @@
+ KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV"
+ fi
+ KRB4_LDFLAGS="-L${kerberos}/lib"
+- elif test -d /usr/local/include/kerberosIV ; then
+- KRB4_CFLAGS="-I/usr/local/include/kerberosIV"
+- elif test -d /usr/include/kerberosIV ; then
+- KRB4_CFLAGS="-I/usr/include/kerberosIV"
+ fi
+ AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
+
+@@ -1896,10 +1892,6 @@
+ ZEPHYR_LDFLAGS="-L${zephyr}/lib"
+ elif test -d /usr/athena/include/zephyr ; then
+ ZEPHYR_CFLAGS="-I/usr/athena/include"
+- elif test -d /usr/include/zephyr ; then
+- ZEPHYR_CFLAGS="-I/usr/include"
+- elif test -d /usr/local/include/zephyr ; then
+- ZEPHYR_CFLAGS="-I/usr/local/include"
+ fi
+ AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.])
+ AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
--- /dev/null
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ "
+
+PR = "r1"
--- /dev/null
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ file://purple-OE-branding.patch;patch=1 \
+ "
+
+PR = "r0"
--- /dev/null
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ file://purple-OE-branding.patch;patch=1 \
+ "
+
+PR = "r0"
SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
+LEAD_SONAME = "libpq.so"
+
inherit autotools pkgconfig
do_compile_append() {
cp /usr/sbin/zic ${S}/src/timezone/
}
+do_stage() {
+ autotools_stage_includes
+
+ mkdir -p ${STAGING_LIBDIR}/pgsql
+ oe_libinstall -a -so -C src/interfaces/libpq libpq ${STAGING_LIBDIR}/pgsql
+
+ oe_libinstall -a -so -C src/interfaces/ecpg/ecpglib libecpg ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C src/interfaces/ecpg/compatlib libecpg_compat ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C src/interfaces/ecpg/pgtypeslib libpgtypes ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \
+ libecpg-compat-dbg libecpg-compat \
+ libecpg-dbg libecpg libecpg-dev \
+ libpq-dbg libpq libpq-dev \
+ libpgtypes-dbg libpgtypes "
+
+FILES_${PN}-client = "${bindir}/clusterdb \
+ ${bindir}/createdb \
+ ${bindir}/createlang \
+ ${bindir}/createuser \
+ ${bindir}/dropdb \
+ ${bindir}/droplang \
+ ${bindir}/dropuser \
+ ${bindir}/pg_dump \
+ ${bindir}/pg_dumpall \
+ ${bindir}/pg_restore \
+ ${bindir}/psql \
+ ${bindir}/reindexdb \
+ ${bindir}/vacuumdb \
+ ${bindir}/vacuumlo \
+ ${datadir}/${PN}/psqlrc.sample"
+
FILES_${PN}-doc += "${prefix}/doc/"
+FILES_${PN}-timezone = "${datadir}/${PN}/timezone"
+FILES_${PN}-server-dev = "${includedir}/${PN}/server"
+
+FILES_libecpg = "${libdir}/libecpg*.so.*"
+FILES_libecpg-dbg = "${libdir}/.debug/libecpg*"
+FILES_libecpg-dev = "${libdir}/libecpg*.a ${libdir}/libecpg*.so \
+ ${libdir}/libpgtypes*.a ${libdir}/libpgtypes*.so \
+ ${includedir}/ecpg*.h ${includedir}/${PN}/ecpg*.h \
+ ${includedir}/pgtypes*.h ${includedir}/${PN}/informix \
+ ${includedir}/sql3types.h ${includedir}/sqlca.h"
+
+FILES_libpq = "${libdir}/libpq*.so.*"
+FILES_libpq-dbg = "${libdir}/.debug/libpq*"
+FILES_libpq-dev = "${libdir}/libpq*.a ${libdir}/libpq*.so ${libdir}/libpgport.a \
+ ${includedir}"
+
+FILES_libecpg-compat = "${libdir}/libecpg_compat*.so.*"
+FILES_libecpg-compat-dbg = "${libdir}/.debug/libecpg_compat*"
+FILES_libpgtypes = "${libdir}/libpgtypes*.so.*"
+FILES_libpgtypes-dbg = "${libdir}/.debug/libpgtypes*"
require postgresql.inc
-PR = "r1"
+PR = "r2"
require postgresql.inc
-PR = "r1"
+PR = "r2"
require postgresql.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ Src/m4/sdl.m4 2004-01-21 00:43:55.000000000 +0100
-@@ -0,0 +1,175 @@
-+# Configure paths for SDL
-+# Sam Lantinga 9/21/99
-+# stolen from Manish Singh
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_SDL,
-+[dnl
-+dnl Get the cflags and libraries from the sdl-config script
-+dnl
-+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
-+ sdl_prefix="$withval", sdl_prefix="")
-+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-+ sdl_exec_prefix="$withval", sdl_exec_prefix="")
-+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
-+ , enable_sdltest=yes)
-+
-+ if test x$sdl_exec_prefix != x ; then
-+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-+ if test x${SDL_CONFIG+set} != xset ; then
-+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-+ fi
-+ fi
-+ if test x$sdl_prefix != x ; then
-+ sdl_args="$sdl_args --prefix=$sdl_prefix"
-+ if test x${SDL_CONFIG+set} != xset ; then
-+ SDL_CONFIG=$sdl_prefix/bin/sdl-config
-+ fi
-+ fi
-+
-+ AC_REQUIRE([AC_CANONICAL_TARGET])
-+ PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-+ min_sdl_version=ifelse([$1], ,0.11.0,$1)
-+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-+ no_sdl=""
-+ if test "$SDL_CONFIG" = "no" ; then
-+ no_sdl=yes
-+ else
-+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-+
-+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_sdltest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $SDL_CFLAGS"
-+ LIBS="$LIBS $SDL_LIBS"
-+dnl
-+dnl Now check if the installed SDL is sufficiently new. (Also sanity
-+dnl checks the results of sdl-config to some extent
-+dnl
-+ rm -f conf.sdltest
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "SDL.h"
-+
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ /* This hangs on some systems (?)
-+ system ("touch conf.sdltest");
-+ */
-+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_sdl_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_sdl_version");
-+ exit(1);
-+ }
-+
-+ if (($sdl_major_version > major) ||
-+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-+ printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ return 1;
-+ }
-+}
-+
-+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_sdl" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$SDL_CONFIG" = "no" ; then
-+ echo "*** The sdl-config script installed by SDL could not be found"
-+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the SDL_CONFIG environment variable to the"
-+ echo "*** full path to sdl-config."
-+ else
-+ if test -f conf.sdltest ; then
-+ :
-+ else
-+ echo "*** Could not run SDL test program, checking why..."
-+ CFLAGS="$CFLAGS $SDL_CFLAGS"
-+ LIBS="$LIBS $SDL_LIBS"
-+ AC_TRY_LINK([
-+#include <stdio.h>
-+#include "SDL.h"
-+
-+int main(int argc, char *argv[])
-+{ return 0; }
-+#undef main
-+#define main K_and_R_C_main
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding SDL or finding the wrong"
-+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-+ echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ SDL_CFLAGS=""
-+ SDL_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(SDL_CFLAGS)
-+ AC_SUBST(SDL_LIBS)
-+ rm -f conf.sdltest
-+])
PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
- file://m4.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz"
inherit autotools
-EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
+EXTRA_OECONF = "--without-x --disable-sdltest"
do_install() {
install -d ${D}${bindir} \
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
- file://m4.patch;patch=1 \
file://prboom.png \
file://prboom.desktop"
inherit autotools
-EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
+EXTRA_OECONF = "--without-x --disable-sdltest"
do_install() {
install -d ${D}${palmtopdir}/bin \
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
- --with-libgps=${STAGING_DIR}/${HOST_SYS} \
- --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+ --with-libgps=${STAGING_EXECPREFIXDIR} \
+ --with-libpcap=${STAGING_EXECPREFIXDIR} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
--without-athena --enable-dbus \
- --with-libiw=${STAGING_DIR}/${HOST_SYS}"
+ --with-libiw=${STAGING_EXECPREFIXDIR}"
CFLAGS =+ "-I${S}/include"
LDFLAGS += "-lz"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
- --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+ --with-libpcap=${STAGING_EXECPREFIXDIR} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
--without-athena \
SECTION = "base"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
RDEPENDS = "initscripts"
# You can create your own pslash-hand-img.h by doing
}
INITSCRIPT_NAME = "psplash"
-INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
FILES_${PN} += "/mnt/.psplash"
grep -q pulse: /etc/passwd || \
adduser --disabled-password --home=/var/run/pulse --system \
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
- adduser pulse audio
+ addgroup pulse audio
/etc/init.d/populate-volatile.sh update
}
require pulse.inc
-PR = "r6"
+PR = "r7"
file://fix-dbus-without-hal.patch;patch=1 \
"
-PR = "r2"
+PR = "r3"
# problems w/ pulseaudio 0.9.9 atm:
# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
+++ /dev/null
---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000
-+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000
-@@ -37,10 +37,10 @@
- all: modules
-
- modules modules_install clean:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
-
- install:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
-
- else
-
+++ /dev/null
---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000
-+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000
-@@ -37,10 +37,10 @@
- all: modules
-
- modules modules_install clean:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
-
- install:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
-
- else
-
+++ /dev/null
---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000
-+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000
-@@ -37,10 +37,10 @@
- all: modules
-
- modules modules_install clean:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
-
- install:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
-
- else
-
+++ /dev/null
---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000
-+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000
-@@ -37,10 +37,10 @@
- all: modules
-
- modules modules_install clean:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
-
- install:
-- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
-+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile- Tue Feb 28 21:05:41 2006
---- driver/Makefile Tue Feb 28 21:07:15 2006
-***************
-*** 45,54 ****
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
---- 45,54 ----
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile- Tue Feb 28 21:05:41 2006
---- driver/Makefile Tue Feb 28 21:07:15 2006
-***************
-*** 45,54 ****
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
---- 45,54 ----
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile- Tue Feb 28 21:05:41 2006
---- driver/Makefile Tue Feb 28 21:07:15 2006
-***************
-*** 45,54 ****
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
---- 45,54 ----
- M:=$(shell pwd)
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
+++ /dev/null
-*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
-***************
-*** 57,66 ****
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
---- 57,66 ----
- CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
-
- modules modules_install clean:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
-
- install:
-! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
-
- else
-
--- /dev/null
+*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
+--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
+***************
+*** 57,66 ****
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
+--- 57,66 ----
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
--- /dev/null
+require pvrusb2-mci.inc
+
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+ -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}"
+++ /dev/null
-require pvrusb2-mci.inc
-
-# It in fact requires these modules, but for now is using the local ones.
-# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-20050911/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
-
+++ /dev/null
-require pvrusb2-mci.inc
-
-RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400"
-# It in fact also requires kernel-module-saa7115", but for now is using the local ones.
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-20050921/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
-
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-# It in fact requires these modules, but for now is using the local ones.
-# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-20051016/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
-
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-# It in fact requires these modules, but for now is using the local ones.
-# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2"
-
-#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \
-# file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-20051113"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
-do_compile() {
- cd ivtv; oe_runmake
- cd ../driver; oe_runmake
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
-
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-# It in fact requires these modules, but for now is using the local ones.
-# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-RRECOMMEND = "kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060101.tar.bz2"
-
-S = "${WORKDIR}/pvrusb2-mci-20060101"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
-do_compile() {
- cd ivtv; oe_runmake
- cd ../driver; oe_runmake
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-# It in fact requires these modules, but for now is using the local ones.
-# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-RRECOMMEND = "kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060103.tar.bz2"
-
-S = "${WORKDIR}/pvrusb2-mci-20060103"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
-do_compile() {
- cd ivtv; oe_runmake
- cd ../driver; oe_runmake
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-# It in fact requires these modules, but for now is using the local ones.
-# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-RRECOMMEND = "kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060121.tar.bz2"
-
-S = "${WORKDIR}/pvrusb2-mci-20060121"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
-do_compile() {
- cd ivtv; oe_runmake
- cd ../driver; oe_runmake
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r2"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' \
- '-D__LINUX_ARM_ARCH__=5'"
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom \
- kernel-module-firmware-class \
- kernel-module-tuner \
- kernel-module-msp3400 \
- kernel-module-saa7115 \
- kernel-module-tda9887 \
- kernel-module-v4l1-compat \
- kernel-module-v4l2-common \
- kernel-module-videodev"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://hotplug.functions \
- file://firmware.hotplug \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- mkdir -p ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom \
- kernel-module-firmware-class \
- kernel-module-tuner \
- kernel-module-msp3400 \
- kernel-module-saa7115 \
- kernel-module-tda9887 \
- kernel-module-v4l1-compat \
- kernel-module-v4l2-common \
- kernel-module-videodev"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://hotplug.functions \
- file://firmware.hotplug \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- mkdir -p ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware
-}
+++ /dev/null
-require pvrusb2-mci.inc
-
-PR = "r1"
-RRECOMMENDS = "kernel-module-tveeprom \
- kernel-module-firmware-class \
- kernel-module-tuner \
- kernel-module-msp3400 \
- kernel-module-saa7115 \
- kernel-module-tda9887 \
- kernel-module-v4l1-compat \
- kernel-module-v4l2-common \
- kernel-module-videodev"
-
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
- file://hotplug.functions \
- file://firmware.hotplug \
- file://Makefile.patch;patch=1"
-
-S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
-
-inherit module
-
-CFLAGS = "'-I${KERNEL_SOURCE}/include' \
- '-I${KERNEL_SOURCE}/drivers/media/video' "
-
-CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
-
-CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
-
-EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
-
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
- mkdir -p ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware
- cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware
-}
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
RRECOMMENDS = "kernel-module-tveeprom \
kernel-module-firmware-class \
'LD=${KERNEL_LD}' \
'KDIR=${STAGING_KERNEL_DIR}'"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
do_install() {
install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
--- /dev/null
+require pvrusb2-mci2.inc
+
+RRECOMMENDS = "kernel-module-tveeprom \
+ kernel-module-firmware-class \
+ kernel-module-tuner \
+ kernel-module-msp3400 \
+ kernel-module-saa7115 \
+ kernel-module-tda9887 \
+ kernel-module-v4l1-compat \
+ kernel-module-v4l2-common \
+ kernel-module-videodev"
+
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
+ file://hotplug.functions \
+ file://firmware.hotplug \
+ file://Makefile.patch;patch=1"
+
+S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+ '-I${KERNEL_SOURCE}/drivers/media/video' "
+
+CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
+
+CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
+
+EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
+ 'CC=${KERNEL_CC}' \
+ 'LD=${KERNEL_LD}' \
+ 'KDIR=${STAGING_KERNEL_DIR}'"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+ mkdir -p ${D}/etc/hotplug.d/firmware
+ cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware
+ cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware
+}
'LD=${KERNEL_LD}' \
'KDIR=${STAGING_KERNEL_DIR}'"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+ -rpath-link ${STAGING_DIR_TARGET}${layout_libdir}"
do_install() {
install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
########################################################################################################################
-### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Tue Jan 22 04:03:18 2008
+### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Feb 27 13:29:38 2008
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
DESCRIPTION_python-profile="Python Basic Profiling Support"
-PR_python-profile="ml7"
+PR_python-profile="ml0"
RDEPENDS_python-profile="python-core"
FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml7"
+PR_python-threading="ml0"
RDEPENDS_python-threading="python-core python-lang"
FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* "
DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml7"
+PR_python-distutils="ml0"
RDEPENDS_python-distutils="python-core"
FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml7"
+PR_python-textutils="ml0"
RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml7"
+PR_python-codecs="ml0"
RDEPENDS_python-codecs="python-core python-lang"
FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* "
DESCRIPTION_python-ctypes="Python C Types Support"
-PR_python-ctypes="ml7"
+PR_python-ctypes="ml0"
RDEPENDS_python-ctypes="python-core"
FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so "
DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml7"
+PR_python-pickle="ml0"
RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
DESCRIPTION_python-datetime="Python Calendar and Time support"
-PR_python-datetime="ml7"
+PR_python-datetime="ml0"
RDEPENDS_python-datetime="python-core python-codecs"
FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml7"
+PR_python-core="ml0"
RDEPENDS_python-core=""
FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* "
DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml7"
+PR_python-io="ml0"
RDEPENDS_python-io="python-core python-math"
FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* "
DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml7"
+PR_python-compiler="ml0"
RDEPENDS_python-compiler="python-core"
FILES_python-compiler="${libdir}/python2.5/compiler "
DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml7"
+PR_python-compression="ml0"
RDEPENDS_python-compression="python-core python-zlib"
FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml7"
+PR_python-re="ml0"
RDEPENDS_python-re="python-core"
FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* "
DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml7"
+PR_python-xmlrpc="ml0"
RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml7"
+PR_python-terminal="ml0"
RDEPENDS_python-terminal="python-core python-io"
FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml7"
+PR_python-email="ml0"
RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
FILES_python-email="${libdir}/python2.5/email "
DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml7"
+PR_python-image="ml0"
RDEPENDS_python-image="python-core"
FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
DESCRIPTION_python-core-dbg="Python core module debug information"
-PR_python-core-dbg="ml7"
+PR_python-core-dbg="ml0"
RDEPENDS_python-core-dbg="python-core"
FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml7"
+PR_python-resource="ml0"
RDEPENDS_python-resource="python-core"
FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
DESCRIPTION_python-devel="Python Development Package"
-PR_python-devel="ml7"
+PR_python-devel="ml0"
RDEPENDS_python-devel="python-core"
FILES_python-devel="${includedir} ${libdir}/python2.5/config "
DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml7"
+PR_python-math="ml0"
RDEPENDS_python-math="python-core"
FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* "
DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml7"
+PR_python-hotshot="ml0"
RDEPENDS_python-hotshot="python-core"
FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml7"
+PR_python-unixadmin="ml0"
RDEPENDS_python-unixadmin="python-core"
FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml7"
+PR_python-syslog="ml0"
RDEPENDS_python-syslog="python-core"
FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-PR_python-tkinter="ml7"
+PR_python-tkinter="ml0"
RDEPENDS_python-tkinter="python-core"
FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml7"
+PR_python-gdbm="ml0"
RDEPENDS_python-gdbm="python-core"
FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml7"
+PR_python-fcntl="ml0"
RDEPENDS_python-fcntl="python-core"
FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml7"
+PR_python-netclient="ml0"
RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml7"
+PR_python-pprint="ml0"
RDEPENDS_python-pprint="python-core"
FILES_python-pprint="${libdir}/python2.5/pprint.* "
DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml7"
+PR_python-netserver="ml0"
RDEPENDS_python-netserver="python-core python-netclient"
FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* "
DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml7"
+PR_python-curses="ml0"
RDEPENDS_python-curses="python-core"
FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so "
DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
-PR_python-smtpd="ml7"
+PR_python-smtpd="ml0"
RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
FILES_python-smtpd="${bindir}/smtpd.* "
DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml7"
+PR_python-html="ml0"
RDEPENDS_python-html="python-core"
FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* "
DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml7"
+PR_python-readline="ml0"
RDEPENDS_python-readline="python-core"
FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* "
DESCRIPTION_python-subprocess="Python Subprocess Support"
-PR_python-subprocess="ml7"
+PR_python-subprocess="ml0"
RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml7"
+PR_python-pydoc="ml0"
RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* "
DESCRIPTION_python-logging="Python Logging Support"
-PR_python-logging="ml7"
+PR_python-logging="ml0"
RDEPENDS_python-logging="python-core python-io python-lang python-stringold"
FILES_python-logging="${libdir}/python2.5/logging "
DESCRIPTION_python-mailbox="Python Mailbox Format Support"
-PR_python-mailbox="ml7"
+PR_python-mailbox="ml0"
RDEPENDS_python-mailbox="python-core python-mime"
FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml7"
+PR_python-xml="ml0"
RDEPENDS_python-xml="python-core python-re python-netclient"
FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml7"
+PR_python-mime="ml0"
RDEPENDS_python-mime="python-core python-io"
FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml7"
+PR_python-sqlite3="ml0"
RDEPENDS_python-sqlite3="python-core"
FILES_python-sqlite3="${libdir}/python2.5/sqlite3 "
DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml7"
+PR_python-tests="ml0"
RDEPENDS_python-tests="python-core"
FILES_python-tests="${libdir}/python2.5/test "
DESCRIPTION_python-unittest="Python Unit Testing Framework"
-PR_python-unittest="ml7"
+PR_python-unittest="ml0"
RDEPENDS_python-unittest="python-core python-stringold python-lang"
FILES_python-unittest="${libdir}/python2.5/unittest.* "
DESCRIPTION_python-stringold="Python String APIs [deprecated]"
-PR_python-stringold="ml7"
+PR_python-stringold="ml0"
RDEPENDS_python-stringold="python-core python-re"
FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* "
DESCRIPTION_python-robotparser="Python robots.txt parser"
-PR_python-robotparser="ml7"
+PR_python-robotparser="ml0"
RDEPENDS_python-robotparser="python-core python-netclient"
FILES_python-robotparser="${libdir}/python2.5/robotparser.* "
DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
-PR_python-lib-old-and-deprecated="ml7"
+PR_python-lib-old-and-deprecated="ml0"
RDEPENDS_python-lib-old-and-deprecated="python-core"
FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old "
DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-PR_python-compile="ml7"
+PR_python-compile="ml0"
RDEPENDS_python-compile="python-core"
FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* "
DESCRIPTION_python-debugger="Python Debugger"
-PR_python-debugger="ml7"
+PR_python-debugger="ml0"
RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell"
FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml7"
+PR_python-shell="ml0"
RDEPENDS_python-shell="python-core python-re"
FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-PR_python-bsddb="ml7"
+PR_python-bsddb="ml0"
RDEPENDS_python-bsddb="python-core"
FILES_python-bsddb="${libdir}/python2.5/bsddb "
DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
-PR_python-mmap="ml7"
+PR_python-mmap="ml0"
RDEPENDS_python-mmap="python-core python-io"
FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so "
DESCRIPTION_python-zlib="Python zlib Support."
-PR_python-zlib="ml7"
+PR_python-zlib="ml0"
RDEPENDS_python-zlib="python-core"
FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so "
DESCRIPTION_python-db="Python File-Based Database Support"
-PR_python-db="ml7"
+PR_python-db="ml0"
RDEPENDS_python-db="python-core"
FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* "
DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml7"
+PR_python-crypt="ml0"
RDEPENDS_python-crypt="python-core"
FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so "
DESCRIPTION_python-idle="Python Integrated Development Environment"
-PR_python-idle="ml7"
+PR_python-idle="ml0"
RDEPENDS_python-idle="python-core python-tkinter"
FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib "
DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml7"
+PR_python-lang="ml0"
RDEPENDS_python-lang="python-core"
FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* "
DESCRIPTION_python-audio="Python Audio Handling"
-PR_python-audio="ml7"
+PR_python-audio="ml0"
RDEPENDS_python-audio="python-core"
FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so "
+++ /dev/null
-#
-# FIXME: Don't simply rip this test out... add getting it from cache
-#
-Index: Python-2.5.1/configure.in
-===================================================================
---- Python-2.5.1.orig/configure.in
-+++ Python-2.5.1/configure.in
-@@ -3367,41 +3367,6 @@ else
- AC_MSG_RESULT(no)
- fi
-
--AC_MSG_CHECKING(for %zd printf() format support)
--AC_TRY_RUN([#include <stdio.h>
--#include <stddef.h>
--#include <string.h>
--
--int main()
--{
-- char buffer[256];
--
--#ifdef HAVE_SSIZE_T
--typedef ssize_t Py_ssize_t;
--#elif SIZEOF_VOID_P == SIZEOF_LONG
--typedef long Py_ssize_t;
--#else
--typedef int Py_ssize_t;
--#endif
--
-- if(sprintf(buffer, "%zd", (size_t)123) < 0)
-- return 1;
--
-- if (strcmp(buffer, "123"))
-- return 1;
--
-- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
-- return 1;
--
-- if (strcmp(buffer, "-123"))
-- return 1;
--
-- return 0;
--}],
--[AC_MSG_RESULT(yes)
-- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
-- AC_MSG_RESULT(no))
--
- AC_CHECK_TYPE(socklen_t,,
- AC_DEFINE(socklen_t,int,
- Define to `int' if <sys/socket.h> does not define.),[
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: Python-2.5.1/Makefile.pre.in
-===================================================================
---- Python-2.5.1.orig/Makefile.pre.in
-+++ Python-2.5.1/Makefile.pre.in
-@@ -83,8 +83,8 @@ prefix= @prefix@
- exec_prefix= @exec_prefix@
-
- # Expanded directories
--BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+BINDIR= @bindir@
-+LIBDIR= @libdir@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
+++ /dev/null
-#
-# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de>
-#
-Index: Python-2.5.1/Makefile.pre.in
-===================================================================
---- Python-2.5.1.orig/Makefile.pre.in
-+++ Python-2.5.1/Makefile.pre.in
-@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
-
- PYTHON= python$(EXE)
- BUILDPYTHON= python$(BUILDEXE)
-+HOSTPYTHON= $(BUILDPYTHON)
-
- # === Definitions added by makesetup ===
-
-@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
- ##########################################################################
- # Parser
- PGEN= Parser/pgen$(EXE)
--
-+HOSTPGEN= $(PGEN)$(EXE)
- POBJS= \
- Parser/acceler.o \
- Parser/grammar1.o \
-@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON)
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- case $$MAKEFLAGS in \
-- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
- esac
-
- # Build static library
-@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
-
-
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-
- $(PGEN): $(PGENOBJS)
- $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib
- done
- $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-
-@@ -885,7 +886,7 @@ libainstall: all
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall:
-- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED) \
-Index: Python-2.5.1/setup.py
-===================================================================
---- Python-2.5.1.orig/setup.py
-+++ Python-2.5.1/setup.py
-@@ -211,6 +211,7 @@ class PyBuildExt(build_ext):
- except ImportError, why:
- self.announce('*** WARNING: renaming "%s" since importing it'
- ' failed: %s' % (ext.name, why), level=3)
-+ return
- assert not self.inplace
- basename, tail = os.path.splitext(ext_filename)
- newname = basename + "_failed" + tail
-@@ -244,8 +245,8 @@ class PyBuildExt(build_ext):
-
- def detect_modules(self):
- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-
- # Add paths specified in the environment variables LDFLAGS and
- # CPPFLAGS for header and library files.
-@@ -341,6 +342,9 @@ class PyBuildExt(build_ext):
-
- # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
-+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
-+
- #
- # The following modules are all pretty straightforward, and compile
- # on pretty much any POSIXish platform.
+++ /dev/null
-Index: Python-2.5.1/Python/compile.c
-===================================================================
---- Python-2.5.1.orig/Python/compile.c
-+++ Python-2.5.1/Python/compile.c
-@@ -30,7 +30,7 @@
- #include "symtable.h"
- #include "opcode.h"
-
--int Py_OptimizeFlag = 0;
-+int Py_OptimizeFlag = 1;
-
- /*
- ISSUES:
+++ /dev/null
-diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
---- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200
-+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100
-@@ -1321,16 +1329,16 @@
- ffi_configfile):
- from distutils.dir_util import mkpath
- mkpath(ffi_builddir)
-- config_args = []
-+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
-- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
-+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
-
- res = os.system(cmd)
- if res or not os.path.exists(ffi_configfile):
-- print "Failed to configure _ctypes module"
-+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
- return False
-
- fficonfig = {}
-diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
---- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200
-+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100
-@@ -273,11 +273,13 @@
- PyErr_NoMemory();
- return NULL;
- }
-+#if FFI_CLOSURES
- p->pcl = MallocClosure();
- if (p->pcl == NULL) {
- PyErr_NoMemory();
- goto error;
- }
-+#endif
-
- for (i = 0; i < nArgs; ++i) {
- PyObject *cnv = PySequence_GetItem(converters, i);
-@@ -315,12 +317,14 @@
- "ffi_prep_cif failed with %d", result);
- goto error;
- }
-+#if FFI_CLOSURES
- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
- if (result != FFI_OK) {
- PyErr_Format(PyExc_RuntimeError,
- "ffi_prep_closure failed with %d", result);
- goto error;
- }
-+#endif
-
- p->converters = converters;
- p->callable = callable;
-@@ -328,8 +332,10 @@
-
- error:
- if (p) {
-+#if FFI_CLOSURES
- if (p->pcl)
- FreeClosure(p->pcl);
-+#endif
- PyMem_Free(p);
- }
- return NULL;
-diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
---- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100
-+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100
-@@ -3419,7 +3419,9 @@
- Py_CLEAR(self->paramflags);
-
- if (self->thunk) {
-+#if FFI_CLOSURES
- FreeClosure(self->thunk->pcl);
-+#endif
- PyMem_Free(self->thunk);
- self->thunk = NULL;
- }
-diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
---- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200
-+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100
-@@ -68,7 +68,9 @@
- };
-
- typedef struct {
-+#if FFI_CLOSURES
- ffi_closure *pcl; /* the C callable */
-+#endif
- ffi_cif cif;
- PyObject *converters;
- PyObject *callable;
-diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
---- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200
-+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100
-@@ -27,7 +27,9 @@
- /******************************************************************/
-
- typedef union _tagITEM {
-+#if FFI_CLOSURES
- ffi_closure closure;
-+#endif
- union _tagITEM *next;
- } ITEM;
-
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: Python-2.5.1/setup.py
-===================================================================
---- Python-2.5.1.orig/setup.py
-+++ Python-2.5.1/setup.py
-@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext):
- dotversion = dotversion[:-1] + '.' + dotversion[-1]
- tcl_include_sub = []
- tk_include_sub = []
-- for dir in inc_dirs:
-+ for dir in [os.getenv("STAGING_INCDIR")]:
- tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
- tk_include_sub += [dir + os.sep + "tk" + dotversion]
- tk_include_sub += tcl_include_sub
-@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext):
- if dir not in include_dirs:
- include_dirs.append(dir)
-
-- # Check for various platform-specific directories
-- if platform == 'sunos5':
-- include_dirs.append('/usr/openwin/include')
-- added_lib_dirs.append('/usr/openwin/lib')
-- elif os.path.exists('/usr/X11R6/include'):
-- include_dirs.append('/usr/X11R6/include')
-- added_lib_dirs.append('/usr/X11R6/lib64')
-- added_lib_dirs.append('/usr/X11R6/lib')
-- elif os.path.exists('/usr/X11R5/include'):
-- include_dirs.append('/usr/X11R5/include')
-- added_lib_dirs.append('/usr/X11R5/lib')
-- else:
-- # Assume default location for X11
-- include_dirs.append('/usr/X11/include')
-- added_lib_dirs.append('/usr/X11/lib')
--
- # If Cygwin, then verify that X is installed before proceeding
- if platform == 'cygwin':
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: Python-2.5.1/Lib/site.py
-===================================================================
---- Python-2.5.1.orig/Lib/site.py
-+++ Python-2.5.1/Lib/site.py
-@@ -323,8 +323,9 @@ def setcopyright():
- "Jython is maintained by the Jython developers (www.jython.org).")
- else:
- __builtin__.credits = _Printer("credits", """\
-- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
-- for supporting Python development. See www.python.org for more information.""")
-+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org).
-+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by
-+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""")
- here = os.path.dirname(os.__file__)
- __builtin__.license = _Printer(
- "license", "See http://www.python.org/%.3s/license.html" % sys.version,
+++ /dev/null
-# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
-# GPLv2 or later
-# Version: 20082201
-# Features:
-# * set proper default encoding
-# * enable readline completion in the interactive interpreter
-# * load command line history on startup
-# * save command line history on exit
-
-import os
-
-def __exithandler():
- try:
- readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
- except IOError:
- pass
-
-def __registerExitHandler():
- import atexit
- atexit.register( __exithandler )
-
-def __enableReadlineSupport():
- readline.parse_and_bind("tab: complete")
- try:
- readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
- except IOError:
- pass
-
-def __enableDefaultEncoding():
- import sys
- try:
- sys.setdefaultencoding('utf8')
- except LookupError:
- pass
-
-import sys
-try:
- import rlcompleter, readline
-except ImportError:
- sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] )
-else:
- __enableDefaultEncoding()
- __registerExitHandler()
- __enableReadlineSupport()
- sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] )
--- /dev/null
+Index: Python-2.5.2/configure.in
+===================================================================
+--- Python-2.5.2.orig/configure.in
++++ Python-2.5.2/configure.in
+@@ -3410,45 +3410,6 @@ esac
+
+
+
+-AC_MSG_CHECKING(for %zd printf() format support)
+-AC_TRY_RUN([#include <stdio.h>
+-#include <stddef.h>
+-#include <string.h>
+-
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-
+-#ifdef HAVE_SSIZE_T
+-typedef ssize_t Py_ssize_t;
+-#elif SIZEOF_VOID_P == SIZEOF_LONG
+-typedef long Py_ssize_t;
+-#else
+-typedef int Py_ssize_t;
+-#endif
+-
+-int main()
+-{
+- char buffer[256];
+-
+- if(sprintf(buffer, "%zd", (size_t)123) < 0)
+- return 1;
+-
+- if (strcmp(buffer, "123"))
+- return 1;
+-
+- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
+- return 1;
+-
+- if (strcmp(buffer, "-123"))
+- return 1;
+-
+- return 0;
+-}],
+-[AC_MSG_RESULT(yes)
+- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
+- AC_MSG_RESULT(no))
+-
+ AC_CHECK_TYPE(socklen_t,,
+ AC_DEFINE(socklen_t,int,
+ Define to `int' if <sys/socket.h> does not define.),[
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: Python-2.5.1/Makefile.pre.in
+===================================================================
+--- Python-2.5.1.orig/Makefile.pre.in
++++ Python-2.5.1/Makefile.pre.in
+@@ -83,8 +83,8 @@ prefix= @prefix@
+ exec_prefix= @exec_prefix@
+
+ # Expanded directories
+-BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++BINDIR= @bindir@
++LIBDIR= @libdir@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
--- /dev/null
+#
+# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+#
+Index: Python-2.5.2/Makefile.pre.in
+===================================================================
+--- Python-2.5.2.orig/Makefile.pre.in
++++ Python-2.5.2/Makefile.pre.in
+@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
+
+ PYTHON= python$(EXE)
+ BUILDPYTHON= python$(BUILDEXE)
++HOSTPYTHON= $(BUILDPYTHON)
+
+ # === Definitions added by makesetup ===
+
+@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
+ ##########################################################################
+ # Parser
+ PGEN= Parser/pgen$(EXE)
+-
++HOSTPGEN= $(PGEN)$(EXE)
+ POBJS= \
+ Parser/acceler.o \
+ Parser/grammar1.o \
+@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON)
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ case $$MAKEFLAGS in \
+- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
+ # Build static library
+@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
+
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+ -@ mkdir Include
+- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+
+ $(PGEN): $(PGENOBJS)
+ $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib
+ done
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+
+@@ -894,7 +895,7 @@ libainstall: all
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall:
+- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --install-platlib=$(DESTSHARED) \
+Index: Python-2.5.2/setup.py
+===================================================================
+--- Python-2.5.2.orig/setup.py
++++ Python-2.5.2/setup.py
+@@ -211,6 +211,7 @@ class PyBuildExt(build_ext):
+ except ImportError, why:
+ self.announce('*** WARNING: renaming "%s" since importing it'
+ ' failed: %s' % (ext.name, why), level=3)
++ return
+ assert not self.inplace
+ basename, tail = os.path.splitext(ext_filename)
+ newname = basename + "_failed" + tail
+@@ -244,8 +245,8 @@ class PyBuildExt(build_ext):
+
+ def detect_modules(self):
+ # Ensure that /usr/local is always used
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+
+ # Add paths specified in the environment variables LDFLAGS and
+ # CPPFLAGS for header and library files.
+@@ -342,6 +343,9 @@ class PyBuildExt(build_ext):
+
+ # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+
++ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
++ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
++
+ #
+ # The following modules are all pretty straightforward, and compile
+ # on pretty much any POSIXish platform.
--- /dev/null
+Index: Python-2.5.1/Python/compile.c
+===================================================================
+--- Python-2.5.1.orig/Python/compile.c
++++ Python-2.5.1/Python/compile.c
+@@ -30,7 +30,7 @@
+ #include "symtable.h"
+ #include "opcode.h"
+
+-int Py_OptimizeFlag = 0;
++int Py_OptimizeFlag = 1;
+
+ /*
+ ISSUES:
--- /dev/null
+diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
+--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200
++++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100
+@@ -1321,16 +1329,16 @@
+ ffi_configfile):
+ from distutils.dir_util import mkpath
+ mkpath(ffi_builddir)
+- config_args = []
++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
+
+ # Pass empty CFLAGS because we'll just append the resulting
+ # CFLAGS to Python's; -g or -O2 is to be avoided.
+- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
+- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
+
+ res = os.system(cmd)
+ if res or not os.path.exists(ffi_configfile):
+- print "Failed to configure _ctypes module"
++ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
+ return False
+
+ fficonfig = {}
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
+--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100
+@@ -273,11 +273,13 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
++#if FFI_CLOSURES
+ p->pcl = MallocClosure();
+ if (p->pcl == NULL) {
+ PyErr_NoMemory();
+ goto error;
+ }
++#endif
+
+ for (i = 0; i < nArgs; ++i) {
+ PyObject *cnv = PySequence_GetItem(converters, i);
+@@ -315,12 +317,14 @@
+ "ffi_prep_cif failed with %d", result);
+ goto error;
+ }
++#if FFI_CLOSURES
+ result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
+ if (result != FFI_OK) {
+ PyErr_Format(PyExc_RuntimeError,
+ "ffi_prep_closure failed with %d", result);
+ goto error;
+ }
++#endif
+
+ p->converters = converters;
+ p->callable = callable;
+@@ -328,8 +332,10 @@
+
+ error:
+ if (p) {
++#if FFI_CLOSURES
+ if (p->pcl)
+ FreeClosure(p->pcl);
++#endif
+ PyMem_Free(p);
+ }
+ return NULL;
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
+--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100
++++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100
+@@ -3419,7 +3419,9 @@
+ Py_CLEAR(self->paramflags);
+
+ if (self->thunk) {
++#if FFI_CLOSURES
+ FreeClosure(self->thunk->pcl);
++#endif
+ PyMem_Free(self->thunk);
+ self->thunk = NULL;
+ }
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
+--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100
+@@ -68,7 +68,9 @@
+ };
+
+ typedef struct {
++#if FFI_CLOSURES
+ ffi_closure *pcl; /* the C callable */
++#endif
+ ffi_cif cif;
+ PyObject *converters;
+ PyObject *callable;
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
+--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100
+@@ -27,7 +27,9 @@
+ /******************************************************************/
+
+ typedef union _tagITEM {
++#if FFI_CLOSURES
+ ffi_closure closure;
++#endif
+ union _tagITEM *next;
+ } ITEM;
+
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: Python-2.5.1/setup.py
+===================================================================
+--- Python-2.5.1.orig/setup.py
++++ Python-2.5.1/setup.py
+@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext):
+ dotversion = dotversion[:-1] + '.' + dotversion[-1]
+ tcl_include_sub = []
+ tk_include_sub = []
+- for dir in inc_dirs:
++ for dir in [os.getenv("STAGING_INCDIR")]:
+ tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
+ tk_include_sub += [dir + os.sep + "tk" + dotversion]
+ tk_include_sub += tcl_include_sub
+@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext):
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: Python-2.5.1/Lib/site.py
+===================================================================
+--- Python-2.5.1.orig/Lib/site.py
++++ Python-2.5.1/Lib/site.py
+@@ -323,8 +323,9 @@ def setcopyright():
+ "Jython is maintained by the Jython developers (www.jython.org).")
+ else:
+ __builtin__.credits = _Printer("credits", """\
+- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
+- for supporting Python development. See www.python.org for more information.""")
++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org).
++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by
++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""")
+ here = os.path.dirname(os.__file__)
+ __builtin__.license = _Printer(
+ "license", "See http://www.python.org/%.3s/license.html" % sys.version,
--- /dev/null
+# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# GPLv2 or later
+# Version: 20082201
+# Features:
+# * set proper default encoding
+# * enable readline completion in the interactive interpreter
+# * load command line history on startup
+# * save command line history on exit
+
+import os
+
+def __exithandler():
+ try:
+ readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
+ except IOError:
+ pass
+
+def __registerExitHandler():
+ import atexit
+ atexit.register( __exithandler )
+
+def __enableReadlineSupport():
+ readline.parse_and_bind("tab: complete")
+ try:
+ readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
+ except IOError:
+ pass
+
+def __enableDefaultEncoding():
+ import sys
+ try:
+ sys.setdefaultencoding('utf8')
+ except LookupError:
+ pass
+
+import sys
+try:
+ import rlcompleter, readline
+except ImportError:
+ pass
+else:
+ __enableDefaultEncoding()
+ __registerExitHandler()
+ __enableReadlineSupport()
SECTION = "devel/python"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "MIT"
-DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml0"
+DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
+RDEPENDS = "python-threading python-io python-stringold python-logging"
+PR = "ml2"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
S = "${WORKDIR}/dbus-python-${PV}"
autotools_stage_all
}
+FILES_${PN}-dev += "${libdir}/pkgconfig
--- /dev/null
+DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \
+tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \
+processing, date/time processing and web site programming."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "EGENIX"
+SRCNAME = "egenix-mx-base"
+PR = "r0"
+
+SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}"
+export LIB = "${STAGING_LIBDIR}"
+
+FILES_${PN} += "${datadir}"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/mx/*/*/.debug"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml0"
+PR = "ml1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
file://python-path.patch;patch=1"
autotools_stage_all
}
+PACKAGES =+ "${PN}-examples"
+
FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dev += "\
+ ${datadir}/gst-python/0.10/defs \
+ ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \
+"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
--- /dev/null
+Index: m2crypto-0.18.2/setup.py
+===================================================================
+--- m2crypto-0.18.2.orig/setup.py
++++ m2crypto-0.18.2/setup.py
+@@ -38,7 +38,7 @@ class _M2CryptoBuildExt(build_ext.build_
+ self.openssl = 'c:\\pkg'
+ else:
+ self.libraries = ['ssl', 'crypto']
+- self.openssl = '/usr'
++ self.openssl = os.environ.get( "STAGING_DIR" )
+
+
+ def finalize_options(self):
+@@ -47,8 +47,8 @@ class _M2CryptoBuildExt(build_ext.build_
+
+ build_ext.build_ext.finalize_options(self)
+
+- opensslIncludeDir = os.path.join(self.openssl, 'include')
+- opensslLibraryDir = os.path.join(self.openssl, 'lib')
++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" )
++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" )
+
+ self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+ [opensslIncludeDir]]
--- /dev/null
+DESCRIPTION = "A Python crypto and SSL toolkit"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "openssl swig-native"
+LICENSE = "BSD"
+SRCNAME = "M2Crypto"
+PR = "ml0"
+
+SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
+ file://install.patch;patch=1"
+S = "${WORKDIR}/m2crypto-0.18.2"
+
+inherit setuptools
+
+export STAGING_DIR := "${STAGING_DIR}"
+export STAGING_INCDIR := "${STAGING_INCDIR}"
+export STAGING_LIBDIR := "${STAGING_LIBDIR}"
+
--- /dev/null
+DESCRIPTION = "Python Packet Capture Library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+RDEPENDS = "python-core"
+DEPENDS = "libpcap-0.7.2 libnet-1.1.1"
+SRCNAME = "pycap"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
--- /dev/null
+DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \
+an open-source physics engine. PyODE also includes an XODE parser."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "ode"
+SRCNAME = "PyODE"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \
+ file://install.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_configure_prepend() {
+ ln -s ${STAGING_LIBDIR}/.. ../ode
+}
+
S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
-EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}"
inherit distutils autotools
+++ /dev/null
-DESCRIPTION = "Python Programming Language"
-HOMEPAGE = "http://www.python.org"
-LICENSE = "PSF"
-SECTION = "devel/python"
-PRIORITY = "optional"
-DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
-DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-
-# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml10"
-
-PYTHON_MAJMIN = "2.5"
-
-SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
- file://bindir-libdir.patch;patch=1 \
- file://crosscompile.patch;patch=1 \
- file://fix-tkinter-detection.patch;patch=1 \
- file://autohell.patch;patch=1 \
- file://sitebranding.patch;patch=1 \
- file://enable-ctypes-module.patch;patch=1 \
- file://default-is-optimized.patch;patch=1 \
- file://sitecustomize.py"
-S = "${WORKDIR}/Python-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
- --without-cxx --with-signal-module --with-wctype-functions \
- --enable-shared"
-
-#
-# copy config.h and an appropriate Makefile for distutils.sysconfig
-# which laters uses the information out of these to compile extensions
-#
-do_compile_prepend() {
- install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
- install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
- install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
- install -m 0644 Makefile Makefile.orig
- install -m 0644 Makefile Makefile.backup
- sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
- install -m 0644 Makefile Makefile.backup
- sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
- install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
-}
-
-do_compile() {
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- OPT="${CFLAGS}" libpython2.5.so
-
- oe_libinstall -so libpython2.5 ${STAGING_LIBDIR}
-
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- OPT="${CFLAGS}"
-}
-
-do_stage() {
- install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
- oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
-}
-
-do_install() {
- install -m 0644 Makefile.orig Makefile
-
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- DESTDIR=${D} LIBDIR=${libdir} install
-
- install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
-}
-
-require python-${PYTHON_MAJMIN}-manifest.inc
-
-RPROVIDES_python-core = "python"
-RRECOMMENDS_python-core = "python-readline"
-
-# add sitecustomize
-FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
-
-# package libpython
-PACKAGES =+ "libpython2"
-FILES_libpython2 = "${libdir}/libpython*"
-
-# catch debug extensions
-FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
-
-# catch all the rest (unsorted)
-PACKAGES += "python-misc"
-FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
-
-# catch manpage
-PACKAGES += "python-man"
-FILES_python-man = "${datadir}/man"
-
--- /dev/null
+DESCRIPTION = "Python Programming Language"
+HOMEPAGE = "http://www.python.org"
+LICENSE = "PSF"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
+DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
+
+# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
+PR = "ml0"
+
+PYTHON_MAJMIN = "2.5"
+
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+ file://bindir-libdir.patch;patch=1 \
+ file://crosscompile.patch;patch=1 \
+ file://fix-tkinter-detection.patch;patch=1 \
+ file://autohell.patch;patch=1 \
+ file://sitebranding.patch;patch=1 \
+ file://enable-ctypes-module.patch;patch=1 \
+ file://default-is-optimized.patch;patch=1 \
+ file://sitecustomize.py"
+S = "${WORKDIR}/Python-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
+ --without-cxx --with-signal-module --with-wctype-functions \
+ --enable-shared"
+
+#
+# copy config.h and an appropriate Makefile for distutils.sysconfig
+# which laters uses the information out of these to compile extensions
+#
+do_compile_prepend() {
+ install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+ install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ install -m 0644 Makefile Makefile.orig
+ install -m 0644 Makefile Makefile.backup
+ sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
+ install -m 0644 Makefile Makefile.backup
+ sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
+ install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+}
+
+do_compile() {
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ OPT="${CFLAGS}" libpython2.5.so
+
+ oe_libinstall -so libpython2.5 ${STAGING_LIBDIR}
+
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ OPT="${CFLAGS}"
+}
+
+do_stage() {
+ install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
+}
+
+do_install() {
+ install -m 0644 Makefile.orig Makefile
+
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ DESTDIR=${D} LIBDIR=${libdir} install
+
+ install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
+}
+
+require python-${PYTHON_MAJMIN}-manifest.inc
+
+# manual additions
+RPROVIDES_python-core = "python"
+RRECOMMENDS_python-core = "python-readline"
+RRECOMMENDS_python-crypt = "openssl"
+PR_python-crypt = "ml1"
+
+# add sitecustomize
+FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
+
+# package libpython
+PACKAGES =+ "libpython2"
+FILES_libpython2 = "${libdir}/libpython*"
+
+# catch debug extensions
+FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
+
+# catch all the rest (unsorted)
+PACKAGES += "python-misc"
+FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
+
+# catch manpage
+PACKAGES += "python-man"
+FILES_python-man = "${datadir}/man"
+
inherit qmake_base qt3x11
export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
ARCH_i686 = "x86"
EXTRA_OEMAKE = "-e"
}
do_stage() {
- install -d ${STAGING_DIR}/${HOST_SYS}/qt3/lib
- oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR}/${HOST_SYS}/qt3/lib
- install -d ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+ install -d ${STAGING_DIR_HOST}/qt3/lib
+ oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR_HOST}/qt3/lib
+ install -d ${STAGING_DIR_HOST}/qt3/include/private
for f in include/*.h
do
- install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/
+ install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/
done
for f in include/private/*.h
do
- install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+ install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/private
done
}
inherit qmake_base qt4x11 pkgconfig
export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
+STAGING_QT_DIR = "${STAGING_DIR_TARGET}/qt4"
EXTRA_OEMAKE = "-e"
require qt4_arch.inc
}
do_stage() {
- rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
- oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+ rm -rf ${STAGING_DIR_HOST}/qt2
+ install -d ${STAGING_DIR_HOST}/qt2/lib
+ oe_libinstall -so -C lib lib${PN} ${STAGING_DIR_HOST}/qt2/lib
rm -f include/qxt.h
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+ install -d ${STAGING_DIR_HOST}/qt2/include
+ cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+ cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
}
do_install() {
EXTRA_OECONF += "-static -thread"
do_stage() {
- rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
- oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+ rm -rf ${STAGING_DIR_HOST}/qt2
+ install -d ${STAGING_DIR_HOST}/qt2/lib
+ oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
rm -f include/qxt.h
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+ install -d ${STAGING_DIR_HOST}/qt2/include
+ cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+ cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
}
do_install() {
EXTRA_OECONF += "-static -thread"
do_stage() {
- rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
- oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+ rm -rf ${STAGING_DIR_HOST}/qt2
+ install -d ${STAGING_DIR_HOST}/qt2/lib
+ oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
rm -f include/qxt.h
- install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
- cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
- install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/
+ install -d ${STAGING_DIR_HOST}/qt2/include
+ cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+ cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
+ install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR_HOST}/qt2/include/
}
do_install() {
export CFLAGS_append=" -I${STAGING_INCDIR}/mysql "
-EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR} --enable-mysql"
+EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-mysql"
-EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR}"
+EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix}"
+++ /dev/null
- file://Makefile.am.patch;patch=1"
+++ /dev/null
-SECTION = "libs"
-LICENSE= "BSD-X"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
-S = "${WORKDIR}/Randr"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
--bindir=${bindir} \
--mandir=${mandir} \
--sharedir=${datadir} \
- --with-x=${STAGING_DIR}/${HOST_SYS} \
- --with-openssl=${STAGING_DIR}/${HOST_SYS} \
+ --with-x=${STAGING_EXECPREFIXDIR} \
+ --with-openssl=${STAGING_EXECPREFIXDIR} \
--with-oss \
--without-debug
}
inherit autotools
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
inherit autotools
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
--- /dev/null
+require re2c.inc
+
+PR = "r0"
+
+inherit native
--- /dev/null
+DESCRIPTION = "Tool for writing very fast and very flexible scanners"
+HOMEPAGE = "http://re2c.sourceforge.net/"
+AUTHOR = "Marcus Börger helly@users.sourceforge.net"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "PD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/re2c/re2c-${PV}.tar.gz"
+
+S = "${WORKDIR}/re2c-${PV}"
+
+inherit autotools
--- /dev/null
+require re2c.inc
+
+PR = "r0"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "XRecord extension protocol bits"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
-S = "${WORKDIR}/RecordExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-SECTION = "libs"
-LICENSE = "MIT-X"
-DESCRIPTION = "X Render extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-DESCRIPTION = "X Render extension headers"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render"
-S = "${WORKDIR}/Render"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-SECTION = "libs"
-LICENSE = "Xorg"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Resource usage extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/resourceext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-LICENSE = "Xorg"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Resource usage extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt"
-S = "${WORKDIR}/ResourceExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
-}
SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=roadster"
S = "${WORKDIR}/${PN}"
-EXTRA_OECONF = " --with-gpsd=${STAGING_DIR}/${TARGET_SYS} "
+EXTRA_OECONF = " --with-gpsd=${STAGING_DIR_TARGET}${layout_exec_prefix} "
inherit autotools
CFLAGS += " -I{$STAGING_INCDIR} "
+++ /dev/null
-DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
-DEPENDS = "libusb-native"
-SECTION = "devel"
-AUTHOR = "Harald Welte"
-LICENSE = "GPL"
-PV = "0.1.0+svn${SRCDATE}"
-PR = "r0"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
-S = "${WORKDIR}/s3c2410_boot_usb"
-
-inherit native
-
-do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE}
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_build after do_compile
+++ /dev/null
-DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
-SECTION = "devel"
-AUTHOR = "Harald Welte"
-LICENSE = "GPL"
-PV = "0.1+svn${SRCDATE}"
-PR = "r0"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
-S = "${WORKDIR}/sjf2410-linux"
-
-inherit native
-
-CFLAGS += "-DLINUX_PPDEV"
-
-do_compile() {
- oe_runmake
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_package after do_install
--- /dev/null
+DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
+S = "${WORKDIR}/s3c2410_boot_usb"
+
+inherit native
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE}
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_build after do_compile
--- /dev/null
+DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PV = "1.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
+S = "${WORKDIR}/gpio"
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install -m 0755 ${PN} ${D}${sbindir}
+}
--- /dev/null
+DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
+S = "${WORKDIR}/sjf2410-linux"
+
+inherit native
+
+CFLAGS += "-DLINUX_PPDEV"
+
+do_compile() {
+ oe_runmake
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_package after do_install
file://fix-makefile.patch;patch=1 \
file://event_base.patch;patch=1"
-EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
-CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11"
-LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11"
+EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR_TARGET}${layout_prefix}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
+CFLAGS_append = " -I${STAGING_INCDIR}/X11"
+LDFLAGS_append = " -L${STAGING_LIBDIR}/X11"
do_install() {
oe_runmake 'BINDIR=${D}${bindir}' install
}
do_stage() {
- make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install
+ make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR_HOST}${layout_mandir}" includedir="${STAGING_INCDIR}" install
rm ${STAGING_BINDIR}/rec
ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec
}
SRC_URI = "http://freedesktop.org/Software/startup-notification/releases/startup-notification-${PV}.tar.gz"
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
file://disable-revision-install.patch;patch=1 \
file://apr-regex.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r62"
+PR = "r63"
inherit task
DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
inherit task
RDEPENDS_task-openmoko-base = "\
matchbox-panel-2 \
matchbox-panel-2-applets \
- matchbox-keyboard-inputmethod \
- matchbox-keyboard-im \
- matchbox-keyboard-applet \
+# matchbox-keyboard-inputmethod \
+# matchbox-keyboard-im \
+# matchbox-keyboard-applet \
matchbox-stroke \
+ multitap-pad \
openmoko-terminal2 \
# openmoko-keyboard \
openmoko-panel-battery \
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
inherit task
libgsmd-tools \
openmoko-dialer2 \
openmoko-panel-gsm \
+ openmoko-panel-memory \
# ppp \
"
LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch;patch=1 \
oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR}
oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
+ sed -i "s,-L${libdir},," tclConfig.sh
install -d ${STAGING_BINDIR_CROSS}/
install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
cd ..
EXTRA_OECONF=" --enable-shared --disable-rpath "
-#do_configure_prepend() {
-# ./autogen.sh
-#}
-
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR}/tremor \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
PACKAGES = "${PN}-dbg ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
ttf-dejavu-serif ttf-dejavu-serif-condensed ttf-dejavu-common"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
S = "${WORKDIR}/hunkyfonts-${PV}/TTF/"
PACKAGES = "${PN}-dbg ttf-hunky-sans ttf-hunky-serif"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
S = "${WORKDIR}/liberation-fonts-${PV}"
PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
+RRECOMMENDS_${PN}-dbg = ""
+
FILES_ttf-liberation-mono = "${datadir}/fonts/truetype/*Mono*"
FILES_ttf-liberation-sans = "${datadir}/fonts/truetype/*Sans*"
FILES_ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*"
S = "${WORKDIR}/sazanami-20040629"
PACKAGES = "${PN}-dbg ttf-sazanami-gothic ttf-sazanami-mincho"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \
${datadir}/doc/ttf-sazanami-gothic/README"
FILES_ttf-sazanami-mincho = "${datadir}/fonts/truetype/sazanami-mincho.ttf \
SECTION = "bootloader"
PRIORITY = "optional"
-UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89"
-UBOOT_OPENMOKO_REV = "3817"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4"
+UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
+UBOOT_OPENMOKO_REV = "4118"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r3"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
- file://makefile-no-dirafter.patch;patch=1 \
- file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+# file://makefile-no-dirafter.patch;patch=1 \
+# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
"
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
do_quilt() {
echo "echo ${LOCALVERSION}" >>tools/setlocalversion
}
-do_configure_prepend() {
- find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
- find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
- cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
-}
-
do_compile () {
chmod +x board/neo1973/gta*/split_by_variant.sh
for mach in ${UBOOT_MACHINES}
DEFAULT_PREFERENCE = "-1"
+BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6"
+
SRC_URI = "\
- git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=3afac79ec27b91df185f090b31dad9620779f440 \
+
+git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
S = "${WORKDIR}/${PN}"
-EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \
- --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \
- --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \
+EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \
+ --with-libiberty=${STAGING_LIBDIR}/libiberty.a \
+ --with-bfd-include-dir=${STAGING_INCDIR} \
"
SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
file://uClibc.config"
-UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
-UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
+UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
# the CFLAGS (for when building the utils).
EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include"
-KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include"
+KERNEL_SOURCE = "${STAGING_INCDIR}"
+KERNEL_HEADERS = "${STAGING_INCDIR}"
# Lets munge this via siteinfo.bbclass as well:
# ARCH_BIG_ENDIAN=y
}
do_stage() {
- # Install into the cross dir (this MUST be done first because we
- # will install crt1.o in the install_dev stage and gcc needs it)
- oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
- RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
- install_dev install_runtime
-
- oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
- RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
- install_utils
-
- # We don't really need this
- rm -f ${UCLIBC_PREFIX}/include/.cvsignore
-
- # Fixup shared lib symlinks
- ( cd ${UCLIBC_PREFIX}/lib
- for f in c crypt dl m nsl pthread resolv thread_db util; do
- ln -sf lib${f}.so.? lib${f}.so
- done
- )
+ # This MUST be done first because we
+ # will install crt1.o in the install_dev stage and gcc needs it
- # This conflicts with the c++ version of this header
- rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+ # Install into the staging dir
+ oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ install_dev install_runtime
# Install into the staging dir
oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
- install_dev install_runtime install_utils
+ install_utils
# We don't really need this
rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore
}
do_install() {
- # Install into the cross dir (this MUST be done first because we
+ # This MUST be done first because we
# will install crt1.o in the install_dev stage and gcc needs it)
- oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
- RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
- install_dev install_runtime
+ oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ install_dev install_runtime
oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
install_dev install_runtime
#!/bin/sh
+# udevd does clearenv(). Export shell PATH to children.
+export PATH
+
# Do not run when pcmcia-cs is installed
test -x /sbin/cardctl && exit 0
# directory which is guaranteed to be available.
mount -n -o bind /dev /etc/udev
- if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+ if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs udev /dev; then
umount /etc/udev
echo "udev requires tmpfs support, not started."
exit 1
# I hate this hack. -- Md
make_extra_nodes() {
+ mknod -m 666 /dev/null c 1 3
if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
cp -a /lib/udev/devices/* /dev/
fi
supported_kernel() {
case "$(uname -r)" in
2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
- 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+ 2.6.1[0134]|2.6.1[01234][!0-9]*) return 1 ;;
esac
return 0
}
-set_hotplug_handler() {
- case "$(uname -r)" in
- 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
- esac
- echo $HANDLER > /proc/sys/kernel/hotplug
-}
-
# shell version of /usr/bin/tty
my_tty() {
[ -x /bin/readlink ] || return 0
readlink --silent /proc/self/fd/0 || true
}
-warn_if_interactive() {
- if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
- return
- fi
-
- TTY=$(my_tty)
- if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
- return
- fi
-
- printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
- printf "has been run from an interactive shell.\n"
- printf "It will probably not do what you expect, so this script will wait\n"
- printf "60 seconds before continuing. Press ^C to stop it.\n"
- printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
- sleep 60
-}
-
##############################################################################
PATH="/sbin:/bin:/usr/bin"
# defaults
tmpfs_size="2M"
-udev_root="/dev"
-udevd_timeout=30
. /etc/udev/udev.conf
if ! supported_kernel; then
- echo "udev requires a kernel >= 2.6.12, not started."
+ echo "udev requires a kernel >= 2.6.15, not started."
exit 1
fi
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
- echo "udev requires hotplug support, not started."
- exit 1
-fi
-
##############################################################################
# When modifying this script, do not forget that between the time that
# the new /dev has been mounted and udevsynthesize has been run there will be
# no /dev/null. This also means that you cannot use the "&" shell command.
-
case "$1" in
start)
- if [ -e "$udev_root/.udev/" ]; then
- if mountpoint -q /dev/; then
- TMPFS_MOUNTED=1
- else
- echo ".udev/ already exists on the static $udev_root!"
- fi
- else
- warn_if_interactive
- fi
+ unmount_devpts
+ mount_tmpfs
+ [ -d /proc/1 ] || mount -n /proc
- echo "Starting the hotplug events dispatcher" "udevd"
- udevd --daemon
-
- set_hotplug_handler
+ # /dev/null must be created before udevd is started
+ make_extra_nodes
- if [ -z "$TMPFS_MOUNTED" ]; then
- unmount_devpts
- mount_tmpfs
- [ -d /proc/1 ] || mount -n /proc
+ # It's all over netlink now
+ if [ -e /proc/sys/kernel/hotplug ]; then
+ echo "" > /proc/sys/kernel/hotplug
fi
- # if this directory is not present /dev will not be updated by udev
- mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/
- # /dev/null must be created before udevd is started
- make_extra_nodes
+ echo "Starting the hotplug events dispatcher" "udevd"
+ udevd --daemon
echo "Synthesizing the initial hotplug events"
udevtrigger
-
- # wait for the udevd childs to finish
- echo "Waiting for /dev to be fully populated"
- while [ -d /dev/.udev/queue/ ]; do
- sleep 1
- udevd_timeout=$(($udevd_timeout - 1))
- if [ $udevd_timeout -eq 0 ]; then
- # ps axf
- break
- fi
- done
- if [ $udevd_timeout -eq 0 ]; then
- echo 'timeout'
- fi
+ udevsettle
;;
stop)
the hotplug package and requires a kernel not older than 2.6.12."
RPROVIDES_${PN} = "hotplug"
-PR = "r0"
+PR = "r2"
-DEFAULT_PREFERENCE = "-115"
+DEFAULT_PREFERENCE = "-118"
SRC_URI = "\
http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
--- /dev/null
+Index: build/unix/config_proginfo_build
+===================================================================
+--- build/unix/config_proginfo_build.orig 2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_build 2008-02-28 10:01:38.000000000 +0000
+@@ -37,9 +37,9 @@
+
+ ### gcc ###
+ PROG_gcc_NAME="GNU C compiler"
+-PROG_gcc_FILE="gcc"
++PROG_gcc_FILE="$CC"
+ PROG_gcc_ACTION=""
+-PROG_gcc_VERSION='$(gcc --version)'
++PROG_gcc_VERSION='$($CC --version)'
+
+
+ ### sed ###
+Index: build/unix/config_proginfo_host
+===================================================================
+--- build/unix/config_proginfo_host.orig 2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_host 2008-02-28 10:03:09.000000000 +0000
+@@ -69,7 +69,7 @@
+ ;;
+ *)
+ LIB_SDL_CFLAGS='$(sdl-config --cflags)'
+- LIB_SDL_LDFLAGS='$(sdl-config --libs)'
++ LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz'
+ LIB_SDL_VERSION='$(sdl-config --version)'
+ ;;
+ esac
+@@ -170,8 +170,8 @@
+ LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
+ ;;
+ *)
+- LIB_vorbisfile_CFLAGS=""
+- LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis"
++ LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR"
++ LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg"
+ ;;
+ esac
+ LIB_vorbisfile_VERSION=""
do_configure() {
install ${WORKDIR}/build-opts.sh ${S}/
- ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+ ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR}
}
do_compile() {
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
S = "${WORKDIR}/uqm-${PV}"
SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \
file://build-opts.sh \
+ file://build-oe.patch;patch=1;pnum=0 \
"
do_configure() {
install ${WORKDIR}/build-opts.sh ${S}/
- ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+ ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR}
}
do_compile() {
require vim.inc
-DEPENDS += "gtk+"
+DEPENDS += "gtk+ xt"
PR = "r1"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
LICENSE = "GPL"
PR = "r2"
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
file://only-the-modules.patch;patch=1 \
file://config.in"
}
do_compile() {
- oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}"
+ oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}"
}
do_install() {
inherit native
do_stage() {
- install -d ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin
- install -m 755 mkbold ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
- install -m 755 mkitalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
- install -m 755 mkbolditalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
- install -m 755 ${WORKDIR}/makebifonts ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 755 mkbold ${STAGING_BINDIR_NATIVE}/
+ install -m 755 mkitalic ${STAGING_BINDIR_NATIVE}/
+ install -m 755 mkbolditalic ${STAGING_BINDIR_NATIVE}/
+ install -m 755 ${WORKDIR}/makebifonts ${STAGING_BINDIR_NATIVE}/
}
+++ /dev/null
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-11-22 17:40:34.000000000 +0800
-+++ xorg-server-1.3.0.0/configure.ac 2007-11-22 17:59:56.000000000 +0800
-@@ -1576,6 +1576,7 @@
- AM_CONDITIONAL(H3600_TS, false)
- AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
- AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
-+AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes])
-
- # Xephyr needs nanosleep() which is in librt on Solaris
- AC_CHECK_FUNC([nanosleep], [],
-@@ -1824,6 +1825,7 @@
- hw/kdrive/chips/Makefile
- hw/kdrive/ephyr/Makefile
- hw/kdrive/epson/Makefile
-+hw/kdrive/glamo/Makefile
- hw/kdrive/fake/Makefile
- hw/kdrive/fbdev/Makefile
- hw/kdrive/w100/Makefile
-Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am 2007-11-22 17:40:34.000000000 +0800
-+++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am 2007-11-22 17:54:54.000000000 +0800
-@@ -7,6 +7,10 @@
- FBDEV_SUBDIRS = fbdev epson
- endif
-
-+if KDRIVEGLAMO
-+GLAMO_SUBDIRS = glamo
-+endif
-+
- if KDRIVEW100
- W100_SUBDIRS = w100
- endif
-@@ -30,8 +34,9 @@
- $(FBDEV_SUBDIRS) \
- $(W100_SUBDIRS) \
- $(VESA_SUBDIRS) \
-+ $(GLAMO_SUBDIRS) \
- $(XEPHYR_SUBDIRS) \
- fake
-
- DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
-- smi via fbdev sdl ephyr src linux fake sis300
-+ smi via fbdev sdl ephyr src linux fake sis300 glamo
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:34.000000000 +0800
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:35.000000000 +0800
-@@ -41,11 +41,14 @@
-
- Xglamo_LDADD = \
- $(GLAMO_LIBS) \
-- @KDRIVE_LIBS@
-+ @KDRIVE_LIBS@ \
-+ @XSERVER_LIBS@
-
- Xglamo_DEPENDENCIES = \
- libglamo.a \
-- @KDRIVE_LOCAL_LIBS@
-+ $(FBDEV_LIBS) \
-+ $(VESA_LIBS) \
-+ $(DRI_LIBS)
-
- relink:
- rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:34.000000000 +0800
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:35.000000000 +0800
-@@ -49,16 +49,10 @@
- void
- InitInput(int argc, char **argv)
- {
-- KdKeyboardInfo *ki;
--
-- KdAddKeyboardDriver(&LinuxKeyboardDriver);
-- KdAddPointerDriver(&LinuxMouseDriver);
--#ifdef TSLIB
-- KdAddPointerDriver(&TsDriver);
-+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
-+#ifdef TOUCHSCREEN
-+ KdAddMouseDriver (&TsFuncs);
- #endif
--
-- ki = KdParseKeyboard("keybd");
-- KdAddKeyboard(ki);
- }
-
- void
+++ /dev/null
-Index: xserver/hw/kdrive/glamo/Makefile.am
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/Makefile.am 2007-09-25 19:32:10.000000000 +0800
-@@ -0,0 +1,51 @@
-+if KDRIVEFBDEV
-+FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
-+FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a
-+endif
-+
-+if KDRIVEVESA
-+VESA_INCLUDES = -I$(top_srcdir)/hw/kdrive/vesa
-+VESA_LIBS = $(top_builddir)/hw/kdrive/vesa/libvesa.a
-+endif
-+
-+INCLUDES = \
-+ @KDRIVE_INCS@ \
-+ $(DRI_INCLUDES) \
-+ $(FBDEV_INCLUDES) \
-+ $(VESA_INCLUDES) \
-+ @KDRIVE_CFLAGS@
-+
-+bin_PROGRAMS = Xglamo
-+
-+noinst_LIBRARIES = libglamo.a
-+
-+libglamo_a_SOURCES = \
-+ glamo_dma.c \
-+ glamo_dma.h \
-+ glamo_draw.c \
-+ glamo_draw.h \
-+ glamo.c \
-+ glamo.h \
-+ glamo-regs.h \
-+ glamo_video.c
-+
-+Xglamo_SOURCES = \
-+ glamo_stub.c
-+
-+GLAMO_LIBS = \
-+ libglamo.a \
-+ $(FBDEV_LIBS) \
-+ $(VESA_LIBS) \
-+ $(DRI_LIBS) \
-+ @KDRIVE_LIBS@
-+
-+Xglamo_LDADD = \
-+ $(GLAMO_LIBS) \
-+ @KDRIVE_LIBS@
-+
-+Xglamo_DEPENDENCIES = \
-+ libglamo.a \
-+ @KDRIVE_LOCAL_LIBS@
-+
-+relink:
-+ rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-Index: xserver/hw/kdrive/glamo/glamo-regs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo-regs.h 2007-09-25 19:00:20.000000000 +0800
-@@ -0,0 +1,685 @@
-+#ifndef _GLAMO_REGS_H
-+#define _GLAMO_REGS_H
-+
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+enum glamo_regster_offsets {
-+ GLAMO_REGOFS_GENERIC = 0x0000,
-+ GLAMO_REGOFS_HOSTBUS = 0x0200,
-+ GLAMO_REGOFS_MEMORY = 0x0300,
-+ GLAMO_REGOFS_VIDCAP = 0x0400,
-+ GLAMO_REGOFS_ISP = 0x0500,
-+ GLAMO_REGOFS_JPEG = 0x0800,
-+ GLAMO_REGOFS_MPEG = 0x0c00,
-+ GLAMO_REGOFS_LCD = 0x1100,
-+ GLAMO_REGOFS_MMC = 0x1400,
-+ GLAMO_REGOFS_MPROC0 = 0x1500,
-+ GLAMO_REGOFS_MPROC1 = 0x1580,
-+ GLAMO_REGOFS_CMDQUEUE = 0x1600,
-+ GLAMO_REGOFS_RISC = 0x1680,
-+ GLAMO_REGOFS_2D = 0x1700,
-+ GLAMO_REGOFS_3D = 0x1b00,
-+};
-+
-+
-+enum glamo_register_generic {
-+ GLAMO_REG_GCONF1 = 0x0000,
-+ GLAMO_REG_GCONF2 = 0x0002,
-+#define GLAMO_REG_DEVICE_ID GLAMO_REG_GCONF2
-+ GLAMO_REG_GCONF3 = 0x0004,
-+#define GLAMO_REG_REVISION_ID GLAMO_REG_GCONF3
-+ GLAMO_REG_IRQ_GEN1 = 0x0006,
-+#define GLAMO_REG_IRQ_ENABLE GLAMO_REG_IRQ_GEN1
-+ GLAMO_REG_IRQ_GEN2 = 0x0008,
-+#define GLAMO_REG_IRQ_SET GLAMO_REG_IRQ_GEN2
-+ GLAMO_REG_IRQ_GEN3 = 0x000a,
-+#define GLAMO_REG_IRQ_CLEAR GLAMO_REG_IRQ_GEN3
-+ GLAMO_REG_IRQ_GEN4 = 0x000c,
-+#define GLAMO_REG_IRQ_STATUS GLAMO_REG_IRQ_GEN4
-+ GLAMO_REG_CLOCK_HOST = 0x0010,
-+ GLAMO_REG_CLOCK_MEMORY = 0x0012,
-+ GLAMO_REG_CLOCK_LCD = 0x0014,
-+ GLAMO_REG_CLOCK_MMC = 0x0016,
-+ GLAMO_REG_CLOCK_ISP = 0x0018,
-+ GLAMO_REG_CLOCK_JPEG = 0x001a,
-+ GLAMO_REG_CLOCK_3D = 0x001c,
-+ GLAMO_REG_CLOCK_2D = 0x001e,
-+ GLAMO_REG_CLOCK_RISC1 = 0x0020, /* 3365 only? */
-+ GLAMO_REG_CLOCK_RISC2 = 0x0022, /* 3365 only? */
-+ GLAMO_REG_CLOCK_MPEG = 0x0024,
-+ GLAMO_REG_CLOCK_MPROC = 0x0026,
-+
-+ GLAMO_REG_CLOCK_GEN5_1 = 0x0030,
-+ GLAMO_REG_CLOCK_GEN5_2 = 0x0032,
-+ GLAMO_REG_CLOCK_GEN6 = 0x0034,
-+ GLAMO_REG_CLOCK_GEN7 = 0x0036,
-+ GLAMO_REG_CLOCK_GEN8 = 0x0038,
-+ GLAMO_REG_CLOCK_GEN9 = 0x003a,
-+ GLAMO_REG_CLOCK_GEN10 = 0x003c,
-+ GLAMO_REG_CLOCK_GEN11 = 0x003e,
-+ GLAMO_REG_PLL_GEN1 = 0x0040,
-+ GLAMO_REG_PLL_GEN2 = 0x0042,
-+ GLAMO_REG_PLL_GEN3 = 0x0044,
-+ GLAMO_REG_PLL_GEN4 = 0x0046,
-+ GLAMO_REG_PLL_GEN5 = 0x0048,
-+ GLAMO_REG_GPIO_GEN1 = 0x0050,
-+ GLAMO_REG_GPIO_GEN2 = 0x0052,
-+ GLAMO_REG_GPIO_GEN3 = 0x0054,
-+ GLAMO_REG_GPIO_GEN4 = 0x0056,
-+ GLAMO_REG_GPIO_GEN5 = 0x0058,
-+ GLAMO_REG_GPIO_GEN6 = 0x005a,
-+ GLAMO_REG_GPIO_GEN7 = 0x005c,
-+ GLAMO_REG_GPIO_GEN8 = 0x005e,
-+ GLAMO_REG_GPIO_GEN9 = 0x0060,
-+ GLAMO_REG_GPIO_GEN10 = 0x0062,
-+ GLAMO_REG_DFT_GEN1 = 0x0070,
-+ GLAMO_REG_DFT_GEN2 = 0x0072,
-+ GLAMO_REG_DFT_GEN3 = 0x0074,
-+ GLAMO_REG_DFT_GEN4 = 0x0076,
-+
-+ GLAMO_REG_DFT_GEN5 = 0x01e0,
-+ GLAMO_REG_DFT_GEN6 = 0x01f0,
-+};
-+
-+#define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2))
-+
-+#define REG_MEM(x) (GLAMO_REGOFS_MEMORY+(x))
-+#define GLAMO_REG_MEM_TIMING(x) (GLAMO_REG_MEM_TIMING1-2+(x*2))
-+
-+enum glamo_register_mem {
-+ GLAMO_REG_MEM_TYPE = REG_MEM(0x00),
-+ GLAMO_REG_MEM_GEN = REG_MEM(0x02),
-+ GLAMO_REG_MEM_TIMING1 = REG_MEM(0x04),
-+ GLAMO_REG_MEM_TIMING2 = REG_MEM(0x06),
-+ GLAMO_REG_MEM_TIMING3 = REG_MEM(0x08),
-+ GLAMO_REG_MEM_TIMING4 = REG_MEM(0x0a),
-+ GLAMO_REG_MEM_TIMING5 = REG_MEM(0x0c),
-+ GLAMO_REG_MEM_TIMING6 = REG_MEM(0x0e),
-+ GLAMO_REG_MEM_TIMING7 = REG_MEM(0x10),
-+ GLAMO_REG_MEM_TIMING8 = REG_MEM(0x12),
-+ GLAMO_REG_MEM_TIMING9 = REG_MEM(0x14),
-+ GLAMO_REG_MEM_TIMING10 = REG_MEM(0x16),
-+ GLAMO_REG_MEM_TIMING11 = REG_MEM(0x18),
-+ GLAMO_REG_MEM_POWER1 = REG_MEM(0x1a),
-+ GLAMO_REG_MEM_POWER2 = REG_MEM(0x1c),
-+ GLAMO_REG_MEM_LCD_BUF1 = REG_MEM(0x1e),
-+ GLAMO_REG_MEM_LCD_BUF2 = REG_MEM(0x20),
-+ GLAMO_REG_MEM_LCD_BUF3 = REG_MEM(0x22),
-+ GLAMO_REG_MEM_LCD_BUF4 = REG_MEM(0x24),
-+ GLAMO_REG_MEM_BIST1 = REG_MEM(0x26),
-+ GLAMO_REG_MEM_BIST2 = REG_MEM(0x28),
-+ GLAMO_REG_MEM_BIST3 = REG_MEM(0x2a),
-+ GLAMO_REG_MEM_BIST4 = REG_MEM(0x2c),
-+ GLAMO_REG_MEM_BIST5 = REG_MEM(0x2e),
-+ GLAMO_REG_MEM_MAH1 = REG_MEM(0x30),
-+ GLAMO_REG_MEM_MAH2 = REG_MEM(0x32),
-+ GLAMO_REG_MEM_DRAM1 = REG_MEM(0x34),
-+ GLAMO_REG_MEM_DRAM2 = REG_MEM(0x36),
-+ GLAMO_REG_MEM_CRC = REG_MEM(0x38),
-+};
-+
-+#define GLAMO_MEM_TYPE_MASK 0x03
-+
-+enum glamo_reg_mem_dram1 {
-+ GLAMO_MEM_DRAM1_EN_SDRAM_CLK = (1 << 11),
-+ GLAMO_MEM_DRAM1_SELF_REFRESH = (1 << 12),
-+};
-+
-+enum glamo_reg_mem_dram2 {
-+ GLAMO_MEM_DRAM2_DEEP_PWRDOWN = (1 << 12),
-+};
-+
-+enum glamo_irq {
-+ GLAMO_IRQ_HOSTBUS = 0x0001,
-+ GLAMO_IRQ_JPEG = 0x0002,
-+ GLAMO_IRQ_MPEG = 0x0004,
-+ GLAMO_IRQ_MPROC1 = 0x0008,
-+ GLAMO_IRQ_MPROC0 = 0x0010,
-+ GLAMO_IRQ_CMDQUEUE = 0x0020,
-+ GLAMO_IRQ_2D = 0x0040,
-+ GLAMO_IRQ_MMC = 0x0080,
-+ GLAMO_IRQ_RISC = 0x0100,
-+};
-+
-+enum glamo_reg_clock_host {
-+ GLAMO_CLOCK_HOST_DG_BCLK = 0x0001,
-+ GLAMO_CLOCK_HOST_DG_M0CLK = 0x0004,
-+ GLAMO_CLOCK_HOST_RESET = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mem {
-+ GLAMO_CLOCK_MEM_DG_M1CLK = 0x0001,
-+ GLAMO_CLOCK_MEM_EN_M1CLK = 0x0002,
-+ GLAMO_CLOCK_MEM_DG_MOCACLK = 0x0004,
-+ GLAMO_CLOCK_MEM_EN_MOCACLK = 0x0008,
-+ GLAMO_CLOCK_MEM_RESET = 0x1000,
-+ GLAMO_CLOCK_MOCA_RESET = 0x2000,
-+};
-+
-+enum glamo_reg_clock_lcd {
-+ GLAMO_CLOCK_LCD_DG_DCLK = 0x0001,
-+ GLAMO_CLOCK_LCD_EN_DCLK = 0x0002,
-+ GLAMO_CLOCK_LCD_DG_DMCLK = 0x0004,
-+ GLAMO_CLOCK_LCD_EN_DMCLK = 0x0008,
-+ //
-+ GLAMO_CLOCK_LCD_EN_DHCLK = 0x0020,
-+ GLAMO_CLOCK_LCD_DG_M5CLK = 0x0040,
-+ GLAMO_CLOCK_LCD_EN_M5CLK = 0x0080,
-+ GLAMO_CLOCK_LCD_RESET = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mmc {
-+ GLAMO_CLOCK_MMC_DG_TCLK = 0x0001,
-+ GLAMO_CLOCK_MMC_EN_TCLK = 0x0002,
-+ GLAMO_CLOCK_MMC_DG_M9CLK = 0x0004,
-+ GLAMO_CLOCK_MMC_EN_M9CLK = 0x0008,
-+ GLAMO_CLOCK_MMC_RESET = 0x1000,
-+};
-+
-+enum glamo_reg_clock_isp {
-+ GLAMO_CLOCK_ISP_DG_I1CLK = 0x0001,
-+ GLAMO_CLOCK_ISP_EN_I1CLK = 0x0002,
-+ GLAMO_CLOCK_ISP_DG_CCLK = 0x0004,
-+ GLAMO_CLOCK_ISP_EN_CCLK = 0x0008,
-+ //
-+ GLAMO_CLOCK_ISP_EN_SCLK = 0x0020,
-+ GLAMO_CLOCK_ISP_DG_M2CLK = 0x0040,
-+ GLAMO_CLOCK_ISP_EN_M2CLK = 0x0080,
-+ GLAMO_CLOCK_ISP_DG_M15CLK = 0x0100,
-+ GLAMO_CLOCK_ISP_EN_M15CLK = 0x0200,
-+ GLAMO_CLOCK_ISP1_RESET = 0x1000,
-+ GLAMO_CLOCK_ISP2_RESET = 0x2000,
-+};
-+
-+enum glamo_reg_clock_jpeg {
-+ GLAMO_CLOCK_JPEG_DG_JCLK = 0x0001,
-+ GLAMO_CLOCK_JPEG_EN_JCLK = 0x0002,
-+ GLAMO_CLOCK_JPEG_DG_M3CLK = 0x0004,
-+ GLAMO_CLOCK_JPEG_EN_M3CLK = 0x0008,
-+ GLAMO_CLOCK_JPEG_RESET = 0x1000,
-+};
-+
-+enum glamo_reg_clock_2d {
-+ GLAMO_CLOCK_2D_DG_GCLK = 0x0001,
-+ GLAMO_CLOCK_2D_EN_GCLK = 0x0002,
-+ GLAMO_CLOCK_2D_DG_M7CLK = 0x0004,
-+ GLAMO_CLOCK_2D_EN_M7CLK = 0x0008,
-+ GLAMO_CLOCK_2D_DG_M6CLK = 0x0010,
-+ GLAMO_CLOCK_2D_EN_M6CLK = 0x0020,
-+ GLAMO_CLOCK_2D_RESET = 0x1000,
-+ GLAMO_CLOCK_2D_CQ_RESET = 0x2000,
-+};
-+
-+enum glamo_reg_clock_3d {
-+ GLAMO_CLOCK_3D_DG_ECLK = 0x0001,
-+ GLAMO_CLOCK_3D_EN_ECLK = 0x0002,
-+ GLAMO_CLOCK_3D_DG_RCLK = 0x0004,
-+ GLAMO_CLOCK_3D_EN_RCLK = 0x0008,
-+ GLAMO_CLOCK_3D_DG_M8CLK = 0x0010,
-+ GLAMO_CLOCK_3D_EN_M8CLK = 0x0020,
-+ GLAMO_CLOCK_3D_BACK_RESET = 0x1000,
-+ GLAMO_CLOCK_3D_FRONT_RESET = 0x2000,
-+};
-+
-+enum glamo_reg_clock_mpeg {
-+ GLAMO_CLOCK_MPEG_DG_X0CLK = 0x0001,
-+ GLAMO_CLOCK_MPEG_EN_X0CLK = 0x0002,
-+ GLAMO_CLOCK_MPEG_DG_X1CLK = 0x0004,
-+ GLAMO_CLOCK_MPEG_EN_X1CLK = 0x0008,
-+ GLAMO_CLOCK_MPEG_DG_X2CLK = 0x0010,
-+ GLAMO_CLOCK_MPEG_EN_X2CLK = 0x0020,
-+ GLAMO_CLOCK_MPEG_DG_X3CLK = 0x0040,
-+ GLAMO_CLOCK_MPEG_EN_X3CLK = 0x0080,
-+ GLAMO_CLOCK_MPEG_DG_X4CLK = 0x0100,
-+ GLAMO_CLOCK_MPEG_EN_X4CLK = 0x0200,
-+ GLAMO_CLOCK_MPEG_DG_X6CLK = 0x0400,
-+ GLAMO_CLOCK_MPEG_EN_X6CLK = 0x0800,
-+ GLAMO_CLOCK_MPEG_ENC_RESET = 0x1000,
-+ GLAMO_CLOCK_MPEG_DEC_RESET = 0x2000,
-+};
-+
-+enum glamo_reg_clock51 {
-+ GLAMO_CLOCK_GEN51_EN_DIV_MCLK = 0x0001,
-+ GLAMO_CLOCK_GEN51_EN_DIV_SCLK = 0x0002,
-+ GLAMO_CLOCK_GEN51_EN_DIV_JCLK = 0x0004,
-+ GLAMO_CLOCK_GEN51_EN_DIV_DCLK = 0x0008,
-+ GLAMO_CLOCK_GEN51_EN_DIV_DMCLK = 0x0010,
-+ GLAMO_CLOCK_GEN51_EN_DIV_DHCLK = 0x0020,
-+ GLAMO_CLOCK_GEN51_EN_DIV_GCLK = 0x0040,
-+ GLAMO_CLOCK_GEN51_EN_DIV_TCLK = 0x0080,
-+ /* FIXME: higher bits */
-+};
-+
-+enum glamo_reg_clock52 {
-+ GLAMO_CLOCK_GEN52_EN_DIV_ACLK = 0x0001,
-+ GLAMO_CLOCK_GEN52_EN_DIV_AMCLK = 0x0002,
-+ GLAMO_CLOCK_GEN52_EN_DIV_OCLK = 0x0004,
-+ GLAMO_CLOCK_GEN52_EN_DIV_ZCLK = 0x0008,
-+ GLAMO_CLOCK_GEN52_EN_DIV_ICLK = 0x0010,
-+ /* FIXME: higher bits */
-+};
-+
-+enum glamo_reg_hostbus2 {
-+ GLAMO_HOSTBUS2_MMIO_EN_ISP = 0x0001,
-+ GLAMO_HOSTBUS2_MMIO_EN_JPEG = 0x0002,
-+ GLAMO_HOSTBUS2_MMIO_EN_MPEG = 0x0004,
-+ GLAMO_HOSTBUS2_MMIO_EN_LCD = 0x0008,
-+ GLAMO_HOSTBUS2_MMIO_EN_MMC = 0x0010,
-+ GLAMO_HOSTBUS2_MMIO_EN_MICROP0 = 0x0020,
-+ GLAMO_HOSTBUS2_MMIO_EN_MICROP1 = 0x0040,
-+ GLAMO_HOSTBUS2_MMIO_EN_CQ = 0x0080,
-+ GLAMO_HOSTBUS2_MMIO_EN_RISC = 0x0100,
-+ GLAMO_HOSTBUS2_MMIO_EN_2D = 0x0200,
-+ GLAMO_HOSTBUS2_MMIO_EN_3D = 0x0400,
-+};
-+
-+/* LCD Controller */
-+
-+#define REG_LCD(x) (x)
-+enum glamo_reg_lcd {
-+ GLAMO_REG_LCD_MODE1 = REG_LCD(0x00),
-+ GLAMO_REG_LCD_MODE2 = REG_LCD(0x02),
-+ GLAMO_REG_LCD_MODE3 = REG_LCD(0x04),
-+ GLAMO_REG_LCD_WIDTH = REG_LCD(0x06),
-+ GLAMO_REG_LCD_HEIGHT = REG_LCD(0x08),
-+ GLAMO_REG_LCD_POLARITY = REG_LCD(0x0a),
-+ GLAMO_REG_LCD_A_BASE1 = REG_LCD(0x0c),
-+ GLAMO_REG_LCD_A_BASE2 = REG_LCD(0x0e),
-+ GLAMO_REG_LCD_B_BASE1 = REG_LCD(0x10),
-+ GLAMO_REG_LCD_B_BASE2 = REG_LCD(0x12),
-+ GLAMO_REG_LCD_C_BASE1 = REG_LCD(0x14),
-+ GLAMO_REG_LCD_C_BASE2 = REG_LCD(0x16),
-+ GLAMO_REG_LCD_PITCH = REG_LCD(0x18),
-+ /* RES */
-+ GLAMO_REG_LCD_HORIZ_TOTAL = REG_LCD(0x1c),
-+ /* RES */
-+ GLAMO_REG_LCD_HORIZ_RETR_START = REG_LCD(0x20),
-+ /* RES */
-+ GLAMO_REG_LCD_HORIZ_RETR_END = REG_LCD(0x24),
-+ /* RES */
-+ GLAMO_REG_LCD_HORIZ_DISP_START = REG_LCD(0x28),
-+ /* RES */
-+ GLAMO_REG_LCD_HORIZ_DISP_END = REG_LCD(0x2c),
-+ /* RES */
-+ GLAMO_REG_LCD_VERT_TOTAL = REG_LCD(0x30),
-+ /* RES */
-+ GLAMO_REG_LCD_VERT_RETR_START = REG_LCD(0x34),
-+ /* RES */
-+ GLAMO_REG_LCD_VERT_RETR_END = REG_LCD(0x38),
-+ /* RES */
-+ GLAMO_REG_LCD_VERT_DISP_START = REG_LCD(0x3c),
-+ /* RES */
-+ GLAMO_REG_LCD_VERT_DISP_END = REG_LCD(0x40),
-+ /* RES */
-+ GLAMO_REG_LCD_POL = REG_LCD(0x44),
-+ GLAMO_REG_LCD_DATA_START = REG_LCD(0x46),
-+ GLAMO_REG_LCD_FRATE_CONTRO = REG_LCD(0x48),
-+ GLAMO_REG_LCD_DATA_CMD_HDR = REG_LCD(0x4a),
-+ GLAMO_REG_LCD_SP_START = REG_LCD(0x4c),
-+ GLAMO_REG_LCD_SP_END = REG_LCD(0x4e),
-+ GLAMO_REG_LCD_CURSOR_BASE1 = REG_LCD(0x50),
-+ GLAMO_REG_LCD_CURSOR_BASE2 = REG_LCD(0x52),
-+ GLAMO_REG_LCD_CURSOR_PITCH = REG_LCD(0x54),
-+ GLAMO_REG_LCD_CURSOR_X_SIZE = REG_LCD(0x56),
-+ GLAMO_REG_LCD_CURSOR_Y_SIZE = REG_LCD(0x58),
-+ GLAMO_REG_LCD_CURSOR_X_POS = REG_LCD(0x5a),
-+ GLAMO_REG_LCD_CURSOR_Y_POS = REG_LCD(0x5c),
-+ GLAMO_REG_LCD_CURSOR_PRESET = REG_LCD(0x5e),
-+ GLAMO_REG_LCD_CURSOR_FG_COLOR = REG_LCD(0x60),
-+ /* RES */
-+ GLAMO_REG_LCD_CURSOR_BG_COLOR = REG_LCD(0x64),
-+ /* RES */
-+ GLAMO_REG_LCD_CURSOR_DST_COLOR = REG_LCD(0x68),
-+ /* RES */
-+ GLAMO_REG_LCD_STATUS1 = REG_LCD(0x80),
-+ GLAMO_REG_LCD_STATUS2 = REG_LCD(0x82),
-+ GLAMO_REG_LCD_STATUS3 = REG_LCD(0x84),
-+ GLAMO_REG_LCD_STATUS4 = REG_LCD(0x86),
-+ /* RES */
-+ GLAMO_REG_LCD_COMMAND1 = REG_LCD(0xa0),
-+ GLAMO_REG_LCD_COMMAND2 = REG_LCD(0xa2),
-+ /* RES */
-+ GLAMO_REG_LCD_WFORM_DELAY1 = REG_LCD(0xb0),
-+ GLAMO_REG_LCD_WFORM_DELAY2 = REG_LCD(0xb2),
-+ /* RES */
-+ GLAMO_REG_LCD_GAMMA_CORR = REG_LCD(0x100),
-+ /* RES */
-+ GLAMO_REG_LCD_GAMMA_R_ENTRY01 = REG_LCD(0x110),
-+ GLAMO_REG_LCD_GAMMA_R_ENTRY23 = REG_LCD(0x112),
-+ GLAMO_REG_LCD_GAMMA_R_ENTRY45 = REG_LCD(0x114),
-+ GLAMO_REG_LCD_GAMMA_R_ENTRY67 = REG_LCD(0x116),
-+ GLAMO_REG_LCD_GAMMA_R_ENTRY8 = REG_LCD(0x118),
-+ /* RES */
-+ GLAMO_REG_LCD_GAMMA_G_ENTRY01 = REG_LCD(0x130),
-+ GLAMO_REG_LCD_GAMMA_G_ENTRY23 = REG_LCD(0x132),
-+ GLAMO_REG_LCD_GAMMA_G_ENTRY45 = REG_LCD(0x134),
-+ GLAMO_REG_LCD_GAMMA_G_ENTRY67 = REG_LCD(0x136),
-+ GLAMO_REG_LCD_GAMMA_G_ENTRY8 = REG_LCD(0x138),
-+ /* RES */
-+ GLAMO_REG_LCD_GAMMA_B_ENTRY01 = REG_LCD(0x150),
-+ GLAMO_REG_LCD_GAMMA_B_ENTRY23 = REG_LCD(0x152),
-+ GLAMO_REG_LCD_GAMMA_B_ENTRY45 = REG_LCD(0x154),
-+ GLAMO_REG_LCD_GAMMA_B_ENTRY67 = REG_LCD(0x156),
-+ GLAMO_REG_LCD_GAMMA_B_ENTRY8 = REG_LCD(0x158),
-+ /* RES */
-+ GLAMO_REG_LCD_SRAM_DRIVING1 = REG_LCD(0x160),
-+ GLAMO_REG_LCD_SRAM_DRIVING2 = REG_LCD(0x162),
-+ GLAMO_REG_LCD_SRAM_DRIVING3 = REG_LCD(0x164),
-+};
-+
-+enum glamo_reg_lcd_mode1 {
-+ GLAMO_LCD_MODE1_PWRSAVE = 0x0001,
-+ GLAMO_LCD_MODE1_PARTIAL_PRT = 0x0002,
-+ GLAMO_LCD_MODE1_HWFLIP = 0x0004,
-+ GLAMO_LCD_MODE1_LCD2 = 0x0008,
-+ /* RES */
-+ GLAMO_LCD_MODE1_PARTIAL_MODE = 0x0020,
-+ GLAMO_LCD_MODE1_CURSOR_DSTCOLOR = 0x0040,
-+ GLAMO_LCD_MODE1_PARTIAL_ENABLE = 0x0080,
-+ GLAMO_LCD_MODE1_TVCLK_IN_ENABLE = 0x0100,
-+ GLAMO_LCD_MODE1_HSYNC_HIGH_ACT = 0x0200,
-+ GLAMO_LCD_MODE1_VSYNC_HIGH_ACT = 0x0400,
-+ GLAMO_LCD_MODE1_HSYNC_FLIP = 0x0800,
-+ GLAMO_LCD_MODE1_GAMMA_COR_EN = 0x1000,
-+ GLAMO_LCD_MODE1_DITHER_EN = 0x2000,
-+ GLAMO_LCD_MODE1_CURSOR_EN = 0x4000,
-+ GLAMO_LCD_MODE1_ROTATE_EN = 0x8000,
-+};
-+
-+enum glamo_reg_lcd_mode2 {
-+ GLAMO_LCD_MODE2_CRC_CHECK_EN = 0x0001,
-+ GLAMO_LCD_MODE2_DCMD_PER_LINE = 0x0002,
-+ GLAMO_LCD_MODE2_NOUSE_BDEF = 0x0004,
-+ GLAMO_LCD_MODE2_OUT_POS_MODE = 0x0008,
-+ GLAMO_LCD_MODE2_FRATE_CTRL_EN = 0x0010,
-+ GLAMO_LCD_MODE2_SINGLE_BUFFER = 0x0020,
-+ GLAMO_LCD_MODE2_SER_LSB_TO_MSB = 0x0040,
-+ /* FIXME */
-+};
-+
-+enum glamo_reg_lcd_mode3 {
-+ /* LCD color source data format */
-+ GLAMO_LCD_SRC_RGB565 = 0x0000,
-+ GLAMO_LCD_SRC_ARGB1555 = 0x4000,
-+ GLAMO_LCD_SRC_ARGB4444 = 0x8000,
-+ /* interface type */
-+ GLAMO_LCD_MODE3_LCD = 0x1000,
-+ GLAMO_LCD_MODE3_RGB = 0x0800,
-+ GLAMO_LCD_MODE3_CPU = 0x0000,
-+ /* mode */
-+ GLAMO_LCD_MODE3_RGB332 = 0x0000,
-+ GLAMO_LCD_MODE3_RGB444 = 0x0100,
-+ GLAMO_LCD_MODE3_RGB565 = 0x0200,
-+ GLAMO_LCD_MODE3_RGB666 = 0x0300,
-+ /* depth */
-+ GLAMO_LCD_MODE3_6BITS = 0x0000,
-+ GLAMO_LCD_MODE3_8BITS = 0x0010,
-+ GLAMO_LCD_MODE3_9BITS = 0x0020,
-+ GLAMO_LCD_MODE3_16BITS = 0x0030,
-+ GLAMO_LCD_MODE3_18BITS = 0x0040,
-+};
-+
-+enum glamo_lcd_cmd_type {
-+ GLAMO_LCD_CMD_TYPE_DISP = 0x0000,
-+ GLAMO_LCD_CMD_TYPE_PARALLEL = 0x4000,
-+ GLAMO_LCD_CMD_TYPE_SERIAL = 0x8000,
-+ GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000,
-+};
-+#define GLAMO_LCD_CMD_TYPE_MASK 0xc000
-+
-+enum glamo_lcd_cmds {
-+ GLAMO_LCD_CMD_DATA_DISP_FIRE = 0x00,
-+ GLAMO_LCD_CMD_DATA_DISP_SYNC = 0x01, /* RGB only */
-+ /* switch to command mode, no display */
-+ GLAMO_LCD_CMD_DATA_FIRE_NO_DISP = 0x02,
-+ /* display until VSYNC, switch to command */
-+ GLAMO_LCD_CMD_DATA_FIRE_VSYNC = 0x11,
-+ /* display until HSYNC, switch to command */
-+ GLAMO_LCD_CMD_DATA_FIRE_HSYNC = 0x12,
-+ /* display until VSYNC, 1 black frame, VSYNC, switch to command */
-+ GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B = 0x13,
-+ /* don't care about display and switch to command */
-+ GLAMO_LCD_CMD_DATA_FIRE_FREE = 0x14, /* RGB only */
-+ /* don't care about display, keep data display but disable data,
-+ * and switch to command */
-+ GLAMO_LCD_CMD_DATA_FIRE_FREE_D = 0x15, /* RGB only */
-+};
-+
-+enum glamo_core_revisions {
-+ GLAMO_CORE_REV_A0 = 0x0000,
-+ GLAMO_CORE_REV_A1 = 0x0001,
-+ GLAMO_CORE_REV_A2 = 0x0002,
-+ GLAMO_CORE_REV_A3 = 0x0003,
-+};
-+
-+#define REG_ISP(x) (GLAMO_REGOFS_ISP+(x))
-+
-+enum glamo_register_isp {
-+ GLAMO_REG_ISP_EN1 = REG_ISP(0x00),
-+ GLAMO_REG_ISP_EN2 = REG_ISP(0x02),
-+ GLAMO_REG_ISP_EN3 = REG_ISP(0x04),
-+ GLAMO_REG_ISP_EN4 = REG_ISP(0x06),
-+ GLAMO_REG_ISP_CAP_0_ADDRL = REG_ISP(0x08),
-+ GLAMO_REG_ISP_CAP_0_ADDRH = REG_ISP(0x0a),
-+ GLAMO_REG_ISP_CAP_1_ADDRL = REG_ISP(0x0c),
-+ GLAMO_REG_ISP_CAP_1_ADDRH = REG_ISP(0x0e),
-+ GLAMO_REG_ISP_DEC_Y_ADDRL = REG_ISP(0x10),
-+ GLAMO_REG_ISP_DEC_Y_ADDRH = REG_ISP(0x12),
-+ GLAMO_REG_ISP_DEC_U_ADDRL = REG_ISP(0x14),
-+ GLAMO_REG_ISP_DEC_U_ADDRH = REG_ISP(0x16),
-+ GLAMO_REG_ISP_DEC_V_ADDRL = REG_ISP(0x18),
-+ GLAMO_REG_ISP_DEC_V_ADDRH = REG_ISP(0x1a),
-+ GLAMO_REG_ISP_CAP_SEG_HEIGHT = REG_ISP(0x1c),
-+ GLAMO_REG_ISP_CAP_PITCH = REG_ISP(0x1e),
-+ GLAMO_REG_ISP_CAP_HEIGHT = REG_ISP(0x20),
-+ GLAMO_REG_ISP_CAP_WIDTH = REG_ISP(0x22),
-+ GLAMO_REG_ISP_DEC_PITCH_Y = REG_ISP(0x24),
-+ GLAMO_REG_ISP_DEC_PITCH_UV = REG_ISP(0x26),
-+ GLAMO_REG_ISP_DEC_HEIGHT = REG_ISP(0x28),
-+ GLAMO_REG_ISP_DEC_WIDTH = REG_ISP(0x2a),
-+ GLAMO_REG_ISP_ONFLY_MODE1 = REG_ISP(0x2c),
-+ GLAMO_REG_ISP_ONFLY_MODE2 = REG_ISP(0x2e),
-+ GLAMO_REG_ISP_ONFLY_MODE3 = REG_ISP(0x30),
-+ GLAMO_REG_ISP_ONFLY_MODE4 = REG_ISP(0x32),
-+ GLAMO_REG_ISP_ONFLY_MODE5 = REG_ISP(0x34),
-+ //
-+ GLAMO_REG_ISP_YUV2RGB_11 = REG_ISP(0x50),
-+ GLAMO_REG_ISP_YUV2RGB_21 = REG_ISP(0x52),
-+ GLAMO_REG_ISP_YUV2RGB_32 = REG_ISP(0x54),
-+ GLAMO_REG_ISP_YUV2RGB_33 = REG_ISP(0x56),
-+ GLAMO_REG_ISP_YUV2RGB_RG = REG_ISP(0x58),
-+ GLAMO_REG_ISP_YUV2RGB_B = REG_ISP(0x5a),
-+ //
-+ GLAMO_REG_ISP_PORT1_SCALEH = REG_ISP(0x76),
-+ GLAMO_REG_ISP_PORT1_SCALEV = REG_ISP(0x78),
-+ GLAMO_REG_ISP_PORT2_SCALEH = REG_ISP(0x7a),
-+ GLAMO_REG_ISP_PORT2_SCALEV = REG_ISP(0x7c),
-+ GLAMO_REG_ISP_DEC_SCALEH = REG_ISP(0x7e),
-+ GLAMO_REG_ISP_DEC_SCALEV = REG_ISP(0x80),
-+ GLAMO_REG_ISP_TURBO = REG_ISP(0x82),
-+ GLAMO_REG_ISP_PORT1_CAP_EN = REG_ISP(0x84),
-+ GLAMO_REG_ISP_PORT1_CAP_0_ADDRL = REG_ISP(0x86),
-+ GLAMO_REG_ISP_PORT1_CAP_0_ADDRH = REG_ISP(0x88),
-+ GLAMO_REG_ISP_PORT1_CAP_1_ADDRL = REG_ISP(0x8a),
-+ GLAMO_REG_ISP_PORT1_CAP_1_ADDRH = REG_ISP(0x8c),
-+ GLAMO_REG_ISP_PORT1_CAP_WIDTH = REG_ISP(0x8e),
-+ GLAMO_REG_ISP_PORT1_CAP_HEIGHT = REG_ISP(0x90),
-+ GLAMO_REG_ISP_PORT1_CAP_PITCH = REG_ISP(0x92),
-+ GLAMO_REG_ISP_PORT1_CAP_CLIP_L = REG_ISP(0x94),
-+ GLAMO_REG_ISP_PORT1_CAP_CLIP_R = REG_ISP(0x96),
-+ GLAMO_REG_ISP_PORT1_CAP_CLIP_T = REG_ISP(0x98),
-+ GLAMO_REG_ISP_PORT1_CAP_CLIP_B = REG_ISP(0x9a),
-+ GLAMO_REG_ISP_PORT1_DEC_EN = REG_ISP(0x9c),
-+ GLAMO_REG_ISP_PORT1_DEC_0_ADDRL = REG_ISP(0x9e),
-+ GLAMO_REG_ISP_PORT1_DEC_0_ADDRH = REG_ISP(0xa0),
-+ GLAMO_REG_ISP_PORT1_DEC_1_ADDRL = REG_ISP(0xa2),
-+ GLAMO_REG_ISP_PORT1_DEC_1_ADDRH = REG_ISP(0xa4),
-+ GLAMO_REG_ISP_PORT1_DEC_WIDTH = REG_ISP(0xa6),
-+ GLAMO_REG_ISP_PORT1_DEC_HEIGHT = REG_ISP(0xa8),
-+ GLAMO_REG_ISP_PORT1_DEC_PITCH = REG_ISP(0xaa),
-+ GLAMO_REG_ISP_PORT1_DEC_CLIP_L = REG_ISP(0xac),
-+ GLAMO_REG_ISP_PORT1_DEC_CLIP_R = REG_ISP(0xae),
-+ GLAMO_REG_ISP_PORT1_DEC_CLIP_T = REG_ISP(0xb0),
-+ GLAMO_REG_ISP_PORT1_DEC_CLIP_B = REG_ISP(0xb2),
-+ GLAMO_REG_ISP_PORT2_EN = REG_ISP(0xb4),
-+ GLAMO_REG_ISP_PORT2_0_Y_ADDRL = REG_ISP(0xb6),
-+ GLAMO_REG_ISP_PORT2_0_Y_ADDRH = REG_ISP(0xb8),
-+ GLAMO_REG_ISP_PORT2_0_U_ADDRL = REG_ISP(0xba),
-+ GLAMO_REG_ISP_PORT2_0_U_ADDRH = REG_ISP(0xbc),
-+ GLAMO_REG_ISP_PORT2_0_V_ADDRL = REG_ISP(0xbe),
-+ GLAMO_REG_ISP_PORT2_0_V_ADDRH = REG_ISP(0xc0),
-+ GLAMO_REG_ISP_PORT2_1_Y_ADDRL = REG_ISP(0xc2),
-+ GLAMO_REG_ISP_PORT2_1_Y_ADDRH = REG_ISP(0xc4),
-+ GLAMO_REG_ISP_PORT2_1_U_ADDRL = REG_ISP(0xc6),
-+ GLAMO_REG_ISP_PORT2_1_U_ADDRH = REG_ISP(0xc8),
-+ GLAMO_REG_ISP_PORT2_1_V_ADDRL = REG_ISP(0xca),
-+ GLAMO_REG_ISP_PORT2_1_V_ADDRH = REG_ISP(0xcc),
-+ GLAMO_REG_ISP_PORT2_2_Y_ADDRL = REG_ISP(0xce),
-+ GLAMO_REG_ISP_PORT2_2_Y_ADDRH = REG_ISP(0xd0),
-+ GLAMO_REG_ISP_PORT2_2_U_ADDRL = REG_ISP(0xd2),
-+ GLAMO_REG_ISP_PORT2_2_U_ADDRH = REG_ISP(0xd4),
-+ GLAMO_REG_ISP_PORT2_2_V_ADDRL = REG_ISP(0xd6),
-+ GLAMO_REG_ISP_PORT2_2_V_ADDRH = REG_ISP(0xd8),
-+ GLAMO_REG_ISP_PORT2_WIDTH = REG_ISP(0xda),
-+ GLAMO_REG_ISP_PORT2_HEIGHT = REG_ISP(0xdc),
-+ GLAMO_REG_ISP_PORT2_Y_PITCH = REG_ISP(0xde),
-+ GLAMO_REG_ISP_PORT2_UV_PITCH = REG_ISP(0xe0),
-+ //
-+ GLAMO_REG_ISP_RGB2YUV_11_12 = REG_ISP(0xf6),
-+ GLAMO_REG_ISP_RGB2YUV_13_21 = REG_ISP(0xf8),
-+ GLAMO_REG_ISP_RGB2YUV_22_23 = REG_ISP(0xfa),
-+ GLAMO_REG_ISP_RGB2YUV_31_32 = REG_ISP(0xfc),
-+ GLAMO_REG_ISP_RGB2YUV_33 = REG_ISP(0xfe),
-+ //
-+ GLAMO_REG_ISP_PORT1_SCALEH_MATRIX = REG_ISP(0x10c),
-+ //
-+ GLAMO_REG_ISP_PORT1_SCALEV_MATRIX = REG_ISP(0x120),
-+ //
-+ GLAMO_REG_ISP_PORT2_SCALEH_MATRIX = REG_ISP(0x134),
-+ //
-+ GLAMO_REG_ISP_PORT2_SCALEV_MATRIX = REG_ISP(0x148),
-+ //
-+ GLAMO_REG_ISP_DEC_SCALEH_MATRIX = REG_ISP(0x15c),
-+ //
-+ GLAMO_REG_ISP_DEC_SCALEV_MATRIX = REG_ISP(0x170),
-+ //
-+ GLAMO_REG_ISP_STATUS = REG_ISP(0x184),
-+};
-+
-+enum glamo_reg_isp_en1 {
-+ GLAMO_ISP_EN1_FIRE_ISP = 0x0001,
-+ GLAMO_ISP_EN1_FIRE_CAP = 0x0002,
-+ GLAMO_ISP_EN1_VIDEO_CONF = 0x0004,
-+ GLAMO_ISP_EN1_BAYER_SRC = 0x0008,
-+ //
-+ GLAMO_ISP_EN1_YUV_PACK = 0x0040,
-+ GLAMO_ISP_EN1_PLANE_MODE = 0x0080,
-+ GLAMO_ISP_EN1_YUV_INPUT = 0x0100,
-+ GLAMO_ISP_EN1_YUV420 = 0x0200,
-+ //
-+};
-+
-+enum glamo_reg_isp_en3 {
-+ //
-+ GLAMO_ISP_EN3_SCALE_IMPROVE = 0x0040,
-+ GLAMO_ISP_EN3_PLANE_MODE = 0x0080,
-+ GLAMO_ISP_EN3_YUV_INPUT = 0x0100,
-+ GLAMO_ISP_EN3_YUV420 = 0x0200,
-+ //
-+};
-+
-+enum glamo_reg_isp_port1_en {
-+ GLAMO_ISP_PORT1_EN_OUTPUT = 0x0001,
-+// GLAMO_ISP_PORT1_EN_SCALE = 0x0002,
-+ GLAMO_ISP_PORT1_EN_CLIP = 0x0004,
-+ GLAMO_ISP_PORT1_EN_CLIP_OUT = 0x0008,
-+ GLAMO_ISP_PORT1_EN_DUAL_BUF = 0x0010,
-+};
-+
-+enum glamo_reg_isp_port2_en {
-+ GLAMO_ISP_PORT2_EN_OUTPUT = 0x0001,
-+ GLAMO_ISP_PORT2_EN_SCALE = 0x0002,
-+ GLAMO_ISP_PORT2_EN_JPEG = 0x0010,
-+ GLAMO_ISP_PORT2_EN_MPEG = 0x0020,
-+ GLAMO_ISP_PORT2_EN_ENCODE = 0x0040,
-+ GLAMO_ISP_PORT2_EN_DECODE = 0x0080,
-+};
-+
-+#define REG_CQ(x) (GLAMO_REGOFS_CMDQUEUE+(x))
-+
-+enum glamo_register_cq {
-+ GLAMO_REG_CQ_BASE_ADDRL = REG_CQ(0x00),
-+ GLAMO_REG_CQ_BASE_ADDRH = REG_CQ(0x02),
-+ GLAMO_REG_CQ_LEN = REG_CQ(0x04),
-+ GLAMO_REG_CQ_WRITE_ADDRL = REG_CQ(0x06),
-+ GLAMO_REG_CQ_WRITE_ADDRH = REG_CQ(0x08),
-+ GLAMO_REG_CQ_FLIP = REG_CQ(0x0a),
-+ GLAMO_REG_CQ_CONTROL = REG_CQ(0x0c),
-+ GLAMO_REG_CQ_READ_ADDRL = REG_CQ(0x0e),
-+ GLAMO_REG_CQ_READ_ADDRH = REG_CQ(0x10),
-+ GLAMO_REG_CQ_STATUS = REG_CQ(0x12),
-+};
-+
-+#define REG_2D(x) (GLAMO_REGOFS_2D+(x))
-+
-+enum glamo_register_2d {
-+ GLAMO_REG_2D_SRC_ADDRL = REG_2D(0x00),
-+ GLAMO_REG_2D_SRC_ADDRH = REG_2D(0x02),
-+ GLAMO_REG_2D_SRC_PITCH = REG_2D(0x04),
-+ GLAMO_REG_2D_SRC_X = REG_2D(0x06),
-+ GLAMO_REG_2D_SRC_Y = REG_2D(0x08),
-+ GLAMO_REG_2D_DST_X = REG_2D(0x0a),
-+ GLAMO_REG_2D_DST_Y = REG_2D(0x0c),
-+ GLAMO_REG_2D_DST_ADDRL = REG_2D(0x0e),
-+ GLAMO_REG_2D_DST_ADDRH = REG_2D(0x10),
-+ GLAMO_REG_2D_DST_PITCH = REG_2D(0x12),
-+ GLAMO_REG_2D_DST_HEIGHT = REG_2D(0x14),
-+ GLAMO_REG_2D_RECT_WIDTH = REG_2D(0x16),
-+ GLAMO_REG_2D_RECT_HEIGHT = REG_2D(0x18),
-+ GLAMO_REG_2D_PAT_ADDRL = REG_2D(0x1a),
-+ GLAMO_REG_2D_PAT_ADDRH = REG_2D(0x1c),
-+ GLAMO_REG_2D_PAT_FG = REG_2D(0x1e),
-+ GLAMO_REG_2D_PAT_BG = REG_2D(0x20),
-+ GLAMO_REG_2D_SRC_FG = REG_2D(0x22),
-+ GLAMO_REG_2D_SRC_BG = REG_2D(0x24),
-+ GLAMO_REG_2D_MASK1 = REG_2D(0x26),
-+ GLAMO_REG_2D_MASK2 = REG_2D(0x28),
-+ GLAMO_REG_2D_MASK3 = REG_2D(0x2a),
-+ GLAMO_REG_2D_MASK4 = REG_2D(0x2c),
-+ GLAMO_REG_2D_ROT_X = REG_2D(0x2e),
-+ GLAMO_REG_2D_ROT_Y = REG_2D(0x30),
-+ GLAMO_REG_2D_LEFT_CLIP = REG_2D(0x32),
-+ GLAMO_REG_2D_TOP_CLIP = REG_2D(0x34),
-+ GLAMO_REG_2D_RIGHT_CLIP = REG_2D(0x36),
-+ GLAMO_REG_2D_BOTTOM_CLIP = REG_2D(0x38),
-+ GLAMO_REG_2D_COMMAND1 = REG_2D(0x3A),
-+ GLAMO_REG_2D_COMMAND2 = REG_2D(0x3C),
-+ GLAMO_REG_2D_COMMAND3 = REG_2D(0x3E),
-+ GLAMO_REG_2D_SAFE = REG_2D(0x40),
-+ GLAMO_REG_2D_STATUS = REG_2D(0x42),
-+ GLAMO_REG_2D_ID1 = REG_2D(0x44),
-+ GLAMO_REG_2D_ID2 = REG_2D(0x46),
-+ GLAMO_REG_2D_ID3 = REG_2D(0x48),
-+};
-+
-+#endif /* _GLAMO_REGS_H */
-Index: xserver/hw/kdrive/glamo/glamo.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo.c 2007-09-26 17:44:47.000000000 +0800
-@@ -0,0 +1,498 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2003 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "glamo.h"
-+#if defined(USE_DRI) && defined(GLXEXT)
-+#include "glamo_sarea.h"
-+#endif
-+
-+static Bool
-+GLAMOCardInit(KdCardInfo *card)
-+{
-+ GLAMOCardInfo *glamoc;
-+ Bool initialized = FALSE;
-+
-+ glamoc = xcalloc(sizeof(GLAMOCardInfo), 1);
-+ if (glamoc == NULL)
-+ return FALSE;
-+
-+#ifdef KDRIVEFBDEV
-+ if (!initialized && fbdevInitialize(card, &glamoc->backend_priv.fbdev)) {
-+ glamoc->use_fbdev = TRUE;
-+ initialized = TRUE;
-+ glamoc->backend_funcs.cardfini = fbdevCardFini;
-+ glamoc->backend_funcs.scrfini = fbdevScreenFini;
-+ glamoc->backend_funcs.initScreen = fbdevInitScreen;
-+ glamoc->backend_funcs.finishInitScreen = fbdevFinishInitScreen;
-+ glamoc->backend_funcs.createRes = fbdevCreateResources;
-+ glamoc->backend_funcs.preserve = fbdevPreserve;
-+ glamoc->backend_funcs.restore = fbdevRestore;
-+ glamoc->backend_funcs.dpms = fbdevDPMS;
-+ glamoc->backend_funcs.enable = fbdevEnable;
-+ glamoc->backend_funcs.disable = fbdevDisable;
-+ glamoc->backend_funcs.getColors = fbdevGetColors;
-+ glamoc->backend_funcs.putColors = fbdevPutColors;
-+#ifdef RANDR
-+ glamoc->backend_funcs.randrSetConfig = fbdevRandRSetConfig;
-+#endif
-+ }
-+#endif
-+#ifdef KDRIVEVESA
-+ if (!initialized && vesaInitialize(card, &glamoc->backend_priv.vesa)) {
-+ glamoc->use_vesa = TRUE;
-+ initialized = TRUE;
-+ glamoc->backend_funcs.cardfini = vesaCardFini;
-+ glamoc->backend_funcs.scrfini = vesaScreenFini;
-+ glamoc->backend_funcs.initScreen = vesaInitScreen;
-+ glamoc->backend_funcs.finishInitScreen = vesaFinishInitScreen;
-+ glamoc->backend_funcs.createRes = vesaCreateResources;
-+ glamoc->backend_funcs.preserve = vesaPreserve;
-+ glamoc->backend_funcs.restore = vesaRestore;
-+ glamoc->backend_funcs.dpms = vesaDPMS;
-+ glamoc->backend_funcs.enable = vesaEnable;
-+ glamoc->backend_funcs.disable = vesaDisable;
-+ glamoc->backend_funcs.getColors = vesaGetColors;
-+ glamoc->backend_funcs.putColors = vesaPutColors;
-+#ifdef RANDR
-+ glamoc->backend_funcs.randrSetConfig = vesaRandRSetConfig;
-+#endif
-+ }
-+#endif
-+
-+ if (!initialized || !GLAMOMapReg(card, glamoc)) {
-+ xfree(glamoc);
-+ return FALSE;
-+ }
-+
-+#ifdef USE_DRI
-+ /* We demand identification by busid, not driver name */
-+ glamoc->drmFd = drmOpen(NULL, glamoc->busid);
-+ if (glamoc->drmFd < 0)
-+ ErrorF("Failed to open DRM, DRI disabled.\n");
-+#endif /* USE_DRI */
-+
-+ card->driver = glamoc;
-+
-+ glamoc->is_3362 = TRUE;
-+ ErrorF("Using GLAMO 3362 card\n");
-+
-+ return TRUE;
-+}
-+
-+static void
-+GLAMOCardFini(KdCardInfo *card)
-+{
-+ GLAMOCardInfo *glamoc = (GLAMOCardInfo *)card->driver;
-+
-+ GLAMOUnmapReg(card, glamoc);
-+ glamoc->backend_funcs.cardfini(card);
-+}
-+
-+/*
-+ * Once screen->off_screen_base is set, this function
-+ * allocates the remaining memory appropriately
-+ */
-+
-+static void
-+GLAMOSetOffscreen (KdScreenInfo *screen)
-+{
-+ GLAMOCardInfo(screen);
-+#if defined(USE_DRI) && defined(GLXEXT)
-+ GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver;
-+ int l;
-+#endif
-+ int screen_size;
-+ char *mmio = glamoc->reg_base;
-+
-+ /* check (and adjust) pitch */
-+ if (mmio)
-+ {
-+ int byteStride = screen->fb[0].byteStride;
-+ int bitStride;
-+ int pixelStride;
-+ int bpp = screen->fb[0].bitsPerPixel;
-+
-+ /*
-+ * Ensure frame buffer is correctly aligned
-+ */
-+ if (byteStride & 0x3f)
-+ {
-+ byteStride = (byteStride + 0x3f) & ~0x3f;
-+ bitStride = byteStride * 8;
-+ pixelStride = bitStride / bpp;
-+
-+ screen->fb[0].byteStride = byteStride;
-+ screen->fb[0].pixelStride = pixelStride;
-+ }
-+ }
-+
-+ screen_size = screen->fb[0].byteStride * screen->height;
-+
-+ screen->off_screen_base = screen_size;
-+
-+#if defined(USE_DRI) && defined(GLXEXT)
-+ /* Reserve a static area for the back buffer the same size as the
-+ * visible screen. XXX: This would be better initialized in glamo_dri.c
-+ * when GLX is set up, but the offscreen memory manager's allocations
-+ * don't last through VT switches, while the kernel's understanding of
-+ * offscreen locations does.
-+ */
-+ glamos->frontOffset = 0;
-+ glamos->frontPitch = screen->fb[0].byteStride;
-+
-+ if (screen->off_screen_base + screen_size <= screen->memory_size) {
-+ glamos->backOffset = screen->off_screen_base;
-+ glamos->backPitch = screen->fb[0].byteStride;
-+ screen->off_screen_base += screen_size;
-+ }
-+
-+ /* Reserve the depth span for Rage 128 */
-+ if (!glamoc->is_3362 && screen->off_screen_base +
-+ screen->fb[0].byteStride <= screen->memory_size) {
-+ glamos->spanOffset = screen->off_screen_base;
-+ screen->off_screen_base += screen->fb[0].byteStride;
-+ }
-+
-+ /* Reserve the static depth buffer, which happens to be the same
-+ * bitsPerPixel as the screen.
-+ */
-+ if (screen->off_screen_base + screen_size <= screen->memory_size) {
-+ glamos->depthOffset = screen->off_screen_base;
-+ glamos->depthPitch = screen->fb[0].byteStride;
-+ screen->off_screen_base += screen_size;
-+ }
-+
-+ /* Reserve approx. half of remaining offscreen memory for local
-+ * textures. Round down to a whole number of texture regions.
-+ */
-+ glamos->textureSize = (screen->memory_size - screen->off_screen_base) / 2;
-+ l = GLAMOLog2(glamos->textureSize / GLAMO_NR_TEX_REGIONS);
-+ if (l < GLAMO_LOG_TEX_GRANULARITY)
-+ l = GLAMO_LOG_TEX_GRANULARITY;
-+ glamos->textureSize = (glamos->textureSize >> l) << l;
-+ if (glamos->textureSize >= 512 * 1024) {
-+ glamos->textureOffset = screen->off_screen_base;
-+ screen->off_screen_base += glamos->textureSize;
-+ } else {
-+ /* Minimum texture size is for 2 256x256x32bpp textures */
-+ glamos->textureSize = 0;
-+ }
-+#endif /* USE_DRI && GLXEXT */
-+}
-+
-+static Bool
-+GLAMOScreenInit(KdScreenInfo *screen)
-+{
-+ GLAMOScreenInfo *glamos;
-+ GLAMOCardInfo(screen);
-+ Bool success = FALSE;
-+
-+ glamos = xcalloc(sizeof(GLAMOScreenInfo), 1);
-+ if (glamos == NULL)
-+ return FALSE;
-+
-+ glamos->glamoc = glamoc;
-+ glamos->screen = screen;
-+ screen->driver = glamos;
-+
-+ if (screen->fb[0].depth == 0)
-+ screen->fb[0].depth = 16;
-+#ifdef KDRIVEFBDEV
-+ if (glamoc->use_fbdev) {
-+ success = fbdevScreenInitialize(screen,
-+ &glamos->backend_priv.fbdev);
-+ }
-+#endif
-+#ifdef KDRIVEVESA
-+ if (glamoc->use_vesa) {
-+ success = vesaScreenInitialize(screen,
-+ &glamos->backend_priv.vesa);
-+ }
-+#endif
-+
-+ if (!success) {
-+ screen->driver = NULL;
-+ xfree(glamos);
-+ return FALSE;
-+ }
-+
-+ GLAMOSetOffscreen (screen);
-+
-+ return TRUE;
-+}
-+
-+#ifdef RANDR
-+static Bool
-+GLAMORandRSetConfig (ScreenPtr pScreen,
-+ Rotation randr,
-+ int rate,
-+ RRScreenSizePtr pSize)
-+{
-+ KdScreenPriv(pScreen);
-+ KdScreenInfo *screen = pScreenPriv->screen;
-+ GLAMOCardInfo *glamoc = screen->card->driver;
-+ Bool ret;
-+
-+ GLAMODrawDisable (pScreen);
-+ ret = glamoc->backend_funcs.randrSetConfig(pScreen, randr, rate, pSize);
-+ GLAMOSetOffscreen (screen);
-+ /*
-+ * Set frame buffer mapping
-+ */
-+ (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
-+ pScreen->width,
-+ pScreen->height,
-+ screen->fb[0].depth,
-+ screen->fb[0].bitsPerPixel,
-+ screen->fb[0].byteStride,
-+ screen->fb[0].frameBuffer);
-+
-+ GLAMODrawEnable (pScreen);
-+ return ret;
-+}
-+
-+static Bool
-+GLAMORandRInit (ScreenPtr pScreen)
-+{
-+ rrScrPrivPtr pScrPriv;
-+
-+ pScrPriv = rrGetScrPriv(pScreen);
-+ pScrPriv->rrSetConfig = GLAMORandRSetConfig;
-+ return TRUE;
-+}
-+#endif
-+
-+static void
-+GLAMOScreenFini(KdScreenInfo *screen)
-+{
-+ GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver;
-+ GLAMOCardInfo *glamoc = screen->card->driver;
-+
-+#ifdef XV
-+ GLAMOFiniVideo(screen->pScreen);
-+#endif
-+
-+ glamoc->backend_funcs.scrfini(screen);
-+ xfree(glamos);
-+ screen->driver = 0;
-+}
-+
-+Bool
-+GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc)
-+{
-+ glamoc->reg_base = (char *)KdMapDevice(GLAMO_REG_BASE(card),
-+ GLAMO_REG_SIZE(card));
-+
-+ if (glamoc->reg_base == NULL)
-+ return FALSE;
-+
-+ KdSetMappedMode(GLAMO_REG_BASE(card), GLAMO_REG_SIZE(card),
-+ KD_MAPPED_MODE_REGISTERS);
-+
-+ return TRUE;
-+}
-+
-+void
-+GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc)
-+{
-+ if (glamoc->reg_base) {
-+ KdResetMappedMode(GLAMO_REG_BASE(card), GLAMO_REG_SIZE(card),
-+ KD_MAPPED_MODE_REGISTERS);
-+ KdUnmapDevice((void *)glamoc->reg_base, GLAMO_REG_SIZE(card));
-+ glamoc->reg_base = 0;
-+ }
-+}
-+
-+static Bool
-+GLAMOInitScreen(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+#ifdef XV
-+ GLAMOInitVideo(pScreen);
-+#endif
-+ return glamoc->backend_funcs.initScreen(pScreen);
-+}
-+
-+static Bool
-+GLAMOFinishInitScreen(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ if (!glamoc->backend_funcs.finishInitScreen(pScreen))
-+ return FALSE;
-+#ifdef RANDR
-+ if (!GLAMORandRInit (pScreen))
-+ return FALSE;
-+#endif
-+ return TRUE;
-+}
-+
-+static Bool
-+GLAMOCreateResources(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ return glamoc->backend_funcs.createRes(pScreen);
-+}
-+
-+static void
-+GLAMOPreserve(KdCardInfo *card)
-+{
-+ GLAMOCardInfo *glamoc = card->driver;
-+
-+ glamoc->backend_funcs.preserve(card);
-+}
-+
-+static void
-+GLAMORestore(KdCardInfo *card)
-+{
-+ GLAMOCardInfo *glamoc = card->driver;
-+
-+ GLAMOUnmapReg(card, glamoc);
-+
-+ glamoc->backend_funcs.restore(card);
-+}
-+
-+static Bool
-+GLAMODPMS(ScreenPtr pScreen, int mode)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ return glamoc->backend_funcs.dpms(pScreen, mode);
-+}
-+
-+static Bool
-+GLAMOEnable(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ if (!glamoc->backend_funcs.enable(pScreen))
-+ return FALSE;
-+
-+ if ((glamoc->reg_base == NULL) && !GLAMOMapReg(pScreenPriv->screen->card,
-+ glamoc))
-+ return FALSE;
-+
-+ GLAMOSetOffscreen (pScreenPriv->screen);
-+
-+ return TRUE;
-+}
-+
-+static void
-+GLAMODisable(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+#if defined(USE_DRI) && defined(GLXEXT)
-+ GLAMOScreenInfo(pScreenPriv);
-+#endif /* USE_DRI && GLXEXT */
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ GLAMOUnmapReg(pScreenPriv->card, glamoc);
-+
-+ glamoc->backend_funcs.disable(pScreen);
-+}
-+
-+static void
-+GLAMOGetColors(ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ glamoc->backend_funcs.getColors(pScreen, fb, n, pdefs);
-+}
-+
-+static void
-+GLAMOPutColors(ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+
-+ glamoc->backend_funcs.putColors(pScreen, fb, n, pdefs);
-+}
-+
-+/* Compute log base 2 of val. */
-+int
-+GLAMOLog2(int val)
-+{
-+ int bits;
-+
-+ for (bits = 0; val != 0; val >>= 1, ++bits)
-+ ;
-+ return bits - 1;
-+}
-+
-+KdCardFuncs GLAMOFuncs = {
-+ GLAMOCardInit, /* cardinit */
-+ GLAMOScreenInit, /* scrinit */
-+ GLAMOInitScreen, /* initScreen */
-+ GLAMOFinishInitScreen, /* finishInitScreen */
-+ GLAMOCreateResources, /* createRes */
-+ GLAMOPreserve, /* preserve */
-+ GLAMOEnable, /* enable */
-+ GLAMODPMS, /* dpms */
-+ GLAMODisable, /* disable */
-+ GLAMORestore, /* restore */
-+ GLAMOScreenFini, /* scrfini */
-+ GLAMOCardFini, /* cardfini */
-+
-+#if 0
-+ GLAMOCursorInit, /* initCursor */
-+ GLAMOCursorEnable, /* enableCursor */
-+ GLAMOCursorDisable, /* disableCursor */
-+ GLAMOCursorFini, /* finiCursor */
-+ GLAMORecolorCursor, /* recolorCursor */
-+#else
-+ 0, /* initCursor */
-+ 0, /* enableCursor */
-+ 0, /* disableCursor */
-+ 0, /* finiCursor */
-+ 0, /* recolorCursor */
-+#endif
-+
-+
-+#if 1
-+ GLAMODrawInit, /* initAccel */
-+ GLAMODrawEnable, /* enableAccel */
-+ GLAMODrawDisable, /* disableAccel */
-+ GLAMODrawFini, /* finiAccel */
-+#else
-+ 0, /* initAccel */
-+ 0, /* enableAccel */
-+ 0, /* disableAccel */
-+ 0, /* finiAccel */
-+#endif
-+
-+ GLAMOGetColors, /* getColors */
-+ GLAMOPutColors, /* putColors */
-+};
-Index: xserver/hw/kdrive/glamo/glamo.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo.h 2007-09-26 17:45:48.000000000 +0800
-@@ -0,0 +1,386 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2003 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _GLAMO_H_
-+#define _GLAMO_H_
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#ifdef KDRIVEFBDEV
-+#include <fbdev.h>
-+#endif
-+#ifdef KDRIVEVESA
-+#include <vesa.h>
-+#endif
-+
-+#include "kxv.h"
-+
-+#undef XF86DRI
-+#ifdef XF86DRI
-+#define USE_DRI
-+#include "xf86drm.h"
-+#include "dri.h"
-+#ifdef GLXEXT
-+#include "GL/glxint.h"
-+#include "GL/glxtokens.h"
-+#include "glamo_dripriv.h"
-+#endif
-+#endif
-+
-+#define GLAMO_REG_BASE(c) ((c)->attr.address[0])
-+#define GLAMO_REG_SIZE(c) (0x2400)
-+
-+#ifdef __powerpc__
-+
-+static __inline__ void
-+MMIO_OUT16(__volatile__ void *base, const unsigned long offset,
-+ const unsigned int val)
-+{
-+ __asm__ __volatile__(
-+ "stwbrx %1,%2,%3\n\t"
-+ "eieio"
-+ : "=m" (*((volatile unsigned char *)base+offset))
-+ : "r" (val), "b" (base), "r" (offset));
-+}
-+
-+static __inline__ CARD32
-+MMIO_IN16(__volatile__ void *base, const unsigned long offset)
-+{
-+ register unsigned int val;
-+ __asm__ __volatile__(
-+ "lwbrx %0,%1,%2\n\t"
-+ "eieio"
-+ : "=r" (val)
-+ : "b" (base), "r" (offset),
-+ "m" (*((volatile unsigned char *)base+offset)));
-+ return val;
-+}
-+
-+#else
-+
-+#define MMIO_OUT16(mmio, a, v) (*(VOL16 *)((mmio) + (a)) = (v))
-+#define MMIO_IN16(mmio, a) (*(VOL16 *)((mmio) + (a)))
-+
-+#endif
-+
-+typedef volatile CARD8 VOL8;
-+typedef volatile CARD16 VOL16;
-+typedef volatile CARD32 VOL32;
-+
-+struct backend_funcs {
-+ void (*cardfini)(KdCardInfo *);
-+ void (*scrfini)(KdScreenInfo *);
-+ Bool (*initScreen)(ScreenPtr);
-+ Bool (*finishInitScreen)(ScreenPtr pScreen);
-+ Bool (*createRes)(ScreenPtr);
-+ void (*preserve)(KdCardInfo *);
-+ void (*restore)(KdCardInfo *);
-+ Bool (*dpms)(ScreenPtr, int);
-+ Bool (*enable)(ScreenPtr);
-+ void (*disable)(ScreenPtr);
-+ void (*getColors)(ScreenPtr, int, int, xColorItem *);
-+ void (*putColors)(ScreenPtr, int, int, xColorItem *);
-+#ifdef RANDR
-+ Bool (*randrSetConfig) (ScreenPtr, Rotation, int, RRScreenSizePtr);
-+#endif
-+};
-+
-+typedef struct _GLAMOCardInfo {
-+ union {
-+#ifdef KDRIVEFBDEV
-+ FbdevPriv fbdev;
-+#endif
-+#ifdef KDRIVEVESA
-+ VesaCardPrivRec vesa;
-+#endif
-+ } backend_priv;
-+ struct backend_funcs backend_funcs;
-+
-+ char *reg_base;
-+ Bool is_3362;
-+ CARD32 crtc_pitch;
-+ CARD32 crtc2_pitch;
-+#ifdef USE_DRI
-+ int drmFd;
-+#endif /* USE_DRI */
-+ Bool use_fbdev, use_vesa;
-+} GLAMOCardInfo;
-+
-+#define getGLAMOCardInfo(kd) ((GLAMOCardInfo *) ((kd)->card->driver))
-+#define GLAMOCardInfo(kd) GLAMOCardInfo *glamoc = getGLAMOCardInfo(kd)
-+
-+typedef struct _GLAMOCursor {
-+ int width, height;
-+ int xhot, yhot;
-+
-+ Bool has_cursor;
-+ CursorPtr pCursor;
-+ Pixel source, mask;
-+ KdOffscreenArea *area;
-+} GLAMOCursor;
-+
-+typedef struct _GLAMOPortPriv {
-+ int brightness;
-+ int saturation;
-+ RegionRec clip;
-+ CARD32 size;
-+ KdOffscreenArea *off_screen;
-+ DrawablePtr pDraw;
-+ PixmapPtr pPixmap;
-+
-+ CARD32 src_offset;
-+ CARD32 src_pitch;
-+ CARD8 *src_addr;
-+
-+ int id;
-+ int src_x1, src_y1, src_x2, src_y2;
-+ int dst_x1, dst_y1, dst_x2, dst_y2;
-+ int src_w, src_h, dst_w, dst_h;
-+} GLAMOPortPrivRec, *GLAMOPortPrivPtr;
-+
-+typedef struct _dmaBuf {
-+ int size;
-+ int used;
-+ void *address;
-+#ifdef USE_DRI
-+ drmBufPtr drmBuf;
-+#endif
-+} dmaBuf;
-+
-+typedef struct _GLAMOScreenInfo {
-+ union {
-+#ifdef KDRIVEFBDEV
-+ FbdevScrPriv fbdev;
-+#endif
-+#ifdef KDRIVEVESA
-+ VesaScreenPrivRec vesa;
-+#endif
-+ } backend_priv;
-+ KaaScreenInfoRec kaa;
-+
-+ GLAMOCardInfo *glamoc;
-+ KdScreenInfo *screen;
-+
-+ int scratch_offset;
-+ int scratch_next;
-+ KdOffscreenArea *scratch_area;
-+
-+ GLAMOCursor cursor;
-+
-+ KdVideoAdaptorPtr pAdaptor;
-+ int num_texture_ports;
-+
-+ Bool using_dri; /* If we use the DRM for DMA. */
-+
-+ KdOffscreenArea *dma_space; /* For "DMA" from framebuffer. */
-+ CARD16 *ring_addr; /* Beginning of ring buffer. */
-+ int ring_write; /* Index of write ptr in ring. */
-+ int ring_read; /* Index of read ptr in ring. */
-+ int ring_len;
-+
-+ dmaBuf *indirectBuffer;
-+ int indirectStart;
-+
-+#ifdef USE_DRI
-+ Bool dma_started;
-+
-+ drmSize registerSize;
-+ drmHandle registerHandle;
-+ drmHandle fbHandle;
-+
-+ drmSize gartSize;
-+ drmHandle agpMemHandle; /* Handle from drmAgpAlloc */
-+ unsigned long gartOffset;
-+ unsigned char *AGP; /* Map */
-+ int agpMode;
-+ drmSize pciSize;
-+ drmHandle pciMemHandle;
-+
-+ /* ring buffer data */
-+ unsigned long ringStart; /* Offset into AGP space */
-+ drmHandle ringHandle; /* Handle from drmAddMap */
-+ drmSize ringMapSize; /* Size of map */
-+ int ringSize; /* Size of ring (MB) */
-+ unsigned char *ring; /* Map */
-+
-+ unsigned long ringReadOffset; /* Offset into AGP space */
-+ drmHandle ringReadPtrHandle; /* Handle from drmAddMap */
-+ drmSize ringReadMapSize; /* Size of map */
-+ unsigned char *ringReadPtr; /* Map */
-+
-+ /* vertex/indirect buffer data */
-+ unsigned long bufStart; /* Offset into AGP space */
-+ drmHandle bufHandle; /* Handle from drmAddMap */
-+ drmSize bufMapSize; /* Size of map */
-+ int bufSize; /* Size of buffers (MB) */
-+ unsigned char *buf; /* Map */
-+ int bufNumBufs; /* Number of buffers */
-+ drmBufMapPtr buffers; /* Buffer map */
-+
-+ /* AGP Texture data */
-+ unsigned long gartTexStart; /* Offset into AGP space */
-+ drmHandle gartTexHandle; /* Handle from drmAddMap */
-+ drmSize gartTexMapSize; /* Size of map */
-+ int gartTexSize; /* Size of AGP tex space (MB) */
-+ unsigned char *gartTex; /* Map */
-+ int log2GARTTexGran;
-+
-+ int DMAusecTimeout; /* CCE timeout in usecs */
-+
-+ /* DRI screen private data */
-+ int frontOffset;
-+ int frontPitch;
-+ int backOffset;
-+ int backPitch;
-+ int depthOffset;
-+ int depthPitch;
-+ int spanOffset;
-+ int textureOffset;
-+ int textureSize;
-+ int log2TexGran;
-+
-+ int irqEnabled;
-+
-+ int serverContext;
-+
-+ DRIInfoPtr pDRIInfo;
-+#ifdef GLXEXT
-+ int numVisualConfigs;
-+ __GLXvisualConfig *pVisualConfigs;
-+ GLAMOConfigPrivPtr pVisualConfigsPriv;
-+#endif /* GLXEXT */
-+#endif /* USE_DRI */
-+} GLAMOScreenInfo;
-+
-+#define getGLAMOScreenInfo(kd) ((GLAMOScreenInfo *) ((kd)->screen->driver))
-+#define GLAMOScreenInfo(kd) GLAMOScreenInfo *glamos = getGLAMOScreenInfo(kd)
-+
-+typedef union { float f; CARD32 i; } fi_type;
-+
-+/* Surely there's a better way to go about this */
-+static inline CARD32
-+GLAMOFloatAsInt(float val)
-+{
-+ fi_type fi;
-+
-+ fi.f = val;
-+ return fi.i;
-+}
-+
-+#define GET_FLOAT_BITS(x) GLAMOFloatAsInt(x)
-+
-+static inline void
-+MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val)
-+{
-+ CARD16 tmp;
-+
-+ val &= mask;
-+
-+ tmp = MMIO_IN16(mmio, reg);
-+ tmp &= ~mask;
-+ tmp |= val;
-+
-+ MMIO_OUT16(mmio, reg, tmp);
-+}
-+
-+/* glamo.c */
-+Bool
-+GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc);
-+
-+void
-+GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc);
-+
-+/* glamo_draw.c */
-+void
-+GLAMODrawSetup(ScreenPtr pScreen);
-+
-+Bool
-+GLAMODrawInit(ScreenPtr pScreen);
-+
-+void
-+GLAMODrawEnable(ScreenPtr pScreen);
-+
-+void
-+GLAMODrawDisable(ScreenPtr pScreen);
-+
-+void
-+GLAMODrawFini(ScreenPtr pScreen);
-+
-+/* glamo_dri.c */
-+#ifdef USE_DRI
-+Bool
-+GLAMODRIScreenInit(ScreenPtr pScreen);
-+
-+void
-+GLAMODRICloseScreen(ScreenPtr pScreen);
-+
-+void
-+GLAMODRIDMAStart(GLAMOScreenInfo *glamos);
-+
-+void
-+GLAMODRIDMAStop(GLAMOScreenInfo *glamos);
-+
-+void
-+GLAMODRIDMAReset(GLAMOScreenInfo *glamos);
-+
-+void
-+GLAMODRIDispatchIndirect(GLAMOScreenInfo *glamos, Bool discard);
-+
-+drmBufPtr
-+GLAMODRIGetBuffer(GLAMOScreenInfo *glamos);
-+
-+#endif /* USE_DRI */
-+
-+/* glamo_cursor.c */
-+Bool
-+GLAMOCursorInit(ScreenPtr pScreen);
-+
-+void
-+GLAMOCursorEnable(ScreenPtr pScreen);
-+
-+void
-+GLAMOCursorDisable(ScreenPtr pScreen);
-+
-+void
-+GLAMOCursorFini(ScreenPtr pScreen);
-+
-+void
-+GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef);
-+
-+int
-+GLAMOLog2(int val);
-+
-+/* glamo_video.c */
-+Bool
-+GLAMOInitVideo(ScreenPtr pScreen);
-+
-+void
-+GLAMOFiniVideo(ScreenPtr pScreen);
-+
-+extern KdCardFuncs GLAMOFuncs;
-+
-+#endif /* _GLAMO_H_ */
-Index: xserver/hw/kdrive/glamo/glamo_dma.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_dma.c 2007-09-26 17:45:16.000000000 +0800
-@@ -0,0 +1,410 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2004 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#include <sys/time.h>
-+
-+#include "glamo.h"
-+#include "glamo-regs.h"
-+#include "glamo_dma.h"
-+#include "glamo_draw.h"
-+
-+#ifdef USE_DRI
-+#include "radeon_common.h"
-+#include "glamo_sarea.h"
-+#endif /* USE_DRI */
-+
-+#define DEBUG_FIFO 1
-+
-+#if DEBUG_FIFO
-+static void
-+GLAMODebugFifo(GLAMOScreenInfo *glamos)
-+{
-+ GLAMOCardInfo *glamoc = glamos->glamoc;
-+ char *mmio = glamoc->reg_base;
-+ CARD32 offset;
-+
-+ ErrorF("GLAMO_REG_CQ_STATUS: 0x%04x\n",
-+ MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS));
-+
-+ offset = MMIO_IN16(mmio, GLAMO_REG_CQ_WRITE_ADDRL);
-+ offset |= (MMIO_IN16(mmio, GLAMO_REG_CQ_WRITE_ADDRH) << 16) & 0x7;
-+ ErrorF("GLAMO_REG_CQ_WRITE_ADDR: 0x%08x\n", (unsigned int) offset);
-+
-+ offset = MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRL);
-+ offset |= (MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRH) << 16) & 0x7;
-+ ErrorF("GLAMO_REG_CQ_READ_ADDR: 0x%08x\n", (unsigned int) offset);
-+}
-+#endif
-+
-+void
-+GLAMOEngineReset(ScreenPtr pScreen, enum glamo_engine engine)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+ CARD32 reg;
-+ CARD16 mask;
-+ char *mmio = glamoc->reg_base;
-+
-+ if (!mmio)
-+ return;
-+
-+ switch (engine) {
-+ case GLAMO_ENGINE_ISP:
-+ reg = GLAMO_REG_CLOCK_ISP;
-+ mask = GLAMO_CLOCK_ISP2_RESET;
-+ break;
-+ case GLAMO_ENGINE_CQ:
-+ reg = GLAMO_REG_CLOCK_2D;
-+ mask = GLAMO_CLOCK_2D_CQ_RESET;
-+ break;
-+ case GLAMO_ENGINE_2D:
-+ reg = GLAMO_REG_CLOCK_2D;
-+ mask = GLAMO_CLOCK_2D_RESET;
-+ break;
-+ }
-+
-+ MMIOSetBitMask(mmio, reg, mask, 0xffff);
-+ usleep(1000);
-+ MMIOSetBitMask(mmio, reg, mask, 0);
-+ usleep(1000);
-+}
-+
-+void
-+GLAMOEngineDisable(ScreenPtr pScreen, enum glamo_engine engine)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+ char *mmio = glamoc->reg_base;
-+
-+ if (!mmio)
-+ return;
-+
-+ return;
-+}
-+
-+void
-+GLAMOEngineEnable(ScreenPtr pScreen, enum glamo_engine engine)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+ char *mmio = glamoc->reg_base;
-+
-+ if (!mmio)
-+ return;
-+
-+ switch (engine) {
-+ case GLAMO_ENGINE_ISP:
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_ISP,
-+ GLAMO_CLOCK_ISP_EN_M2CLK |
-+ GLAMO_CLOCK_ISP_EN_I1CLK,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_2,
-+ GLAMO_CLOCK_GEN52_EN_DIV_ICLK,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1,
-+ GLAMO_CLOCK_GEN51_EN_DIV_JCLK,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2),
-+ GLAMO_HOSTBUS2_MMIO_EN_ISP,
-+ 0xffff);
-+ break;
-+ case GLAMO_ENGINE_CQ:
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_2D,
-+ GLAMO_CLOCK_2D_EN_M6CLK,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2),
-+ GLAMO_HOSTBUS2_MMIO_EN_CQ,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1,
-+ GLAMO_CLOCK_GEN51_EN_DIV_MCLK,
-+ 0xffff);
-+ break;
-+ case GLAMO_ENGINE_2D:
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_2D,
-+ GLAMO_CLOCK_2D_EN_M7CLK |
-+ GLAMO_CLOCK_2D_EN_GCLK |
-+ GLAMO_CLOCK_2D_DG_M7CLK |
-+ GLAMO_CLOCK_2D_DG_GCLK,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2),
-+ GLAMO_HOSTBUS2_MMIO_EN_2D,
-+ 0xffff);
-+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1,
-+ GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
-+ 0xffff);
-+ break;
-+ }
-+}
-+
-+void
-+GLAMOWaitIdle(GLAMOScreenInfo *glamos)
-+{
-+ GLAMOCardInfo *glamoc = glamos->glamoc;
-+ char *mmio = glamoc->reg_base;
-+ CARD16 status;
-+ TIMEOUT_LOCALS;
-+
-+ if (glamos->indirectBuffer != NULL)
-+ GLAMOFlushIndirect(glamos, 0);
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri) {
-+ int ret = 0;
-+ int cmd = (glamoc->is_3362 ? DRM_RADEON_CP_IDLE :
-+ DRM_R128_CCE_IDLE);
-+ WHILE_NOT_TIMEOUT(2) {
-+ ret = drmCommandNone(glamoc->drmFd, cmd);
-+ if (ret != -EBUSY)
-+ break;
-+ }
-+ if (TIMEDOUT()) {
-+ GLAMODebugFifo(glamos);
-+ FatalError("Timed out idling CCE (card hung)\n");
-+ }
-+ if (ret != 0)
-+ ErrorF("Failed to idle DMA, returned %d\n", ret);
-+ return;
-+ }
-+#endif
-+
-+ WHILE_NOT_TIMEOUT(.5) {
-+ status = MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS);
-+ if ((status & (1 << 2)) && !(status & (1 << 8)))
-+ break;
-+ }
-+ if (TIMEDOUT()) {
-+ ErrorF("Timeout idling accelerator, resetting...\n");
-+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
-+ GLAMODrawSetup(glamos->screen->pScreen);
-+ }
-+
-+#if DEBUG_FIFO
-+ ErrorF("Idle?\n");
-+ GLAMODebugFifo(glamos);
-+#endif
-+}
-+
-+dmaBuf *
-+GLAMOGetDMABuffer(GLAMOScreenInfo *glamos)
-+{
-+ dmaBuf *buf;
-+
-+ buf = (dmaBuf *)xalloc(sizeof(dmaBuf));
-+ if (buf == NULL)
-+ return NULL;
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri) {
-+ buf->drmBuf = GLAMODRIGetBuffer(glamos);
-+ if (buf->drmBuf == NULL) {
-+ xfree(buf);
-+ return NULL;
-+ }
-+ buf->size = buf->drmBuf->total;
-+ buf->used = buf->drmBuf->used;
-+ buf->address = buf->drmBuf->address;
-+ return buf;
-+ }
-+#endif /* USE_DRI */
-+
-+ buf->size = glamos->ring_len / 2;
-+ buf->address = xalloc(buf->size);
-+ if (buf->address == NULL) {
-+ xfree(buf);
-+ return NULL;
-+ }
-+ buf->used = 0;
-+
-+ return buf;
-+}
-+
-+static void
-+GLAMODispatchIndirectDMA(GLAMOScreenInfo *glamos)
-+{
-+ GLAMOCardInfo *glamoc = glamos->glamoc;
-+ dmaBuf *buf = glamos->indirectBuffer;
-+ char *mmio = glamoc->reg_base;
-+ CARD16 *addr;
-+ int count, ring_count;
-+ TIMEOUT_LOCALS;
-+
-+ addr = (CARD16 *)((char *)buf->address + glamos->indirectStart);
-+ count = (buf->used - glamos->indirectStart) / 2;
-+ ring_count = glamos->ring_len / 2;
-+
-+ WHILE_NOT_TIMEOUT(.5) {
-+ if (count <= 0)
-+ break;
-+
-+ glamos->ring_addr[glamos->ring_write++] = *addr++;
-+ if (glamos->ring_write >= ring_count)
-+ glamos->ring_write = 0;
-+
-+ while (glamos->ring_write == glamos->ring_read)
-+ {
-+ glamos->ring_read =
-+ MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRL);
-+ glamos->ring_read |=
-+ (MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRH) & 0x7) << 16;
-+ }
-+
-+ count--;
-+ }
-+ if (TIMEDOUT()) {
-+ ErrorF("Timeout submitting packets, resetting...\n");
-+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
-+ GLAMODrawSetup(glamos->screen->pScreen);
-+ }
-+
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRH,
-+ (glamos->ring_write >> 15) & 0x7);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRL,
-+ (glamos->ring_write << 1) & 0xffff);
-+}
-+
-+void
-+GLAMOFlushIndirect(GLAMOScreenInfo *glamos, Bool discard)
-+{
-+ dmaBuf *buf = glamos->indirectBuffer;
-+
-+ if ((glamos->indirectStart == buf->used) && !discard)
-+ return;
-+
-+#if DEBUG_FIFO
-+ ErrorF("Dispatching %d DWORDS\n", (buf->used - glamos->indirectStart) /
-+ 4);
-+#endif
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri) {
-+ buf->drmBuf->used = buf->used;
-+ GLAMODRIDispatchIndirect(glamos, discard);
-+ if (discard) {
-+ buf->drmBuf = GLAMODRIGetBuffer(glamos);
-+ buf->size = buf->drmBuf->total;
-+ buf->used = buf->drmBuf->used;
-+ buf->address = buf->drmBuf->address;
-+ glamos->indirectStart = 0;
-+ } else {
-+ /* Start on a double word boundary */
-+ glamos->indirectStart = buf->used = (buf->used + 7) & ~7;
-+ }
-+ return;
-+ }
-+#endif /* USE_DRI */
-+
-+ GLAMODispatchIndirectDMA(glamos);
-+
-+ buf->used = 0;
-+ glamos->indirectStart = 0;
-+}
-+
-+static Bool
-+GLAMODMAInit(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ GLAMOCardInfo(pScreenPriv);
-+ char *mmio = glamoc->reg_base;
-+ int cq_len = 63;
-+
-+ glamos->ring_len = (cq_len + 1) * 1024;
-+
-+ glamos->dma_space = KdOffscreenAlloc(pScreen, glamos->ring_len + 4,
-+ 16, TRUE, NULL, NULL);
-+ if (!glamos->dma_space)
-+ return FALSE;
-+
-+ glamos->ring_addr = (CARD16 *) (pScreenPriv->screen->memory_base +
-+ glamos->dma_space->offset);
-+ glamos->ring_read = 0;
-+ glamos->ring_write = 0;
-+
-+ /* make the decoder happy? */
-+ glamos->ring_addr[glamos->ring_len / 2] = 0x0;
-+ glamos->ring_addr[glamos->ring_len / 2 + 1] = 0x0;
-+
-+ GLAMOEngineEnable(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
-+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
-+
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_BASE_ADDRL,
-+ glamos->dma_space->offset & 0xffff);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_BASE_ADDRH,
-+ (glamos->dma_space->offset >> 16) & 0x7f);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_LEN, cq_len);
-+
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRH, 0);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRL, 0);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_READ_ADDRH, 0);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_READ_ADDRL, 0);
-+ MMIO_OUT16(mmio, GLAMO_REG_CQ_CONTROL,
-+ 1 << 12 |
-+ 5 << 8 |
-+ 8 << 4);
-+
-+ return TRUE;
-+}
-+
-+void
-+GLAMODMASetup(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri)
-+ GLAMODRIDMAStart(glamos);
-+#endif /* USE_DRI */
-+
-+ if (!glamos->using_dri)
-+ GLAMODMAInit(pScreen);
-+
-+ glamos->indirectBuffer = GLAMOGetDMABuffer(glamos);
-+ if (glamos->indirectBuffer == FALSE)
-+ FatalError("Failed to allocate DMA buffer.\n");
-+
-+ if (glamos->using_dri)
-+ ErrorF("Initialized DRI DMA\n");
-+ else
-+ ErrorF("Initialized DMA\n");
-+}
-+
-+void
-+GLAMODMATeardown(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ GLAMOWaitIdle(glamos);
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri)
-+ GLAMODRIDMAStop(glamos);
-+#endif /* USE_DRI */
-+
-+ xfree(glamos->indirectBuffer->address);
-+ xfree(glamos->indirectBuffer);
-+ glamos->indirectBuffer = NULL;
-+}
-Index: xserver/hw/kdrive/glamo/glamo_dma.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_dma.h 2007-09-25 19:17:53.000000000 +0800
-@@ -0,0 +1,159 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2004 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _GLAMO_DMA_H_
-+#define _GLAMO_DMA_H_
-+
-+#define CCE_DEBUG 1
-+
-+#if !CCE_DEBUG
-+#define DMA_PACKET0(reg, count) \
-+ (reg)
-+#else
-+#define DMA_PACKET0(reg, count) \
-+ (__packet0count = (count), __reg = (reg), \
-+ (reg))
-+#endif
-+#define DMA_PACKET1(reg1, reg2) \
-+ (GLAMO_CCE_PACKET1 | \
-+ (((reg2) >> 2) << GLAMO_CCE_PACKET1_REG_2_SHIFT) | ((reg1) >> 2))
-+#define DMA_PACKET3(type, count) \
-+ ((type) | (((count) - 1) << 16))
-+
-+#if !CCE_DEBUG
-+
-+#define RING_LOCALS CARD16 *__head; int __count
-+#define BEGIN_DMA(n) \
-+do { \
-+ if ((glamos->indirectBuffer->used + 2 * (n)) > \
-+ glamos->indirectBuffer->size) { \
-+ GLAMOFlushIndirect(glamos, 1); \
-+ } \
-+ __head = (CARD16 *)((char *)glamos->indirectBuffer->address + \
-+ glamos->indirectBuffer->used); \
-+ __count = 0; \
-+} while (0)
-+#define END_DMA() do { \
-+ glamos->indirectBuffer->used += __count * 2; \
-+} while (0)
-+
-+#else
-+
-+#define RING_LOCALS \
-+ CARD16 *__head; int __count, __total, __reg, __packet0count
-+#define BEGIN_DMA(n) \
-+do { \
-+ if ((glamos->indirectBuffer->used + 2 * (n)) > \
-+ glamos->indirectBuffer->size) { \
-+ GLAMOFlushIndirect(glamos, 1); \
-+ } \
-+ __head = (CARD16 *)((char *)glamos->indirectBuffer->address + \
-+ glamos->indirectBuffer->used); \
-+ __count = 0; \
-+ __total = n; \
-+ __reg = 0; \
-+ __packet0count = 0; \
-+} while (0)
-+#define END_DMA() do { \
-+ if (__count != __total) \
-+ FatalError("count != total (%d vs %d) at %s:%d\n", \
-+ __count, __total, __FILE__, __LINE__); \
-+ glamos->indirectBuffer->used += __count * 2; \
-+} while (0)
-+
-+#endif
-+
-+#define OUT_RING(val) do { \
-+ __head[__count++] = (val); \
-+} while (0)
-+
-+#define OUT_RING_REG(reg, val) do { \
-+ if (__reg != reg) \
-+ FatalError("unexpected reg (0x%x vs 0x%x) at %s:%d\n", \
-+ reg, __reg, __FILE__, __LINE__); \
-+ if (__packet0count-- <= 0) \
-+ FatalError("overrun of packet0 at %s:%d\n", \
-+ __FILE__, __LINE__); \
-+ __head[__count++] = (val); \
-+ __reg += 4; \
-+} while (0)
-+
-+#define OUT_RING_F(x) OUT_RING(GET_FLOAT_BITS(x))
-+
-+#define OUT_REG(reg, val) \
-+do { \
-+ OUT_RING(DMA_PACKET0(reg, 1)); \
-+ OUT_RING(val); \
-+} while (0)
-+
-+#define TIMEOUT_LOCALS struct timeval _target, _curtime
-+
-+static inline Bool
-+tv_le(struct timeval *tv1, struct timeval *tv2)
-+{
-+ if (tv1->tv_sec < tv2->tv_sec ||
-+ (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec < tv2->tv_usec))
-+ return TRUE;
-+ else
-+ return FALSE;
-+}
-+
-+#define WHILE_NOT_TIMEOUT(_timeout) \
-+ gettimeofday(&_target, NULL); \
-+ _target.tv_usec += ((_timeout) * 1000000); \
-+ _target.tv_sec += _target.tv_usec / 1000000; \
-+ _target.tv_usec = _target.tv_usec % 1000000; \
-+ while (gettimeofday(&_curtime, NULL), tv_le(&_curtime, &_target))
-+
-+#define TIMEDOUT() (!tv_le(&_curtime, &_target))
-+
-+dmaBuf *
-+GLAMOGetDMABuffer(GLAMOScreenInfo *glamos);
-+
-+void
-+GLAMOFlushIndirect(GLAMOScreenInfo *glamos, Bool discard);
-+
-+void
-+GLAMODMASetup(ScreenPtr pScreen);
-+
-+void
-+GLAMODMATeardown(ScreenPtr pScreen);
-+
-+enum glamo_engine {
-+ GLAMO_ENGINE_ISP,
-+ GLAMO_ENGINE_CQ,
-+ GLAMO_ENGINE_2D,
-+};
-+
-+void
-+GLAMOEngineEnable(ScreenPtr pScreen, enum glamo_engine engine);
-+
-+void
-+GLAMOEngineDisable(ScreenPtr pScreen, enum glamo_engine engine);
-+
-+void
-+GLAMOEngineReset(ScreenPtr pScreen, enum glamo_engine engine);
-+
-+#endif /* _GLAMO_DMA_H_ */
-Index: xserver/hw/kdrive/glamo/glamo_draw.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_draw.c 2007-09-26 17:46:30.000000000 +0800
-@@ -0,0 +1,522 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2003 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "glamo.h"
-+#include "glamo-regs.h"
-+#include "glamo_dma.h"
-+#include "glamo_draw.h"
-+#include "kaa.h"
-+
-+static const CARD8 GLAMOSolidRop[16] = {
-+ /* GXclear */ 0x00, /* 0 */
-+ /* GXand */ 0xa0, /* src AND dst */
-+ /* GXandReverse */ 0x50, /* src AND NOT dst */
-+ /* GXcopy */ 0xf0, /* src */
-+ /* GXandInverted*/ 0x0a, /* NOT src AND dst */
-+ /* GXnoop */ 0xaa, /* dst */
-+ /* GXxor */ 0x5a, /* src XOR dst */
-+ /* GXor */ 0xfa, /* src OR dst */
-+ /* GXnor */ 0x05, /* NOT src AND NOT dst */
-+ /* GXequiv */ 0xa5, /* NOT src XOR dst */
-+ /* GXinvert */ 0x55, /* NOT dst */
-+ /* GXorReverse */ 0xf5, /* src OR NOT dst */
-+ /* GXcopyInverted*/ 0x0f, /* NOT src */
-+ /* GXorInverted */ 0xaf, /* NOT src OR dst */
-+ /* GXnand */ 0x5f, /* NOT src OR NOT dst */
-+ /* GXset */ 0xff, /* 1 */
-+};
-+
-+static const CARD8 GLAMOBltRop[16] = {
-+ /* GXclear */ 0x00, /* 0 */
-+ /* GXand */ 0x88, /* src AND dst */
-+ /* GXandReverse */ 0x44, /* src AND NOT dst */
-+ /* GXcopy */ 0xcc, /* src */
-+ /* GXandInverted*/ 0x22, /* NOT src AND dst */
-+ /* GXnoop */ 0xaa, /* dst */
-+ /* GXxor */ 0x66, /* src XOR dst */
-+ /* GXor */ 0xee, /* src OR dst */
-+ /* GXnor */ 0x11, /* NOT src AND NOT dst */
-+ /* GXequiv */ 0x99, /* NOT src XOR dst */
-+ /* GXinvert */ 0x55, /* NOT dst */
-+ /* GXorReverse */ 0xdd, /* src OR NOT dst */
-+ /* GXcopyInverted*/ 0x33, /* NOT src */
-+ /* GXorInverted */ 0xbb, /* NOT src OR dst */
-+ /* GXnand */ 0x77, /* NOT src OR NOT dst */
-+ /* GXset */ 0xff, /* 1 */
-+};
-+
-+GLAMOScreenInfo *accel_glamos;
-+CARD32 settings, color, src_pitch_offset, dst_pitch_offset;
-+
-+int sample_count;
-+float sample_offsets_x[255];
-+float sample_offsets_y[255];
-+
-+void
-+GLAMODrawSetup(ScreenPtr pScreen)
-+{
-+ GLAMOEngineEnable(pScreen, GLAMO_ENGINE_2D);
-+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_2D);
-+}
-+
-+static void
-+GLAMOWaitMarker(ScreenPtr pScreen, int marker)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ ENTER_DRAW(0);
-+ GLAMOWaitIdle(glamos);
-+ LEAVE_DRAW(0);
-+}
-+
-+#if GLAMO_TRACE_DRAW
-+void
-+GLAMOEnterDraw (PixmapPtr pPix, const char *function)
-+{
-+ if (pPix != NULL) {
-+ KdScreenPriv(pPix->drawable.pScreen);
-+ CARD32 offset;
-+
-+ offset = ((CARD8 *)pPix->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+
-+ ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset,
-+ pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth,
-+ (unsigned int) pPix->drawable.bitsPerPixel);
-+ } else
-+ ErrorF ("Enter %s\n", function);
-+}
-+
-+void
-+GLAMOLeaveDraw (PixmapPtr pPix, const char *function)
-+{
-+ if (pPix != NULL) {
-+ KdScreenPriv(pPix->drawable.pScreen);
-+ CARD32 offset;
-+
-+ offset = ((CARD8 *)pPix->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+
-+ ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset);
-+ } else
-+ ErrorF ("Leave %s\n", function);
-+}
-+#endif
-+
-+static Bool
-+GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
-+{
-+ KdScreenPriv(pPix->drawable.pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ CARD32 offset, pitch;
-+ FbBits mask;
-+ RING_LOCALS;
-+
-+ if (pPix->drawable.bitsPerPixel != 16)
-+ GLAMO_FALLBACK(("Only 16bpp is supported\n"));
-+
-+ mask = FbFullMask(16);
-+ if ((pm & mask) != mask)
-+ GLAMO_FALLBACK(("Can't do planemask 0x%08x\n", (unsigned int) pm));
-+
-+ accel_glamos = glamos;
-+
-+ settings = GLAMOSolidRop[alu] << 8;
-+ offset = ((CARD8 *) pPix->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+ pitch = pPix->devKind;
-+
-+ ENTER_DRAW(pPix);
-+
-+ BEGIN_DMA(12);
-+ OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff);
-+ OUT_REG(GLAMO_REG_2D_DST_ADDRH, (offset >> 16) & 0x7f);
-+ OUT_REG(GLAMO_REG_2D_DST_PITCH, pitch);
-+ OUT_REG(GLAMO_REG_2D_DST_HEIGHT, pPix->drawable.height);
-+ OUT_REG(GLAMO_REG_2D_PAT_FG, fg);
-+ OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
-+ END_DMA();
-+
-+ LEAVE_DRAW(pPix);
-+
-+ return TRUE;
-+}
-+
-+static void
-+GLAMOSolid(int x1, int y1, int x2, int y2)
-+{
-+ ENTER_DRAW(0);
-+ GLAMOScreenInfo *glamos = accel_glamos;
-+ RING_LOCALS;
-+
-+ BEGIN_DMA(14);
-+ OUT_REG(GLAMO_REG_2D_DST_X, x1);
-+ OUT_REG(GLAMO_REG_2D_DST_Y, y1);
-+ OUT_REG(GLAMO_REG_2D_RECT_WIDTH, x2 - x1);
-+ OUT_REG(GLAMO_REG_2D_RECT_HEIGHT, y2 - y1);
-+ OUT_REG(GLAMO_REG_2D_COMMAND3, 0);
-+ OUT_REG(GLAMO_REG_2D_ID1, 0);
-+ OUT_REG(GLAMO_REG_2D_ID2, 0);
-+ END_DMA();
-+ LEAVE_DRAW(0);
-+}
-+
-+static void
-+GLAMODoneSolid(void)
-+{
-+ ENTER_DRAW(0);
-+ LEAVE_DRAW(0);
-+}
-+
-+static Bool
-+GLAMOPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, Pixel pm)
-+{
-+ KdScreenPriv(pDst->drawable.pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ CARD32 src_offset, src_pitch;
-+ CARD32 dst_offset, dst_pitch;
-+ FbBits mask;
-+ RING_LOCALS;
-+
-+ if (pSrc->drawable.bitsPerPixel != 16 ||
-+ pDst->drawable.bitsPerPixel != 16)
-+ GLAMO_FALLBACK(("Only 16bpp is supported"));
-+
-+ mask = FbFullMask(16);
-+ if ((pm & mask) != mask)
-+ GLAMO_FALLBACK(("Can't do planemask 0x%08x", (unsigned int) pm));
-+
-+ accel_glamos = glamos;
-+
-+ src_offset = ((CARD8 *) pSrc->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+ src_pitch = pSrc->devKind;
-+
-+ dst_offset = ((CARD8 *) pDst->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+ dst_pitch = pDst->devKind;
-+
-+ settings = GLAMOBltRop[alu] << 8;
-+
-+ ENTER_DRAW (pDst);
-+
-+ BEGIN_DMA(16);
-+
-+ OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff);
-+ OUT_REG(GLAMO_REG_2D_SRC_ADDRH, (src_offset >> 16) & 0x7f);
-+ OUT_REG(GLAMO_REG_2D_SRC_PITCH, src_pitch);
-+
-+ OUT_REG(GLAMO_REG_2D_DST_ADDRL, dst_offset & 0xffff);
-+ OUT_REG(GLAMO_REG_2D_DST_ADDRH, (dst_offset >> 16) & 0x7f);
-+ OUT_REG(GLAMO_REG_2D_DST_PITCH, dst_pitch);
-+ OUT_REG(GLAMO_REG_2D_DST_HEIGHT, pDst->drawable.height);
-+
-+ OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
-+
-+ END_DMA();
-+
-+ LEAVE_DRAW(pDst);
-+
-+ return TRUE;
-+}
-+
-+static void
-+GLAMOCopy(int srcX, int srcY, int dstX, int dstY, int w, int h)
-+{
-+ GLAMOScreenInfo *glamos = accel_glamos;
-+ RING_LOCALS;
-+
-+ BEGIN_DMA(18);
-+ OUT_REG(GLAMO_REG_2D_SRC_X, srcX);
-+ OUT_REG(GLAMO_REG_2D_SRC_Y, srcY);
-+ OUT_REG(GLAMO_REG_2D_DST_X, dstX);
-+ OUT_REG(GLAMO_REG_2D_DST_Y, dstY);
-+ OUT_REG(GLAMO_REG_2D_RECT_WIDTH, w);
-+ OUT_REG(GLAMO_REG_2D_RECT_HEIGHT, h);
-+ OUT_REG(GLAMO_REG_2D_COMMAND3, 0);
-+ OUT_REG(GLAMO_REG_2D_ID1, 0);
-+ OUT_REG(GLAMO_REG_2D_ID2, 0);
-+ END_DMA();
-+}
-+
-+static void
-+GLAMODoneCopy(void)
-+{
-+ ENTER_DRAW(0);
-+ LEAVE_DRAW(0);
-+}
-+
-+static Bool
-+GLAMOUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
-+{
-+ int width, height, bpp, i;
-+ CARD8 *dst_offset;
-+ int dst_pitch;
-+
-+ dst_offset = (CARD8 *)pDst->devPrivate.ptr;
-+ dst_pitch = pDst->devKind;
-+ width = pDst->drawable.width;
-+ height = pDst->drawable.height;
-+ bpp = pDst->drawable.bitsPerPixel;
-+ bpp /= 8;
-+
-+ for (i = 0; i < height; i++)
-+ {
-+ memcpy(dst_offset, src, width * bpp);
-+
-+ dst_offset += dst_pitch;
-+ src += src_pitch;
-+ }
-+
-+ ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp);
-+
-+ return TRUE;
-+}
-+
-+
-+#if 0
-+static Bool
-+GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst)
-+{
-+ KdScreenPriv(pSrc->drawable.pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+ GLAMOScreenInfo(pScreenPriv);
-+ int dst_pitch, src_pitch, w, i, size, bytes;
-+ unsigned char *dst, *src;
-+ RING_LOCALS;
-+
-+ ENTER_DRAW(pSrc);
-+ /* Align width to log 2, useful for R128 composite. This should be a
-+ * KAA flag we check for (and supported in kaa.c in general) since many
-+ * older bits of hardware are going to want POT pitches.
-+ */
-+ w = pSrc->drawable.width;
-+ if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT)
-+ w = 1 << (GLAMOLog2(w - 1) + 1);
-+ dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 +
-+ glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1);
-+
-+ size = dst_pitch * pSrc->drawable.height;
-+ if (size > glamos->scratch_area->size)
-+ GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n",
-+ pSrc->drawable.width, pSrc->drawable.height));
-+
-+ glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) &
-+ ~(glamos->kaa.offsetAlign - 1);
-+ if (glamos->scratch_next + size > glamos->scratch_area->offset +
-+ glamos->scratch_area->size) {
-+ /* Only sync when we've used all of the scratch area. */
-+ kaaWaitSync(pSrc->drawable.pScreen);
-+ glamos->scratch_next = glamos->scratch_area->offset;
-+ }
-+ memcpy(pDst, pSrc, sizeof(*pDst));
-+ pDst->devKind = dst_pitch;
-+ pDst->devPrivate.ptr = pScreenPriv->screen->memory_base +
-+ glamos->scratch_next;
-+ glamos->scratch_next += size;
-+
-+ src = pSrc->devPrivate.ptr;
-+ src_pitch = pSrc->devKind;
-+ dst = pDst->devPrivate.ptr;
-+ bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
-+
-+ i = pSrc->drawable.height;
-+ while (i--) {
-+ memcpy(dst, src, bytes);
-+ dst += dst_pitch;
-+ src += src_pitch;
-+ }
-+
-+ /* Flush the pixel cache */
-+ if (glamoc->is_3362) {
-+ BEGIN_DMA(4);
-+ OUT_REG(RADEON_REG_RB3D_DSTCACHE_CTLSTAT,
-+ RADEON_RB3D_DC_FLUSH_ALL);
-+ OUT_REG(GLAMO_REG_WAIT_UNTIL, RADEON_WAIT_HOST_IDLECLEAN);
-+ END_DMA();
-+ } else {
-+ BEGIN_DMA(2);
-+ OUT_REG(R128_REG_PC_GUI_CTLSTAT, R128_PC_FLUSH_ALL);
-+ END_DMA();
-+ }
-+
-+ LEAVE_DRAW(pSrc);
-+ return TRUE;
-+}
-+#endif
-+
-+static void
-+GLAMOBlockHandler(pointer blockData, OSTimePtr timeout, pointer readmask)
-+{
-+ ScreenPtr pScreen = (ScreenPtr) blockData;
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ /* When the server is going to sleep, make sure that all DMA data has
-+ * been flushed.
-+ */
-+ if (glamos->indirectBuffer)
-+ GLAMOFlushIndirect(glamos, 1);
-+}
-+
-+static void
-+GLAMOWakeupHandler(pointer blockData, int result, pointer readmask)
-+{
-+}
-+
-+Bool
-+GLAMODrawInit(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ ErrorF("Screen: %d/%d depth/bpp\n", pScreenPriv->screen->fb[0].depth,
-+ pScreenPriv->screen->fb[0].bitsPerPixel);
-+
-+ RegisterBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
-+ pScreen);
-+
-+ glamos->using_dri = FALSE;
-+#ifdef USE_DRI
-+ glamos->using_dri = GLAMODRIScreenInit(pScreen);
-+#endif /* USE_DRI */
-+
-+ memset(&glamos->kaa, 0, sizeof(KaaScreenInfoRec));
-+ glamos->kaa.waitMarker = GLAMOWaitMarker;
-+ glamos->kaa.PrepareSolid = GLAMOPrepareSolid;
-+ glamos->kaa.Solid = GLAMOSolid;
-+ glamos->kaa.DoneSolid = GLAMODoneSolid;
-+ glamos->kaa.PrepareCopy = GLAMOPrepareCopy;
-+ glamos->kaa.Copy = GLAMOCopy;
-+ glamos->kaa.DoneCopy = GLAMODoneCopy;
-+ /* Other acceleration will be hooked in in DrawEnable depending on
-+ * what type of DMA gets initialized.
-+ */
-+
-+ glamos->kaa.flags = KAA_OFFSCREEN_PIXMAPS;
-+ glamos->kaa.offsetAlign = 2;
-+ glamos->kaa.pitchAlign = 2;
-+
-+ kaaInitTrapOffsets(8, sample_offsets_x, sample_offsets_y, 0.0, 0.0);
-+ sample_count = (1 << 8) - 1;
-+
-+ if (!kaaDrawInit(pScreen, &glamos->kaa))
-+ return FALSE;
-+
-+ return TRUE;
-+}
-+
-+#if 0
-+static void
-+GLAMOScratchSave(ScreenPtr pScreen, KdOffscreenArea *area)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ glamos->scratch_area = NULL;
-+}
-+#endif
-+
-+void
-+GLAMODrawEnable(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+
-+ GLAMODMASetup(pScreen);
-+ GLAMODrawSetup(pScreen);
-+
-+ glamos->scratch_area = NULL;
-+ glamos->kaa.PrepareBlend = NULL;
-+ glamos->kaa.Blend = NULL;
-+ glamos->kaa.DoneBlend = NULL;
-+ glamos->kaa.CheckComposite = NULL;
-+ glamos->kaa.PrepareComposite = NULL;
-+ glamos->kaa.Composite = NULL;
-+ glamos->kaa.DoneComposite = NULL;
-+ glamos->kaa.UploadToScreen = NULL;
-+ glamos->kaa.UploadToScratch = NULL;
-+
-+#ifdef USE_DRI
-+ if (glamos->using_dri) {
-+ if (!glamoc->is_3362) {
-+ /*glamos->kaa.PrepareTrapezoids = R128PrepareTrapezoids;
-+ glamos->kaa.Trapezoids = R128Trapezoids;
-+ glamos->kaa.DoneTrapezoids = R128DoneTrapezoids;*/
-+ } else if (glamoc->is_r100 || glamoc->is_r200) {
-+ glamos->kaa.PrepareTrapezoids = RadeonPrepareTrapezoids;
-+ glamos->kaa.Trapezoids = RadeonTrapezoids;
-+ glamos->kaa.DoneTrapezoids = RadeonDoneTrapezoids;
-+ }
-+ }
-+#endif /* USE_DRI */
-+
-+ glamos->kaa.UploadToScreen = GLAMOUploadToScreen;
-+
-+ /* Reserve a scratch area. It'll be used for storing glyph data during
-+ * Composite operations, because glyphs aren't in real pixmaps and thus
-+ * can't be migrated.
-+ */
-+#if 0
-+ glamos->scratch_area = KdOffscreenAlloc(pScreen, 131072,
-+ glamos->kaa.offsetAlign, TRUE, GLAMOScratchSave, glamos);
-+ if (glamos->scratch_area != NULL) {
-+ glamos->scratch_next = glamos->scratch_area->offset;
-+ glamos->kaa.UploadToScratch = GLAMOUploadToScratch;
-+ }
-+#endif
-+
-+ kaaMarkSync(pScreen);
-+}
-+
-+void
-+GLAMODrawDisable(ScreenPtr pScreen)
-+{
-+ kaaWaitSync(pScreen);
-+ GLAMODMATeardown(pScreen);
-+}
-+
-+void
-+GLAMODrawFini(ScreenPtr pScreen)
-+{
-+#ifdef USE_DRI
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ if (glamos->using_dri) {
-+ GLAMODRICloseScreen(pScreen);
-+ glamos->using_dri = FALSE;
-+ }
-+#endif /* USE_DRI */
-+
-+ RemoveBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
-+ pScreen);
-+
-+ kaaDrawFini(pScreen);
-+}
-+
-Index: xserver/hw/kdrive/glamo/glamo_draw.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_draw.h 2007-09-25 19:02:01.000000000 +0800
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2004 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _GLAMO_DRAW_H_
-+#define _GLAMO_DRAW_H_
-+
-+void GLAMOWaitIdle(GLAMOScreenInfo *glamos);
-+
-+#define GLAMO_TRACE_FALL 1
-+#define GLAMO_TRACE_DRAW 1
-+
-+#if GLAMO_TRACE_FALL
-+#define GLAMO_FALLBACK(x) \
-+do { \
-+ ErrorF("%s: ", __FUNCTION__); \
-+ ErrorF x; \
-+ return FALSE; \
-+} while (0)
-+#else
-+#define GLAMO_FALLBACK(x) return FALSE
-+#endif
-+
-+#if GLAMO_TRACE_DRAW
-+#define ENTER_DRAW(pix) GLAMOEnterDraw(pix, __FUNCTION__)
-+#define LEAVE_DRAW(pix) GLAMOLeaveDraw(pix, __FUNCTION__)
-+
-+void
-+GLAMOEnterDraw (PixmapPtr pPixmap, const char *function);
-+
-+void
-+GLAMOLeaveDraw (PixmapPtr pPixmap, const char *function);
-+#else /* GLAMO_TRACE */
-+#define ENTER_DRAW(pix)
-+#define LEAVE_DRAW(pix)
-+#endif /* !GLAMO_TRACE */
-+
-+#endif /* _GLAMO_DRAW_H_ */
-Index: xserver/hw/kdrive/glamo/glamo_stub.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_stub.c 2007-09-26 17:45:27.000000000 +0800
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2003 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "glamo.h"
-+#include "klinux.h"
-+
-+void
-+InitCard(char *name)
-+{
-+ KdCardAttr attr;
-+
-+ attr.io = 0;
-+ attr.address[0] = 0x8000000;
-+ attr.naddr = 1;
-+ KdCardInfoAdd(&GLAMOFuncs, &attr, 0);
-+}
-+
-+void
-+InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
-+{
-+ KdInitOutput(pScreenInfo, argc, argv);
-+}
-+
-+void
-+InitInput(int argc, char **argv)
-+{
-+ KdKeyboardInfo *ki;
-+
-+ KdAddKeyboardDriver(&LinuxKeyboardDriver);
-+ KdAddPointerDriver(&LinuxMouseDriver);
-+#ifdef TSLIB
-+ KdAddPointerDriver(&TsDriver);
-+#endif
-+
-+ ki = KdParseKeyboard("keybd");
-+ KdAddKeyboard(ki);
-+}
-+
-+void
-+ddxUseMsg (void)
-+{
-+ KdUseMsg();
-+#ifdef KDRIVEVESA
-+ vesaUseMsg();
-+#endif
-+}
-+
-+int
-+ddxProcessArgument(int argc, char **argv, int i)
-+{
-+ int ret;
-+
-+#ifdef KDRIVEVESA
-+ if (!(ret = vesaProcessArgument (argc, argv, i)))
-+#endif
-+ ret = KdProcessArgument(argc, argv, i);
-+
-+ return ret;
-+}
-Index: xserver/hw/kdrive/glamo/glamo_video.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_video.c 2007-09-26 17:47:55.000000000 +0800
-@@ -0,0 +1,798 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2004 Keith Packard
-+ * Copyright © 2005 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "glamo.h"
-+#include "glamo_dma.h"
-+#include "glamo_draw.h"
-+#include "glamo-regs.h"
-+#include "kaa.h"
-+
-+#include <X11/extensions/Xv.h>
-+#include "fourcc.h"
-+
-+#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+
-+static Atom xvBrightness, xvSaturation;
-+
-+#define IMAGE_MAX_WIDTH 2048
-+#define IMAGE_MAX_HEIGHT 2048
-+
-+static void
-+GLAMOStopVideo(KdScreenInfo *screen, pointer data, Bool exit)
-+{
-+ ScreenPtr pScreen = screen->pScreen;
-+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data;
-+
-+ REGION_EMPTY(screen->pScreen, &pPortPriv->clip);
-+
-+ if (pPortPriv->off_screen) {
-+ KdOffscreenFree (pScreen, pPortPriv->off_screen);
-+ pPortPriv->off_screen = 0;
-+ }
-+}
-+
-+static int
-+GLAMOSetPortAttribute(KdScreenInfo *screen, Atom attribute, int value,
-+ pointer data)
-+{
-+ return BadMatch;
-+}
-+
-+static int
-+GLAMOGetPortAttribute(KdScreenInfo *screen, Atom attribute, int *value,
-+ pointer data)
-+{
-+ return BadMatch;
-+}
-+
-+static void
-+GLAMOQueryBestSize(KdScreenInfo *screen, Bool motion, short vid_w, short vid_h,
-+ short drw_w, short drw_h, unsigned int *p_w, unsigned int *p_h,
-+ pointer data)
-+{
-+ *p_w = drw_w;
-+ *p_h = drw_h;
-+}
-+
-+/* GLAMOClipVideo -
-+
-+ Takes the dst box in standard X BoxRec form (top and left
-+ edges inclusive, bottom and right exclusive). The new dst
-+ box is returned. The source boundaries are given (x1, y1
-+ inclusive, x2, y2 exclusive) and returned are the new source
-+ boundaries in 16.16 fixed point.
-+*/
-+
-+static void
-+GLAMOClipVideo(BoxPtr dst, INT32 *x1, INT32 *x2, INT32 *y1, INT32 *y2,
-+ BoxPtr extents, INT32 width, INT32 height)
-+{
-+ INT32 vscale, hscale, delta;
-+ int diff;
-+
-+ hscale = ((*x2 - *x1) << 16) / (dst->x2 - dst->x1);
-+ vscale = ((*y2 - *y1) << 16) / (dst->y2 - dst->y1);
-+
-+ *x1 <<= 16; *x2 <<= 16;
-+ *y1 <<= 16; *y2 <<= 16;
-+
-+ diff = extents->x1 - dst->x1;
-+ if (diff > 0) {
-+ dst->x1 = extents->x1;
-+ *x1 += diff * hscale;
-+ }
-+ diff = dst->x2 - extents->x2;
-+ if (diff > 0) {
-+ dst->x2 = extents->x2;
-+ *x2 -= diff * hscale;
-+ }
-+ diff = extents->y1 - dst->y1;
-+ if (diff > 0) {
-+ dst->y1 = extents->y1;
-+ *y1 += diff * vscale;
-+ }
-+ diff = dst->y2 - extents->y2;
-+ if (diff > 0) {
-+ dst->y2 = extents->y2;
-+ *y2 -= diff * vscale;
-+ }
-+
-+ if (*x1 < 0) {
-+ diff = (- *x1 + hscale - 1)/ hscale;
-+ dst->x1 += diff;
-+ *x1 += diff * hscale;
-+ }
-+ delta = *x2 - (width << 16);
-+ if (delta > 0) {
-+ diff = (delta + hscale - 1)/ hscale;
-+ dst->x2 -= diff;
-+ *x2 -= diff * hscale;
-+ }
-+ if (*y1 < 0) {
-+ diff = (- *y1 + vscale - 1)/ vscale;
-+ dst->y1 += diff;
-+ *y1 += diff * vscale;
-+ }
-+ delta = *y2 - (height << 16);
-+ if (delta > 0) {
-+ diff = (delta + vscale - 1)/ vscale;
-+ dst->y2 -= diff;
-+ *y2 -= diff * vscale;
-+ }
-+}
-+
-+static void
-+GlamoDisplayVideo(KdScreenInfo *screen, GLAMOPortPrivPtr pPortPriv)
-+{
-+ ScreenPtr pScreen = screen->pScreen;
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ PixmapPtr pPixmap = pPortPriv->pPixmap;
-+ CARD32 dst_offset, dst_pitch;
-+ int dstxoff, dstyoff, srcDatatype;
-+ RING_LOCALS;
-+
-+ BoxPtr pBox = REGION_RECTS(&pPortPriv->clip);
-+ int nBox = REGION_NUM_RECTS(&pPortPriv->clip);
-+
-+ dst_offset = ((CARD8 *)pPixmap->devPrivate.ptr -
-+ pScreenPriv->screen->memory_base);
-+ dst_pitch = pPixmap->devKind;
-+
-+#ifdef COMPOSITE
-+ dstxoff = -pPixmap->screen_x + pPixmap->drawable.x;
-+ dstyoff = -pPixmap->screen_y + pPixmap->drawable.y;
-+#else
-+ dstxoff = 0;
-+ dstyoff = 0;
-+#endif
-+
-+ BEGIN_DMA(14);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_11, 0x0167);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_21, 0x01c5);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_32, 0x00b6);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_33, 0x0058);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_RG, 0xb3 << 8 | 0x89);
-+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_B, 0xe2);
-+
-+ /* TODO weight matrix */
-+
-+ OUT_REG(GLAMO_REG_ISP_PORT2_EN, GLAMO_ISP_PORT2_EN_DECODE);
-+
-+ END_DMA();
-+
-+ if (pPortPriv->id == FOURCC_UYVY)
-+ srcDatatype = 3;
-+ else
-+ srcDatatype = 1;
-+
-+ BEGIN_DMA(8);
-+#if 0
-+ OUT_REG(GLAMO_REG_ISP_EN3, GLAMO_ISP_EN3_SCALE_IMPROVE |
-+ GLAMO_ISP_EN3_PLANE_MODE |
-+ GLAMO_ISP_EN3_YUV_INPUT |
-+ GLAMO_ISP_EN3_YUV420);
-+ OUT_REG(GLAMO_REG_ISP_PORT1_DEC_EN, GLAMO_ISP_PORT1_EN_OUTPUT);
-+
-+ OUT_REG(GLAMO_REG_ISP_DEC_SCALEH, 1 << 11);
-+ OUT_REG(GLAMO_REG_ISP_DEC_SCALEV, 1 << 11);
-+
-+ {
-+ struct {
-+ int src_block_y;
-+ int src_block_x;
-+ int src_block_h;
-+ int src_block_w;
-+ int jpeg_out_y;
-+ int jpeg_out_x;
-+ int fifo_full_cnt;
-+ int in_length;
-+ int fifo_data_cnt;
-+ int in_height;
-+ } onfly;
-+
-+ onfly.src_block_y = 32;
-+ onfly.src_block_x = 32;
-+ onfly.src_block_h = 36;
-+ onfly.src_block_w = 35;
-+ onfly.jpeg_out_y = 32;
-+ onfly.jpeg_out_x = 32;
-+ onfly.fifo_full_cnt = 0;
-+ onfly.in_length = onfly.jpeg_out_x + 3;
-+ onfly.fifo_data_cnt = onfly.src_block_w * onfly.src_block_h / 2;
-+ onfly.in_height = onfly.jpeg_out_y + 2;
-+
-+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE1, onfly.src_block_y << 10 | onfly.src_block_x << 2);
-+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE2, onfly.src_block_h << 8 | onfly.src_block_w);
-+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE3, onfly.jpeg_out_y << 8 | onfly.jpeg_out_x);
-+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE4, onfly.fifo_full_cnt << 8 | onfly.in_length);
-+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE5, onfly.fifo_data_cnt << 6 | onfly.in_height);
-+ }
-+#endif
-+
-+ OUT_REG(GLAMO_REG_ISP_EN1,
-+ GLAMO_ISP_EN1_YUV420 |
-+ GLAMO_ISP_EN1_YUV_INPUT |
-+ GLAMO_ISP_EN1_YUV_PACK |
-+ ((srcDatatype << 4) & 0x7));
-+
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_EN,
-+ GLAMO_ISP_PORT1_EN_OUTPUT);
-+
-+ OUT_REG(GLAMO_REG_ISP_CAP_PITCH, pPortPriv->src_pitch);
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_PITCH, dst_pitch);
-+
-+ END_DMA();
-+
-+ while (nBox--) {
-+ int srcX, srcY, dstX, dstY, srcw, srch, dstw, dsth;
-+ CARD32 srcO, dstO;
-+
-+ dstX = pBox->x1 + dstxoff;
-+ dstY = pBox->y1 + dstyoff;
-+ dstw = pBox->x2 - pBox->x1;
-+ dsth = pBox->y2 - pBox->y1;
-+ srcX = (pBox->x1 - pPortPriv->dst_x1) *
-+ pPortPriv->src_w / pPortPriv->dst_w;
-+ srcY = (pBox->y1 - pPortPriv->dst_y1) *
-+ pPortPriv->src_h / pPortPriv->dst_h;
-+ srcw = pPortPriv->src_w - srcX; /* XXX */
-+ srch = pPortPriv->src_h - srcY; /* XXX */
-+
-+ srcO = pPortPriv->src_offset + srcY * pPortPriv->src_pitch + srcX * 2;
-+ dstO = dst_offset + dstY * dst_pitch + dstX * 2;
-+
-+ BEGIN_DMA(18);
-+
-+ OUT_REG(GLAMO_REG_ISP_CAP_0_ADDRL, srcO & 0xffff);
-+ OUT_REG(GLAMO_REG_ISP_CAP_0_ADDRH, (srcO >> 16) & 0x7f);
-+ OUT_REG(GLAMO_REG_ISP_CAP_HEIGHT, srch);
-+ OUT_REG(GLAMO_REG_ISP_CAP_WIDTH, srcw);
-+
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_0_ADDRL, dstO & 0xffff);
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_0_ADDRH, (dstO >> 16) & 0x7f);
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_WIDTH, dstw);
-+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_HEIGHT, dsth);
-+
-+ /* fire */
-+ OUT_REG(GLAMO_REG_ISP_EN1, GLAMO_ISP_EN1_FIRE_ISP);
-+ OUT_REG(GLAMO_REG_ISP_EN1, 0);
-+
-+ END_DMA();
-+
-+ GLAMOWaitIdle(glamos);
-+
-+ pBox++;
-+ }
-+#ifdef DAMAGEEXT
-+ /* XXX: Shouldn't this be in kxv.c instead? */
-+ DamageDamageRegion(pPortPriv->pDraw, &pPortPriv->clip);
-+#endif
-+ kaaMarkSync(pScreen);
-+}
-+
-+static void
-+GLAMOVideoSave(ScreenPtr pScreen, KdOffscreenArea *area)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ GLAMOPortPrivPtr pPortPriv = glamos->pAdaptor->pPortPrivates[0].ptr;
-+
-+ if (pPortPriv->off_screen == area)
-+ pPortPriv->off_screen = 0;
-+}
-+
-+static int
-+GLAMOPutImage(KdScreenInfo *screen, DrawablePtr pDraw,
-+ short src_x, short src_y,
-+ short drw_x, short drw_y,
-+ short src_w, short src_h,
-+ short drw_w, short drw_h,
-+ int id,
-+ unsigned char *buf,
-+ short width,
-+ short height,
-+ Bool sync,
-+ RegionPtr clipBoxes,
-+ pointer data)
-+{
-+ ScreenPtr pScreen = screen->pScreen;
-+ KdScreenPriv(pScreen);
-+ GLAMOCardInfo(pScreenPriv);
-+ GLAMOScreenInfo(pScreenPriv);
-+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data;
-+ char *mmio = glamoc->reg_base;
-+ INT32 x1, x2, y1, y2;
-+ int randr = RR_Rotate_0 /* XXX */;
-+ int srcPitch, srcPitch2, dstPitch;
-+ int top, left, npixels, nlines, size;
-+ BoxRec dstBox;
-+ int dst_width = width, dst_height = height;
-+ int rot_x1, rot_y1, rot_x2, rot_y2;
-+ int dst_x1, dst_y1, dst_x2, dst_y2;
-+ int rot_src_w, rot_src_h, rot_drw_w, rot_drw_h;
-+
-+ /* Clip */
-+ x1 = src_x;
-+ x2 = src_x + src_w;
-+ y1 = src_y;
-+ y2 = src_y + src_h;
-+
-+ dstBox.x1 = drw_x;
-+ dstBox.x2 = drw_x + drw_w;
-+ dstBox.y1 = drw_y;
-+ dstBox.y2 = drw_y + drw_h;
-+
-+ GLAMOClipVideo(&dstBox, &x1, &x2, &y1, &y2,
-+ REGION_EXTENTS(pScreen, clipBoxes), width, height);
-+
-+ src_w = (x2 - x1) >> 16;
-+ src_h = (y2 - y1) >> 16;
-+ drw_w = dstBox.x2 - dstBox.x1;
-+ drw_h = dstBox.y2 - dstBox.y1;
-+
-+ if ((x1 >= x2) || (y1 >= y2))
-+ return Success;
-+
-+ if (mmio == NULL)
-+ return BadAlloc;
-+
-+ if (randr & (RR_Rotate_0|RR_Rotate_180)) {
-+ dst_width = width;
-+ dst_height = height;
-+ rot_src_w = src_w;
-+ rot_src_h = src_h;
-+ rot_drw_w = drw_w;
-+ rot_drw_h = drw_h;
-+ } else {
-+ dst_width = height;
-+ dst_height = width;
-+ rot_src_w = src_h;
-+ rot_src_h = src_w;
-+ rot_drw_w = drw_h;
-+ rot_drw_h = drw_w;
-+ }
-+
-+ switch (randr & RR_Rotate_All) {
-+ case RR_Rotate_0:
-+ default:
-+ dst_x1 = dstBox.x1;
-+ dst_y1 = dstBox.y1;
-+ dst_x2 = dstBox.x2;
-+ dst_y2 = dstBox.y2;
-+ rot_x1 = x1;
-+ rot_y1 = y1;
-+ rot_x2 = x2;
-+ rot_y2 = y2;
-+ break;
-+ case RR_Rotate_90:
-+ dst_x1 = dstBox.y1;
-+ dst_y1 = screen->height - dstBox.x2;
-+ dst_x2 = dstBox.y2;
-+ dst_y2 = screen->height - dstBox.x1;
-+ rot_x1 = y1;
-+ rot_y1 = (src_w << 16) - x2;
-+ rot_x2 = y2;
-+ rot_y2 = (src_w << 16) - x1;
-+ break;
-+ case RR_Rotate_180:
-+ dst_x1 = screen->width - dstBox.x2;
-+ dst_y1 = screen->height - dstBox.y2;
-+ dst_x2 = screen->width - dstBox.x1;
-+ dst_y2 = screen->height - dstBox.y1;
-+ rot_x1 = (src_w << 16) - x2;
-+ rot_y1 = (src_h << 16) - y2;
-+ rot_x2 = (src_w << 16) - x1;
-+ rot_y2 = (src_h << 16) - y1;
-+ break;
-+ case RR_Rotate_270:
-+ dst_x1 = screen->width - dstBox.y2;
-+ dst_y1 = dstBox.x1;
-+ dst_x2 = screen->width - dstBox.y1;
-+ dst_y2 = dstBox.x2;
-+ rot_x1 = (src_h << 16) - y2;
-+ rot_y1 = x1;
-+ rot_x2 = (src_h << 16) - y1;
-+ rot_y2 = x2;
-+ break;
-+ }
-+
-+ switch(id) {
-+ case FOURCC_YV12:
-+ case FOURCC_I420:
-+ dstPitch = ((dst_width << 1) + 15) & ~15;
-+ srcPitch = (width + 3) & ~3;
-+ srcPitch2 = ((width >> 1) + 3) & ~3;
-+ size = dstPitch * dst_height;
-+ break;
-+ case FOURCC_UYVY:
-+ case FOURCC_YUY2:
-+ default:
-+ dstPitch = ((dst_width << 1) + 15) & ~15;
-+ srcPitch = (width << 1);
-+ srcPitch2 = 0;
-+ size = dstPitch * dst_height;
-+ break;
-+ }
-+
-+ if (pPortPriv->off_screen != NULL && size != pPortPriv->size) {
-+ KdOffscreenFree(screen->pScreen, pPortPriv->off_screen);
-+ pPortPriv->off_screen = 0;
-+ }
-+
-+ if (pPortPriv->off_screen == NULL) {
-+ pPortPriv->off_screen = KdOffscreenAlloc(screen->pScreen,
-+ size * 2, 64, TRUE, GLAMOVideoSave, pPortPriv);
-+ if (pPortPriv->off_screen == NULL)
-+ return BadAlloc;
-+ }
-+
-+
-+ if (pDraw->type == DRAWABLE_WINDOW)
-+ pPortPriv->pPixmap =
-+ (*pScreen->GetWindowPixmap)((WindowPtr)pDraw);
-+ else
-+ pPortPriv->pPixmap = (PixmapPtr)pDraw;
-+
-+ /* Migrate the pixmap to offscreen if necessary. */
-+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap))
-+ kaaMoveInPixmap(pPortPriv->pPixmap);
-+
-+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) {
-+ return BadAlloc;
-+ }
-+
-+ pPortPriv->src_offset = pPortPriv->off_screen->offset;
-+ pPortPriv->src_addr = (CARD8 *)(pScreenPriv->screen->memory_base +
-+ pPortPriv->src_offset);
-+ pPortPriv->src_pitch = dstPitch;
-+ pPortPriv->size = size;
-+ pPortPriv->pDraw = pDraw;
-+
-+ /* copy data */
-+ top = rot_y1 >> 16;
-+ left = (rot_x1 >> 16) & ~1;
-+ npixels = ((((rot_x2 + 0xffff) >> 16) + 1) & ~1) - left;
-+
-+ /* Since we're probably overwriting the area that might still be used
-+ * for the last PutImage request, wait for idle.
-+ */
-+ GLAMOWaitIdle(glamos);
-+
-+ switch(id) {
-+ case FOURCC_YV12:
-+ case FOURCC_I420:
-+ top &= ~1;
-+ nlines = ((((rot_y2 + 0xffff) >> 16) + 1) & ~1) - top;
-+ /* pack the source as YUY2 to vram */
-+ KdXVCopyPlanarData(screen, buf, pPortPriv->src_addr, randr,
-+ srcPitch, srcPitch2, dstPitch, rot_src_w, rot_src_h,
-+ height, top, left, nlines, npixels, id);
-+ break;
-+ case FOURCC_UYVY:
-+ case FOURCC_YUY2:
-+ default:
-+ nlines = ((rot_y2 + 0xffff) >> 16) - top;
-+ KdXVCopyPackedData(screen, buf, pPortPriv->src_addr, randr,
-+ srcPitch, dstPitch, rot_src_w, rot_src_h, top, left,
-+ nlines, npixels);
-+ break;
-+ }
-+
-+ /* update cliplist */
-+ if (!REGION_EQUAL(screen->pScreen, &pPortPriv->clip, clipBoxes)) {
-+ REGION_COPY(screen->pScreen, &pPortPriv->clip, clipBoxes);
-+ }
-+
-+ pPortPriv->id = id;
-+ pPortPriv->src_x1 = rot_x1;
-+ pPortPriv->src_y1 = rot_y1;
-+ pPortPriv->src_x2 = rot_x2;
-+ pPortPriv->src_y2 = rot_y2;
-+ pPortPriv->src_w = rot_src_w;
-+ pPortPriv->src_h = rot_src_h;
-+ pPortPriv->dst_x1 = dst_x1;
-+ pPortPriv->dst_y1 = dst_y1;
-+ pPortPriv->dst_x2 = dst_x2;
-+ pPortPriv->dst_y2 = dst_y2;
-+ pPortPriv->dst_w = rot_drw_w;
-+ pPortPriv->dst_h = rot_drw_h;
-+
-+ GlamoDisplayVideo(screen, pPortPriv);
-+
-+ return Success;
-+}
-+
-+static int
-+GLAMOReputImage(KdScreenInfo *screen, DrawablePtr pDraw, short drw_x, short drw_y,
-+ RegionPtr clipBoxes, pointer data)
-+{
-+ ScreenPtr pScreen = screen->pScreen;
-+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data;
-+ BoxPtr pOldExtents = REGION_EXTENTS(screen->pScreen, &pPortPriv->clip);
-+ BoxPtr pNewExtents = REGION_EXTENTS(screen->pScreen, clipBoxes);
-+
-+ if (pOldExtents->x1 != pNewExtents->x1 ||
-+ pOldExtents->x2 != pNewExtents->x2 ||
-+ pOldExtents->y1 != pNewExtents->y1 ||
-+ pOldExtents->y2 != pNewExtents->y2)
-+ return BadMatch;
-+
-+ if (pDraw->type == DRAWABLE_WINDOW)
-+ pPortPriv->pPixmap =
-+ (*pScreen->GetWindowPixmap)((WindowPtr)pDraw);
-+ else
-+ pPortPriv->pPixmap = (PixmapPtr)pDraw;
-+
-+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap))
-+ kaaMoveInPixmap(pPortPriv->pPixmap);
-+
-+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) {
-+ ErrorF("err\n");
-+ return BadAlloc;
-+ }
-+
-+
-+ /* update cliplist */
-+ if (!REGION_EQUAL(screen->pScreen, &pPortPriv->clip, clipBoxes))
-+ REGION_COPY(screen->pScreen, &pPortPriv->clip, clipBoxes);
-+
-+ /* XXX: What do the drw_x and drw_y here mean for us? */
-+
-+ GlamoDisplayVideo(screen, pPortPriv);
-+
-+ return Success;
-+}
-+
-+static int
-+GLAMOQueryImageAttributes(KdScreenInfo *screen, int id, unsigned short *w,
-+ unsigned short *h, int *pitches, int *offsets)
-+{
-+ int size, tmp;
-+
-+ if (*w > IMAGE_MAX_WIDTH)
-+ *w = IMAGE_MAX_WIDTH;
-+ if (*h > IMAGE_MAX_HEIGHT)
-+ *h = IMAGE_MAX_HEIGHT;
-+
-+ *w = (*w + 1) & ~1;
-+ if (offsets)
-+ offsets[0] = 0;
-+
-+ switch (id)
-+ {
-+ case FOURCC_YV12:
-+ case FOURCC_I420:
-+ *h = (*h + 1) & ~1;
-+ size = (*w + 3) & ~3;
-+ if (pitches)
-+ pitches[0] = size;
-+ size *= *h;
-+ if (offsets)
-+ offsets[1] = size;
-+ tmp = ((*w >> 1) + 3) & ~3;
-+ if (pitches)
-+ pitches[1] = pitches[2] = tmp;
-+ tmp *= (*h >> 1);
-+ size += tmp;
-+ if (offsets)
-+ offsets[2] = size;
-+ size += tmp;
-+ break;
-+ case FOURCC_UYVY:
-+ case FOURCC_YUY2:
-+ default:
-+ size = *w << 1;
-+ if (pitches)
-+ pitches[0] = size;
-+ size *= *h;
-+ break;
-+ }
-+
-+ return size;
-+}
-+
-+
-+/* client libraries expect an encoding */
-+static KdVideoEncodingRec DummyEncoding[1] =
-+{
-+ {
-+ 0,
-+ "XV_IMAGE",
-+ IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
-+ {1, 1}
-+ }
-+};
-+
-+#define NUM_FORMATS 1
-+
-+static KdVideoFormatRec Formats[NUM_FORMATS] =
-+{
-+ {16, TrueColor}
-+};
-+
-+#define NUM_ATTRIBUTES 0
-+
-+static KdAttributeRec Attributes[NUM_ATTRIBUTES] =
-+{
-+};
-+
-+#define NUM_IMAGES 4
-+
-+static KdImageRec Images[NUM_IMAGES] =
-+{
-+ XVIMAGE_YUY2,
-+ XVIMAGE_YV12,
-+ XVIMAGE_I420,
-+ XVIMAGE_UYVY
-+};
-+
-+static KdVideoAdaptorPtr
-+GLAMOSetupImageVideo(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ KdVideoAdaptorPtr adapt;
-+ GLAMOPortPrivPtr pPortPriv;
-+ int i;
-+
-+ glamos->num_texture_ports = 16;
-+
-+ adapt = xcalloc(1, sizeof(KdVideoAdaptorRec) + glamos->num_texture_ports *
-+ (sizeof(GLAMOPortPrivRec) + sizeof(DevUnion)));
-+ if (adapt == NULL)
-+ return NULL;
-+
-+ adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-+ adapt->flags = VIDEO_CLIP_TO_VIEWPORT;
-+ adapt->name = "GLAMO Texture Video";
-+ adapt->nEncodings = 1;
-+ adapt->pEncodings = DummyEncoding;
-+ adapt->nFormats = NUM_FORMATS;
-+ adapt->pFormats = Formats;
-+ adapt->nPorts = glamos->num_texture_ports;
-+ adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
-+
-+ pPortPriv =
-+ (GLAMOPortPrivPtr)(&adapt->pPortPrivates[glamos->num_texture_ports]);
-+
-+ for (i = 0; i < glamos->num_texture_ports; i++)
-+ adapt->pPortPrivates[i].ptr = &pPortPriv[i];
-+
-+ adapt->nAttributes = NUM_ATTRIBUTES;
-+ adapt->pAttributes = Attributes;
-+ adapt->pImages = Images;
-+ adapt->nImages = NUM_IMAGES;
-+ adapt->PutVideo = NULL;
-+ adapt->PutStill = NULL;
-+ adapt->GetVideo = NULL;
-+ adapt->GetStill = NULL;
-+ adapt->StopVideo = GLAMOStopVideo;
-+ adapt->SetPortAttribute = GLAMOSetPortAttribute;
-+ adapt->GetPortAttribute = GLAMOGetPortAttribute;
-+ adapt->QueryBestSize = GLAMOQueryBestSize;
-+ adapt->PutImage = GLAMOPutImage;
-+ adapt->ReputImage = GLAMOReputImage;
-+ adapt->QueryImageAttributes = GLAMOQueryImageAttributes;
-+
-+ /* gotta uninit this someplace */
-+ REGION_INIT(pScreen, &pPortPriv->clip, NullBox, 0);
-+
-+ glamos->pAdaptor = adapt;
-+
-+ xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-+ xvSaturation = MAKE_ATOM("XV_SATURGLAMOON");
-+
-+ return adapt;
-+}
-+
-+static void GLAMOPowerUp(ScreenPtr pScreen)
-+{
-+ GLAMOEngineEnable(pScreen, GLAMO_ENGINE_ISP);
-+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_ISP);
-+
-+ /* HW_DEBUG_0?? */
-+ //MMIOSetBitMask(mmio, REG_ISP(0x102), 0x0020, 0);
-+}
-+
-+static void GLAMOPowerDown(ScreenPtr pScreen)
-+{
-+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_ISP);
-+
-+ /* ... and stop the clock */
-+}
-+
-+Bool GLAMOInitVideo(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ GLAMOCardInfo(pScreenPriv);
-+ KdScreenInfo *screen = pScreenPriv->screen;
-+ KdVideoAdaptorPtr *adaptors, *newAdaptors = NULL;
-+ KdVideoAdaptorPtr newAdaptor = NULL;
-+ int num_adaptors;
-+
-+ glamos->pAdaptor = NULL;
-+
-+ if (glamoc->reg_base == NULL)
-+ return FALSE;
-+
-+ num_adaptors = KdXVListGenericAdaptors(screen, &adaptors);
-+
-+ newAdaptor = GLAMOSetupImageVideo(pScreen);
-+
-+ if (newAdaptor) {
-+ GLAMOPowerUp(pScreen);
-+
-+ if (!num_adaptors) {
-+ num_adaptors = 1;
-+ adaptors = &newAdaptor;
-+ } else {
-+ newAdaptors = xalloc((num_adaptors + 1) *
-+ sizeof(KdVideoAdaptorPtr *));
-+ if (newAdaptors) {
-+ memcpy(newAdaptors, adaptors, num_adaptors *
-+ sizeof(KdVideoAdaptorPtr));
-+ newAdaptors[num_adaptors] = newAdaptor;
-+ adaptors = newAdaptors;
-+ num_adaptors++;
-+ }
-+ }
-+ }
-+
-+ if (num_adaptors)
-+ KdXVScreenInit(pScreen, adaptors, num_adaptors);
-+
-+ if (newAdaptors)
-+ xfree(newAdaptors);
-+
-+ return TRUE;
-+}
-+
-+void
-+GLAMOFiniVideo(ScreenPtr pScreen)
-+{
-+ KdScreenPriv(pScreen);
-+ GLAMOScreenInfo(pScreenPriv);
-+ KdVideoAdaptorPtr adapt = glamos->pAdaptor;
-+ GLAMOPortPrivPtr pPortPriv;
-+ int i;
-+
-+ if (!adapt)
-+ return;
-+
-+ GLAMOPowerDown(pScreen);
-+
-+ for (i = 0; i < glamos->num_texture_ports; i++) {
-+ pPortPriv = (GLAMOPortPrivPtr)(&adapt->pPortPrivates[i].ptr);
-+ REGION_UNINIT(pScreen, &pPortPriv->clip);
-+ }
-+ xfree(adapt);
-+ glamos->pAdaptor = NULL;
-+}
xserver-kdrive-xephyr \
xserver-kdrive-epson \
xserver-kdrive-ati \
- xserver-kdrive-glamo \
xserver-kdrive-chips \
xserver-kdrive-i810 \
xserver-kdrive-mach64 \
DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version"
DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset"
DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-glamo = "X server from freedesktop.org, supporting Smedia Glamo chipset"
DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets"
DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets"
DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset"
FILES_xserver-kdrive-sdl = "${bindir}/Xsdl"
FILES_xserver-kdrive-w100 = "${bindir}/Xw100"
FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-glamo = "${bindir}/Xglamo"
FILES_xserver-kdrive-chips = "${bindir}/Xchips"
FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-imageon = "${bindir}/Ximageon"
RDEPENDS_xserver-kdrive-sdl = "${PN}"
RDEPENDS_xserver-kdrive-w100 = "${PN}"
RDEPENDS_xserver-kdrive-ati = "${PN}"
-RDEPENDS_xserver-kdrive-glamo = "${PN}"
RDEPENDS_xserver-kdrive-chips = "${PN}"
RDEPENDS_xserver-kdrive-i810 = "${PN}"
RDEPENDS_xserver-kdrive-mach64 = "${PN}"
--- /dev/null
+DESCRIPTION = "X server for glamo chip in GTA02"
+SECTION = "x11/base"
+LICENSE = "MIT"
+DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
+ scrnsaverproto xineramaproto videoproto xextproto xproto \
+ libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 \
+ xtrans libxkbfile libxcalibrate"
+DEPENDS += "libxkbfile libxcalibrate"
+RDEPENDS_${PN} = "xserver-kdrive"
+PROVIDES = "virtual/xserver"
+PE = "1"
+PR = "r0"
+
+XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561"
+
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
+ file://kmode.patch;patch=1 \
+ file://disable-apm.patch;patch=1 \
+ file://no-serial-probing.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://optional-xkb.patch;patch=1 \
+ file://enable-tslib.patch;patch=1 \
+ file://kmode-palm.patch;patch=1 \
+ file://enable-epson.patch;patch=1 \
+ file://enable-builtin-fonts.patch;patch=1 \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+ file://fix_default_mode.patch;patch=1 \
+ file://enable-xcalibrate.patch;patch=1 \
+ file://hide-cursor-and-ppm-root.patch;patch=1 \
+ file://xcalibrate_coords.patch;patch=1 \
+ file://w100.patch;patch=1 \
+ file://w100-autofoo.patch;patch=1 \
+ file://w100-fix-offscreen-bmp.patch;patch=1 \
+ file://kdrive-1.3-18bpp.patch;patch=1 \
+ file://gumstix-kmode.patch;patch=1 \
+"
+
+FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.3.0.0:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+ --disable-dga --disable-dri --disable-xinerama \
+ --disable-xf86misc --disable-xf86vidmode \
+ --disable-xorg --disable-xorgcfg \
+ --disable-xkb --disable-xnest --disable-xvfb \
+ --disable-xevie --disable-xprint --disable-xtrap \
+ --disable-dmx \
+ --with-default-font-path=built-ins \
+ --enable-tslib --enable-xcalibrate \
+ ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
+do_configure_prepend() {
+ sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
+}
+
+FILES_${PN} = "${bindir}/Xglamo"
+FILES_${PN}-dbg = "${bindir}/.debug/Xglamo"
+
+ARM_INSTRUCTION_SET = "arm"
PE = "1"
PR = "r4"
-FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
+FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
file://kdrive-evdev.patch;patch=1 \
+++ /dev/null
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:27.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:28.000000000 +0100
-@@ -20,6 +20,7 @@
- noinst_LIBRARIES = libglamo.a
-
- libglamo_a_SOURCES = \
-+ glamo-log.h \
- glamo_dma.c \
- glamo_dma.h \
- glamo_draw.c \
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h 2007-11-29 09:05:53.000000000 +0100
-@@ -0,0 +1,63 @@
-+/*
-+ * Copyright © 2007 OpenMoko, Inc.
-+ *
-+ * This driver is based on Xati,
-+ * Copyright © 2004 Eric Anholt
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that copyright
-+ * notice and this permission notice appear in supporting documentation, and
-+ * that the name of the copyright holders not be used in advertising or
-+ * publicity pertaining to distribution of the software without specific,
-+ * written prior permission. The copyright holders make no representations
-+ * about the suitability of this software for any purpose. It is provided "as
-+ * is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-+ * OF THIS SOFTWARE.
-+ *
-+ * Author: Dodji Seketeli <dodji@openedhand.com>
-+ */
-+#ifndef _GLAMO_LOG_H_
-+#define _GLAMO_LOG_H_
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#include <assert.h>
-+#include "os.h"
-+
-+#ifdef NDEBUG
-+/*we are not in debug mode*/
-+#define GLAMO_LOG
-+#define GLAMO_LOG_ERROR
-+
-+#else /*NDEBUG*/
-+
-+#define ERROR_LOG_LEVEL 3
-+#define INFO_LOG_LEVEL 4
-+
-+#ifndef GLAMO_LOG
-+#define GLAMO_LOG(...) \
-+LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
-+ __FILE__, __LINE__, __func__) ; \
-+LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
-+#endif /*GLAMO_LOG*/
-+
-+#ifndef GLAMO_LOG_ERROR
-+#define GLAMO_LOG_ERROR(...) \
-+LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
-+ __FILE__, __LINE__, __func__) ; \
-+LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
-+#endif /*GLAMO_LOG_ERROR*/
-+
-+#endif /*NDEBUG*/
-+
-+#endif /*_GLAMO_LOG_H_*/
-+
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-28 18:44:27.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-29 09:33:11.000000000 +0100
-@@ -26,6 +26,7 @@
- #ifdef HAVE_CONFIG_H
- #include <kdrive-config.h>
- #endif
-+#include "glamo-log.h"
- #include "glamo.h"
- #include "glamo-regs.h"
- #include "glamo_dma.h"
-@@ -90,45 +91,11 @@
- KdScreenPriv(pScreen);
- GLAMOScreenInfo(pScreenPriv);
-
-- ENTER_DRAW(0);
-+ GLAMO_LOG("enter");
- GLAMOWaitIdle(glamos);
-- LEAVE_DRAW(0);
-+ GLAMO_LOG("leave");
- }
-
--#if GLAMO_TRACE_DRAW
--void
--GLAMOEnterDraw (PixmapPtr pPix, const char *function)
--{
-- if (pPix != NULL) {
-- KdScreenPriv(pPix->drawable.pScreen);
-- CARD32 offset;
--
-- offset = ((CARD8 *)pPix->devPrivate.ptr -
-- pScreenPriv->screen->memory_base);
--
-- ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset,
-- pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth,
-- (unsigned int) pPix->drawable.bitsPerPixel);
-- } else
-- ErrorF ("Enter %s\n", function);
--}
--
--void
--GLAMOLeaveDraw (PixmapPtr pPix, const char *function)
--{
-- if (pPix != NULL) {
-- KdScreenPriv(pPix->drawable.pScreen);
-- CARD32 offset;
--
-- offset = ((CARD8 *)pPix->devPrivate.ptr -
-- pScreenPriv->screen->memory_base);
--
-- ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset);
-- } else
-- ErrorF ("Leave %s\n", function);
--}
--#endif
--
- static Bool
- GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
- {
-@@ -152,7 +119,7 @@
- pScreenPriv->screen->memory_base);
- pitch = pPix->devKind;
-
-- ENTER_DRAW(pPix);
-+ GLAMO_LOG("enter");
-
- BEGIN_DMA(12);
- OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff);
-@@ -163,7 +130,7 @@
- OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
- END_DMA();
-
-- LEAVE_DRAW(pPix);
-+ GLAMO_LOG("leave");
-
- return TRUE;
- }
-@@ -171,7 +138,7 @@
- static void
- GLAMOSolid(int x1, int y1, int x2, int y2)
- {
-- ENTER_DRAW(0);
-+ GLAMO_LOG("enter");
- GLAMOScreenInfo *glamos = accel_glamos;
- RING_LOCALS;
-
-@@ -184,14 +151,12 @@
- OUT_REG(GLAMO_REG_2D_ID1, 0);
- OUT_REG(GLAMO_REG_2D_ID2, 0);
- END_DMA();
-- LEAVE_DRAW(0);
-+ GLAMO_LOG("leave");
- }
-
- static void
- GLAMODoneSolid(void)
- {
-- ENTER_DRAW(0);
-- LEAVE_DRAW(0);
- }
-
- static Bool
-@@ -204,6 +169,8 @@
- FbBits mask;
- RING_LOCALS;
-
-+ GLAMO_LOG("enter");
-+
- if (pSrc->drawable.bitsPerPixel != 16 ||
- pDst->drawable.bitsPerPixel != 16)
- GLAMO_FALLBACK(("Only 16bpp is supported"));
-@@ -224,8 +191,6 @@
-
- settings = GLAMOBltRop[alu] << 8;
-
-- ENTER_DRAW (pDst);
--
- BEGIN_DMA(16);
-
- OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff);
-@@ -241,7 +206,7 @@
-
- END_DMA();
-
-- LEAVE_DRAW(pDst);
-+ GLAMO_LOG("leave");
-
- return TRUE;
- }
-@@ -268,8 +233,10 @@
- static void
- GLAMODoneCopy(void)
- {
-- ENTER_DRAW(0);
-- LEAVE_DRAW(0);
-+ GLAMOScreenInfo *glamos = accel_glamos;
-+ GLAMO_LOG("enter");
-+ GLAMOFlushIndirect(glamos, 1);
-+ GLAMO_LOG("leave");
- }
-
- static Bool
-@@ -279,6 +246,7 @@
- CARD8 *dst_offset;
- int dst_pitch;
-
-+ GLAMO_LOG("enter");
- dst_offset = (CARD8 *)pDst->devPrivate.ptr;
- dst_pitch = pDst->devKind;
- width = pDst->drawable.width;
-@@ -294,83 +262,9 @@
- src += src_pitch;
- }
-
-- ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp);
--
- return TRUE;
- }
-
--
--#if 0
--static Bool
--GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst)
--{
-- KdScreenPriv(pSrc->drawable.pScreen);
-- GLAMOCardInfo(pScreenPriv);
-- GLAMOScreenInfo(pScreenPriv);
-- int dst_pitch, src_pitch, w, i, size, bytes;
-- unsigned char *dst, *src;
-- RING_LOCALS;
--
-- ENTER_DRAW(pSrc);
-- /* Align width to log 2, useful for R128 composite. This should be a
-- * KAA flag we check for (and supported in kaa.c in general) since many
-- * older bits of hardware are going to want POT pitches.
-- */
-- w = pSrc->drawable.width;
-- if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT)
-- w = 1 << (GLAMOLog2(w - 1) + 1);
-- dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 +
-- glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1);
--
-- size = dst_pitch * pSrc->drawable.height;
-- if (size > glamos->scratch_area->size)
-- GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n",
-- pSrc->drawable.width, pSrc->drawable.height));
--
-- glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) &
-- ~(glamos->kaa.offsetAlign - 1);
-- if (glamos->scratch_next + size > glamos->scratch_area->offset +
-- glamos->scratch_area->size) {
-- /* Only sync when we've used all of the scratch area. */
-- kaaWaitSync(pSrc->drawable.pScreen);
-- glamos->scratch_next = glamos->scratch_area->offset;
-- }
-- memcpy(pDst, pSrc, sizeof(*pDst));
-- pDst->devKind = dst_pitch;
-- pDst->devPrivate.ptr = pScreenPriv->screen->memory_base +
-- glamos->scratch_next;
-- glamos->scratch_next += size;
--
-- src = pSrc->devPrivate.ptr;
-- src_pitch = pSrc->devKind;
-- dst = pDst->devPrivate.ptr;
-- bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
--
-- i = pSrc->drawable.height;
-- while (i--) {
-- memcpy(dst, src, bytes);
-- dst += dst_pitch;
-- src += src_pitch;
-- }
--
-- /* Flush the pixel cache */
-- if (glamoc->is_3362) {
-- BEGIN_DMA(4);
-- OUT_REG(RADEON_REG_RB3D_DSTCACHE_CTLSTAT,
-- RADEON_RB3D_DC_FLUSH_ALL);
-- OUT_REG(GLAMO_REG_WAIT_UNTIL, RADEON_WAIT_HOST_IDLECLEAN);
-- END_DMA();
-- } else {
-- BEGIN_DMA(2);
-- OUT_REG(R128_REG_PC_GUI_CTLSTAT, R128_PC_FLUSH_ALL);
-- END_DMA();
-- }
--
-- LEAVE_DRAW(pSrc);
-- return TRUE;
--}
--#endif
--
- static void
- GLAMOBlockHandler(pointer blockData, OSTimePtr timeout, pointer readmask)
- {
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c 2007-11-28 18:44:27.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c 2007-11-28 22:13:23.000000000 +0100
-@@ -25,6 +25,7 @@
-
- #include <sys/time.h>
-
-+#include "glamo-log.h"
- #include "glamo.h"
- #include "glamo-regs.h"
- #include "glamo_dma.h"
-@@ -35,9 +36,7 @@
- #include "glamo_sarea.h"
- #endif /* USE_DRI */
-
--#define DEBUG_FIFO 1
--
--#if DEBUG_FIFO
-+#ifndef NDEBUG
- static void
- GLAMODebugFifo(GLAMOScreenInfo *glamos)
- {
-@@ -273,7 +272,7 @@
- count--;
- }
- if (TIMEDOUT()) {
-- ErrorF("Timeout submitting packets, resetting...\n");
-+ GLAMO_LOG_ERROR("Timeout submitting packets, resetting...\n");
- GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
- GLAMODrawSetup(glamos->screen->pScreen);
- }
-@@ -292,11 +291,6 @@
- if ((glamos->indirectStart == buf->used) && !discard)
- return;
-
--#if DEBUG_FIFO
-- ErrorF("Dispatching %d DWORDS\n", (buf->used - glamos->indirectStart) /
-- 4);
--#endif
--
- #ifdef USE_DRI
- if (glamos->using_dri) {
- buf->drmBuf->used = buf->used;
-@@ -384,11 +378,6 @@
- glamos->indirectBuffer = GLAMOGetDMABuffer(glamos);
- if (glamos->indirectBuffer == FALSE)
- FatalError("Failed to allocate DMA buffer.\n");
--
-- if (glamos->using_dri)
-- ErrorF("Initialized DRI DMA\n");
-- else
-- ErrorF("Initialized DMA\n");
- }
-
- void
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-11-29 09:07:21.000000000 +0100
-+++ xorg-server-1.3.0.0/configure.ac 2007-11-29 09:15:38.000000000 +0100
-@@ -866,6 +866,10 @@
-
- if ! test "x$DEBUGGING" = xyes; then
- AC_DEFINE(NDEBUG, 1, [Disable some debugging code])
-+ AC_MSG_NOTICE([disabled debugging])
-+else
-+ AC_MSG_NOTICE([enabled debugging])
-+
- fi
-
- AC_DEFINE(USE_RGB_TXT, 1, [Use rgb.txt directly])
+++ /dev/null
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:54:00.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:55:05.000000000 +0100
-@@ -314,8 +314,8 @@
- */
-
- glamos->kaa.flags = KAA_OFFSCREEN_PIXMAPS;
-- glamos->kaa.offsetAlign = 2;
-- glamos->kaa.pitchAlign = 2;
-+ glamos->kaa.offsetAlign = 0;
-+ glamos->kaa.pitchAlign = 0;
-
- kaaInitTrapOffsets(8, sample_offsets_x, sample_offsets_y, 0.0, 0.0);
- sample_count = (1 << 8) - 1;
+++ /dev/null
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c 2007-11-28 18:44:27.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c 2007-11-30 10:18:43.000000000 +0100
-@@ -27,9 +27,6 @@
- #include <kdrive-config.h>
- #endif
- #include "glamo.h"
--#if defined(USE_DRI) && defined(GLXEXT)
--#include "glamo_sarea.h"
--#endif
-
- static Bool
- GLAMOCardInit(KdCardInfo *card)
-@@ -89,13 +86,6 @@
- return FALSE;
- }
-
--#ifdef USE_DRI
-- /* We demand identification by busid, not driver name */
-- glamoc->drmFd = drmOpen(NULL, glamoc->busid);
-- if (glamoc->drmFd < 0)
-- ErrorF("Failed to open DRM, DRI disabled.\n");
--#endif /* USE_DRI */
--
- card->driver = glamoc;
-
- glamoc->is_3362 = TRUE;
-@@ -122,10 +112,6 @@
- GLAMOSetOffscreen (KdScreenInfo *screen)
- {
- GLAMOCardInfo(screen);
--#if defined(USE_DRI) && defined(GLXEXT)
-- GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver;
-- int l;
--#endif
- int screen_size;
- char *mmio = glamoc->reg_base;
-
-@@ -152,57 +138,7 @@
- }
-
- screen_size = screen->fb[0].byteStride * screen->height;
--
- screen->off_screen_base = screen_size;
--
--#if defined(USE_DRI) && defined(GLXEXT)
-- /* Reserve a static area for the back buffer the same size as the
-- * visible screen. XXX: This would be better initialized in glamo_dri.c
-- * when GLX is set up, but the offscreen memory manager's allocations
-- * don't last through VT switches, while the kernel's understanding of
-- * offscreen locations does.
-- */
-- glamos->frontOffset = 0;
-- glamos->frontPitch = screen->fb[0].byteStride;
--
-- if (screen->off_screen_base + screen_size <= screen->memory_size) {
-- glamos->backOffset = screen->off_screen_base;
-- glamos->backPitch = screen->fb[0].byteStride;
-- screen->off_screen_base += screen_size;
-- }
--
-- /* Reserve the depth span for Rage 128 */
-- if (!glamoc->is_3362 && screen->off_screen_base +
-- screen->fb[0].byteStride <= screen->memory_size) {
-- glamos->spanOffset = screen->off_screen_base;
-- screen->off_screen_base += screen->fb[0].byteStride;
-- }
--
-- /* Reserve the static depth buffer, which happens to be the same
-- * bitsPerPixel as the screen.
-- */
-- if (screen->off_screen_base + screen_size <= screen->memory_size) {
-- glamos->depthOffset = screen->off_screen_base;
-- glamos->depthPitch = screen->fb[0].byteStride;
-- screen->off_screen_base += screen_size;
-- }
--
-- /* Reserve approx. half of remaining offscreen memory for local
-- * textures. Round down to a whole number of texture regions.
-- */
-- glamos->textureSize = (screen->memory_size - screen->off_screen_base) / 2;
-- l = GLAMOLog2(glamos->textureSize / GLAMO_NR_TEX_REGIONS);
-- if (l < GLAMO_LOG_TEX_GRANULARITY)
-- l = GLAMO_LOG_TEX_GRANULARITY;
-- glamos->textureSize = (glamos->textureSize >> l) << l;
-- if (glamos->textureSize >= 512 * 1024) {
-- glamos->textureOffset = screen->off_screen_base;
-- screen->off_screen_base += glamos->textureSize;
-- } else {
-- /* Minimum texture size is for 2 256x256x32bpp textures */
-- glamos->textureSize = 0;
-- }
--#endif /* USE_DRI && GLXEXT */
- }
-
- static Bool
-@@ -413,9 +349,6 @@
- GLAMODisable(ScreenPtr pScreen)
- {
- KdScreenPriv(pScreen);
--#if defined(USE_DRI) && defined(GLXEXT)
-- GLAMOScreenInfo(pScreenPriv);
--#endif /* USE_DRI && GLXEXT */
- GLAMOCardInfo(pScreenPriv);
-
- GLAMOUnmapReg(pScreenPriv->card, glamoc);
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c 2007-11-28 22:13:23.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c 2007-11-30 10:25:49.000000000 +0100
-@@ -31,11 +31,6 @@
- #include "glamo_dma.h"
- #include "glamo_draw.h"
-
--#ifdef USE_DRI
--#include "radeon_common.h"
--#include "glamo_sarea.h"
--#endif /* USE_DRI */
--
- #ifndef NDEBUG
- static void
- GLAMODebugFifo(GLAMOScreenInfo *glamos)
-@@ -168,26 +163,6 @@
- if (glamos->indirectBuffer != NULL)
- GLAMOFlushIndirect(glamos, 0);
-
--#ifdef USE_DRI
-- if (glamos->using_dri) {
-- int ret = 0;
-- int cmd = (glamoc->is_3362 ? DRM_RADEON_CP_IDLE :
-- DRM_R128_CCE_IDLE);
-- WHILE_NOT_TIMEOUT(2) {
-- ret = drmCommandNone(glamoc->drmFd, cmd);
-- if (ret != -EBUSY)
-- break;
-- }
-- if (TIMEDOUT()) {
-- GLAMODebugFifo(glamos);
-- FatalError("Timed out idling CCE (card hung)\n");
-- }
-- if (ret != 0)
-- ErrorF("Failed to idle DMA, returned %d\n", ret);
-- return;
-- }
--#endif
--
- WHILE_NOT_TIMEOUT(.5) {
- status = MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS);
- if ((status & (1 << 2)) && !(status & (1 << 8)))
-@@ -214,20 +189,6 @@
- if (buf == NULL)
- return NULL;
-
--#ifdef USE_DRI
-- if (glamos->using_dri) {
-- buf->drmBuf = GLAMODRIGetBuffer(glamos);
-- if (buf->drmBuf == NULL) {
-- xfree(buf);
-- return NULL;
-- }
-- buf->size = buf->drmBuf->total;
-- buf->used = buf->drmBuf->used;
-- buf->address = buf->drmBuf->address;
-- return buf;
-- }
--#endif /* USE_DRI */
--
- buf->size = glamos->ring_len / 2;
- buf->address = xalloc(buf->size);
- if (buf->address == NULL) {
-@@ -290,25 +251,6 @@
-
- if ((glamos->indirectStart == buf->used) && !discard)
- return;
--
--#ifdef USE_DRI
-- if (glamos->using_dri) {
-- buf->drmBuf->used = buf->used;
-- GLAMODRIDispatchIndirect(glamos, discard);
-- if (discard) {
-- buf->drmBuf = GLAMODRIGetBuffer(glamos);
-- buf->size = buf->drmBuf->total;
-- buf->used = buf->drmBuf->used;
-- buf->address = buf->drmBuf->address;
-- glamos->indirectStart = 0;
-- } else {
-- /* Start on a double word boundary */
-- glamos->indirectStart = buf->used = (buf->used + 7) & ~7;
-- }
-- return;
-- }
--#endif /* USE_DRI */
--
- GLAMODispatchIndirectDMA(glamos);
-
- buf->used = 0;
-@@ -367,13 +309,7 @@
- KdScreenPriv(pScreen);
- GLAMOScreenInfo(pScreenPriv);
-
--#ifdef USE_DRI
-- if (glamos->using_dri)
-- GLAMODRIDMAStart(glamos);
--#endif /* USE_DRI */
--
-- if (!glamos->using_dri)
-- GLAMODMAInit(pScreen);
-+ GLAMODMAInit(pScreen);
-
- glamos->indirectBuffer = GLAMOGetDMABuffer(glamos);
- if (glamos->indirectBuffer == FALSE)
-@@ -388,11 +324,6 @@
-
- GLAMOWaitIdle(glamos);
-
--#ifdef USE_DRI
-- if (glamos->using_dri)
-- GLAMODRIDMAStop(glamos);
--#endif /* USE_DRI */
--
- xfree(glamos->indirectBuffer->address);
- xfree(glamos->indirectBuffer);
- glamos->indirectBuffer = NULL;
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h 2007-11-30 10:24:13.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h 2007-11-30 10:25:06.000000000 +0100
-@@ -39,18 +39,6 @@
-
- #include "kxv.h"
-
--#undef XF86DRI
--#ifdef XF86DRI
--#define USE_DRI
--#include "xf86drm.h"
--#include "dri.h"
--#ifdef GLXEXT
--#include "GL/glxint.h"
--#include "GL/glxtokens.h"
--#include "glamo_dripriv.h"
--#endif
--#endif
--
- #define GLAMO_REG_BASE(c) ((c)->attr.address[0])
- #define GLAMO_REG_SIZE(c) (0x2400)
-
-@@ -124,9 +112,6 @@
- Bool is_3362;
- CARD32 crtc_pitch;
- CARD32 crtc2_pitch;
--#ifdef USE_DRI
-- int drmFd;
--#endif /* USE_DRI */
- Bool use_fbdev, use_vesa;
- } GLAMOCardInfo;
-
-@@ -166,9 +151,6 @@
- int size;
- int used;
- void *address;
--#ifdef USE_DRI
-- drmBufPtr drmBuf;
--#endif
- } dmaBuf;
-
- typedef struct _GLAMOScreenInfo {
-@@ -194,8 +176,6 @@
- KdVideoAdaptorPtr pAdaptor;
- int num_texture_ports;
-
-- Bool using_dri; /* If we use the DRM for DMA. */
--
- KdOffscreenArea *dma_space; /* For "DMA" from framebuffer. */
- CARD16 *ring_addr; /* Beginning of ring buffer. */
- int ring_write; /* Index of write ptr in ring. */
-@@ -204,76 +184,6 @@
-
- dmaBuf *indirectBuffer;
- int indirectStart;
--
--#ifdef USE_DRI
-- Bool dma_started;
--
-- drmSize registerSize;
-- drmHandle registerHandle;
-- drmHandle fbHandle;
--
-- drmSize gartSize;
-- drmHandle agpMemHandle; /* Handle from drmAgpAlloc */
-- unsigned long gartOffset;
-- unsigned char *AGP; /* Map */
-- int agpMode;
-- drmSize pciSize;
-- drmHandle pciMemHandle;
--
-- /* ring buffer data */
-- unsigned long ringStart; /* Offset into AGP space */
-- drmHandle ringHandle; /* Handle from drmAddMap */
-- drmSize ringMapSize; /* Size of map */
-- int ringSize; /* Size of ring (MB) */
-- unsigned char *ring; /* Map */
--
-- unsigned long ringReadOffset; /* Offset into AGP space */
-- drmHandle ringReadPtrHandle; /* Handle from drmAddMap */
-- drmSize ringReadMapSize; /* Size of map */
-- unsigned char *ringReadPtr; /* Map */
--
-- /* vertex/indirect buffer data */
-- unsigned long bufStart; /* Offset into AGP space */
-- drmHandle bufHandle; /* Handle from drmAddMap */
-- drmSize bufMapSize; /* Size of map */
-- int bufSize; /* Size of buffers (MB) */
-- unsigned char *buf; /* Map */
-- int bufNumBufs; /* Number of buffers */
-- drmBufMapPtr buffers; /* Buffer map */
--
-- /* AGP Texture data */
-- unsigned long gartTexStart; /* Offset into AGP space */
-- drmHandle gartTexHandle; /* Handle from drmAddMap */
-- drmSize gartTexMapSize; /* Size of map */
-- int gartTexSize; /* Size of AGP tex space (MB) */
-- unsigned char *gartTex; /* Map */
-- int log2GARTTexGran;
--
-- int DMAusecTimeout; /* CCE timeout in usecs */
--
-- /* DRI screen private data */
-- int frontOffset;
-- int frontPitch;
-- int backOffset;
-- int backPitch;
-- int depthOffset;
-- int depthPitch;
-- int spanOffset;
-- int textureOffset;
-- int textureSize;
-- int log2TexGran;
--
-- int irqEnabled;
--
-- int serverContext;
--
-- DRIInfoPtr pDRIInfo;
--#ifdef GLXEXT
-- int numVisualConfigs;
-- __GLXvisualConfig *pVisualConfigs;
-- GLAMOConfigPrivPtr pVisualConfigsPriv;
--#endif /* GLXEXT */
--#endif /* USE_DRI */
- } GLAMOScreenInfo;
-
- #define getGLAMOScreenInfo(kd) ((GLAMOScreenInfo *) ((kd)->screen->driver))
-@@ -330,31 +240,6 @@
- void
- GLAMODrawFini(ScreenPtr pScreen);
-
--/* glamo_dri.c */
--#ifdef USE_DRI
--Bool
--GLAMODRIScreenInit(ScreenPtr pScreen);
--
--void
--GLAMODRICloseScreen(ScreenPtr pScreen);
--
--void
--GLAMODRIDMAStart(GLAMOScreenInfo *glamos);
--
--void
--GLAMODRIDMAStop(GLAMOScreenInfo *glamos);
--
--void
--GLAMODRIDMAReset(GLAMOScreenInfo *glamos);
--
--void
--GLAMODRIDispatchIndirect(GLAMOScreenInfo *glamos, Bool discard);
--
--drmBufPtr
--GLAMODRIGetBuffer(GLAMOScreenInfo *glamos);
--
--#endif /* USE_DRI */
--
- /* glamo_cursor.c */
- Bool
- GLAMOCursorInit(ScreenPtr pScreen);
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:55:05.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-30 10:26:02.000000000 +0100
-@@ -296,11 +296,6 @@
- RegisterBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
- pScreen);
-
-- glamos->using_dri = FALSE;
--#ifdef USE_DRI
-- glamos->using_dri = GLAMODRIScreenInit(pScreen);
--#endif /* USE_DRI */
--
- memset(&glamos->kaa, 0, sizeof(KaaScreenInfoRec));
- glamos->kaa.waitMarker = GLAMOWaitMarker;
- glamos->kaa.PrepareSolid = GLAMOPrepareSolid;
-@@ -357,20 +352,6 @@
- glamos->kaa.UploadToScreen = NULL;
- glamos->kaa.UploadToScratch = NULL;
-
--#ifdef USE_DRI
-- if (glamos->using_dri) {
-- if (!glamoc->is_3362) {
-- /*glamos->kaa.PrepareTrapezoids = R128PrepareTrapezoids;
-- glamos->kaa.Trapezoids = R128Trapezoids;
-- glamos->kaa.DoneTrapezoids = R128DoneTrapezoids;*/
-- } else if (glamoc->is_r100 || glamoc->is_r200) {
-- glamos->kaa.PrepareTrapezoids = RadeonPrepareTrapezoids;
-- glamos->kaa.Trapezoids = RadeonTrapezoids;
-- glamos->kaa.DoneTrapezoids = RadeonDoneTrapezoids;
-- }
-- }
--#endif /* USE_DRI */
--
- glamos->kaa.UploadToScreen = GLAMOUploadToScreen;
-
- /* Reserve a scratch area. It'll be used for storing glyph data during
-@@ -399,15 +380,6 @@
- void
- GLAMODrawFini(ScreenPtr pScreen)
- {
--#ifdef USE_DRI
-- KdScreenPriv(pScreen);
-- GLAMOScreenInfo(pScreenPriv);
-- if (glamos->using_dri) {
-- GLAMODRICloseScreen(pScreen);
-- glamos->using_dri = FALSE;
-- }
--#endif /* USE_DRI */
--
- RemoveBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
- pScreen);
-
+++ /dev/null
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c 2007-11-30 10:18:43.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c 2007-11-30 10:35:27.000000000 +0100
-@@ -38,9 +38,7 @@
- if (glamoc == NULL)
- return FALSE;
-
--#ifdef KDRIVEFBDEV
- if (!initialized && fbdevInitialize(card, &glamoc->backend_priv.fbdev)) {
-- glamoc->use_fbdev = TRUE;
- initialized = TRUE;
- glamoc->backend_funcs.cardfini = fbdevCardFini;
- glamoc->backend_funcs.scrfini = fbdevScreenFini;
-@@ -58,29 +56,6 @@
- glamoc->backend_funcs.randrSetConfig = fbdevRandRSetConfig;
- #endif
- }
--#endif
--#ifdef KDRIVEVESA
-- if (!initialized && vesaInitialize(card, &glamoc->backend_priv.vesa)) {
-- glamoc->use_vesa = TRUE;
-- initialized = TRUE;
-- glamoc->backend_funcs.cardfini = vesaCardFini;
-- glamoc->backend_funcs.scrfini = vesaScreenFini;
-- glamoc->backend_funcs.initScreen = vesaInitScreen;
-- glamoc->backend_funcs.finishInitScreen = vesaFinishInitScreen;
-- glamoc->backend_funcs.createRes = vesaCreateResources;
-- glamoc->backend_funcs.preserve = vesaPreserve;
-- glamoc->backend_funcs.restore = vesaRestore;
-- glamoc->backend_funcs.dpms = vesaDPMS;
-- glamoc->backend_funcs.enable = vesaEnable;
-- glamoc->backend_funcs.disable = vesaDisable;
-- glamoc->backend_funcs.getColors = vesaGetColors;
-- glamoc->backend_funcs.putColors = vesaPutColors;
--#ifdef RANDR
-- glamoc->backend_funcs.randrSetConfig = vesaRandRSetConfig;
--#endif
-- }
--#endif
--
- if (!initialized || !GLAMOMapReg(card, glamoc)) {
- xfree(glamoc);
- return FALSE;
-@@ -158,18 +133,8 @@
-
- if (screen->fb[0].depth == 0)
- screen->fb[0].depth = 16;
--#ifdef KDRIVEFBDEV
-- if (glamoc->use_fbdev) {
-- success = fbdevScreenInitialize(screen,
-- &glamos->backend_priv.fbdev);
-- }
--#endif
--#ifdef KDRIVEVESA
-- if (glamoc->use_vesa) {
-- success = vesaScreenInitialize(screen,
-- &glamos->backend_priv.vesa);
-- }
--#endif
-+
-+ success = fbdevScreenInitialize(screen, &glamos->backend_priv.fbdev);
-
- if (!success) {
- screen->driver = NULL;
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h 2007-11-30 10:25:06.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h 2007-11-30 10:35:17.000000000 +0100
-@@ -30,13 +30,7 @@
- #include <kdrive-config.h>
- #endif
-
--#ifdef KDRIVEFBDEV
- #include <fbdev.h>
--#endif
--#ifdef KDRIVEVESA
--#include <vesa.h>
--#endif
--
- #include "kxv.h"
-
- #define GLAMO_REG_BASE(c) ((c)->attr.address[0])
-@@ -99,12 +93,7 @@
-
- typedef struct _GLAMOCardInfo {
- union {
--#ifdef KDRIVEFBDEV
- FbdevPriv fbdev;
--#endif
--#ifdef KDRIVEVESA
-- VesaCardPrivRec vesa;
--#endif
- } backend_priv;
- struct backend_funcs backend_funcs;
-
-@@ -112,7 +101,6 @@
- Bool is_3362;
- CARD32 crtc_pitch;
- CARD32 crtc2_pitch;
-- Bool use_fbdev, use_vesa;
- } GLAMOCardInfo;
-
- #define getGLAMOCardInfo(kd) ((GLAMOCardInfo *) ((kd)->card->driver))
-@@ -155,12 +143,7 @@
-
- typedef struct _GLAMOScreenInfo {
- union {
--#ifdef KDRIVEFBDEV
- FbdevScrPriv fbdev;
--#endif
--#ifdef KDRIVEVESA
-- VesaScreenPrivRec vesa;
--#endif
- } backend_priv;
- KaaScreenInfoRec kaa;
-
-Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-28 18:44:27.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-30 10:34:10.000000000 +0100
-@@ -59,9 +59,6 @@
- ddxUseMsg (void)
- {
- KdUseMsg();
--#ifdef KDRIVEVESA
-- vesaUseMsg();
--#endif
- }
-
- int
-@@ -69,9 +66,6 @@
- {
- int ret;
-
--#ifdef KDRIVEVESA
-- if (!(ret = vesaProcessArgument (argc, argv, i)))
--#endif
- ret = KdProcessArgument(argc, argv, i);
-
- return ret;
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r24"
+PR = "r25"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
file://kdrive-1.3-18bpp.patch;patch=1 \
file://linux-keyboard-mediumraw.patch;patch=1 \
file://gumstix-kmode.patch;patch=1 \
- file://smedia-glamo.patch;patch=1 \
- file://build-glamo.patch;patch=1 \
- file://00-xglamo-logs.patch;patch=1 \
- file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \
- file://02-xglamo-no-dri.patch;patch=1 \
- file://03-xglamo-no-vesa.patch;patch=1 \
+ file://fix-picturestr-include-order.patch;patch=1 \
"
SRC_URI_append_avr32 = " \
--- /dev/null
+DESCRIPTION = "Capture X-Window display to individual frames or MPEG video."
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "Rasca <thron@gmx.de> Karl H. Beckers <karl.h.beckers@gmx.net>"
+HOMEPAGE = "http://xvidcap.sf.net"
+
+DEPENDS = "intltool-native docbook-utils-native gtk+ glib-2.0 libglade lame xmu libxfixes xdamage"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-libmp3lame --with-x"
+
+FILES_${PN} += "${datadir}/dbus-1"
--- /dev/null
+require xvidcap.inc
+
+PR = "r0"
+
--- /dev/null
+require xvidcap.inc
+
+PR = "r0"
+
+# 1.1.7rc1 still uses this directory name
+S = "${WORKDIR}/${PN}-1.1.6"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "Xorg"
-SECTION = "x11/libs"
-DESCRIPTION = "Xxf86dga extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt"
-S = "${WORKDIR}/XF86DGAExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-DESCRIPTION = "Xxf86vm extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt"
-S = "${WORKDIR}/XF86VMExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
--- /dev/null
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = landscape ; then
+ exit
+fi
+echo landscape > /var/run/last-screen-rotation
--- /dev/null
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = portait ; then
+ exit
+fi
+echo portait > /var/run/last-screen-rotation
---- zaurusd/config/alsa/cxx00-default.state.orig 2006-06-28 08:45:07.000000000 +0000
-+++ zaurusd/config/alsa/cxx00-default.state 2007-05-21 21:40:50.000000000 +0000
-@@ -32,7 +32,7 @@
+http://bugs.openembedded.org/show_bug.cgi?id=2617
+- Fixes default ALSA state for SL-Cxx00.
+ * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24).
+ * Increased Mic Levels and Boost.
+ * Enabled Capture Switch.
+ * Improved Headphones / Speaker volume balance.
+ * 3D Mode changed to "Playback" (still Off by default).
+ * Disabled all bypasses.
+ * All Mono signals decreased to 0 (not connected).
+ * Line Mux changed to differential, keeping PGA unused.
+ * Using Digital mono for recording (jack supports ony mono).
+ * Enabled Automatic Level Control, optimized for voice recording.
+ * Enabled Zero Cross volume changes.
+- Do not alter incorrect mixer levels by zaurus-mixer-callback.
+
+Index: zaurusd/config/alsa/cxx00-default.state
+===================================================================
+--- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000
++++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000
+@@ -6,8 +6,8 @@
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+- value.0 23
+- value.1 23
++ value.0 48
++ value.1 48
+ }
+ control.2 {
+ comment.access 'read write'
+@@ -15,8 +15,8 @@
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+- value.0 false
+- value.1 false
++ value.0 true
++ value.1 true
+ }
+ control.3 {
+ comment.access 'read write'
+@@ -24,26 +24,26 @@
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+- value.0 false
+- value.1 false
++ value.0 true
++ value.1 true
+ }
+ control.4 {
+ comment.access 'read write'
comment.type BOOLEAN
comment.count 2
iface MIXER
- name 'Out1 Playback ZC Switch'
+- value.0 false
+- value.1 false
+ name 'Headphone Playback ZC Switch'
- value.0 false
- value.1 false
++ value.0 true
++ value.1 true
}
-@@ -41,7 +41,7 @@
+ control.5 {
+ comment.access 'read write'
comment.type BOOLEAN
comment.count 2
iface MIXER
- name 'Out2 Playback ZC Switch'
+- value.0 false
+- value.1 false
+ name 'Speaker Playback ZC Switch'
- value.0 false
- value.1 false
++ value.0 true
++ value.1 true
+ }
+ control.6 {
+ comment.access 'read write'
+@@ -92,8 +92,8 @@
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+- value.0 255
+- value.1 255
++ value.0 220
++ value.1 220
}
-@@ -218,7 +218,7 @@
- comment.item.3 Stereo
+ control.11 {
+ comment.access 'read write'
+@@ -131,7 +131,7 @@
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+- value 15
++ value 0
+ }
+ control.15 {
+ comment.access 'read write'
+@@ -188,7 +188,7 @@
+ comment.item.1 Playback
iface MIXER
- name 'ALC Capture Function'
-- value Left
-+ value Off
+ name '3D Mode'
+- value Capture
++ value Playback
}
- control.24 {
+ control.21 {
comment.access 'read write'
-@@ -321,8 +321,8 @@
+@@ -226,7 +226,7 @@
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+- value false
++ value true
+ }
+ control.25 {
+ comment.access 'read write'
+@@ -235,7 +235,7 @@
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+- value 0
++ value 9
+ }
+ control.26 {
+ comment.access 'read write'
+@@ -244,7 +244,7 @@
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+- value 3
++ value 9
+ }
+ control.27 {
+ comment.access 'read write'
+@@ -253,7 +253,7 @@
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+- value 2
++ value 3
+ }
+ control.28 {
+ comment.access 'read write'
+@@ -306,7 +306,7 @@
+ comment.count 1
+ iface MIXER
+ name 'ZC Timeout Switch'
+- value false
++ value true
+ }
+ control.34 {
+ comment.access 'read write'
+@@ -321,7 +321,7 @@
comment.type BOOLEAN
comment.count 1
iface MIXER
- name 'Right Out2 Playback Invert Switch'
-- value true
+ name 'Right Speaker Playback Invert Switch'
-+ value false
+ value true
}
control.36 {
- comment.access 'read write'
@@ -331,8 +331,8 @@
comment.range '0 - 3'
iface MIXER
name 'Mic Boost'
- value.0 2
- value.1 2
++ value.0 3
++ value.1 3
+ }
+ control.37 {
+ comment.access 'read write'
+@@ -341,8 +341,8 @@
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Left Playback Volume'
+- value.0 2
+- value.1 2
+ value.0 0
+ value.1 0
}
- control.37 {
+ control.38 {
comment.access 'read write'
-@@ -351,8 +351,8 @@
+@@ -361,8 +361,8 @@
comment.range '0 - 7'
iface MIXER
- name 'Bypass Right Playback Volume'
-- value.0 0
-- value.1 0
-+ value.0 2
-+ value.1 2
+ name 'Bypass Mono Playback Volume'
+- value.0 2
+- value.1 2
++ value.0 0
++ value.1 0
}
- control.39 {
+ control.40 {
comment.access 'read write'
@@ -378,9 +378,9 @@
comment.count 2
- value.0 120
- value.1 120
+ name 'Headphone Playback Volume'
-+ value.0 121
-+ value.1 121
++ value.0 105
++ value.1 105
}
control.42 {
comment.access 'read write'
- value.0 119
- value.1 119
+ name 'Speaker Playback Volume'
-+ value.0 121
-+ value.1 121
++ value.0 127
++ value.1 127
}
control.43 {
comment.access 'read write'
+@@ -399,7 +399,7 @@
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+- value 121
++ value 0
+ }
+ control.44 {
+ comment.access 'read write'
@@ -411,7 +411,7 @@
comment.item.3 'Digital Mono'
iface MIXER
name 'Right ADC Mux'
- value 'Mono (Left)'
-+ value Stereo
++ value 'Digital Mono'
}
control.45 {
comment.access 'read write'
iface MIXER
name 'Left ADC Mux'
- value 'Mono (Left)'
-+ value Stereo
++ value 'Digital Mono'
}
control.46 {
comment.access 'read write'
-@@ -458,7 +458,7 @@
- comment.item.4 Differential
- iface MIXER
- name 'Right Line Mux'
-- value Differential
-+ value 'Line 1'
- }
- control.49 {
- comment.access 'read write'
@@ -471,7 +471,7 @@
comment.item.4 Differential
iface MIXER
name 'Left Line Mux'
- value PGA
-+ value 'Line 1'
++ value Differential
}
control.50 {
comment.access 'read write'
-@@ -483,7 +483,7 @@
- comment.item.3 Differential
- iface MIXER
- name 'Right PGA Mux'
-- value Differential
-+ value 'Line 1'
- }
- control.51 {
- comment.access 'read write'
-@@ -495,7 +495,7 @@
- comment.item.3 Differential
- iface MIXER
- name 'Left PGA Mux'
-- value Differential
-+ value 'Line 1'
- }
- control.52 {
- comment.access 'read write'
-@@ -535,7 +535,7 @@
- comment.count 1
- iface MIXER
- name 'Right Mixer Left Playback Switc'
-- value false
-+ value true
- }
- control.57 {
- comment.access 'read write'
@@ -610,9 +610,8 @@
comment.access 'read write'
comment.type ENUMERATED
iface MIXER
name 'Speaker Function'
value On
+Index: zaurusd/scripts/zaurus-mixer-callback.in
+===================================================================
+--- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000
++++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000
+@@ -16,8 +16,6 @@
+ JACK="$1"
+ SPK="$2"
+ LEFT="true"
+-RLPLAYBACK="false"
+-RLBYPASS="false"
+
+ case $SPK in
+ "On")
+@@ -37,8 +35,6 @@
+ ;;
+ "Headset" | "Mic" | "Line")
+ LEFT="false"
+- RLPLAYBACK="true"
+- RLBYPASS="true"
+ SPK="Off"
+ ;;
+ *)
+@@ -58,12 +54,6 @@
+ }; /Speaker Function/ {
+ N
+ s:\(Speaker Function.*\n.*value \).*$:\1$SPK:
+-}; /Right Mixer Left Playback/ {
+-N
+-s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK:
+-}; /Right Mixer Left Bypass/ {
+-N
+-s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS:
+ }; /Left Mixer Playback/ {
+ N
+ s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT:
exit 1
fi
-panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
-
+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $1}'`"
+# touch ~/.norot can disable rotation.
+if test -f /home/$panel_user/.norot ; then
+ exit
+fi
STATE=$1
+++ /dev/null
---- zaurusd/scripts/zaurus-mixer-callback.in.orig 2007-06-05 03:15:30.000000000 +0000
-+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-06-05 03:14:53.000000000 +0000
-@@ -16,7 +16,7 @@
- JACK="$1"
- SPK="$2"
- LEFT="true"
--RLPLAYBACK="false"
-+RLPLAYBACK="true"
- RLBYPASS="false"
-
- case $SPK in
DEPENDS = "tslib"
RDEPENDS = "procps"
PV = "0.0+svn${SRCDATE}"
-PR = "r16"
+PR = "r17"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://zaurus-hinge.in \
file://disable-alsa-handling.patch;patch=1 \
file://zaurus-hinge.matchbox-portrait \
file://zaurus-hinge.matchbox-landscape \
- file://zaurusd-mixer-callback.patch;patch=1 \
file://tslib-1.diff;patch=1 \
file://zaurus-hinge.bl-on \
- file://zaurus-hinge.bl-off"
+ file://zaurus-hinge.bl-off \
+ file://01-check-toggle-landscape \
+ file://01-check-toggle-portait"
S = "${WORKDIR}/${PN}"
install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"
install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"
+ install -m 0755 "${WORKDIR}/01-check-toggle-landscape" "${D}/etc/zaurusd/hinge-landscape.d/01-check-toggle"
+ install -m 0755 "${WORKDIR}/01-check-toggle-portait" "${D}/etc/zaurusd/hinge-portrait.d/01-check-toggle"
+
install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape"
install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait"
}
--- /dev/null
+From zziplib Debian source package
+--- a/zzip/zip.c 2007-03-19 02:27:49.000000000 +1100
++++ b/zzip/zip.c 2007-11-07 17:40:52.985849197 +1100
+@@ -402,7 +402,10 @@
+ uint16_t u_extras, u_comment, u_namlen;
+
+ if (fd_map)
+- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
++ {
++ d = &dirent;
++ memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */
++ }
+ else
+ {
+ if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0)
--- /dev/null
+Index: zziplib-0.10.82/bins/zziptest.c
+===================================================================
+--- zziplib-0.10.82.orig/bins/zziptest.c 2008-02-20 12:10:35.000000000 +0100
++++ zziplib-0.10.82/bins/zziptest.c 2008-02-20 12:10:44.000000000 +0100
+@@ -52,7 +52,7 @@
+ }
+ } printf("OK.\n");
+
+-#if 1
++#if 0
+ printf("{check...\n");
+ { struct zzip_dir_hdr * hdr = dir->hdr0;
+
--- /dev/null
+Reworks zziplib's configure and top-level makefile considerably to make
+this package compile in a cross-compilation environment. This has not
+and will not be sent upstream because the author most likely wants it that
+way (lots of MSVC crap).
+
+Index: zziplib-0.13.49/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/Makefile.am 2008-02-19 22:54:19.000000000 +0100
++++ zziplib-0.13.49/Makefile.am 2008-02-19 23:37:40.000000000 +0100
+@@ -1,126 +1,10 @@
+-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+-WANT_AUTOMAKE = 1.7
+-WANT_AUTOCONF = 2.57
++WANT_AUTOMAKE = 1.96
++WANT_AUTOCONF = 2.61
+
+ DIST_SUBDIRS = zzip zzipwrap bins test docs SDL
+ SUBDIRS = zzip zzipwrap bins test docs @SDL@
+
+-# see Makefile.mk for the "make rpm" target
+-rpm2: dist-bzip2 $(PACKAGE).spec
+- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+-
+-indent-check:
+- (cd zzip && $(MAKE) `basename $@`)
+-
+-doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \
+-man mans manpages htmpages unpack clean-unpack changes.htm pdfs \
+-omf install-omf install-doc install-docs install-sf install-man3 install-mans :
+- (cd docs && $(MAKE) `basename $@`)
+-
+-sdl testsdl test-sdl install-sdl :
+- (cd SDL && $(MAKE) `basename $@`)
+-
+-check-test0 check-test1 check-zzdir check-zzcat \
+-check-zzxor check-zzxordir check-zzxorcat \
+-check-sfx check-readme : \
+- (cd test && $(MAKE) `basename $@`)
+-
+-MSVC8 = msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \
+-msvc8/zzdir.vcproj msvc8/zzipself.vcproj msvc8/zzip.vcproj \
+-msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \
+-msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \
+-msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \
+-msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \
+-msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \
+- msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj
+-
+-MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \
+-msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \
+-msvc7/zziplib.sln msvc7/zzipsetstub.sln msvc7/zzobfuscated.sln \
+-msvc7/zziplib.vcproj msvc7/zzipsetstub.vcproj msvc7/zzobfuscated.vcproj \
+-msvc7/zzcat.sln msvc7/zzipself.bat msvc7/zzip.sln \
+-msvc7/zzcat.vcproj msvc7/zzipself.sln msvc7/zziptest.sln \
+-msvc7/zzdir.sln msvc7/zzipself.txt msvc7/zziptest.vcproj
+-
+-MSVC6 = \
+-msvc6/zzcat.dsp msvc6/zziplib.dsp msvc6/zzipwrap.dsp \
+-msvc6/zzdir.dsp msvc6/zziplib.dsw msvc6/zzobfuscated.dsp \
+-msvc6/zziptest.dsp msvc6/zzip.dsp
+-
+ EXTRA_DIST = zziplib.spec zzipback.sed Makefile.mk \
+- $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+-
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
+- comp compats msvc6 msvc7
+-# ------------------------------------------------------------------------
+-
+-test-comp:
+- test ! -d testing || rm -r testing
+- mkdir testing
+- (cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz)
+- (cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure)
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib"
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" check
+-
+-clean-comp:
+- test ! -d testing || rm -r testing
+-
+-msvc :
+- mkdir bin
+- mkdir lib
+- mkdir include
+- mkdir include/zzip
+- cp $(srcdir)/msvc6/Release/*.exe bin/
+- cp $(srcdir)/msvc6/Release/*.dll bin/
+- cp $(srcdir)/msvc6/Release/*.lib lib/
+- cp $(srcdir)/zzip/*.h include/zzip/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/
+- rm -r bin lib include
+-
+-# ------------------------------------------------------------------ zzip64
+-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64
+-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64"
++ $(am__aclocal_m4_deps)
+
+-zzip64-setup: zzip64-setup.tmp
+-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc
+- - mkdir zzip64
+- cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/
+- date > zzip64.dir
+-zzip64-build: zzip64-build.tmp
+-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/*
+- cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64)
+-zzip64-install: zzip64-install.tmp
+-zzip64-install.tmp : zzip64-build.tmp
+- cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip64.so/' \
+- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
+- -e 's/-lzzip/-lzzip64/' \
+- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc
+-zzip32-postinstall:
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip32.so/' \
+- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/-lzzip/-lzzip32/' \
+- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc
+-zzip-postinstall:
+- : "the 12.8x and 11.8x and 10.8x packages are all the same actually"
+- cd $(DESTDIR)$(libdir) || exit 1 \
+- ; for i in libzzip*.so.1? ; do : \
+- ; v10=`echo $i | sed -e "s/.so.../.so.10/"` \
+- ; v11=`echo $i | sed -e "s/.so.../.so.11/"` \
+- ; v12=`echo $i | sed -e "s/.so.../.so.12/"` \
+- ; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \
+- ; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \
+- ; ln -s $v10 $v11 || true; done
+Index: zziplib-0.13.49/configure.ac
+===================================================================
+--- zziplib-0.13.49.orig/configure.ac 2008-02-15 21:56:37.000000000 +0100
++++ zziplib-0.13.49/configure.ac 2008-02-19 23:43:05.000000000 +0100
+@@ -1,12 +1,12 @@
+-AC_INIT(zziplib.spec)
+-AC_PREREQ(2.49)
+-AC_COPYRIGHT([Guido Draheim <guido@gmx.de> for ZZipLib.SF.net])
++AC_PREREQ(2.61)
++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido@gmx.de>])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
++
++AC_CONFIG_SRCDIR([zzip/zip.c])
+ AC_REVISION($Revision: 1.9 $)
+-AC_CONFIG_AUX_DIR(uses)
++
+ # =======================================================================
+-AC_CANONICAL_SYSTEM
+-dnl AM_ENABLE_MULTILIB([Makefile],[$host])
+-AX_ENABLE_BUILDDIR_UNAME
+ AC_SET_DEFAULT_PATHS_SYSTEM
+ # -----------------------------------------------------------------------
+ AC_ARG_ENABLE(thread-safe,AC_HELP_STRING(
+@@ -61,8 +61,6 @@
+ AC_SUBST(ZLIB_INCL)
+ AC_SUBST(ZLIB_LDIR)
+ # -----------------------------------------------------------------------
+-AX_SPEC_DEFAULTS
+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+ dnl test ".$CFLAGS" = "." && CFLAGS=""
+ AC_PROG_CC
+ dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
+@@ -77,7 +75,7 @@
+ sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in
+ AC_CONFIG_HEADERS([config.h])
+ AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h])
+-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
+ AM_MAINTAINER_MODE
+
+ AX_CREATE_PKGCONFIG_INFO(dnl
+Index: zziplib-0.13.49/install-sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ zziplib-0.13.49/install-sh 2008-02-19 23:43:36.000000000 +0100
+@@ -0,0 +1,323 @@
++#!/bin/sh
++# install - install a program, script, or datafile
++
++scriptversion=2005-05-14.22
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# 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
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch. It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chownprog="${CHOWNPROG-chown}"
++chgrpprog="${CHGRPPROG-chgrp}"
++stripprog="${STRIPPROG-strip}"
++rmprog="${RMPROG-rm}"
++mkdirprog="${MKDIRPROG-mkdir}"
++
++chmodcmd="$chmodprog 0755"
++chowncmd=
++chgrpcmd=
++stripcmd=
++rmcmd="$rmprog -f"
++mvcmd="$mvprog"
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c (ignored)
++-d create directories instead of installing files.
++-g GROUP $chgrpprog installed files to GROUP.
++-m MODE $chmodprog installed files to MODE.
++-o USER $chownprog installed files to USER.
++-s $stripprog installed files.
++-t DIRECTORY install into DIRECTORY.
++-T report an error if DSTFILE is a directory.
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -c) shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit $?;;
++
++ -m) chmodcmd="$chmodprog $2"
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
++
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
++
++ -T) no_target_directory=true
++ shift
++ continue;;
++
++ --version) echo "$0 $scriptversion"; exit $?;;
++
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
++done
++
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
++
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ src=
++
++ if test -d "$dst"; then
++ mkdircmd=:
++ chmodcmd=
++ else
++ mkdircmd=$mkdirprog
++ fi
++ else
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
++
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dstarg: Is a directory" >&2
++ exit 1
++ fi
++ dst=$dst/`basename "$src"`
++ fi
++ fi
++
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++ # Make sure that the destination directory exists.
++
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
++
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ shift
++ IFS=$oIFS
++
++ pathcomp=
++
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
++ shift
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp"
++ # mkdir can fail with a `File exist' error in case several
++ # install-sh are creating the directory concurrently. This
++ # is OK.
++ test -d "$pathcomp" || exit
++ fi
++ pathcomp=$pathcomp/
++ done
++ fi
++
++ if test -n "$dir_arg"; then
++ $doit $mkdircmd "$dst" \
++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++ else
++ dstfile=`basename "$dst"`
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Copy the file name to the temp name.
++ $doit $cpprog "$src" "$dsttmp" &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++ # Now rename the file to the real destination.
++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++ || {
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ if test -f "$dstdir/$dstfile"; then
++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++ || {
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++ (exit 1); exit 1
++ }
++ else
++ :
++ fi
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ }
++ }
++ fi || { (exit 1); exit 1; }
++done
++
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++ (exit 0); exit 0
++}
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
--- /dev/null
+require zziplib_${PV}.bb
+
+DEPENDS = "zlib-native"
+
+inherit native
+
+S = "${WORKDIR}/zziplib-${PV}"
+
+PACKAGES = ""
--- /dev/null
+require zziplib_${PV}.bb
+
+DEPENDS = "zlib-native"
+
+inherit native
+
+S = "${WORKDIR}/zziplib-${PV}"
+
+PACKAGES = ""
--- /dev/null
+DESCRIPTION = "Support library for dealing with zip files"
+SECTION = "libs"
+PRIORITY = "optional"
+
+DEPENDS = "zlib python-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2"
+LICENSE = "LGPL MPL"
+
+inherit autotools pkgconfig
+
+do_configure_append() {
+ # Fix some brokenness in the generated makefile.
+ sed -i \
+ -e "s|tail -1|tail -n 1|" \
+ -e "s|dist dist-all dist-all:|dist dist-all:|" \
+ Makefile
+
+ mkdir ${S}/build
+}
-DESCRIPTION = "Support library for dealing with zip files"
-SECTION = "libs"
-PRIORITY = "optional"
+require zziplib.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2"
-LICENSE = "LGPL MPL"
-inherit autotools pkgconfig
+SRC_URI += "file://zziplib-0.10-disable-test.patch;patch=1"
-do_stage() {
- oe_libinstall -a -so -C zzip libzzip ${STAGING_LIBDIR}
- oe_libinstall -a -so -C zzipwrap libzzipwrap ${STAGING_LIBDIR}
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 ${S}/bins/zziplib.m4 ${STAGING_DATADIR}/aclocal/
- for h in zzip.h zzipformat.h zzipwrap.h zziplib.h zzip-io.h; do
- install -m 0644 ${S}/zziplib/$h ${STAGING_INCDIR}/
- done
- install -d ${STAGING_INCDIR}/zzip
- for h in lib.h format.h _msvc.h conf.h file.h stdint.h zzip.h _config.h plugin.h; do
- install -m 0644 ${S}/zzip/$h ${STAGING_INCDIR}/zzip/
- done
-}
+PR = "r1"
--- /dev/null
+require zziplib.inc
+
+SRC_URI += "file://zziplib-buildfix.patch;patch=1"
+
--- /dev/null
+require zziplib.inc
+
+SRC_URI += "\
+ file://zip_c.patch;patch=1 \
+ file://zziplib-autoconf.patch;patch=1 \
+ "
+
+#EXTRA_OECONF = "--srcdir=${S} --enable-builddir=${S}/build"
+
+do_stage() {
+ autotools_stage_all
+}
ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
+ac_cv_type_uid_t={ac_cv_type_uid_t=yes}
# bash
bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
ac_cv_epoll_works=${ac_cv_epoll_works=yes}
+
projects / vuplus_openembedded / commitdiff
