diff options
111 files changed, 4032 insertions, 1566 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 6011790ebe..aa693cd4c6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -798,9 +798,9 @@ python read_subpackage_metadata () { bb.data.setVar(key, sdata[key], d) } -def base_after_parse_two(d): - import bb - import exceptions +def base_after_parse(d): + import bb, os, exceptions + source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0) if not source_mirror_fetch: need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) @@ -828,9 +828,6 @@ def base_after_parse_two(d): if use_nls != None: bb.data.setVar('USE_NLS', use_nls, d) -def base_after_parse(d): - import bb, os - # Make sure MACHINE *isn't* exported bb.data.delVarFlag('MACHINE', 'export', d) bb.data.setVarFlag('MACHINE', 'unexport', 1, d) @@ -855,7 +852,6 @@ def base_after_parse(d): python () { - base_after_parse_two(d) base_after_parse(d) } diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass index 14f957e12b..06152ef8bc 100644 --- a/classes/devshell.bbclass +++ b/classes/devshell.bbclass @@ -2,9 +2,10 @@ EXTRA_OEMAKE[export] = "1" do_devshell[dirs] = "${S}" do_devshell[nostamp] = "1" -do_devshell[interactive] = "1" + devshell_do_devshell() { - bash -i + export TERMWINDOWTITLE="Bitbake Developer Shell" + ${TERMCMD} } addtask devshell after do_patch diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass index 6920fe5dbd..5ccf49267b 100644 --- a/classes/dsmg600-image.bbclass +++ b/classes/dsmg600-image.bbclass @@ -16,4 +16,5 @@ dsmg600_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } -IMAGE_POSTPROCESS_COMMAND += "dsmg600_pack_image; " +# dsmg600 is not a separate machine - use the nslu2 machine override. +IMAGE_POSTPROCESS_COMMAND_nslu2 += "dsmg600_pack_image; " diff --git a/classes/insane.bbclass b/classes/insane.bbclass index e5a1cd03d4..21348a8bb6 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -255,6 +255,10 @@ def package_qa_check_arch(path,name,d): import bb, os target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) + + # FIXME: Cross package confuse this check, so just skip them + if bb.data.inherits_class('cross', d): + return True # avoid following links to /usr/bin (e.g. on udev builds) # we will check the files pointed to anyway... diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 2434ca1f0a..4cc3784b6f 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -169,13 +169,18 @@ inherit cml1 EXPORT_FUNCTIONS do_compile do_install do_stage do_configure -PACKAGES = "kernel kernel-image kernel-dev" +# kernel-base becomes kernel-${KERNEL_VERSION} +# kernel-image becomes kernel-image-${KERNEL_VERISON} +PACKAGES = "kernel kernel-base kernel-image kernel-dev" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" FILES_kernel-dev = "/boot/System.map* /boot/config*" -RDEPENDS_kernel = "kernel-image-${KERNEL_VERSION}" +RDEPENDS_kernel = "kernel-base" +RDEPENDS_kernel-base = "kernel-image" PKG_kernel-image = "kernel-image-${KERNEL_VERSION}" +PKG_kernel-base = "kernel-${KERNEL_VERSION}" ALLOW_EMPTY_kernel = "1" +ALLOW_EMPTY_kernel-base = "1" ALLOW_EMPTY_kernel-image = "1" pkg_postinst_kernel-image () { @@ -362,13 +367,13 @@ python populate_packages_prepend () { postinst = bb.data.getVar('pkg_postinst_modules', d, 1) postrm = bb.data.getVar('pkg_postrm_modules', d, 1) - do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-image-%s' % bb.data.getVar("KERNEL_VERSION", d, 1)) + do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % bb.data.getVar("KERNEL_VERSION", d, 1)) import re, os metapkg = "kernel-modules" bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) bb.data.setVar('FILES_' + metapkg, "", d) - blacklist = [ 'kernel-dev', 'kernel-image' ] + blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ] for l in module_deps.values(): for i in l: pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) diff --git a/classes/nas100d-image.bbclass b/classes/nas100d-image.bbclass index 0d48ebd476..1150116bdb 100644 --- a/classes/nas100d-image.bbclass +++ b/classes/nas100d-image.bbclass @@ -16,4 +16,5 @@ nas100d_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } -IMAGE_POSTPROCESS_COMMAND += "nas100d_pack_image; " +# nas100d is not a separate machine - use the nslu2 machine override. +IMAGE_POSTPROCESS_COMMAND_nslu2 += "nas100d_pack_image; " diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 07d18470f7..a28f8896c9 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -128,11 +128,14 @@ def patch_init(d): i = 0 self.patches.insert(i, patch) - def _applypatch(self, patch, force = None, reverse = None): + def _applypatch(self, patch, force = False, reverse = False, run = True): shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']] if reverse: shellcmd.append('-R') + if not run: + return "sh" + "-c" + " ".join(shellcmd) + if not force: shellcmd.append('--dry-run') @@ -145,7 +148,7 @@ def patch_init(d): output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) return output - def Push(self, force = None, all = None): + def Push(self, force = False, all = False, run = True): bb.note("self._current is %s" % self._current) bb.note("patches is %s" % self.patches) if all: @@ -162,7 +165,7 @@ def patch_init(d): else: self._current = 0 bb.note("applying patch %s" % self.patches[self._current]) - self._applypatch(self.patches[self._current], force) + return self._applypatch(self.patches[self._current], force) def Pop(self, force = None, all = None): @@ -176,7 +179,9 @@ def patch_init(d): """""" class QuiltTree(PatchSet): - def _runcmd(self, args): + def _runcmd(self, args, run = True): + if not run: + return ["quilt"] + args runcmd(["quilt"] + args, self.dir) def _quiltpatchpath(self, file): @@ -251,7 +256,7 @@ def patch_init(d): self.patches.insert(self._current or 0, patch) - def Push(self, force = None, all = None): + def Push(self, force = False, all = False, run = True): # quilt push [-f] args = ["push"] @@ -259,6 +264,8 @@ def patch_init(d): args.append("-f") if all: args.append("-a") + if not run: + return self._runcmd(args, run) self._runcmd(args) @@ -345,16 +352,31 @@ def patch_init(d): olddir = os.path.abspath(os.curdir) os.chdir(self.patchset.dir) - try: - self.patchset.Push(True) - except CmdError, v: - # Patch application failed - if sys.exc_value.output.strip() == "No patches applied": - return - print(sys.exc_value) - print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.') - - os.system('/bin/sh') + try: + self.patchset.Push(False) + except CmdError, v: + # Patch application failed + patchcmd = self.patchset.Push(True, False, False) + + t = bb.data.getVar('T', d, 1) + if not t: + bb.msg.fatal(bb.msg.domain.Build, "T not set") + bb.mkdirhier(t) + import random + rcfile = "%s/bashrc.%s.%s" % (t, str(os.getpid()), random.random()) + f = open(rcfile, "w") + f.write("echo '*** Manual patch resolution mode ***'\n") + f.write("echo 'Dropping to a shell, so patch rejects can be fixed manually.'\n") + f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n") + f.write("echo ''\n") + f.write(" ".join(patchcmd) + "\n") + f.write("#" + bb.data.getVar('TERMCMDRUN', d, 1)) + f.close() + os.chmod(rcfile, 0775) + + os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" + os.environ['TERMRCFILE'] = rcfile + os.system(bb.data.getVar('TERMCMDRUN', d, 1)) # Construct a new PatchSet after the user's changes, compare the # sets, checking patches for modifications, and doing a remote diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e3608c3ddc..ae26d992f2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -365,6 +365,25 @@ SRCDATE = "${DATE}" SRC_URI = "file://${FILE}" ################################################################## +# UI/Interaction Configuration +################################################################## + +SHELLRCCMD = "bash --rcfile $TERMRCFILE" +# Some common terminal programs to choose from +GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' +GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLRCCMD}' +SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' +SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLRCCMD}' +XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' +XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLRCCMD}' +KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' +KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e ${SHELLRCCMD}' + +# Set a default +TERMCMD ?= "${GNOME_TERMCMD}" +TERMCMDRUN ?= "${GNOME_TERMCMDRUN}" + +################################################################## # Miscellaneous utilities. ################################################################## diff --git a/conf/checksums.ini b/conf/checksums.ini index f73fc47571..b11c0f9825 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2,9 +2,9 @@ md5=402bdb26356791bd5d277099adacc006 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 -[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz] -md5=28d0e78d736748e67f25ad99456f10c3 -sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772 +[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz] +md5=bc6f32759db02cf32a83640d74fb9993 +sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] md5=85b6a42a9e17a23c01b2f2ed0ece0563 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ce8d446388..86e87f31d6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "40" +DISTRO_REVISION = "41" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -133,7 +133,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.2" -PREFERRED_VERSION_glib-2.0 = "2.12.10" +PREFERRED_VERSION_glib-2.0 = "2.12.11" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -198,7 +198,7 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index becad95786..6dd4f0d781 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -21,6 +21,12 @@ DISTRO_FEATURES_n2100 += "raid" DISTRO_FEATURES_storcenter += "raid" DISTRO_FEATURES_lsppchd += "raid" DISTRO_FEATURES_lsppchg += "raid" +DISTRO_FEATURES_lsarm += "raid" + +MACHINE_TASK_PROVIDER = "task-base" + +# This isn't actually in OE yet +#DISTRO_EXTRA_RDEPENDS = "openlink-machine" ENABLE_BINARY_LOCALE_GENERATION = "0" HOTPLUG = "udev" @@ -42,7 +48,7 @@ require conf/distro/include/sane-srcdates.inc PREFERRED_VERSION_openlink = "svn" PREFERRED_VERSION_dtc = "20070216" PREFERRED_VERSION_dtc-native = "20070216" - +PREFERRED_VERSION_udev = "097" # Various defines for QNAP Turbostation #FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index be6813369e..59a481a104 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -219,6 +219,7 @@ PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libsm ?= "1.0.2" PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libx11-native ?= "1.1.1" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxcomposite ?= "0.3.1" diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf index ad94a0f029..161f3ad8c1 100644 --- a/conf/machine/include/lsppc.conf +++ b/conf/machine/include/lsppc.conf @@ -20,6 +20,7 @@ USE_VT = "0" HOTPLUG = "udev" udevdir = "/dev" +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_FSTYPES = "tar.gz" #tune for the MPC5200B cpu diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf new file mode 100644 index 0000000000..9698fc9a70 --- /dev/null +++ b/conf/machine/lsarm.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: ARM based Buffalo Linkstation +#@DESCRIPTION: Machine configuration for various different ARM based linkstations +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" +INHERIT += "lsarm-image" + +MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" + +TARGET_FPU = "soft" + +PREFERRED_PROVIDER_virtual/bootloader = "" + +MACHINE_TASK_PROVIDER = "task-base" + +USE_DEVFS = "0" + +require conf/machine/include/tune-arm926ejs.conf + +IMAGE_FSTYPES = "tar.gz" + +# serial console port on devboard rev. B3 +SERIAL_CONSOLE = "115200 ttyS0" + +HOTPLUG = "udev" +udevdir = "/dev" + +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" + +BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" +PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationarm" + diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index bf59929b02..ac22703de9 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -3,4 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD UBOOT_MACHINE = "linkstation_HDLAN" IMAGE_FSTYPES = "tar.gz" -require conf/machine/include/lsppc.conf
\ No newline at end of file +require conf/machine/include/lsppc.conf + +INHERIT += "lsppchd-image" diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 6040010176..9f03febba6 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -3,4 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG UBOOT_MACHINE = "linkstation_HGLAN" IMAGE_FSTYPES = "tar.gz" -require conf/machine/include/lsppc.conf
\ No newline at end of file +require conf/machine/include/lsppc.conf + +INHERIT += "lsppchg-image" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 2acfe812b0..11ec87d205 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -23,5 +23,6 @@ EXTRA_IMAGECMD = "--little-endian" # Creating an image that works with the webinterface required encrypting it # So we'll need openssl EXTRA_IMAGEDEPENDS = "openssl-native" +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 2c1a9d70b5..0911dd39af 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -8,6 +8,8 @@ INHERIT += "turbostation-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" +MACHINE_EXTRA_RDEPENDS = "u-boot" +PREFERRED_VERSION_u-boot = "1.2.0" MODUTILS=26 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" @@ -20,8 +22,8 @@ MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" -EXTRA_IMAGECMD = "--big-endian" -ERASEBLOCK_SIZE = "0x20000" IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000" +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" require conf/machine/include/tune-ppc603e.conf diff --git a/conf/tinder.conf b/conf/tinder.conf index 99e263c96c..614ed89400 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -12,7 +12,7 @@ INHERIT += "tinderclient" # HTTP posting #TINDER_HOST = "ewi546.ewi.utwente.nl" -#TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi" +#TINDER_URL = "/tinderbox" # Which branch do we build #TINDER_BRANCH = "org.openembedded.dev" diff --git a/packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch b/packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch new file mode 100644 index 0000000000..680e6ce4fc --- /dev/null +++ b/packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch @@ -0,0 +1,11 @@ +--- autofs-4.1.4/samples/auto.net~ 2005-04-05 08:02:09.000000000 -0500 ++++ autofs-4.1.4/samples/auto.net 2007-04-07 14:41:19.000000000 -0500 +@@ -37,7 +37,7 @@ + # Newer distributions get this right + SHOWMOUNT="$SMNT --no-headers -e $key" + +-$SHOWMOUNT | LC_ALL=C sort +0 | \ ++$SHOWMOUNT | LC_ALL=C sort | \ + awk -v key="$key" -v opts="$opts" -- ' + BEGIN { ORS=""; first=1 } + { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } diff --git a/packages/autofs/autofs-4.1.4/autofs-additional-distros.patch b/packages/autofs/autofs-4.1.4/autofs-additional-distros.patch new file mode 100644 index 0000000000..2b1af584b3 --- /dev/null +++ b/packages/autofs/autofs-4.1.4/autofs-additional-distros.patch @@ -0,0 +1,12 @@ +--- autofs-4.1.4/samples/rc.autofs.in~ 2005-04-11 06:30:54.000000000 -0500 ++++ autofs-4.1.4/samples/rc.autofs.in 2007-04-07 13:18:44.000000000 -0500 +@@ -43,6 +43,9 @@ + system=debian + elif [ -f /etc/redhat-release ]; then + system=redhat ++elif [ -f /etc/issue ] && grep -q "^SlugOS" /etc/issue ; then ++ # SlugOS behaves like Debian, at least for autofs purposes. ++ system=debian + else + echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2 + exit 1 diff --git a/packages/autofs/autofs_4.1.4.bb b/packages/autofs/autofs_4.1.4.bb index 128c24e296..ab2bacedb7 100644 --- a/packages/autofs/autofs_4.1.4.bb +++ b/packages/autofs/autofs_4.1.4.bb @@ -2,13 +2,17 @@ DESCRIPTION = "Kernel based automounter for linux." SECTION = "base" LICENSE = "GPL" +PR = "r1" + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \ file://cross.patch;patch=1 \ file://Makefile.rules-cross.patch;patch=1 \ - file://install.patch;patch=1" + file://install.patch;patch=1 \ + file://auto.net-sort-option-fix.patch;patch=1 \ + file://autofs-additional-distros.patch;patch=1" inherit autotools diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb new file mode 100644 index 0000000000..8201dd9201 --- /dev/null +++ b/packages/cups/cups_1.2.10.bb @@ -0,0 +1,76 @@ +DESCRIPTION = "An Internet printing system for Unix." +SECTION = "console/utils" +LICENSE = "GPL LGPL" +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native" +PR = "r0" + +SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ + " + +inherit autotools binconfig + +LDFLAGS += " -L${STAGING_LIBDIR} " + +EXTRA_OECONF = " \ + --enable-gnutls \ + --enable-dbus \ + --enable-browsing \ + --disable-openssl \ + --disable-tiff \ + --without-php \ + --without-perl \ + --without-python \ + --without-java \ + " + + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +do_compile () { + sed -i s:STRIP:NOSTRIP: Makedefs + sed -i s:serial:: backend/Makefile + + echo "all:" > man/Makefile + echo "install:" >> man/Makefile + + oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ + "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ + "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ + "LIBZ=-lz -L${STAGING_LIBDIR}" \ + "-I." +} + +fakeroot do_install () { + oe_runmake "DSTROOT=${D}" install +} + +do_stage () { + install -d ${STAGING_INCDIR}/cups + install ${S}/cups/*.h ${STAGING_INCDIR}/cups/ + install ${S}/filter/*.h ${STAGING_INCDIR}/cups/ + oe_libinstall -C cups -so libcups ${STAGING_LIBDIR} + oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR} +} + +FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ + ${libdir}/cups/cgi-bin/.debug \ + ${libdir}/cups/filter/.debug \ + ${libdir}/cups/monitor/.debug \ + ${libdir}/cups/notifier/.debug \ + ${libdir}/cups/daemon/.debug \ + " +#package the html for the webgui inside the main packages (~1MB uncompressed) + +FILES_${PN} += "${datadir}/doc/cups/images \ + ${datadir}/doc/cups/*html \ + ${datadir}/doc/cups/*.css \ + ${datadir}/icons/ \ + " + + + + diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb index 2e5dcbd086..5effeb8de6 100644 --- a/packages/directfb/directfb_1.0.0.bb +++ b/packages/directfb/directfb_1.0.0.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r1" +PR = "r2" RV = "1.0-0" SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ @@ -27,9 +27,14 @@ EXTRA_OECONF = "--with-gfxdrivers=none \ " do_stage() { + autotools_stage_all +} + +do_install() { oe_runmake 'DESTDIR=${D}' install } + FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \ ${libdir}/directfb-${RV}/*/.debug/*.so \ " diff --git a/packages/dosbox/dosbox_0.70.bb b/packages/dosbox/dosbox_0.70.bb new file mode 100644 index 0000000000..9d68e27515 --- /dev/null +++ b/packages/dosbox/dosbox_0.70.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Dos Emulator based on SDL" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "virtual/libsdl" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \ + file://nocdrom.patch;patch=1" +CXXFLAGS_append = " -DC_SDL_NOCDROM" + +inherit autotools + diff --git a/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty b/packages/freetype/freetype-2.3.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty +++ b/packages/freetype/freetype-2.3.3/.mtn2git_empty diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch new file mode 100644 index 0000000000..ae504dcb0b --- /dev/null +++ b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch @@ -0,0 +1,26 @@ +Index: freetype-2.3.1/builds/unix/configure.raw +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.raw ++++ freetype-2.3.1/builds/unix/configure.raw +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) +Index: freetype-2.3.1/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.ac ++++ freetype-2.3.1/builds/unix/configure.ac +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/packages/freetype/freetype-native_2.1.10.bb b/packages/freetype/freetype-native_2.1.10.bb index b5e8b307cd..6f99f7ee84 100644 --- a/packages/freetype/freetype-native_2.1.10.bb +++ b/packages/freetype/freetype-native_2.1.10.bb @@ -1,5 +1,5 @@ require freetype_${PV}.bb -inherit native +inherit pkgconfig native DEPENDS = "" FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" @@ -11,8 +11,7 @@ do_configure() { } do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} + autotools_stage_all } do_install() { diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb new file mode 100644 index 0000000000..79633a3d7f --- /dev/null +++ b/packages/freetype/freetype_2.3.3.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://fix-x86_64-build.patch;patch=1" +# file://no-hardcode.patch;patch=1" +# file://configure.patch;patch=1 \ +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty +++ b/packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch new file mode 100644 index 0000000000..50ffc628db --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch @@ -0,0 +1,20 @@ +--- /tmp/configure.in 2007-02-04 12:07:05.000000000 +0100 ++++ glib-2.12.9/configure.in 2007-02-04 12:08:04.655251000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1239,7 +1239,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ diff --git a/packages/glib-2.0/glib-2.0_2.12.11.bb b/packages/glib-2.0/glib-2.0_2.12.11.bb new file mode 100644 index 0000000000..4d8e59b355 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.11.bb @@ -0,0 +1,6 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + diff --git a/packages/gpe-bootsplash/files/svn-build.patch b/packages/gpe-bootsplash/files/svn-build.patch new file mode 100644 index 0000000000..83bb069a7c --- /dev/null +++ b/packages/gpe-bootsplash/files/svn-build.patch @@ -0,0 +1,239 @@ +--- gpe-bootsplash.orig/Makefile 2007-04-08 02:00:43.064935587 +0300 ++++ gpe-bootsplash/Makefile 2007-04-08 02:01:24.703308411 +0300 +@@ -1,6 +1,6 @@ + PACKAGE = gpe-bootsplash + VERSION = 1.15 +-CVSBUILD = yes ++CVSBUILD = no + + PACKAGE_CFLAGS = `pkg-config --cflags gdk-pixbuf-2.0 libsvg-cairo` `pkg-config --libs gdk-pixbuf-2.0 libsvg-cairo` -DGTK2 + CFLAGS = -fomit-frame-pointer -Os +diff -Naur gpe-bootsplash.orig/build/Makefile.dpkg_ipkg gpe-bootsplash/build/Makefile.dpkg_ipkg +--- gpe-bootsplash.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-bootsplash/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-bootsplash.orig/build/Makefile.translation gpe-bootsplash/build/Makefile.translation +--- gpe-bootsplash.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-bootsplash/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-bootsplash/gpe-bootsplash_svn.bb b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb new file mode 100644 index 0000000000..df6d5da0c1 --- /dev/null +++ b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb @@ -0,0 +1,36 @@ +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libsvg-cairo" +PR = "r0" +PV = "1.15+svn-${SRCDATE}" + +inherit autotools + +SRC_URI += "${GPE_SVN} \ + file://splash-p.svg \ + file://splash-l.svg \ + file://init.patch;patch=1 \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + +do_install_append() { + install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-gpe-portrait.svg + install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-gpe-landscape.svg + mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S07bootsplash +} + +FILES_${PN} += "${datadir}/gpe" + +pkg_postinst() { + update-alternatives --install /usr/share/gpe/splash-l.svg bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg 10 + update-alternatives --install /usr/share/gpe/splash-p.svg bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg 10 +} +pkg_postrm() { + update-alternatives --remove bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg +} + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb index f982c4517f..f1a932f788 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb @@ -1,17 +1,15 @@ -DEFAULT_PREFERENCE = "-1" -LICENSE = "GPL" DESCRIPTION = "Buttonbox for gpe" - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" - +LICENSE = "GPL" DEPENDS = "libgpewidget libgpelaunch" - -S = "${WORKDIR}/${PN}" -#Remove the dash below when 0.5 changes in PV -PV = "0.5+cvs-${SRCDATE}" +PV = "0.5+svn-${SRCDATE}" PR = "r0" inherit autotools -FILES_${PN} += "${datadir}/gpe" +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" +FILES_${PN} += "${datadir}/gpe" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-clock/files/.mtn2git_empty b/packages/gpe-clock/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-clock/files/.mtn2git_empty diff --git a/packages/gpe-clock/files/svn-build.patch b/packages/gpe-clock/files/svn-build.patch new file mode 100644 index 0000000000..69c6d6d07f --- /dev/null +++ b/packages/gpe-clock/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-clock/Makefile.orig 2007-04-07 13:50:17.507459397 +0300 ++++ gpe-clock/Makefile 2007-04-07 13:50:25.711926944 +0300 +@@ -2,7 +2,7 @@ + PREFIX = /usr/local + DEBUG = no + GTK2 = yes +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.25 + + LINGUAS = nl pt cs fr de ro ru sr sk sv es +diff -Naur gpe-clock.orig/build/Makefile.dpkg_ipkg gpe-clock/build/Makefile.dpkg_ipkg +--- gpe-clock.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-clock/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-clock.orig/build/Makefile.translation gpe-clock/build/Makefile.translation +--- gpe-clock.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-clock/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-clock/gpe-clock.inc b/packages/gpe-clock/gpe-clock.inc index 34f628dcea..d4ae3da39c 100644 --- a/packages/gpe-clock/gpe-clock.inc +++ b/packages/gpe-clock/gpe-clock.inc @@ -3,6 +3,6 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" +RDEPENDS = "gpe-announce" inherit gpe diff --git a/packages/gpe-clock/gpe-clock_svn.bb b/packages/gpe-clock/gpe-clock_svn.bb new file mode 100644 index 0000000000..a8bbb89e67 --- /dev/null +++ b/packages/gpe-clock/gpe-clock_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "GPE panel clock" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce" + +inherit autotools + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-gallery/files/svn-build.patch b/packages/gpe-gallery/files/svn-build.patch new file mode 100644 index 0000000000..5b6edf4893 --- /dev/null +++ b/packages/gpe-gallery/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-gallery.orig/Makefile 2007-04-07 13:34:54.581405005 +0300 ++++ gpe-gallery/Makefile 2007-04-07 13:35:03.589918369 +0300 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = gpe-gallery + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.97 + + MEMBERS = main image_tools +diff -Naur gpe-gallery.orig/build/Makefile.dpkg_ipkg gpe-gallery/build/Makefile.dpkg_ipkg +--- gpe-gallery.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-gallery/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-gallery.orig/build/Makefile.translation gpe-gallery/build/Makefile.translation +--- gpe-gallery.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-gallery/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-gallery/gpe-gallery_svn.bb b/packages/gpe-gallery/gpe-gallery_svn.bb new file mode 100644 index 0000000000..863dfe5f93 --- /dev/null +++ b/packages/gpe-gallery/gpe-gallery_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GPE image viewer application" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget" +PV = "0.97+svn-${SRCDATE}" + +inherit autotools +export CVSBUILD = "no" + +SRC_URI += "${GPE_EXTRA_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} += "${datadir}/gpe/pixmaps" +FILES_${PN} += "${datadir}/application-registry" + + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch b/packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch new file mode 100644 index 0000000000..9c446edb94 --- /dev/null +++ b/packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch @@ -0,0 +1,238 @@ +--- gpe-ownerinfo.orig/Makefile 2007-04-08 02:00:43.064935587 +0300 ++++ gpe-ownerinfo/Makefile 2007-04-08 02:01:24.703308411 +0300 +@@ -2,7 +2,7 @@ + VERSION = 0.28 + PREFIX = /usr/local + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + ENABLE_NLS = yes + + LINGUAS = de hu id pt pt_BR fr zh_TW ro sv nl sk cs ru sr es zh_CN vi fi tr sl ko ja ++++ gpe-ownerinfo/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-ownerinfo.orig/build/Makefile.translation gpe-ownerinfo/build/Makefile.translation +--- gpe-ownerinfo.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-ownerinfo/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb new file mode 100644 index 0000000000..b2ee49cf69 --- /dev/null +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GPE owner information dialog" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" +PR = "r1" +PV = "0.28+svn-${SRCDATE}" + +SRC_URI += "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +do_stage () { + oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ +} diff --git a/packages/gpe-su/files/.mtn2git_empty b/packages/gpe-su/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-su/files/.mtn2git_empty diff --git a/packages/gpe-su/files/svn-build.patch b/packages/gpe-su/files/svn-build.patch new file mode 100644 index 0000000000..09a8dfb92f --- /dev/null +++ b/packages/gpe-su/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-su/Makefile.orig 2007-04-07 13:50:17.507459397 +0300 ++++ gpe-su/Makefile 2007-04-07 13:50:25.711926944 +0300 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = gpe-su + DEBUG = yes +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.19 + + LINGUAS = nl pt fr sk cs de sv ro ru sr es zh_CN +diff -Naur gpe-su.orig/build/Makefile.dpkg_ipkg gpe-su/build/Makefile.dpkg_ipkg +--- gpe-su.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-su/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-su.orig/build/Makefile.translation gpe-su/build/Makefile.translation +--- gpe-su.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-su/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-su/gpe-su_svn.bb b/packages/gpe-su/gpe-su_svn.bb new file mode 100644 index 0000000000..113fc4abd4 --- /dev/null +++ b/packages/gpe-su/gpe-su_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "GPE Graphical root-shell frontend" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget" + +inherit pkgconfig + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/gpe-terminal/files/svn-build.patch b/packages/gpe-terminal/files/svn-build.patch new file mode 100644 index 0000000000..477aadd99a --- /dev/null +++ b/packages/gpe-terminal/files/svn-build.patch @@ -0,0 +1,238 @@ +--- gpe-terminal.orig/Makefile 2007-04-08 02:00:43.064935587 +0300 ++++ gpe-terminal/Makefile 2007-04-08 02:01:24.703308411 +0300 +@@ -9,5 +9,5 @@ + install -m 644 -D gpe-terminal.png $(DESTDIR)$(PREFIX)/share/pixmaps/gpe-terminal.png + install -m 644 -D gpe-terminal.desktop $(DESTDIR)$(PREFIX)/share/applications/gpe-terminal.desktop + +-include ../build/Makefile.dpkg_ipkg ++include build/Makefile.dpkg_ipkg + +diff -Naur gpe-terminal.orig/build/Makefile.dpkg_ipkg gpe-terminal/build/Makefile.dpkg_ipkg +--- gpe-terminal.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-terminal/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-terminal.orig/build/Makefile.translation gpe-terminal/build/Makefile.translation +--- gpe-terminal.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-terminal/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-terminal/gpe-terminal_svn.bb b/packages/gpe-terminal/gpe-terminal_svn.bb new file mode 100644 index 0000000000..875c675b2c --- /dev/null +++ b/packages/gpe-terminal/gpe-terminal_svn.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GPE terminal wrapper" +SECTION = "gpe" +LICENSE = "GPL" +RRECOMMENDS = "rxvt-unicode" +PR = "r1" +PV = "1.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${GPE_EXTRA_SVN} \ + file://svn-build.patch;patch=1 \ + file://${PN}.desktop \ + file://${PN}.png" + +S = "${WORKDIR}/${PN}" + +do_install() { + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/${PN}.png ${D}${datadir}/pixmaps/ +} diff --git a/packages/gpe-timesheet/gpe-timesheet_svn.bb b/packages/gpe-timesheet/gpe-timesheet_svn.bb new file mode 100644 index 0000000000..0eae00b1ca --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "GPE time tracker" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget gtk+ sqlite libtododb" +RDEPENDS = "gpe-icons" +PR = "r1" +PV = "0.31+svn-${SRCDATE}" + +inherit autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-todo/gpe-todo_svn.bb b/packages/gpe-todo/gpe-todo_svn.bb new file mode 100644 index 0000000000..22b2e3ec3c --- /dev/null +++ b/packages/gpe-todo/gpe-todo_svn.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +DESCRIPTION = "GPE to-do list" +DEPENDS = "libgpewidget libgpepimc libtododb gtk+" +SECTION = "gpe" +PRIORITY = "optional" + +inherit autotools pkgconfig + +SRC_URI="${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_svn.bb index 4572d467b6..7ecaf20a2f 100644 --- a/packages/gpe-what/gpe-what_cvs.bb +++ b/packages/gpe-what/gpe-what_svn.bb @@ -1,12 +1,12 @@ +DESCRIPTION = "GPE modal help" LICENSE = "GPL" +DEPENDS = "virtual/libx11 gtk+" +PV = "0.41+svn${SRCDATE}" -DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.41+cvs${SRCDATE}" +inherit autotools -inherit autotools gpe +SRC_URI = "${GPE_SVN}" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +S = "${WORKDIR}/${PN}" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-windowlist/gpe-windowlist_cvs.bb b/packages/gpe-windowlist/gpe-windowlist_svn.bb index 245f5c0ff5..2f9d18111e 100644 --- a/packages/gpe-windowlist/gpe-windowlist_cvs.bb +++ b/packages/gpe-windowlist/gpe-windowlist_svn.bb @@ -1,17 +1,14 @@ -DEPENDS = "libgpewidget libgpelaunch gtk+" -SECTION = "gpe" DESCRIPTION = "GPE windowlist applet" +SECTION = "gpe" LICENSE = "GPL" - -DEFAULT_PREFERENCE = "-1" - -PV = "0.1+cvs${SRCDATE}" +DEPENDS = "libgpewidget libgpelaunch gtk+" +PV = "0.1+svn${SRCDATE}" PR = "r1" -inherit autotools gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -S = "${WORKDIR}/${PN}" +inherit autotools +SRC_URI = "${GPE_EXTRA_SVN}" +S = "${WORKDIR}/${PN}" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb new file mode 100644 index 0000000000..cbeebbcdc3 --- /dev/null +++ b/packages/gtk-webcore/osb-browser_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Gtk+ WebCore - reference browser" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" +PV = "0.5.0+svn${SRCDATE}" +PR = "r0" + +inherit autotools + +SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=osb-browser;proto=https" + +S = "${WORKDIR}/osb-browser" + +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index eb65a9b2fc..25e42cd85c 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -35,5 +35,7 @@ do_stage () { install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore + install -d ${STAGING_INCDIR}/../share/osb-jscore + install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/osb-jscore done } diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index de89ef78be..7959a7e752 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -6,7 +6,6 @@ PV = "0.5.2+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ - svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \ file://build_silence.patch;patch=0;maxdate=20070401" diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb deleted file mode 100644 index 80fc6ec095..0000000000 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Plugin system for GPE applications" -AUTHOR = "Luce DeCicco <ldecicco@gmail.com>" - -DEPENDS = "gtk+ libgpewidget" -PV = "0.0+cvs${SRCDATE}" - -#put examples in a seperate package -PACKAGES += "${PN}-examples" -FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*" -FILES_${PN} = "${libdir}/*.so.*" - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -S = "${WORKDIR}/${PN}" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} diff --git a/packages/libmrss/files/atom-changes.patch b/packages/libmrss/files/atom-changes.patch deleted file mode 100644 index 42f74d00f2..0000000000 --- a/packages/libmrss/files/atom-changes.patch +++ /dev/null @@ -1,17 +0,0 @@ -Make sure to always set a pubDate - -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-03-22 19:40:54.000000000 +0100 -+++ libmrss-0.17/src/mrss_parser.c 2007-03-22 19:44:15.000000000 +0100 -@@ -270,6 +270,10 @@ - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = - __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ else if (!strcmp(cur->value, "updated" ) && !item->pubDate -+ && data->version == MRSS_VERSION_ATOM_1_0) -+ item->pubDate = -+ __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); - - /* issued -> pubDate (Atom 0.3) */ - else if (!strcmp (cur->value, "issued") && !item->pubDate) diff --git a/packages/libmrss/files/atom-right-date.patch b/packages/libmrss/files/atom-right-date.patch new file mode 100644 index 0000000000..ba231b2ab4 --- /dev/null +++ b/packages/libmrss/files/atom-right-date.patch @@ -0,0 +1,15 @@ +tm_mon goes from 0-11 written dates from 1-12. It is too late to consider security +here. The worst that can happen is that tm_mon == 0 gets negative but I assume +glibc to do range checking. +Index: libmrss-0.17.1/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.1.orig/src/mrss_parser.c 2007-04-08 02:42:23.000000000 +0200 ++++ libmrss-0.17.1/src/mrss_parser.c 2007-04-08 02:43:37.000000000 +0200 +@@ -150,6 +150,7 @@ + { + char datebuf[256]; + stm.tm_year -= 1900; ++ stm.tm_mon -= 1; + + if (!data->c_locale + && !(data->c_locale = newlocale (LC_ALL_MASK, "C", NULL))) diff --git a/packages/libmrss/files/bump-version.patch b/packages/libmrss/files/bump-version.patch deleted file mode 100644 index 2eeb6931c8..0000000000 --- a/packages/libmrss/files/bump-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -Bump the version info, specially as I changed the struct in a binary -incompatible way. - -Index: libmrss-0.17/src/Makefile.am -=================================================================== ---- libmrss-0.17.orig/src/Makefile.am 2007-04-01 16:43:58.000000000 +0200 -+++ libmrss-0.17/src/Makefile.am 2007-04-01 16:44:10.000000000 +0200 -@@ -10,7 +10,7 @@ - mrss_options.c \ - mrss_search.c - --libmrss_la_LDFLAGS = -version-info 0:16:0 -+libmrss_la_LDFLAGS = -version-info 0:17:0 - - EXTRA_DIST = mrss.h mrss_internal.h - diff --git a/packages/libmrss/files/fix-memleaks.patch b/packages/libmrss/files/fix-memleaks.patch deleted file mode 100644 index c88570c72e..0000000000 --- a/packages/libmrss/files/fix-memleaks.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 22:23:22.000000000 +0200 -+++ libmrss-0.17/src/mrss_parser.c 2007-04-01 22:23:42.000000000 +0200 -@@ -186,10 +186,10 @@ - cat->allocated = 1; - cat->category = c; - -- if (!(c = nxmle_find_attribute (cur, "scheme", NULL))) -+ if (c = nxmle_find_attribute (cur, "scheme", NULL)) - cat->domain = c; - -- if (!(c = nxmle_find_attribute (cur, "label", NULL))) -+ if (c = nxmle_find_attribute (cur, "label", NULL)) - cat->label = c; - - if (!*category) diff --git a/packages/libmrss/files/fix_atom_date_locale.patch b/packages/libmrss/files/fix_atom_date_locale.patch deleted file mode 100644 index 111a4859cd..0000000000 --- a/packages/libmrss/files/fix_atom_date_locale.patch +++ /dev/null @@ -1,121 +0,0 @@ -The Atom date formating code tries to create a RFC822 date. This date -requires to use the C locale for the date (for weekday-names and month-names). - -This patch uses new POSIX functionality to create a C locale and strftime_l -to create a right RFC822 date. - -Index: libmrss-0.17/src/mrss.h -=================================================================== ---- libmrss-0.17.orig/src/mrss.h 2007-02-02 12:23:49.000000000 +0100 -+++ libmrss-0.17/src/mrss.h 2007-04-01 19:46:41.000000000 +0200 -@@ -364,6 +364,9 @@ - mrss_element_t element; - int allocated; - -+ /** For internal use only: */ -+ void* c_locale; -+ - /* Data: */ - - char *file; -Index: libmrss-0.17/src/mrss_free.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_free.c 2007-02-02 12:47:46.000000000 +0100 -+++ libmrss-0.17/src/mrss_free.c 2007-04-01 19:46:41.000000000 +0200 -@@ -22,9 +22,14 @@ - # error Use configure; make; make install - #endif - -+#define _GNU_SOURCE -+ - #include "mrss.h" - #include "mrss_internal.h" - -+#include <locale.h> -+ -+ - static void __mrss_free_channel (mrss_t * mrss); - static void __mrss_free_category (mrss_category_t * category); - static void __mrss_free_hour (mrss_hour_t * hour); -@@ -202,6 +207,9 @@ - __mrss_free_item ((mrss_item_t *) old); - } - -+ if (mrss->c_locale) -+ freelocale (mrss->c_locale); -+ - if (mrss->allocated) - free (mrss); - } -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 19:46:41.000000000 +0200 -+++ libmrss-0.17/src/mrss_parser.c 2007-04-01 20:38:06.000000000 +0200 -@@ -22,9 +22,13 @@ - # error Use configure; make; make install - #endif - -+#define _GNU_SOURCE -+ - #include "mrss.h" - #include "mrss_internal.h" - -+#include <locale.h> -+ - static void - __mrss_parse_tag_insert (mrss_tag_t ** where, mrss_tag_t * what) - { -@@ -133,7 +137,7 @@ - } - - static char * --__mrss_atom_prepare_date (char *datestr) -+__mrss_atom_prepare_date (mrss_t *data, char *datestr) - { - char *ret = NULL; - if (datestr) -@@ -150,8 +154,13 @@ - stm.tm_year -= 1900; - char datebuf[256]; - free (datestr); -- strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", -- &stm); -+ -+ if (!data->c_locale) { -+ data->c_locale = newlocale(LC_ALL_MASK,"C",NULL); -+ } -+ -+ strftime_l (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", -+ &stm, data->c_locale); - ret = strdup (datebuf); - } - } -@@ -269,16 +278,16 @@ - else if (!strcmp (cur->value, "published") && !item->pubDate - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - else if (!strcmp(cur->value, "updated" ) && !item->pubDate - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* issued -> pubDate (Atom 0.3) */ - else if (!strcmp (cur->value, "issued") && !item->pubDate) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* id -> guid */ - else if (!strcmp (cur->value, "id") && !item->guid -@@ -701,7 +710,7 @@ - /* updated -> lastBuildDate */ - else if (!strcmp (cur->value, "updated")) - data->lastBuildDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* author -> managingeditor */ - else if (!strcmp (cur->value, "author")) diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.1.bb index 0d23a2b54f..6476ee58c6 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.1.bb @@ -8,10 +8,7 @@ PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ - file://atom-changes.patch;patch=1 \ - file://fix_atom_date_locale.patch;patch=1 \ - file://fix-memleaks.patch;patch=1 \ - file://bump-version.patch;patch=1 " + file://atom-right-date.patch;patch=1 " do_stage() { autotools_stage_all diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb index 9f5295bdb2..1695045290 100644 --- a/packages/libxml/libxml2_2.6.26.bb +++ b/packages/libxml/libxml2_2.6.26.bb @@ -2,7 +2,8 @@ DESCRIPTION = "GNOME XML Parser library" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" -PR = "r2" +DEPENDS = "libiconv" +PR = "r3" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" diff --git a/packages/linux/linux-linkstationarm/.mtn2git_empty b/packages/linux/linux-linkstationarm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-linkstationarm/.mtn2git_empty diff --git a/packages/linux/linux-linkstationarm/defconfig b/packages/linux/linux-linkstationarm/defconfig new file mode 100644 index 0000000000..0c11bab677 --- /dev/null +++ b/packages/linux/linux-linkstationarm/defconfig @@ -0,0 +1,1123 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.12.6 +# Tue Apr 3 15:51:24 2007 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_IOMAP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +# CONFIG_LOCALVERSION is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_HOTPLUG=y +CONFIG_KOBJECT_UEVENT=y +# CONFIG_IKCONFIG is not set +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# System Type +# +# 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_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +CONFIG_ARCH_MV88fxx81=y +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 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 is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set + +# +# BUFFALO Features +# +CONFIG_BUFFALO_PLATFORM=y +CONFIG_BUFFALO_LINKSTATION_LSGL=y +# CONFIG_BUFFALO_TERASTATION_TEST is not set +# CONFIG_BUFFALO_LSGL_SOFT_BOARDID is not set +CONFIG_USE_RS5C372=y +CONFIG_BUFFALO_USE_MICON=y + +# +# mv88fxx81 Options +# +# CONFIG_ARCH_MV88f1181 is not set +CONFIG_ARCH_MV88f5181=y +CONFIG_MV88F5182=y +# CONFIG_VOIP_RD2 is not set +# CONFIG_MV_88W8660 is not set +CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y +# CONFIG_USE_DSP is not set +CONFIG_MV_DMA_COPYUSER=y + +# +# egiga options +# +CONFIG_ETH_0_MACADDR="000000000051" +# CONFIG_EGIGA_PROC is not set +# CONFIG_EGIGA_MULTI_Q is not set +# CONFIG_QUARTER_DECK is not set + +# +# cesa options +# +CONFIG_MV_CESA=y +# CONFIG_MV_CESA_TEST is not set +CONFIG_SCSI_MVSATA=y +CONFIG_MV88fxx81_PROC=y +CONFIG_UBOOT_STRUCT=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_BIG_ENDIAN is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# +CONFIG_ISA_DMA_API=y +CONFIG_PCI=y +# CONFIG_PCI_LEGACY_PROC is not set +# CONFIG_PCI_NAMES is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_SMP is not set +# CONFIG_PREEMPT is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_REORDER is not set +# CONFIG_DISCONTIGMEM is not set +CONFIG_LEDS=y +CONFIG_LEDS_TIMER=y +# CONFIG_LEDS_CPU is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyAM0 root=/dev/nfs rw nfsroot=10.4.50.31:/home/rshitrit/cramfs-1.1/cramfs-1.1/shoko2 mem=32M ip=10.4.50.99:10.4.50.31:::ARM:eth0:none" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +CONFIG_FPE_FASTFPE=y +# CONFIG_VFP is not set +CONFIG_VFP_RUN_FAST_MODE=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y + +# +# 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 is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY 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_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_AMDSTD_RETRY=0 +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0xf0000000 +CONFIG_MTD_PHYSMAP_LEN=0x1000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_IMPA7 is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD 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 + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# 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_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=3 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +CONFIG_SCSI=y +CONFIG_SCSI_PROC_FS=y + +# +# 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=y + +# +# 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 + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +CONFIG_SCSI_QLA2XXX=y +# CONFIG_SCSI_QLA21XX is not set +# CONFIG_SCSI_QLA22XX is not set +# CONFIG_SCSI_QLA2300 is not set +# CONFIG_SCSI_QLA2322 is not set +# CONFIG_SCSI_QLA6312 is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG 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 +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Networking support +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP 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_TUNNEL is not set +CONFIG_IP_TCPDIAG=y +# CONFIG_IP_TCPDIAG_IPV6 is not set +# CONFIG_IPV6 is not set +# CONFIG_NETFILTER is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP 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_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +CONFIG_ATALK=m +# CONFIG_DEV_APPLETALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT 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 +# CONFIG_NET_CLS_ROUTE is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_SMC91X is not set + +# +# Tulip family network device support +# +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_NET_PCI is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +CONFIG_SK98LIN=y +CONFIG_SK98LIN_NAPI=y +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set +# CONFIG_MARVELL_HARDAP is not set +# CONFIG_MARVELL_SOFTAP is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +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 is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_DRM is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=m +# 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_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_ISA is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Hardware Sensors Chip support +# +# CONFIG_I2C_SENSOR is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_DS1621 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_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_SMSC47B397 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set + +# +# Other I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 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 + +# +# Misc devices +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +# CONFIG_FB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_BLUETOOTH_TTY is not set +# 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=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_DPCM=y +# CONFIG_USB_STORAGE_USBAT is not set +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_MON is not set + +# +# 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_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_TEST is not set + +# +# USB ATM/DSL drivers +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set + +# +# XFS support +# +CONFIG_XFS_FS=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_SECURITY is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVPTS_FS_XATTR is not set +CONFIG_TMPFS=y +# CONFIG_TMPFS_XATTR is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y + +# +# 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_JFFS_FS is not set +# CONFIG_JFFS2_FS 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=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 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 + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=y +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +CONFIG_DEBUG_USER=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_WP512=y +CONFIG_CRYPTO_TGR192=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_BLOWFISH=y +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_SERPENT=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CAST5=y +CONFIG_CRYPTO_CAST6=y +CONFIG_CRYPTO_TEA=y +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_KHAZAD=y +CONFIG_CRYPTO_ANUBIS=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y + diff --git a/packages/linux/linux-linkstationarm/makefile.patch b/packages/linux/linux-linkstationarm/makefile.patch new file mode 100644 index 0000000000..89d6d50594 --- /dev/null +++ b/packages/linux/linux-linkstationarm/makefile.patch @@ -0,0 +1,11 @@ +--- linux-2.6.12.old/Makefile 2005-08-28 23:41:01.000000000 +0000 ++++ linux-2.6.12/Makefile 2007-04-07 17:56:02.000000000 +0000 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 12 +-EXTRAVERSION = -arm1 ++EXTRAVERSION = .6-arm1 + NAME=Woozy Numbat + + # *DOCUMENTATION* diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb new file mode 100644 index 0000000000..77703ad999 --- /dev/null +++ b/packages/linux/linux-linkstationarm_2.6.12.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r2" + +COMPATIBLE_MACHINE = "lsarm" + +SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.bz2 \ + http://downloads.linkstationwiki.net/Users/timtimred/lsarm/2.6.12-compiler_fix.patch;patch=1 \ + file://makefile.patch;patch=1 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.12" + +inherit kernel + +export ARCH="arm" + +KERNEL_IMAGETYPE = "uImage" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + ARCH=${ARCH} oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + diff --git a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch deleted file mode 100644 index d785cb885f..0000000000 --- a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch +++ /dev/null @@ -1,532 +0,0 @@ -Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -=================================================================== ---- /dev/null -+++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -@@ -0,0 +1,351 @@ -+/* -+ * 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 -+ * -+ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> -+ * iPAQ H1940 touchscreen support -+ * -+ * ChangeLog -+ * -+ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> -+ * - added clock (de-)allocation code -+ * -+ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org> -+ * - h1940_ -> s3c2410 (this driver is now also used on the n30 -+ * machines :P) -+ * - Debug messages are now enabled with the config option -+ * TOUCHSCREEN_S3C2410_DEBUG -+ * - Changed the way the value are read -+ * - Input subsystem should now work -+ * - Use ioremap and readl/writel -+ * -+ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org> -+ * - Make use of some undocumented features of the touchscreen -+ * controller -+ * -+ */ -+ -+#include <linux/errno.h> -+#include <linux/kernel.h> -+#include <linux/module.h> -+#include <linux/slab.h> -+#include <linux/input.h> -+#include <linux/init.h> -+#include <linux/serio.h> -+#include <linux/delay.h> -+#include <linux/platform_device.h> -+#include <linux/clk.h> -+#include <asm/io.h> -+#include <asm/irq.h> -+ -+#include <asm/arch/regs-adc.h> -+#include <asm/arch/regs-gpio.h> -+#include <asm/arch/ts.h> -+ -+/* For ts.dev.id.version */ -+#define S3C2410TSVERSION 0x0101 -+ -+#define WAIT4INT(x) (((x)<<8) | \ -+ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_XY_PST(3)) -+ -+#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) -+ -+#define DEBUG_LVL KERN_DEBUG -+ -+MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>"); -+MODULE_DESCRIPTION("s3c2410 touchscreen driver"); -+MODULE_LICENSE("GPL"); -+ -+/* -+ * Definitions & global arrays. -+ */ -+ -+ -+static char *s3c2410ts_name = "s3c2410 TouchScreen"; -+ -+/* -+ * Per-touchscreen data. -+ */ -+ -+struct s3c2410ts { -+ struct input_dev *dev; -+ long xp; -+ long yp; -+ int count; -+ int shift; -+}; -+ -+static struct s3c2410ts ts; -+static void __iomem *base_addr; -+ -+static inline void s3c2410_ts_connect(void) -+{ -+ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); -+} -+ -+static void touch_timer_fire(unsigned long data) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ if (updown) { -+ if (ts.count != 0) { -+ ts.xp >>= ts.shift; -+ ts.yp >>= ts.shift; -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ { -+ struct timeval tv; -+ do_gettimeofday(&tv); -+ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); -+ } -+#endif -+ -+ input_report_abs(ts.dev, ABS_Y, ts.xp); -+ input_report_abs(ts.dev, ABS_X, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 1); -+ input_report_abs(ts.dev, ABS_PRESSURE, 1); -+ input_sync(ts.dev); -+ } -+ -+ ts.count = 0; -+ -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ ts.count = 0; -+ -+ input_report_abs(ts.dev, ABS_Y, ts.xp); -+ input_report_abs(ts.dev, ABS_X, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 0); -+ input_report_abs(ts.dev, ABS_PRESSURE, 0); -+ input_sync(ts.dev); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ } -+} -+ -+static struct timer_list touch_timer = -+ TIMER_INITIALIZER(touch_timer_fire, 0, 0); -+ -+static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ /* TODO we should never get an interrupt with updown set while -+ * the timer is running, but maybe we ought to verify that the -+ * timer isn't running anyways. */ -+ -+ if (updown) -+ touch_timer_fire(0); -+ -+ return IRQ_HANDLED; -+} -+ -+ -+static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; -+ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; -+ ts.count++; -+ -+ if (ts.count < (1<<ts.shift)) { -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ mod_timer(&touch_timer, jiffies+1); -+ writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC); -+ } -+ -+ return IRQ_HANDLED; -+} -+ -+static struct clk *adc_clock; -+ -+/* -+ * The functions for inserting/removing us as a module. -+ */ -+ -+static int __init s3c2410ts_probe(struct platform_device *pdev) -+{ -+ struct s3c2410_ts_mach_info *info; -+ struct input_dev *input_dev; -+ -+ info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data; -+ -+ if (!info) -+ { -+ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); -+ return -EINVAL; -+ } -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); -+#endif -+ -+ adc_clock = clk_get(NULL, "adc"); -+ if (!adc_clock) { -+ printk(KERN_ERR "failed to get adc clock source\n"); -+ return -ENOENT; -+ } -+ clk_enable(adc_clock); -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "got and enabled clock\n"); -+#endif -+ -+ base_addr=ioremap(S3C2410_PA_ADC,0x20); -+ if (base_addr == NULL) { -+ printk(KERN_ERR "Failed to remap register block\n"); -+ return -ENOMEM; -+ } -+ -+ -+ /* Configure GPIOs */ -+ s3c2410_ts_connect(); -+ -+ if ((info->presc&0xff) > 0) -+ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ -+ base_addr+S3C2410_ADCCON); -+ else -+ writel(0,base_addr+S3C2410_ADCCON); -+ -+ -+ /* Initialise registers */ -+ if ((info->delay&0xffff) > 0) -+ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ -+ /* Initialise input stuff */ -+ memset(&ts, 0, sizeof(struct s3c2410ts)); -+ input_dev = input_allocate_device(); -+ -+ if (!input_dev) { -+ printk(KERN_ERR "Unable to allocate the input device !!\n"); -+ return -ENOMEM; -+ } -+ -+ ts.dev = input_dev; -+ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); -+ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); -+ input_set_abs_params(ts.dev, ABS_X, 0x10, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_Y, 0x10, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); -+ -+ ts.dev->private = &ts; -+ ts.dev->name = s3c2410ts_name; -+ ts.dev->id.bustype = BUS_RS232; -+ ts.dev->id.vendor = 0xDEAD; -+ ts.dev->id.product = 0xBEEF; -+ ts.dev->id.version = S3C2410TSVERSION; -+ -+ ts.shift = info->oversampling_shift; -+ -+ /* Get irqs */ -+ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ -+ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); -+ -+ /* All went ok, so register to the input system */ -+ input_register_device(ts.dev); -+ -+ return 0; -+} -+ -+static int s3c2410ts_remove(struct platform_device *pdev) -+{ -+ disable_irq(IRQ_ADC); -+ disable_irq(IRQ_TC); -+ free_irq(IRQ_TC,ts.dev); -+ free_irq(IRQ_ADC,ts.dev); -+ -+ if (adc_clock) { -+ clk_disable(adc_clock); -+ clk_put(adc_clock); -+ adc_clock = NULL; -+ } -+ -+ input_unregister_device(ts.dev); -+ iounmap(base_addr); -+ -+ return 0; -+} -+ -+static struct platform_driver s3c2410ts_driver = { -+ .driver = { -+ .name = "s3c2410-ts", -+ .owner = THIS_MODULE, -+ }, -+ .probe = s3c2410ts_probe, -+ .remove = s3c2410ts_remove, -+}; -+ -+ -+static int __init s3c2410ts_init(void) -+{ -+ return platform_driver_register(&s3c2410ts_driver); -+} -+ -+static void __exit s3c2410ts_exit(void) -+{ -+ platform_driver_unregister(&s3c2410ts_driver); -+} -+ -+module_init(s3c2410ts_init); -+module_exit(s3c2410ts_exit); -+ -+/* -+ Local variables: -+ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." -+ c-basic-offset: 8 -+ End: -+*/ -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c -@@ -28,6 +28,7 @@ - #include <asm/irq.h> - - #include <asm/arch/regs-serial.h> -+#include <asm/arch/ts.h> - - #include "devs.h" - #include "cpu.h" -@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = - - EXPORT_SYMBOL(s3c_device_nand); - -+/* Touchscreen */ -+struct platform_device s3c_device_ts = { -+ .name = "s3c2410-ts", -+ .id = -1, -+}; -+ -+EXPORT_SYMBOL(s3c_device_ts); -+ -+static struct s3c2410_ts_mach_info s3c2410ts_info; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) -+{ -+ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); -+ s3c_device_ts.dev.platform_data = &s3c2410ts_info; -+} -+EXPORT_SYMBOL(set_s3c2410ts_info); -+ - /* USB Device (Gadget)*/ - - static struct resource s3c_usbgadget_resource[] = { -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h -@@ -41,6 +41,8 @@ extern struct platform_device s3c_device - extern struct platform_device s3c_device_timer3; - - extern struct platform_device s3c_device_usbgadget; -+extern struct platform_device s3c_device_ts; -+ - - /* s3c2440 specific devices */ - -Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -@@ -38,6 +38,7 @@ - - #include <asm/arch/idle.h> - #include <asm/arch/fb.h> -+#include <asm/arch/ts.h> - - #include "s3c2410.h" - #include "s3c2440.h" -@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ - &s3c_device_wdt, - &s3c_device_i2c, - &s3c_device_iis, -+ &s3c_device_ts, - }; - - static struct s3c24xx_board smdk2440_board __initdata = { -@@ -184,6 +186,13 @@ static struct s3c24xx_board smdk2440_boa - .devices_count = ARRAY_SIZE(smdk2440_devices) - }; - -+static struct s3c2410_ts_mach_info smdk2440_ts_cfg __initdata = { -+ .delay = 10000, -+ .presc = 49, -+ .oversampling_shift = 2, -+}; -+ -+ - static void __init smdk2440_map_io(void) - { - s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); -@@ -195,6 +204,7 @@ static void __init smdk2440_map_io(void) - static void __init smdk2440_machine_init(void) - { - s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); -+ set_s3c2410ts_info(&smdk2440_ts_cfg); - - smdk_machine_init(); - } -Index: linux-2.6.19/drivers/input/touchscreen/Kconfig -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig -+++ linux-2.6.19/drivers/input/touchscreen/Kconfig -@@ -49,6 +49,25 @@ config TOUCHSCREEN_CORGI - To compile this driver as a module, choose M here: the - module will be called corgi_ts. - -+config TOUCHSCREEN_S3C2410 -+ tristate "Samsung S3C2410 touchscreen input driver" -+ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN -+ select SERIO -+ help -+ Say Y here if you have the s3c2410 touchscreen. -+ -+ If unsure, say N. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called s3c2410_ts. -+ -+config TOUCHSCREEN_S3C2410_DEBUG -+ boolean "Samsung S3C2410 touchscreen debug messages" -+ depends on TOUCHSCREEN_S3C2410 -+ help -+ Select this if you want debug messages -+ -+ - config TOUCHSCREEN_GUNZE - tristate "Gunze AHL-51S touchscreen" - select SERIO -Index: linux-2.6.19/drivers/input/touchscreen/Makefile -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Makefile -+++ linux-2.6.19/drivers/input/touchscreen/Makefile -@@ -15,3 +15,4 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 - obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o -+obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -=================================================================== ---- /dev/null -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -@@ -0,0 +1,28 @@ -+/* linux/include/asm/arch-s3c2410/ts.h -+ * -+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ * -+ * Changelog: -+ * 24-Mar-2005 RTP Created file -+ * 03-Aug-2005 RTP Renamed to ts.h -+ */ -+ -+#ifndef __ASM_ARM_TS_H -+#define __ASM_ARM_TS_H -+ -+struct s3c2410_ts_mach_info { -+ int delay; -+ int presc; -+ int oversampling_shift; -+}; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); -+ -+#endif /* __ASM_ARM_TS_H */ -+ -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -=================================================================== ---- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -@@ -41,7 +41,7 @@ - #define S3C2410_ADCTSC_XP_SEN (1<<4) - #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) - #define S3C2410_ADCTSC_AUTO_PST (1<<2) --#define S3C2410_ADCTSC_XY_PST (0x3<<0) -+#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) - - /* ADCDAT0 Bits */ - #define S3C2410_ADCDAT0_UPDOWN (1<<15) diff --git a/packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty b/packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty diff --git a/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch b/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch new file mode 100644 index 0000000000..bf8a0081dd --- /dev/null +++ b/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch @@ -0,0 +1,92 @@ +From 44c48cf15a3072185ce3541a127a89bfbb2b346f Mon Sep 17 00:00:00 2001 +From: Graeme Gregory <gg@gg-desktop.wolfsonmicro.main> +Date: Fri, 6 Apr 2007 15:47:13 +0100 +Subject: [PATCH] Enable cs8900A network device for smdk2440 board. + +Signed-off-by: Graeme Gregory <gg@opensource.wolfsonmicro.com> +--- + arch/arm/mach-s3c2440/mach-smdk2440.c | 7 ++++++- + drivers/net/cs89x0.c | 20 ++++++++++++++++++-- + 2 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c +index c17eb5b..fb36665 100644 +--- a/arch/arm/mach-s3c2440/mach-smdk2440.c ++++ b/arch/arm/mach-s3c2440/mach-smdk2440.c +@@ -69,7 +69,12 @@ static struct map_desc smdk2440_iodesc[] __initdata = { + .pfn = __phys_to_pfn(S3C2410_CS2 + (1<<24)), + .length = SZ_4M, + .type = MT_DEVICE, +- } ++ }, { ++ .virtual = (u32)S3C2410_ADDR(0x04000000) , ++ .pfn = __phys_to_pfn(S3C2410_CS3 + (1<<24)), ++ .length = SZ_16M, ++ .type = MT_DEVICE, ++ } + }; + + #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK +diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c +index 4612f71..534653e 100644 +--- a/drivers/net/cs89x0.c ++++ b/drivers/net/cs89x0.c +@@ -187,6 +187,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; + #include <asm/irq.h> + static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; + static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; ++#elif defined(CONFIG_ARCH_S3C2440) ++static unsigned int netcard_portlist[] __initdata = {S3C2410_ADDR(0x04000000) + 0x300 , 0}; ++static unsigned int cs8900_irq_map[] = {IRQ_EINT9, 0, 0, 0}; ++static unsigned char cs8900_mac[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02}; + #elif defined(CONFIG_ARCH_PNX010X) + #include <asm/irq.h> + #include <asm/arch/gpio.h> +@@ -719,6 +723,14 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) + + printk( "[Cirrus EEPROM] "); + } ++#if defined(CONFIG_ARCH_S3C2440) ++ else ++ { ++ for (i=0; i < ETH_ALEN; i++) { ++ dev->dev_addr[i] = cs8900_mac[i]; ++ } ++ } ++#endif + + printk("\n"); + +@@ -802,7 +814,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) + } else { + i = lp->isa_config & INT_NO_MASK; + if (lp->chip_type == CS8900) { +-#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) ++#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) || defined(CONFIG_ARCH_S3C2410) + i = cs8900_irq_map[0]; + #else + /* Translate the IRQ using the IRQ mapping table. */ +@@ -1309,7 +1321,7 @@ net_open(struct net_device *dev) + else + #endif + { +-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) ++#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_ARCH_S3C2410) + if (((1 << dev->irq) & lp->irq_map) == 0) { + printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", + dev->name, dev->irq, lp->irq_map); +@@ -1324,7 +1336,11 @@ net_open(struct net_device *dev) + writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); + #endif + write_irq(dev, lp->chip_type, dev->irq); ++#if !defined(CONFIG_ARCH_S3C2440) + ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev); ++#else ++ ret = request_irq(dev->irq, &net_interrupt, IRQF_DISABLED | IRQF_TRIGGER_HIGH, dev->name, dev); ++#endif + if (ret) { + if (net_debug) + printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); +-- +1.5.1 + diff --git a/packages/linux/linux-smdk2440/defconfig-smdk2440 b/packages/linux/linux-smdk2440/defconfig-smdk2440 index 5bdf67e850..8805af7413 100644 --- a/packages/linux/linux-smdk2440/defconfig-smdk2440 +++ b/packages/linux/linux-smdk2440/defconfig-smdk2440 @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc2 -# Thu Jan 4 13:31:25 2007 +# Linux kernel version: 2.6.21-rc6 +# Fri Apr 6 15:53:13 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_NO_IOPORT=y CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # 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" @@ -33,6 +37,7 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -41,6 +46,7 @@ CONFIG_SYSVIPC=y # 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 @@ -120,6 +126,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # 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 @@ -128,55 +135,73 @@ CONFIG_ARCH_S3C2410=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set +CONFIG_PLAT_S3C24XX=y +CONFIG_CPU_S3C244X=y +CONFIG_PM_SIMTEC=y +# CONFIG_S3C2410_BOOT_WATCHDOG is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +CONFIG_S3C2410_DMA=y +CONFIG_S3C2410_DMA_DEBUG=y +CONFIG_MACH_SMDK=y # -# S3C24XX Implementations +# S3C2400 Machines # -# CONFIG_MACH_AML_M5900 is not set -CONFIG_MACH_ANUBIS=y -CONFIG_MACH_OSIRIS=y -CONFIG_ARCH_BAST=y -CONFIG_BAST_PC104_IRQ=y -CONFIG_PM_H1940=y +CONFIG_CPU_S3C2410=y +CONFIG_CPU_S3C2410_DMA=y +CONFIG_S3C2410_PM=y +CONFIG_S3C2410_GPIO=y +CONFIG_S3C2410_CLOCK=y + +# +# S3C2410 Machines +# +CONFIG_ARCH_SMDK2410=y CONFIG_ARCH_H1940=y +CONFIG_PM_H1940=y CONFIG_MACH_N30=y -CONFIG_MACH_SMDK=y -CONFIG_ARCH_SMDK2410=y -CONFIG_ARCH_S3C2440=y -CONFIG_SMDK2440_CPU2440=y -CONFIG_SMDK2440_CPU2442=y -CONFIG_MACH_S3C2413=y -CONFIG_MACH_SMDK2413=y -CONFIG_MACH_VR1000=y -CONFIG_MACH_RX3715=y +CONFIG_ARCH_BAST=y CONFIG_MACH_OTOM=y -CONFIG_MACH_NEXCODER_2440=y -# CONFIG_MACH_VSTMS is not set -CONFIG_S3C2410_CLOCK=y -CONFIG_S3C2410_PM=y -CONFIG_CPU_S3C2410_DMA=y -CONFIG_CPU_S3C2410=y -CONFIG_S3C2412_PM=y +# CONFIG_MACH_AML_M5900 is not set +CONFIG_BAST_PC104_IRQ=y +CONFIG_MACH_VR1000=y +# CONFIG_MACH_QT2410 is not set CONFIG_CPU_S3C2412=y -CONFIG_CPU_S3C244X=y +CONFIG_S3C2412_DMA=y +CONFIG_S3C2412_PM=y + +# +# S3C2412 Machines +# +CONFIG_MACH_SMDK2413=y +CONFIG_MACH_S3C2413=y +# CONFIG_MACH_VSTMS is not set CONFIG_CPU_S3C2440=y +CONFIG_S3C2440_DMA=y + +# +# S3C2440 Machines +# +CONFIG_MACH_ANUBIS=y +CONFIG_MACH_OSIRIS=y +CONFIG_MACH_RX3715=y +CONFIG_ARCH_S3C2440=y +CONFIG_MACH_NEXCODER_2440=y +CONFIG_SMDK2440_CPU2440=y CONFIG_CPU_S3C2442=y # -# S3C2410 Boot +# S3C2442 Machines # -# CONFIG_S3C2410_BOOT_WATCHDOG is not set -# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +CONFIG_SMDK2440_CPU2442=y # -# S3C2410 Setup +# S3C2443 Machines # -CONFIG_S3C2410_DMA=y -CONFIG_S3C2410_DMA_DEBUG=y -# CONFIG_S3C2410_PM_DEBUG is not set -# CONFIG_S3C2410_PM_CHECK is not set -CONFIG_PM_SIMTEC=y -CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +# CONFIG_MACH_SMDK2443 is not set # # Processor Type @@ -203,6 +228,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set # # Bus support @@ -232,6 +258,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_ALIGNMENT_TRAP=y # @@ -241,6 +268,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="root=/dev/nfs ip=auto rw init=/bin/bash console=ttySAC0" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -268,7 +296,7 @@ CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=y +# CONFIG_APM_EMULATION is not set # # Networking @@ -284,6 +312,7 @@ 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 is not set @@ -368,6 +397,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # @@ -393,6 +423,7 @@ CONFIG_MTD_CMDLINE_PARTS=y # 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 @@ -486,6 +517,7 @@ CONFIG_PARPORT_1284=y # Plug and Play support # # CONFIG_PNP is not set +# CONFIG_PNPACPI is not set # # Block devices @@ -499,7 +531,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m @@ -528,7 +559,6 @@ CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_IDE_BAST=y # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # @@ -665,6 +695,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set @@ -675,8 +706,6 @@ CONFIG_MOUSE_PS2=y # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set -CONFIG_TOUCHSCREEN_S3C2410=y -# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -844,12 +873,13 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG=y # CONFIG_SPI_BUTTERFLY is not set -CONFIG_SPI_S3C24XX_GPIO=y # CONFIG_SPI_S3C24XX is not set +CONFIG_SPI_S3C24XX_GPIO=y # # SPI Protocol Masters # +# CONFIG_SPI_AT25 is not set # # Dallas's 1-wire bus @@ -865,6 +895,7 @@ CONFIG_HWMON_VID=m # 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 @@ -906,7 +937,11 @@ CONFIG_SENSORS_LM85=m # # Misc devices # -# CONFIG_TIFM_CORE is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set # # LED devices @@ -935,8 +970,26 @@ CONFIG_SENSORS_LM85=m # # Graphics support # +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_FB=y CONFIG_FIRMWARE_EDID=y -# CONFIG_FB is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set # # Console display driver support @@ -944,7 +997,19 @@ CONFIG_FIRMWARE_EDID=y # CONFIG_VGA_CONSOLE is not set # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +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=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y # # Sound @@ -978,6 +1043,7 @@ CONFIG_SND_DEBUG_DETECT=y # CONFIG_SND_MTS64 is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set +# CONFIG_SND_PORTMAN2X4 is not set # # ALSA ARM devices @@ -989,16 +1055,12 @@ CONFIG_SND_DEBUG_DETECT=y # CONFIG_SND_USB_AUDIO is not set # -# SoC audio support +# System on Chip audio support # CONFIG_SND_SOC=m # -# Soc Platforms -# - -# -# SoC Audio for the Intel PXA2xx +# SoC Platforms # # @@ -1006,7 +1068,7 @@ CONFIG_SND_SOC=m # # -# SoC Audio for the Freescale i.MX +# SoC Audio for the Intel PXA2xx # # @@ -1015,26 +1077,12 @@ CONFIG_SND_SOC=m CONFIG_SND_S3C24XX_SOC=m CONFIG_SND_S3C24XX_SOC_I2S=m CONFIG_SND_S3C24XX_SOC_SMDK2440=m +# CONFIG_SND_S3C24XX_SOC_SMDK2440_WM8956 is not set # -# Soc Codecs -# -# CONFIG_SND_SOC_AC97_CODEC is not set -CONFIG_SND_SOC_WM8711=m -CONFIG_SND_SOC_WM8510=m -CONFIG_SND_SOC_WM8731=m -CONFIG_SND_SOC_WM8750=m -CONFIG_SND_SOC_WM8753=m -CONFIG_SND_SOC_WM8772=m -CONFIG_SND_SOC_WM8971=m -# CONFIG_SND_SOC_WM8956 is not set -# CONFIG_SND_SOC_WM8976 is not set -CONFIG_SND_SOC_WM8974=m -CONFIG_SND_SOC_WM8980=m -# CONFIG_SND_SOC_WM9713 is not set -# CONFIG_SND_SOC_WM9712 is not set +# SoC Audio for the Freescale i.MX +# CONFIG_SND_SOC_UDA1380=m -CONFIG_SND_SOC_AK4535=m # # Open Sound System @@ -1045,6 +1093,7 @@ CONFIG_SND_SOC_AK4535=m # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -1059,10 +1108,8 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set -# CONFIG_USB_MULTITHREAD_PROBE is not set # CONFIG_USB_OTG is not set # @@ -1070,7 +1117,8 @@ CONFIG_USB_DEVICEFS=y # # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set @@ -1093,7 +1141,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HID_POWERBOOK is not set +# 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 @@ -1108,6 +1156,7 @@ CONFIG_USB_HID=y # 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 @@ -1145,6 +1194,7 @@ CONFIG_USB_MON=y # 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 @@ -1154,6 +1204,7 @@ CONFIG_USB_MON=y # 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 is not set # @@ -1368,15 +1419,16 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set CONFIG_LOG_BUF_SHIFT=16 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=y -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1387,6 +1439,7 @@ CONFIG_DEBUG_INFO=y 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 is not set CONFIG_DEBUG_LL=y @@ -1416,4 +1469,4 @@ CONFIG_CRC32=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y diff --git a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch deleted file mode 100644 index d03fd94017..0000000000 --- a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch +++ /dev/null @@ -1,529 +0,0 @@ -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c -@@ -26,6 +26,7 @@ - #include <asm/hardware.h> - #include <asm/io.h> - #include <asm/irq.h> -+#include <asm/arch/ts.h> - - #include <asm/arch/regs-serial.h> - -@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = - - EXPORT_SYMBOL(s3c_device_nand); - -+/* Touchscreen */ -+struct platform_device s3c_device_ts = { -+ .name = "s3c2410-ts", -+ .id = -1, -+}; -+ -+EXPORT_SYMBOL(s3c_device_ts); -+ -+static struct s3c2410_ts_mach_info s3c2410ts_info; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) -+{ -+ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); -+ s3c_device_ts.dev.platform_data = &s3c2410ts_info; -+} -+EXPORT_SYMBOL(set_s3c2410ts_info); -+ - /* USB Device (Gadget)*/ - - static struct resource s3c_usbgadget_resource[] = { -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h -@@ -41,6 +41,7 @@ extern struct platform_device s3c_device - extern struct platform_device s3c_device_timer3; - - extern struct platform_device s3c_device_usbgadget; -+extern struct platform_device s3c_device_ts; - - /* s3c2440 specific devices */ - -Index: linux-2.6.19/drivers/input/touchscreen/Kconfig -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig -+++ linux-2.6.19/drivers/input/touchscreen/Kconfig -@@ -49,6 +49,24 @@ config TOUCHSCREEN_CORGI - To compile this driver as a module, choose M here: the - module will be called corgi_ts. - -+config TOUCHSCREEN_S3C2410 -+ tristate "Samsung S3C2410 touchscreen input driver" -+ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN -+ select SERIO -+ help -+ Say Y here if you have the s3c2410 touchscreen. -+ -+ If unsure, say N. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called s3c2410_ts. -+ -+config TOUCHSCREEN_S3C2410_DEBUG -+ boolean "Samsung S3C2410 touchscreen debug messages" -+ depends on TOUCHSCREEN_S3C2410 -+ help -+ Select this if you want debug messages -+ - config TOUCHSCREEN_GUNZE - tristate "Gunze AHL-51S touchscreen" - select SERIO -Index: linux-2.6.19/drivers/input/touchscreen/Makefile -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Makefile -+++ linux-2.6.19/drivers/input/touchscreen/Makefile -@@ -15,3 +15,5 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 - obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o -+obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o -+ -Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -=================================================================== ---- /dev/null -+++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -@@ -0,0 +1,350 @@ -+/* -+ * 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 -+ * -+ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> -+ * iPAQ H1940 touchscreen support -+ * -+ * ChangeLog -+ * -+ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> -+ * - added clock (de-)allocation code -+ * -+ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org> -+ * - h1940_ -> s3c2410 (this driver is now also used on the n30 -+ * machines :P) -+ * - Debug messages are now enabled with the config option -+ * TOUCHSCREEN_S3C2410_DEBUG -+ * - Changed the way the value are read -+ * - Input subsystem should now work -+ * - Use ioremap and readl/writel -+ * -+ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org> -+ * - Make use of some undocumented features of the touchscreen -+ * controller -+ * -+ */ -+ -+#include <linux/errno.h> -+#include <linux/kernel.h> -+#include <linux/module.h> -+#include <linux/slab.h> -+#include <linux/input.h> -+#include <linux/init.h> -+#include <linux/serio.h> -+#include <linux/delay.h> -+#include <linux/platform_device.h> -+#include <linux/clk.h> -+#include <asm/io.h> -+#include <asm/irq.h> -+ -+#include <asm/arch/regs-adc.h> -+#include <asm/arch/regs-gpio.h> -+#include <asm/arch/ts.h> -+ -+/* For ts.dev.id.version */ -+#define S3C2410TSVERSION 0x0101 -+ -+#define WAIT4INT(x) (((x)<<8) | \ -+ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_XY_PST(3)) -+ -+#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) -+ -+#define DEBUG_LVL KERN_DEBUG -+ -+MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>"); -+MODULE_DESCRIPTION("s3c2410 touchscreen driver"); -+MODULE_LICENSE("GPL"); -+ -+/* -+ * Definitions & global arrays. -+ */ -+ -+ -+static char *s3c2410ts_name = "s3c2410 TouchScreen"; -+ -+/* -+ * Per-touchscreen data. -+ */ -+ -+struct s3c2410ts { -+ struct input_dev *dev; -+ long xp; -+ long yp; -+ int count; -+ int shift; -+}; -+ -+static struct s3c2410ts ts; -+static void __iomem *base_addr; -+ -+static inline void s3c2410_ts_connect(void) -+{ -+ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); -+} -+ -+static void touch_timer_fire(unsigned long data) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ if (updown) { -+ if (ts.count != 0) { -+ ts.xp >>= ts.shift; -+ ts.yp >>= ts.shift; -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ { -+ struct timeval tv; -+ do_gettimeofday(&tv); -+ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); -+ } -+#endif -+ -+ input_report_abs(ts.dev, ABS_X, ts.xp); -+ input_report_abs(ts.dev, ABS_Y, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 1); -+ input_report_abs(ts.dev, ABS_PRESSURE, 1); -+ input_sync(ts.dev); -+ } -+ -+ ts.xp = 0; -+ ts.yp = 0; -+ ts.count = 0; -+ -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ ts.count = 0; -+ -+ input_report_key(ts.dev, BTN_TOUCH, 0); -+ input_report_abs(ts.dev, ABS_PRESSURE, 0); -+ input_sync(ts.dev); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ } -+} -+ -+static struct timer_list touch_timer = -+ TIMER_INITIALIZER(touch_timer_fire, 0, 0); -+ -+static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ /* TODO we should never get an interrupt with updown set while -+ * the timer is running, but maybe we ought to verify that the -+ * timer isn't running anyways. */ -+ -+ if (updown) -+ touch_timer_fire(0); -+ -+ return IRQ_HANDLED; -+} -+ -+ -+static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; -+ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; -+ ts.count++; -+ -+ if (ts.count < (1<<ts.shift)) { -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ mod_timer(&touch_timer, jiffies+1); -+ writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC); -+ } -+ -+ return IRQ_HANDLED; -+} -+ -+static struct clk *adc_clock; -+ -+/* -+ * The functions for inserting/removing us as a module. -+ */ -+ -+static int __init s3c2410ts_probe(struct platform_device *pdev) -+{ -+ struct s3c2410_ts_mach_info *info; -+ struct input_dev *input_dev; -+ -+ info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data; -+ -+ if (!info) -+ { -+ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); -+ return -EINVAL; -+ } -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); -+#endif -+ -+ adc_clock = clk_get(NULL, "adc"); -+ if (!adc_clock) { -+ printk(KERN_ERR "failed to get adc clock source\n"); -+ return -ENOENT; -+ } -+ clk_enable(adc_clock); -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "got and enabled clock\n"); -+#endif -+ -+ base_addr=ioremap(S3C2410_PA_ADC,0x20); -+ if (base_addr == NULL) { -+ printk(KERN_ERR "Failed to remap register block\n"); -+ return -ENOMEM; -+ } -+ -+ -+ /* Configure GPIOs */ -+ s3c2410_ts_connect(); -+ -+ if ((info->presc&0xff) > 0) -+ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ -+ base_addr+S3C2410_ADCCON); -+ else -+ writel(0,base_addr+S3C2410_ADCCON); -+ -+ -+ /* Initialise registers */ -+ if ((info->delay&0xffff) > 0) -+ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ -+ /* Initialise input stuff */ -+ memset(&ts, 0, sizeof(struct s3c2410ts)); -+ input_dev = input_allocate_device(); -+ -+ if (!input_dev) { -+ printk(KERN_ERR "Unable to allocate the input device !!\n"); -+ return -ENOMEM; -+ } -+ -+ ts.dev = input_dev; -+ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); -+ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); -+ input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); -+ -+ ts.dev->private = &ts; -+ ts.dev->name = s3c2410ts_name; -+ ts.dev->id.bustype = BUS_RS232; -+ ts.dev->id.vendor = 0xDEAD; -+ ts.dev->id.product = 0xBEEF; -+ ts.dev->id.version = S3C2410TSVERSION; -+ -+ ts.shift = info->oversampling_shift; -+ -+ /* Get irqs */ -+ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ -+ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); -+ -+ /* All went ok, so register to the input system */ -+ input_register_device(ts.dev); -+ -+ return 0; -+} -+ -+static int s3c2410ts_remove(struct platform_device *pdev) -+{ -+ disable_irq(IRQ_ADC); -+ disable_irq(IRQ_TC); -+ free_irq(IRQ_TC,ts.dev); -+ free_irq(IRQ_ADC,ts.dev); -+ -+ if (adc_clock) { -+ clk_disable(adc_clock); -+ clk_put(adc_clock); -+ adc_clock = NULL; -+ } -+ -+ input_unregister_device(ts.dev); -+ iounmap(base_addr); -+ -+ return 0; -+} -+ -+static struct platform_driver s3c2410ts_driver = { -+ .driver = { -+ .name = "s3c2410-ts", -+ .owner = THIS_MODULE, -+ }, -+ .probe = s3c2410ts_probe, -+ .remove = s3c2410ts_remove, -+}; -+ -+ -+static int __init s3c2410ts_init(void) -+{ -+ return platform_driver_register(&s3c2410ts_driver); -+} -+ -+static void __exit s3c2410ts_exit(void) -+{ -+ platform_driver_unregister(&s3c2410ts_driver); -+} -+ -+module_init(s3c2410ts_init); -+module_exit(s3c2410ts_exit); -+ -+/* -+ Local variables: -+ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." -+ c-basic-offset: 8 -+ End: -+*/ -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -=================================================================== ---- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -@@ -41,7 +41,7 @@ - #define S3C2410_ADCTSC_XP_SEN (1<<4) - #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) - #define S3C2410_ADCTSC_AUTO_PST (1<<2) --#define S3C2410_ADCTSC_XY_PST (0x3<<0) -+#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) - - /* ADCDAT0 Bits */ - #define S3C2410_ADCDAT0_UPDOWN (1<<15) -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -=================================================================== ---- /dev/null -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -@@ -0,0 +1,28 @@ -+/* linux/include/asm/arch-s3c2410/ts.h -+ * -+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ * -+ * Changelog: -+ * 24-Mar-2005 RTP Created file -+ * 03-Aug-2005 RTP Renamed to ts.h -+ */ -+ -+#ifndef __ASM_ARM_TS_H -+#define __ASM_ARM_TS_H -+ -+struct s3c2410_ts_mach_info { -+ int delay; -+ int presc; -+ int oversampling_shift; -+}; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); -+ -+#endif /* __ASM_ARM_TS_H */ -+ -Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -@@ -35,6 +35,7 @@ - #include <asm/arch/regs-serial.h> - #include <asm/arch/regs-gpio.h> - #include <asm/arch/regs-lcd.h> -+#include <asm/arch/ts.h> - - #include <asm/arch/idle.h> - #include <asm/arch/fb.h> -@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ - &s3c_device_wdt, - &s3c_device_i2c, - &s3c_device_iis, -+ &s3c_device_ts, - }; - - static struct s3c24xx_board smdk2440_board __initdata = { -@@ -184,6 +186,12 @@ static struct s3c24xx_board smdk2440_boa - .devices_count = ARRAY_SIZE(smdk2440_devices) - }; - -+static struct s3c2410_ts_mach_info qt2410_ts_cfg = { -+ .delay = 10000, -+ .presc = 49, -+ .oversampling_shift = 2, -+}; -+ - static void __init smdk2440_map_io(void) - { - s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); -@@ -195,6 +203,7 @@ static void __init smdk2440_map_io(void) - static void __init smdk2440_machine_init(void) - { - s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); -+ set_s3c2410ts_info(&qt2410_ts_cfg); - - smdk_machine_init(); - } diff --git a/packages/linux/linux-smdk2440_2.6.19.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb index 6b839bddf8..ea9cbfb91a 100644 --- a/packages/linux/linux-smdk2440_2.6.19.bb +++ b/packages/linux/linux-smdk2440_2.6.20+git.bb @@ -5,13 +5,11 @@ PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${GGSRC}smdk2440-cs89x0-r1.patch;patch=1 \ - file://smdk2440-touchscreen-r3.patch;patch=1 \ - http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.6.patch;patch=1 \ +SRC_URI = "git://opensource.wolfsonmicro.com/linux-2.6-asoc-ggdev;protocol=git;tag=asoc-merge-0002 \ + file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch;patch=1 \ file://defconfig-smdk2440" -S = "${WORKDIR}/linux-${PV}" +S = "${WORKDIR}/git" inherit kernel @@ -30,10 +28,11 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } do_deploy[dirs] = "${S}" addtask deploy before do_package after do_install +KERNEL_RELEASE = "2.6.21" diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 98fb6053c0..1e96e76d5a 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PACKAGES = "" -PR = "r4" +PR = "r5" inherit rootfs_ipk sdk meta @@ -16,10 +16,7 @@ FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ task-sdk-base \ task-sdk-sbox \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" + " DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index e49858398f..86bb212214 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for SDK including GPE and Opie" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r11" +PR = "r12" inherit sdk meta @@ -19,10 +19,7 @@ HOST_INSTALL = "\ TARGET_INSTALL = "\ task-sdk-base \ - task-sdk-opie \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe" + " RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" @@ -73,22 +70,22 @@ EOF 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}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la + rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig + cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f" done for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f" + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" done mkdir -p ${SDK_DEPLOY} diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 917df6876c..6f6d3140c5 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r32" +PR = "r33" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -27,6 +27,7 @@ SLUGOS_PACKAGES = "\ audiofile \ aumix \ autoconf \ + autofs \ automake \ bash \ beep \ @@ -124,6 +125,7 @@ SLUGOS_PACKAGES = "\ ncftp \ ncurses \ netcat \ + nfs-utils \ nmap \ ntfs-3g \ ntp \ diff --git a/packages/miconapl/.mtn2git_empty b/packages/miconapl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/miconapl/.mtn2git_empty diff --git a/packages/miconapl/miconapl_0.0.1.bb b/packages/miconapl/miconapl_0.0.1.bb new file mode 100644 index 0000000000..c5e27ee004 --- /dev/null +++ b/packages/miconapl/miconapl_0.0.1.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "miconapl daemon for ARM Linkstations" +SECTION = "console/network" +DEPENDS = "" +PR = "r2" +LICENSE = "GPL" +COMPATIBLE_MACHINE = "lsarm" + +SRC_URI = "http://downloads.linkstationwiki.net/Users/timtimred/lsarm/miconapl.tar.gz" + +inherit autotools gettext update-rc.d + +S = ${WORKDIR}/miconapl + +FILES_${PN} += "/usr/lib/libbuffalo_bin.so" + +INITSCRIPT_NAME = "miconapl" +INITSCRIPT_PARAMS = "defaults 95" + +do_configure() { +} + +do_compile() { +} + +do_install() { + mkdir -p ${D}/usr/lib + install -D -m 0755 ${S}/usr/lib/libbuffalo_bin.so ${D}/usr/lib/ + install -D -m 0755 ${S}/usr/local/sbin/miconapl ${D}${sbindir}/miconapl + install -D -m 0755 ${S}/etc/init.d/miconapl ${D}${sysconfdir}/init.d/miconapl + install -D -m 0755 ${S}/etc/init.d/logtag ${D}${sysconfdir}/init.d/logtag +} diff --git a/packages/micro-evtd/.mtn2git_empty b/packages/micro-evtd/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/micro-evtd/.mtn2git_empty diff --git a/packages/micro-evtd/micro-evtd_0.0.1.bb b/packages/micro-evtd/micro-evtd_0.0.1.bb new file mode 100644 index 0000000000..c66975c6ae --- /dev/null +++ b/packages/micro-evtd/micro-evtd_0.0.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "micro_evtd daemon for ARM Linkstations" +SECTION = "console/network" +PR = "r2" +LICENSE = "GPL" +COMPATIBLE_MACHINE = "(lsarm)" + +SRC_URI = "http://downloads.linkstationwiki.net/Users/timtimred/lsarm/micro_evtd.tar.gz" + +inherit autotools gettext update-rc.d + +S = ${WORKDIR}/micro_evtd + +INITSCRIPT_NAME = "microevtd" +INITSCRIPT_PARAMS = "defaults 92" + +do_configure() { +} + +do_install() { + install -D -m 0755 ${S}/micro_evtd ${D}${sbindir}/micro_evtd + install -D -m 0755 ${S}/init ${D}${sysconfdir}/init.d/microevtd +} diff --git a/packages/mplayer/files/mplayer-imageon-svn.patch b/packages/mplayer/files/mplayer-imageon-svn.patch new file mode 100644 index 0000000000..c8bb8709cd --- /dev/null +++ b/packages/mplayer/files/mplayer-imageon-svn.patch @@ -0,0 +1,366 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: trunk/configure +=================================================================== +--- trunk.orig/configure ++++ trunk/configure +@@ -519,6 +519,7 @@ _svga=auto + _vesa=auto + _fbdev=auto + _w100=no ++_imageon=no + _dvb=auto + _dvbhead=auto + _dxr2=auto +@@ -820,6 +821,8 @@ for ac_option do + --disable-fbdev) _fbdev=no ;; + --enable-w100) _w100=yes ;; + --disable-w100) _w100=no ;; ++ --enable-imageon) _imageon=yes ;; ++ --disable-imageon) _imageon=no ;; + --enable-dvb) _dvb=yes ;; + --disable-dvb) _dvb=no ;; + --enable-dvbhead) _dvbhead=yes ;; +@@ -4329,6 +4332,18 @@ else + fi + echores "$_w100" + ++echocheck "ATI Imageon 100 (imageon)" ++if test "$_imageon" = yes ; then ++ _def_imageon='#define HAVE_IMAGEON 1' ++ _ld_imageon='-lw100' ++ _vosrc="$_vosrc vo_imageon.c" ++ _vomodules="imageon $_vomodules" ++else ++ _def_imageon='#undef HAVE_IMAGEON' ++ _novomodules="imageon $_novomodules" ++fi ++echores "$_imageon" ++ + + echocheck "DVB" + if test "$_dvb" = auto ; then +@@ -8355,6 +8370,7 @@ $_def_xmga + $_def_syncfb + $_def_fbdev + $_def_w100 ++$_def_imageon + $_def_dxr2 + $_def_dxr3 + $_def_ivtv +Index: trunk/libvo/vo_imageon.c +=================================================================== +--- /dev/null ++++ trunk/libvo/vo_imageon.c +@@ -0,0 +1,308 @@ ++#include <stdio.h> ++#include <stdlib.h> ++#include <inttypes.h> ++#include <string.h> ++ ++#include <mp_msg.h> ++#include <video_out.h> ++#include <video_out_internal.h> ++ ++static vo_info_t info = ++{ ++ "ATI IMAGEON 100 driver", ++ "imageon", ++ "Manuel Teira", ++ "C760-Openzaurus Testing version" ++}; ++ ++LIBVO_EXTERN(imageon) ++ ++#include <acapi.h> ++ ++static struct w100privdata_t { ++ uint8_t config; ++ ac_device_t *dev; ++ uint16_t xres; ++ uint16_t yres; ++ uint16_t ovwidth; ++ uint16_t ovheight; ++ ac_surface_t insurface; ++ ac_surface_t ovsurface; ++ uint16_t srcwidth; ++ uint16_t srcheight; ++ uint8_t rotate; ++ uint8_t scale; ++ ac_point_t ovdst; ++ ac_point_t dstpos; ++ ac_overlayprops_t ovprops; ++ uint32_t format; ++} w100_privdata; ++ ++static int preinit(const char *arg) ++{ ++ //Perhaps libw100 should include some code to query the framebuffer ++ struct w100privdata_t *pdata = &w100_privdata; ++ ++ pdata->config = 0; ++ pdata->xres = 640; ++ pdata->yres = 480; ++ pdata->dev = ac_init(pdata->xres, pdata->yres, AC_ROT90); ++ if (pdata->dev) { ++ return 0; ++ } else { ++ //Put a log message here ++ return 1; ++ } ++} ++ ++ ++static void draw_osd(void) ++{ ++} ++ ++void check_events(void) ++{ ++ mp_msg(MSGT_VO, MSGL_V, "check_events got called\n"); ++} ++ ++static int config(uint32_t srcwidth, uint32_t srcheight, ++ uint32_t dstwidth, uint32_t dstheight, ++ uint32_t flags, char *title, uint32_t format) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ uint8_t xscale, yscale; ++ uint16_t scaledwidth, scaledheight; ++ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: srcwidth:%d, srcheight:%d, " ++ "dstwidth:%d, dstheight:%d\n", ++ srcwidth, srcheight, dstwidth, dstheight); ++ ++ if (pdata->config) { ++ ac_overlay_disable(pdata->dev); ++ ac_free_surface(pdata->dev, &pdata->insurface); ++ ac_free_surface(pdata->dev, &pdata->ovsurface); ++ } ++ ++ pdata->srcwidth = srcwidth; ++ pdata->srcheight = srcheight; ++ ++ //By the moment, only YUV420 supported ++ pdata->ovprops.format = OVLFORMAT_YUV420; ++ pdata->ovprops.portrait_mode = 0; ++ pdata->ovprops.inv_hor = 0; ++ pdata->ovprops.inv_ver = 0; ++ pdata->ovprops.yuv2rgb = 0; ++ ++ pdata->rotate = AC_ROT90; ++ ++ if (flags & VOFLAG_FULLSCREEN) { ++ pdata->ovwidth = 240; ++ pdata->ovheight = 320; ++ xscale = ac_get_scaler(pdata->ovheight, srcwidth); ++ yscale = ac_get_scaler(pdata->ovwidth, srcheight); ++ pdata->scale = (xscale > yscale) ? xscale : yscale; ++ pdata->ovdst.x = 0; ++ pdata->ovdst.y = 0; ++ pdata->ovprops.video_hor_exp = 1; ++ pdata->ovprops.video_ver_exp = 1; ++ } else { ++ pdata->ovwidth = (dstheight + 0xf) & ~0xf; ++ pdata->ovheight = (dstwidth + 0xf) & ~0xf; ++ xscale = ac_get_scaler(dstwidth, srcwidth); ++ yscale = ac_get_scaler(dstheight, srcheight); ++ pdata->ovdst.x = (pdata->xres - pdata->ovheight) / 2; ++ pdata->ovdst.y = (pdata->yres - pdata->ovwidth) / 2; ++ pdata->ovprops.video_hor_exp = 0; ++ pdata->ovprops.video_ver_exp = 0; ++ } ++ ++ pdata->scale = (xscale > yscale) ? xscale : yscale; ++ scaledwidth = ac_apply_scaler(srcwidth, pdata->scale); ++ scaledheight = ac_apply_scaler(srcheight, pdata->scale); ++ pdata->dstpos.x = (pdata->ovwidth - scaledheight) / 2; ++ pdata->dstpos.y = (pdata->ovheight - scaledwidth) / 2; ++ ++ if (ac_alloc_surface(pdata->dev, &pdata->ovsurface, ++ FMT_YUV420, ++ pdata->ovwidth, ++ pdata->ovheight, ++ AC_MEM_INTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_FATAL, "Unable to allocate ov surface\n"); ++ return -1; ++ } ++ ++ if (ac_alloc_surface(pdata->dev, &pdata->insurface, ++ FMT_YUV420, srcwidth, srcheight, ++ AC_MEM_INTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_WARN, ++ "No room in internal memory for insurface\n"); ++ if (ac_alloc_surface(pdata->dev, &pdata->insurface, ++ FMT_YUV420, srcwidth, srcheight, ++ AC_MEM_EXTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_FATAL, ++ "Unable to allocate surface\n"); ++ ac_free_surface(pdata->dev, &pdata->ovsurface); ++ return -1; ++ } ++ } ++ ++ ac_clear_surface(pdata->dev, &pdata->ovsurface); ++ ac_clear_surface(pdata->dev, &pdata->insurface); ++ ++ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: rotate:%d scale:%d ovwidth:%d, ovheight:%d, " ++ "ovdst(x:%d, y:%d) dstpos(x:%d,y:%d)\n", ++ pdata->rotate, ++ pdata->scale, ++ pdata->ovwidth, ++ pdata->ovheight, ++ pdata->ovdst.x, ++ pdata->ovdst.y, ++ pdata->dstpos.x, ++ pdata->dstpos.y); ++ ++ ac_overlay_setup(pdata->dev, &pdata->ovsurface, &pdata->ovsurface.rect, ++ &pdata->ovprops, 0); ++ ac_overlay_setpos(pdata->dev, &pdata->ovdst); ++ ac_overlay_enable(pdata->dev); ++ ++ pdata->config = 1; ++ return 0; ++} ++ ++static int draw_slice(uint8_t *image[], int stride[], ++ int w, int h, int x, int y) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ ac_rect_t dstrect; ++ ac_surface_t *dstsurface = &pdata->insurface; ++ int plane; ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: draw_slice(w:%d,h:%d,x:%d,y:%d)\n", ++ w, h, x, y); ++ ++ ac_reset_ctx(pdata->dev); ++ for (plane = 0; plane <= V_PLANE; plane++) { ++ mp_msg(MSGT_VO, MSGL_V, "Plane: %d, Stride: %d\n", ++ plane, stride[plane]); ++ dstrect.x = x; ++ dstrect.y = y; ++ dstrect.w = w; ++ dstrect.h = h; ++ ac_host2planerect(pdata->dev, ++ image[plane], ++ &dstrect, ++ &pdata->insurface, ++ plane); ++ } ++ return 0; ++} ++ ++static int draw_frame(uint8_t *frame[]) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: draw_frame() not implemented!\n"); ++ ++} ++ ++static void flip_page(void) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ int plane; ++ ac_rect_t srcrect; ++ ac_point_t dstpoint; ++ ac_surface_t *insurface = &pdata->insurface; ++ ac_surface_t *ovsurface = &pdata->ovsurface; ++ ac_surfspec_t *surfspec = &ac_surfspecs[ovsurface->format]; ++ ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: flip_page\n"); ++ ++ srcrect.x = 0; ++ srcrect.y = 0; ++ ++ ac_reset_ctx(pdata->dev); ++ if (pdata->rotate != AC_ROT0) { ++ ac_set_xform(pdata->dev, pdata->rotate, AC_NOMIRROR); ++ } ++ ac_disable_dbuf_update(pdata->dev); ++ ac_waitidle(pdata->dev); ++ for (plane = Y_PLANE; plane < surfspec->nplanes; plane++) { ++ ac_setsrcplane(pdata->dev, insurface, plane); ++ ac_setdstplane(pdata->dev, ovsurface, plane); ++ ac_prepare_scaleblt(pdata->dev, DP_DST_8BPP); ++ srcrect.w = pdata->srcwidth / surfspec->planes[plane].xsubsampling; ++ srcrect.h = pdata->srcheight / surfspec->planes[plane].ysubsampling; ++ dstpoint.x = pdata->dstpos.x / surfspec->planes[plane].xsubsampling; ++ dstpoint.y = pdata->dstpos.y / surfspec->planes[plane].ysubsampling; ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: scaleblt src(x:%d,y:%d,w:%d,h:%d)" ++ "dst(%d,%d)" ++ "scale(%d)\n", ++ srcrect.x, srcrect.y, ++ srcrect.w, srcrect.h, ++ dstpoint.x, dstpoint.y, ++ pdata->scale); ++ ac_scaleblt(pdata->dev, &srcrect, &dstpoint, ++ pdata->scale, pdata->scale); ++ } ++ ac_enable_dbuf_update(pdata->dev); ++} ++ ++static void uninit(void) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ ac_overlay_disable(pdata->dev); ++ ac_finish(pdata->dev); ++} ++ ++static int control(uint32_t request, void *data, ...) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ switch (request) { ++ case VOCTRL_QUERY_FORMAT: ++ return query_format(*((uint32_t *)data)); ++ case VOCTRL_FULLSCREEN: ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: Asked for fullscreen\n"); ++ } ++ return VO_NOTIMPL; ++} ++ ++static int query_format(uint32_t format) ++{ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: query_format was called: %x (%s)\n", ++ format, vo_format_name(format)); ++ ++ if (IMGFMT_IS_RGB(format)) { ++ return 0; ++ ++ switch (IMGFMT_RGB_DEPTH(format)) { ++ case 16: ++ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | ++ VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | ++ VFCAP_OSD | VFCAP_ACCEPT_STRIDE; ++ break; ++ } ++ } else { ++ /* Planar YUV Formats */ ++ switch (format) { ++ case IMGFMT_YV12: ++ case IMGFMT_IYUV: ++ case IMGFMT_I420: ++ case IMGFMT_YVU9: ++ case IMGFMT_IF09: ++ case IMGFMT_Y8: ++ case IMGFMT_Y800: ++ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | ++ VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | ++ VFCAP_OSD | VFCAP_ACCEPT_STRIDE; ++ break; ++ } ++ } ++ ++ return 0; ++} ++ ++ diff --git a/packages/nonworking/exult/exult_1.2.bb b/packages/nonworking/exult/exult_1.2.bb index 2158fe5b37..449bc67eaa 100644 --- a/packages/nonworking/exult/exult_1.2.bb +++ b/packages/nonworking/exult/exult_1.2.bb @@ -2,15 +2,15 @@ DESCRIPTION = "Exult is a project to create an Ultima 7 game engine that runs on capable of using the data and graphics files that come with the game. Qt/E based Palmtop Environments Edition w/ SDL" SECTION = "opie/games" PRIORITY = "optional" -DEPENDS = "libsdl-qpe libsdl-mixer zlib" +DEPENDS = "libsdl-qpe libsdl-mixer zlib freetype" SRC_URI = "${SOURCEFORGE_MIRROR}/exult/exult-${PV}.tar.gz" - inherit autotools #FIXME: Add compatible host or so, it is zaurus specific atm. +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + EXTRA_OECONF = "-host=arm-embeddix-linux-gnu \ - --with-sdl-prefix=${STAGING_BINDIR}/.. \ --disable-exult-studio-support \ --disable-debug \ --disable-exult-studio \ @@ -22,7 +22,7 @@ EXTRA_OECONF = "-host=arm-embeddix-linux-gnu \ --disable-kmid \ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \ - --with-mad-prefix=${STAGING_BINDIR}/.. " + --with-mad-prefix=${STAGING_BINDIR_CROSS}/.. " #CXXFLAGS_append = " -Dmain=SDL_main" #CFLAGS_append = " -Dmain=SDL_main" diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb index 373f30f571..d8421c12f5 100644 --- a/packages/nunome/nunome_1.0.1.bb +++ b/packages/nunome/nunome_1.0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/" RDEPENDS = "virtual/japanese-font" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \ file://nunome.patch;patch=1" @@ -34,8 +34,8 @@ do_install() { oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib install -m 644 nunome_uni.dic ${D}${palmtopdir}/share/nunome - install -m 755 server/nnmsrv ${D}${palmtopdir}/bin - install -m 755 dicman/nnmDicman ${D}${palmtopdir}/bin + install -m 755 server.bin ${D}${palmtopdir}/bin/nnmsrv + install -m 755 dicman.bin ${D}${palmtopdir}/bin/nnmDicman install -m 644 ui/nunome.qm ${D}${palmtopdir}/i18n/ja install -m 644 dicman/nnmDicman.qm ${D}${palmtopdir}/i18n/ja } diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb index aed1ff08d8..6e58b17c5b 100644 --- a/packages/openmoko-apps/openmoko-rssreader_svn.bb +++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko RSS Reader" SECTION = "openmoko/applications" -DEPENDS += "libmrss" +DEPENDS += "libmrss check" PV = "0.0.1+svn${SRCDATE}" PR = "r1" diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index d93225d624..1ac858f7b9 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,7 +8,7 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel-2 --start-applets=openmoko-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & +matchbox-panel-2 --start-applets=openmoko-panel-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & #start some old-style panel plugins to get a keyboard and battery status mbinputmgr & diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index a359e539d3..6daacb2842 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r8" +PR = "r9" inherit openmoko-base diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index af927ddc47..58f07c7eb5 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -10,7 +10,7 @@ PR = "r8" inherit gnome autotools pkgconfig gtk-icon-cache SRC_URI = "svn://svn.o-hand.com/repos/dates/branches/;module=openmoko;proto=http \ - file://om-dates-temp-buildfix_20070308.patch;patch=p1" + file://om-dates-temp-buildfix_20070308.patch;maxdate=20070406;patch=p1" S = "${WORKDIR}/openmoko" diff --git a/packages/opie-bartender/opie-bartender.inc b/packages/opie-bartender/opie-bartender.inc index 633dcc0c91..5b020d5cfa 100644 --- a/packages/opie-bartender/opie-bartender.inc +++ b/packages/opie-bartender/opie-bartender.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Bartender drink receipe database" +DESCRIPTION = "Bartender drink recipe database" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index cda260efcd..9e20ae63e6 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -19,11 +19,11 @@ do_compile() { # You must use gcc to link on sh OPTIONS="" if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + OPTIONS="LD=${TARGET_SYS}-gcc" fi # You must use gcc to link on powerpc also if test ${TARGET_ARCH} = "powerpc" ; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + OPTIONS="LD=${TARGET_SYS}-gcc" fi oe_runmake perl $OPTIONS diff --git a/packages/puzzles/puzzles_r7436.bb b/packages/puzzles/puzzles_r7436.bb index 9b3b3842c7..fc2997fcf8 100644 --- a/packages/puzzles/puzzles_r7436.bb +++ b/packages/puzzles/puzzles_r7436.bb @@ -1,10 +1,19 @@ DEPENDS = "gtk+ libxt" -PR = "r2" -SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ +PR = "r3" + +SVN_REV = "${@bb.data.getVar('PV',d,1).replace('r', '')}" + +SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;proto=svn;rev=${SVN_REV} \ file://game.png" +S = "${WORKDIR}/puzzles" + +do_configure () { + ./mkfiles.pl +} + do_compile_prepend = " \ export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " diff --git a/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty diff --git a/packages/qte/qte-2.3.10/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch index 570c2ff290..570c2ff290 100644 --- a/packages/qte/qte-2.3.10/mnci-touchscreen.patch +++ b/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch diff --git a/packages/qte/qte-2.3.10/mnci.patch b/packages/qte/qte-2.3.10/deprecated/mnci.patch index c2e0e079d9..c2e0e079d9 100644 --- a/packages/qte/qte-2.3.10/mnci.patch +++ b/packages/qte/qte-2.3.10/deprecated/mnci.patch diff --git a/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp index 9917675a43..9917675a43 100644 --- a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp +++ b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h index aa459d1448..aa459d1448 100644 --- a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h +++ b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch index a17362ba87..0111c83b45 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap.patch @@ -1,8 +1,6 @@ -Index: src/kernel/kernelkeyboard.cpp -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ qte/src/kernel/kernelkeyboard.cpp 2006-04-01 23:42:35.154645456 +0200 -@@ -0,0 +1,701 @@ +--- /dev/null 2004-07-13 00:58:01.000000000 +0000 ++++ qte/src/kernel/kernelkeyboard.cpp 2007-04-07 01:00:36.000000000 +0000 +@@ -0,0 +1,769 @@ +/* + + Copyright (C) 2003 Chris Larson @@ -73,6 +71,22 @@ Index: src/kernel/kernelkeyboard.cpp + */ + +/* ++ Paul Sokolovsky, 2007-04: ++ ++ 1. Added support for nicely named and extensible key bindings. ++ E.g., in loadkeys do: ++ keycode 155 = F100 ++ string F100 = "power" ++ where 155 is keycode a power button happens to have on your machine, F100 is ++ arbitrary function key (please use F100-F120), and "power" is OPIE binding. ++ Currently defined bindings are "power", "backlight", "record" ++ 2. K_DO ("Do") keycode is mapped to OPIE power button by default. Kernel uses ++ K_DO for KEY_POWER input subsystem keycode. So, if your device does the right ++ thing, it will work out of the box. ++ 3. Implemented NumLock handling for numeric keypad. ++ */ ++ ++/* + This is an alternative implementation of the QWSTtyKeyboardHandler + of Trolltech's QtE. + @@ -179,6 +193,24 @@ Index: src/kernel/kernelkeyboard.cpp + return; +} + ++static Qt::Key getSpecialKey(int fKey) ++{ ++ struct kbsentry kbs; ++ kbs.kb_func = fKey; ++ ++ if (ioctl(kbdFD, KDGKBSENT, &kbs) != 0) ++ return Qt::Key_unknown; ++ const char *str = (const char *)kbs.kb_string; ++ ++ if (!strcmp("record", str)) ++ return Qt::Key_F24; ++ else if (!strcmp("power", str)) ++ return Qt::Key_F34; ++ else if (!strcmp("backlight", str)) ++ return Qt::Key_F35; ++ ++ return Qt::Key_unknown; ++} + +void QWSTtyKeyboardHandler::readKeyboardMap() +{ @@ -221,7 +253,12 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F1 + kval ), kval ); + else if ( kval >= 30 && kval <= 44) + kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F21 + (kval - 30) ), kval ); -+ else ++ else { ++ Qt::Key specialKey = getSpecialKey(kval); ++ if (specialKey != Qt::Key_unknown) { ++ kernel_map[map][key] = KeyMap( specialKey, kval ); ++ } ++ else + switch(kbe.kb_value ) { + case K_INSERT: + kernel_map[map][key] = KeyMap( Qt::Key_Insert, kval ); @@ -251,10 +288,13 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( Qt::Key_Home, kval ); + break; + case K_DO: ++ kernel_map[map][key] = KeyMap( Qt::Key_F34, kval ); ++ break; + default: + kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); + break; + } ++ } + break; + + case KT_SPEC: @@ -302,56 +342,58 @@ Index: src/kernel/kernelkeyboard.cpp + */ + switch(kbe.kb_value ) { + case K_P0: -+ kernel_map[map][key] = KeyMap( Qt::Key_0, 48 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_0, kbe.kb_value ); + break; + case K_P1: -+ kernel_map[map][key] = KeyMap( Qt::Key_1, 49 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_1, kbe.kb_value ); + break; + case K_P2: -+ kernel_map[map][key] = KeyMap( Qt::Key_2, 50 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_2, kbe.kb_value ); + break; + case K_P3: -+ kernel_map[map][key] = KeyMap( Qt::Key_3, 51 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_3, kbe.kb_value ); + break; + case K_P4: -+ kernel_map[map][key] = KeyMap( Qt::Key_4, 52 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_4, kbe.kb_value ); + break; + case K_P5: -+ kernel_map[map][key] = KeyMap( Qt::Key_5, 53 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_5, kbe.kb_value ); + break; + case K_P6: -+ kernel_map[map][key] = KeyMap( Qt::Key_6, 54 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_6, kbe.kb_value ); + break; + case K_P7: -+ kernel_map[map][key] = KeyMap( Qt::Key_7, 55 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_7, kbe.kb_value ); + break; + case K_P8: -+ kernel_map[map][key] = KeyMap( Qt::Key_8, 56 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_8, kbe.kb_value ); + break; + case K_P9: -+ kernel_map[map][key] = KeyMap( Qt::Key_9, 57 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_9, kbe.kb_value ); + break; + case K_PPLUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Plus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Plus, '+' ); + break; + case K_PMINUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Minus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Minus, '-' ); + break; + case K_PSTAR: -+ kernel_map[map][key] = KeyMap( Qt::Key_multiply, 42 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_multiply, '*' ); + break; + case K_PSLASH: -+ kernel_map[map][key] = KeyMap( Qt::Key_division, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_division, '/' ); + break; + case K_PENTER: + kernel_map[map][key] = KeyMap( Qt::Key_Enter, kval ); + break; + case K_PCOMMA: -+ kernel_map[map][key] = KeyMap( Qt::Key_Comma, kval ) ; ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPLUSMINUS: + kernel_map[map][key] = KeyMap( Qt::Key_plusminus, kval ); ++ break; + case K_PDOT: ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPARENL: + kernel_map[map][key] = KeyMap( Qt::Key_ParenLeft, kval ); @@ -511,6 +553,19 @@ Index: src/kernel/kernelkeyboard.cpp + } +} + ++static Qt::Key numpad2cursor[NR_PAD] = { ++ Qt::Key_Insert, ++ Qt::Key_End, ++ Qt::Key_Down, ++ Qt::Key_Next, ++ Qt::Key_Left, ++ Qt::Key_5, ++ Qt::Key_Right, ++ Qt::Key_Home, ++ Qt::Key_Up, ++ Qt::Key_Prior, ++}; ++ +void QWSTtyKeyboardHandler::handleKey(unsigned int code, bool release) +{ + int old_modifier = modifier; @@ -522,7 +577,9 @@ Index: src/kernel/kernelkeyboard.cpp + key_map = kernel_map[0][code]; + } + -+ unsigned short unicode = acm[key_map.code] & 0xff; ++ unsigned short unicode = 0xffff; ++ if (key_map.code < 0x100) ++ unicode = acm[key_map.code & 0xff] & 0xff; + unsigned int qtKeyCode = key_map.key; + +// if ( !release ) @@ -599,6 +656,15 @@ Index: src/kernel/kernelkeyboard.cpp + + handleExtra( qtKeyCode, release ); + ++ // Do NumLock ++ if (KTYP(key_map.code) == KT_PAD) { ++ if (!numlock) { ++ qtKeyCode = numpad2cursor[KVAL(key_map.code)]; ++ } else { ++ unicode = KVAL(key_map.code) + '0'; ++ } ++ } ++ + /* + * do not repeat modifier keys + */ diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index ce9969f3a3..65204050ac 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -4,7 +4,6 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/libqte2" @@ -47,6 +46,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://simpad-defaultkbd.patch;patch=1 \ file://fix-errno-exception-spec.patch;patch=1 \ file://keyboardless-buttonmap.patch;patch=1 \ + file://kernel-keymap.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -54,24 +54,15 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m # add device specific patches here # SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \ file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_spitz = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada6xx = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " +SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h1940 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h2200 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " @@ -136,7 +127,6 @@ EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XX EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000" -EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" # # don't touch anything below here @@ -151,19 +141,9 @@ export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_D # enable if gcc supports visibility #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc" export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic" -do_configure_prepend_mnci() { - chmod -R a+w ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel - mkdir bin - ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc - ln -sf ${STAGING_BINDIR_NATIVE}/uic bin/uic -} - # generate uclibc and eabi configurations do_configure() { for f in ${S}/configs/linux-*-g++-shared; do diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc index 97c3dc4c41..cf812de460 100644 --- a/packages/qte/qte-common_2.3.12.inc +++ b/packages/qte/qte-common_2.3.12.inc @@ -41,11 +41,6 @@ SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 87eccb7e1a..4bc8c60b79 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r9" +PR = "r11" EXTRA_OECONF += "-thread" diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb index 75b25d3123..2b9dd9a09d 100644 --- a/packages/shasum/shasum-native.bb +++ b/packages/shasum/shasum-native.bb @@ -3,7 +3,7 @@ require shasum.inc inherit native INHIBIT_DEFAULT_DEPS = "1" -INHIBIT_PATCH_TOOL = "1" +PATCHTOOL = "patch" do_fetch[depends] = "" do_populate_staging() { diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 7f8b03ce33..13fad1b2d1 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r33" +PR = "r34" PACKAGES = "\ task-openmoko-linux \ @@ -149,8 +149,6 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-themes-gtk \ openmoko-panel-battery \ openmoko-panel-clock \ - openmoko-panel-demo \ - openmoko-panel-demo-simple \ openmoko-panel-gsm \ openmoko-panel-mainmenu \ openmoko-rssreader \ @@ -168,11 +166,6 @@ RDEPENDS_task-openmoko-demo = "\ # DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications" RDEPENDS_task-openmoko-examples = "\ - openmoko-stylus-demo-simple \ - openmoko-stylus-demo \ - openmoko-finger-demo \ - openmoko-panel-demo-simple \ - openmoko-panel-demo \ openmoko-chordmaster" # diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb new file mode 100644 index 0000000000..805974c9b5 --- /dev/null +++ b/packages/tasks/task-sdk-extra.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "SDK packages" +PR = "r7" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PACKAGES = "\ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe" + +RDEPENDS_task-sdk-x11 := "\ + atk-dev \ + cairo-dev \ + gconf-dbus-dev \ + gtk+-dev \ + gtk-engines-dev \ + libsvg-cairo-dev \ + libmatchbox-dev \ + matchbox-desktop-dev \ + pango-dev \ + startup-notification-dev" + +RDEPENDS_task-sdk-x11-ext := "\ + libxcursor-dev \ + libxdmcp-dev \ + libxft-dev \ + libxrandr-dev \ + libxrender-dev \ + libxsettings-client-dev \ + randrext-dev \ + resourceext-dev \ + libx11-dev \ + libxau-dev \ + libxcalibrate-dev \ + xcalibrateext-dev \ + libxcomposite-dev \ + libxdamage-dev \ + libxext-dev \ + xextproto-dev \ + libxfont-dev \ + libxpm-dev \ + xproto-dev \ + libxt-dev \ + xtrans-dev \ + libxtst-dev" + + +RDEPENDS_task-sdk-gpe := "\ + libcontactsdb-dev \ + esound-dev \ + libeventdb-dev \ + libgpepimc-dev \ + libgpevtype-dev \ + libgpelaunch-dev \ + libgpewidget-dev \ + libhandoff-dev" + diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index 67d5ed47f4..5540bb610b 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK task for Scratchbox rootstraps" -PR = "r4" +PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -19,4 +19,7 @@ RDEPENDS := "\ dbus \ joe \ ipkg \ - "
\ No newline at end of file + gettext-dev \ + pkgconfig-dev \ + ipkg-utils \ + " diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 7039077516..f94f7f17ff 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -6,9 +6,7 @@ ALLOW_EMPTY = "1" PACKAGES = "\ task-sdk-bare \ task-sdk-base \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe" + " RDEPENDS_task-sdk-bare := "\ glibc \ @@ -62,50 +60,3 @@ RDEPENDS_task-sdk-base := "\ zlib-dev \ libxmu-dev" -RDEPENDS_task-sdk-x11 := "\ - atk-dev \ - cairo-dev \ - gconf-dbus-dev \ - gtk+-dev \ - gtk-engines-dev \ - libsvg-cairo-dev \ - libmatchbox-dev \ - matchbox-desktop-dev \ - pango-dev \ - startup-notification-dev" - -RDEPENDS_task-sdk-x11-ext := "\ - libxcursor-dev \ - libxdmcp-dev \ - libxft-dev \ - libxrandr-dev \ - libxrender-dev \ - libxsettings-client-dev \ - randrext-dev \ - resourceext-dev \ - libx11-dev \ - libxau-dev \ - libxcalibrate-dev \ - xcalibrateext-dev \ - libxcomposite-dev \ - libxdamage-dev \ - libxext-dev \ - xextproto-dev \ - libxfont-dev \ - libxpm-dev \ - xproto-dev \ - libxt-dev \ - xtrans-dev \ - libxtst-dev" - - -RDEPENDS_task-sdk-gpe := "\ - libcontactsdb-dev \ - esound-dev \ - libeventdb-dev \ - libgpepimc-dev \ - libgpevtype-dev \ - libgpelaunch-dev \ - libgpewidget-dev \ - libhandoff-dev" - diff --git a/packages/uboot/files/u-boot-20060807.tar.bz2 b/packages/uboot/files/u-boot-20060807.tar.bz2 Binary files differdeleted file mode 100644 index 7b35fcfdd1..0000000000 --- a/packages/uboot/files/u-boot-20060807.tar.bz2 +++ /dev/null diff --git a/packages/uboot/files/u-boot-20060907.tar.bz2 b/packages/uboot/files/u-boot-20060907.tar.bz2 Binary files differdeleted file mode 100644 index 66b562cafe..0000000000 --- a/packages/uboot/files/u-boot-20060907.tar.bz2 +++ /dev/null diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/uboot/u-boot_1.2.0.bb index 15d16bd571..5fbce73018 100644 --- a/packages/uboot/u-boot_1.2.0.bb +++ b/packages/uboot/u-boot_1.2.0.bb @@ -2,6 +2,8 @@ require u-boot.inc PR = "r1" -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2" +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \ + " +SRC_URI_append_turbostation = "file://qnap.diff;patch=1" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 8674a55e21..02df9d2d4e 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -107,9 +107,6 @@ KDRIVE_COMMON_PATCHES = " \ SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" inherit autotools pkgconfig diff --git a/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch b/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch new file mode 100644 index 0000000000..39bc22c6b3 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch @@ -0,0 +1,15 @@ +Patch suggested by Manuel Teira to actually enable offscreen pixmap +acceleration in Xw100. Value 16 is empirical, works well on hx4700, +but in case of issues, consider double it (other accelerated drivers +use bigger values than 16). + +--- xorg-server-1.2.0/hw/kdrive/w100/ati_draw.c.org 2007-04-04 10:28:57.000000000 +0000 ++++ xorg-server-1.2.0/hw/kdrive/w100/ati_draw.c 2007-04-06 14:43:40.000000000 +0000 +@@ -433,6 +433,7 @@ + * or kaaPixmapUseScreen. But this is probably caused by some bug in this + * driver... */ + atis->kaa.flags |= KAA_OFFSCREEN_PIXMAPS; ++ atis->kaa.pitchAlign = 16; + if (!kaaDrawInit(pScreen, &atis->kaa)) + return FALSE; + diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index cb58eee8a3..2ba1b09923 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,12 +3,13 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r5" +PR = "r6" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://enable-xcalibrate.patch;patch=1 \ file://w100.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" |