diff options
826 files changed, 11438 insertions, 14073 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index a81263a12a..1294e41c65 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -82,6 +82,9 @@ def base_dep_prepend(d): if bb.data.getVar('PN', d, True) == "shasum-native": deps = "" + # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not + # we need that built is the responsibility of the patch function / class, not + # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != bb.data.getVar('BUILD_SYS', d, 1)): @@ -272,8 +275,12 @@ oe_libinstall() { # If such file doesn't exist, try to cut version suffix if [ ! -f "$lafile" ]; then - libname=`echo "$libname" | sed 's/-[0-9.]*$//'` - lafile=$libname.la + libname1=`echo "$libname" | sed 's/-[0-9.]*$//'` + lafile1=$libname.la + if [ -f "$lafile1" ]; then + libname=$libname1 + lafile=$lafile1 + fi fi if [ -f "$lafile" ]; then @@ -807,6 +814,7 @@ def base_after_parse(d): pn = bb.data.getVar('PN', d, 1) + # OBSOLETE in bitbake 1.7.4 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) if srcdate != None: @@ -816,9 +824,22 @@ def base_after_parse(d): if use_nls != None: bb.data.setVar('USE_NLS', use_nls, d) - # Make sure MACHINE *isn't* exported + # Make sure MACHINE isn't exported + # (breaks binutils at least) bb.data.delVarFlag('MACHINE', 'export', d) bb.data.setVarFlag('MACHINE', 'unexport', 1, d) + + # Make sure DISTRO isn't exported + # (breaks sysvinit at least) + bb.data.delVarFlag('DISTRO', 'export', d) + bb.data.setVarFlag('DISTRO', 'unexport', 1, d) + + # Git packages should DEPEND on git-native + srcuri = bb.data.getVar('SRC_URI', d, 1) + if "git://" in srcuri: + depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" + depends = depends + " git-native:do_populate_staging" + bb.data.setVarFlag('do_fetch', 'depends', depends, d) mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index dadf2dddfc..497b78f454 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -18,6 +18,8 @@ def get_binconfig_mangle(d): s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" + s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" return s BINCONFIG_GLOB ?= "*-config" diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 855a72a2f7..b86562890a 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,6 +1,8 @@ FILES_${PN} += "${datadir}/icons/hicolor" -RDEPENDS += " hicolor-icon-theme " +RDEPENDS += "hicolor-icon-theme" +# This could run on the host as icon cache files are architecture independent, +# but there is no gtk-update-icon-cache built natively. gtk-icon-cache_postinst() { if [ "x$D" != "x" ]; then exit 1 diff --git a/classes/image.bbclass b/classes/image.bbclass index 101b53307a..248ccab60b 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -58,6 +58,7 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb" LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" ROOTFS_POSTPROCESS_COMMAND ?= "" +MACHINE_POSTPROCESS_COMMAND ?= "" do_rootfs[nostamp] = "1" do_rootfs[dirs] = "${TOPDIR}" @@ -100,6 +101,8 @@ fakeroot do_rootfs () { done ${IMAGE_POSTPROCESS_COMMAND} + + ${MACHINE_POSTPROCESS_COMMAND} } insert_feed_uris () { diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index c5bd1c5e24..17b3bbafa6 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -17,6 +17,7 @@ def openmoko_two_get_subdir(d): elif section in 'apps tools pim'.split(): return "applications" elif section == "panel-plugin": return "panel-plugins" elif section == "inputmethods": return "inputmethods" + elif section == "daemons": return "daemons" else: return section LICENSE = "${@openmoko_two_get_license(d)}" @@ -29,3 +30,4 @@ FILES_${PN} += "${datadir}/icons" # SVNREV = "r${SRCREV}" SVNREV = "${SRCDATE}" + diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index d172fb1766..9a8db4f8f2 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -1,3 +1,7 @@ +# +# Copyright 2006-2007 OpenedHand Ltd. +# + inherit package PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native" @@ -132,6 +136,7 @@ python do_package_deb () { continue controldir = os.path.join(root, 'DEBIAN') bb.mkdirhier(controldir) + os.chmod(controldir, 0755) try: ctrlfile = file(os.path.join(controldir, 'control'), 'wb') # import codecs @@ -150,7 +155,7 @@ python do_package_deb () { fields.append(["Priority: %s\n", ['PRIORITY']]) fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) - fields.append(["OE: %s\n", ['P']]) + fields.append(["OE: %s\n", ['PN']]) fields.append(["Homepage: %s\n", ['HOMEPAGE']]) # Package, Version, Maintainer, Description - mandatory diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index f444541509..67fa661308 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -1,3 +1,6 @@ +# +# Copyright 2006-2007 Openedhand Ltd. +# do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" @@ -52,21 +55,21 @@ fakeroot rootfs_deb_do_rootfs () { } if [ ! -z "${LINGUAS_INSTALL}" ]; then - apt-get install glibc-localedata-i18n - if [ $? -eq 1 ]; then - exit 1 + apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated + if [ $? -ne 0 ]; then + exit $? fi for i in ${LINGUAS_INSTALL}; do - apt-get install $i - if [ $? -eq 1 ]; then - exit 1 + apt-get install $i --force-yes --allow-unauthenticated + if [ $? -ne 0 ]; then + exit $? fi done fi if [ ! -z "${PACKAGE_INSTALL}" ]; then for i in ${PACKAGE_INSTALL}; do - apt-get install $i + apt-get install $i --force-yes --allow-unauthenticated if [ $? -eq 1 ]; then exit 1 fi @@ -134,3 +137,7 @@ rootfs_deb_log_check() { true } +remove_packaging_data_files() { + rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/ + rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ +} diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 937c973ad5..a3b8b36dd0 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -346,8 +346,8 @@ python seppuku_eventhandler() { bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text) if not bug_number: print >> debug_file, "Filing a bugreport failed" - else: - print >> debug_file, "The new bug_number: '%s'" % bug_number + else: + print >> debug_file, "The new bug_number: '%s'" % bug_number if file: if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file): diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 9821eec5b2..3051b7933f 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -7,17 +7,15 @@ INIT_D_DIR = "${sysconfdir}/init.d" updatercd_postinst() { if test "x$D" != "x"; then - D="-r $D" + OPT="-r $D" else - D="-s" + OPT="-s" fi -update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } updatercd_prerm() { -if test "x$D" != "x"; then - D="-r $D" -else +if test "x$D" = "x"; then ${INIT_D_DIR}/${INITSCRIPT_NAME} stop fi } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 19910d32e7..dc3378fd95 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -110,23 +110,33 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -SECTION_${PN}-doc = "doc" + FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" -SECTION_${PN}-dev = "devel" +SECTION_${PN}-doc = "doc" + FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" -FILES_${PN}-locale = "${datadir}/locale" +SECTION_${PN}-dev = "devel" +ALLOW_EMPTY_${PN}-dev = "1" +RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" +SECTION_${PN}-dbg = "devel" +ALLOW_EMPTY_${PN}-dbg = "1" +RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + +FILES_${PN}-locale = "${datadir}/locale" # File manifest @@ -142,7 +152,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -DL_DIR = "${TMPDIR}/downloads" CVSDIR = "${DL_DIR}/cvs" SVNDIR = "${DL_DIR}/svn" GITDIR = "${DL_DIR}/git" @@ -414,7 +423,8 @@ SLOT = "0" # Other -export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" @@ -456,6 +466,7 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +DL_DIR ?= "${TMPDIR}/downloads" IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" MACHINE_TASK_PROVIDER ?= "task-base" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index e83ef90280..282b0532b9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -12,10 +12,6 @@ DISTRO_REVISION = "46" require conf/distro/include/sane-srcdates.inc -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - #Images built can have to modes: # 'debug': empty rootpassword, strace and gdb included # 'release' no root password, no strace and gdb by default @@ -233,7 +229,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc +require conf/distro/include/preferred-xorg-versions.inc # Virtuals: @@ -261,7 +257,7 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -298,20 +294,9 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" #Silence a warning during parsing PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - - -#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad - - -# add altboot to compatible models, will be replaced with angstrom-bootmanager -#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1" -#EXTRA_STUFF_append_c7x0 += "altboot" -#EXTRA_STUFF_append_akita += "altboot" -#EXTRA_STUFF_append_poodle += "altboot" -#EXTRA_STUFF_append_tosa += "altboot" -#EXTRA_STUFF_append_spitz += "altboot" - +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc # do some task-base stuff here diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf new file mode 100644 index 0000000000..7fc656fb5e --- /dev/null +++ b/conf/distro/angstrom-2008.1.conf @@ -0,0 +1,36 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom <http://www.angstrom-distribution.org> +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> +#@-------------------------------------------------------------------- + +# This is a testbed for unstable and/or untested things, while angstrom-2007.1 +# is aiming for stability and a release. +# Use this at your own risk, we welcome bugreports filed at +# http://bugs.openembedded.org +# In doubt, use DISTRO="angstrom-2007.1" + +require conf/distro/angstrom-2007.1.conf + +#DISTRO_VERSION = "2008.1" +DISTRO_VERSION = "2008.1-test-${DATE}" +DISTRO_REVISION = "0" + +PREFERRED_VERSION_gcc ?= "4.2.1" +PREFERRED_VERSION_gcc-cross ?= "4.2.1" + +PREFERRED_VERSION_binutils ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12" + +#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against +PREFERRED_VERSION_linux-libc-headers ?= "2.6.22" + +#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. +PREFERRED_VERSION_glibc ?= "2.6" +PREFERRED_VERSION_glibc-intermediate ?= "2.6" +PREFERRED_VERSION_glibc-initial ?= "2.6" + + diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 333c8c8bc9..dc3929c3a7 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -3,6 +3,16 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" + + + TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index 940568130c..acc8498262 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -24,6 +24,11 @@ PREFERRED_VERSION_libtododb ?= "0.11" PREFERRED_VERSION_libhandoff ?= "0.1" PREFERRED_VERSION_libmimedir ?= "0.4.2" PREFERRED_VERSION_libsoundgen ?= "0.6" +PREFERRED_VERSION_libdotdesktop ?= "0.11" +PREFERRED_VERSION_libeventdb ?= "0.90" +PREFERRED_VERSION_libgpelaunch ?= "0.14" +PREFERRED_VERSION_libgtkstylus ?= "0.3" +PREFERRED_VERSION_libxsettings-client ?= "0.17" PREFERRED_VERSION_gpe-icons ?= "0.25" @@ -33,20 +38,30 @@ PREFERRED_VERSION_gpe-su ?= "0.19" PREFERRED_VERSION_keylaunch ?= "2.0.10" PREFERRED_VERSION_startup-monitor ?= "0.18-2" PREFERRED_VERSION_gpe-dm ?= "0.51" +PREFERRED_VERSION_ipaq-sleep ?= "0.9" +PREFERRED_VERSION_teleport ?= "0.34" +PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_VERSION_gpe-aerial ?= "0.3.0" +PREFERRED_VERSION_gpe-appmgr ?= "2.8" +PREFERRED_VERSION_gpe-autostarter ?= "0.12" PREFERRED_VERSION_gpe-todo ?= "0.56" PREFERRED_VERSION_gpe-calendar ?= "0.91" PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" PREFERRED_VERSION_gpe-contacts ?= "0.47" PREFERRED_VERSION_gpe-beam ?= "0.2.9" PREFERRED_VERSION_gpe-bluetooth ?= "0.55" +PREFERRED_VERSION_gpe-bootsplash ?= "1.15" PREFERRED_VERSION_gpe-conf ?= "0.2.6" +PREFERRED_VERSION_gpe-confd ?= "0.16" PREFERRED_VERSION_gpe-clock ?= "0.25" PREFERRED_VERSION_gpe-mininet ?= "0.7" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.9" PREFERRED_VERSION_gpe-taskmanager ?= "0.20" PREFERRED_VERSION_minilite ?= "0.50" +PREFERRED_VERSION_miniclipboard ?= "0.3" +PREFERRED_VERSION_minimix ?= "0.8" PREFERRED_VERSION_gpe-edit ?= "0.40" PREFERRED_VERSION_gpe-gallery ?= "0.97" PREFERRED_VERSION_gpe-calculator ?= "0.2" @@ -64,8 +79,13 @@ PREFERRED_VERSION_gpe-announce ?= "0.13" PREFERRED_VERSION_gpe-timesheet ?= "0.32" PREFERRED_VERSION_gpe-irc ?= "0.08" PREFERRED_VERSION_starling ?= "0.2" +PREFERRED_VERSION_gpe-keylock ?= "0.12" +PREFERRED_VERSION_gpe-ownerinfo ?= "0.28" +PREFERRED_VERSION_gpe-question ?= "0.04" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-julia ?= "0.0.6" PREFERRED_VERSION_gpe-lights ?= "0.13" PREFERRED_VERSION_gpe-othello ?= "0.2-1" PREFERRED_VERSION_gpe-plucker ?= "0.4" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc new file mode 100644 index 0000000000..0681b01d3d --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -0,0 +1,111 @@ +PREFERRED_VERSION_applewmproto = "1.0.3" +PREFERRED_VERSION_bigreqsproto = "1.0.2" +PREFERRED_VERSION_bigreqsproto-native = "1.0.2" +PREFERRED_VERSION_compositeproto = "0.4" +PREFERRED_VERSION_damageproto = "1.1.0" +PREFERRED_VERSION_diet-x11 = "1.1.2" +PREFERRED_VERSION_dmxproto = "2.2.2" +PREFERRED_VERSION_evieext = "1.0.2" +PREFERRED_VERSION_fixesproto = "4.0" +PREFERRED_VERSION_fontcacheproto = "0.1.2" +PREFERRED_VERSION_fontcacheproto-native = "0.1.2" +PREFERRED_VERSION_fontsproto = "2.0.2" +PREFERRED_VERSION_fontsproto-native = "2.0.2" +PREFERRED_VERSION_gccmakedep = "1.0.2" +PREFERRED_VERSION_glproto = "1.4.8" +PREFERRED_VERSION_imake = "1.0.2" +PREFERRED_VERSION_inputproto = "1.4.2" +PREFERRED_VERSION_inputproto-native = "1.4.1" +PREFERRED_VERSION_kbproto = "1.0.3" +PREFERRED_VERSION_kbproto-native = "1.0.2" +PREFERRED_VERSION_libapplewm = "1.0.0" +PREFERRED_VERSION_libdmx = "1.0.2" +PREFERRED_VERSION_libfontenc = "1.0.4" +PREFERRED_VERSION_libfontenc-native = "1.0.4" +PREFERRED_VERSION_libfs = "1.0.0" +PREFERRED_VERSION_libice = "1.0.3" +PREFERRED_VERSION_liblbxutil = "1.0.1" +PREFERRED_VERSION_liboldx = "1.0.1" +PREFERRED_VERSION_libsm = "1.0.3" +PREFERRED_VERSION_libwindowswm = "1.0.0" +PREFERRED_VERSION_libx11 = "1.1.2" +PREFERRED_VERSION_libx11-native = "1.0.1" +PREFERRED_VERSION_libxau = "1.0.3" +PREFERRED_VERSION_libxau-native = "1.0.3" +PREFERRED_VERSION_libxaw = "1.0.3" +PREFERRED_VERSION_libxcomposite = "0.4.0" +PREFERRED_VERSION_libxcursor = "1.1.8" +PREFERRED_VERSION_libxdamage = "1.1.1" +PREFERRED_VERSION_libxdmcp = "1.0.2" +PREFERRED_VERSION_libxdmcp-native = "1.0.2" +PREFERRED_VERSION_libxevie = "1.0.2" +PREFERRED_VERSION_libxext = "1.0.3" +PREFERRED_VERSION_libxfixes = "4.0.3" +PREFERRED_VERSION_libxfont = "1.3.0" +PREFERRED_VERSION_libxfont-native = "1.3.0" +PREFERRED_VERSION_libxfontcache = "1.0.4" +PREFERRED_VERSION_libxft = "2.1.12" +PREFERRED_VERSION_libxi = "1.1.2" +PREFERRED_VERSION_libxinerama = "1.0.2" +PREFERRED_VERSION_libxkbfile = "1.0.4" +PREFERRED_VERSION_libxkbui = "1.0.2" +PREFERRED_VERSION_libxmu = "1.0.3" +PREFERRED_VERSION_libxp = "1.0.0" +PREFERRED_VERSION_libxpm = "3.5.6" +PREFERRED_VERSION_libxprintapputil = "1.0.1" +PREFERRED_VERSION_libxprintutil = "1.0.1" +PREFERRED_VERSION_libxrandr = "1.2.1" +PREFERRED_VERSION_libxrender = "0.9.2" +PREFERRED_VERSION_libxres = "1.0.3" +PREFERRED_VERSION_libxscrnsaver = "1.1.2" +PREFERRED_VERSION_libxt = "1.0.5" +PREFERRED_VERSION_libxtrap = "1.0.0" +PREFERRED_VERSION_libxtst = "1.0.2" +PREFERRED_VERSION_libxv = "1.0.3" +PREFERRED_VERSION_libxvmc = "1.0.4" +PREFERRED_VERSION_libxxf86dga = "1.0.1" +PREFERRED_VERSION_libxxf86misc = "1.0.1" +PREFERRED_VERSION_libxxf86vm = "1.0.1" +PREFERRED_VERSION_lndir = "1.0.1" +PREFERRED_VERSION_makedepend = "1.0.1" +PREFERRED_VERSION_makedepend-native = "1.0.1" +PREFERRED_VERSION_printproto = "1.0.3" +PREFERRED_VERSION_randrproto = "1.2.1" +PREFERRED_VERSION_recordproto = "1.13.2" +PREFERRED_VERSION_renderproto = "0.9.2" +PREFERRED_VERSION_resourceproto = "1.0.2" +PREFERRED_VERSION_scrnsaverproto = "1.1.0" +PREFERRED_VERSION_trapproto = "3.4.3" +PREFERRED_VERSION_util-macros = "1.1.5" +PREFERRED_VERSION_util-macros-native = "1.1.5" +PREFERRED_VERSION_videoproto = "2.2.2" +PREFERRED_VERSION_windowswmproto = "1.0.3" +PREFERRED_VERSION_xauth = "1.0.2" +PREFERRED_VERSION_xcmiscproto = "1.1.2" +PREFERRED_VERSION_xcmiscproto-native = "1.1.2" +PREFERRED_VERSION_xdpyinfo = "1.0.2" +PREFERRED_VERSION_xextproto = "7.0.2" +PREFERRED_VERSION_xextproto-native = "7.0.2" +PREFERRED_VERSION_xf86bigfontproto = "1.1.2" +PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2" +PREFERRED_VERSION_xf86dgaproto = "2.0.2" +PREFERRED_VERSION_xf86driproto = "2.0.3" +PREFERRED_VERSION_xf86miscproto = "0.9.2" +PREFERRED_VERSION_xf86rushproto = "1.1.2" +PREFERRED_VERSION_xf86vidmodeproto = "2.2.2" +PREFERRED_VERSION_xhost = "1.0.2" +PREFERRED_VERSION_xineramaproto = "1.1.2" +PREFERRED_VERSION_xmodmap = "1.0.2" +PREFERRED_VERSION_xorg-cf-files = "1.0.2" +PREFERRED_VERSION_xproto = "7.0.10" +PREFERRED_VERSION_xproto-native = "7.0.10" +PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" +PREFERRED_VERSION_xrandr = "1.2.2" +PREFERRED_VERSION_xrdb = "1.0.3" +PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" +PREFERRED_VERSION_xserver-xorg = "1.1.0" +PREFERRED_VERSION_xset = "1.0.2" +PREFERRED_VERSION_xtrans = "1.0.3" +PREFERRED_VERSION_xtrans-native = "1.0.3" +PREFERRED_VERSION_xinit = "1.0.4" +PREFERRED_VERSION_xev = "1.0.2" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 18d5c07495..8310d47a22 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -95,7 +95,7 @@ SRCDATE_entice ?= "20070601" SRCDATE_e-utils ?= "20070601" SRCDATE_enna ?= "20070721" -# Misc apps, sorted by alphabet +# Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_dvbstream ?= "20060814" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index bb1605e41b..00b9440b1f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.4" +SLUGOS_VERSION = "4.5" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 5d63676343..c438da25d9 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -7,15 +7,17 @@ require conf/distro/angstrom-2007.1.conf require conf/distro/include/openmoko-srcdate-now.inc - # # Header # +DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" +OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/" @@ -24,3 +26,4 @@ FEED_URIS = "\ all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \ armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \ fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01" + diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index fad73c53bf..de94f560f9 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf new file mode 100644 index 0000000000..adb8f23fa3 --- /dev/null +++ b/conf/machine/alix.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: Alix +#@DESCRIPTION: Machine configuration for PC Engines Alix1c board +# +# http://pcengines.ch/alix1c.htm + +# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +TARGET_ARCH = "i686" + +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi" + +IMAGE_FSTYPES += "tar.gz" + +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-modules \ + " diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index fe0df53cc5..ad94420196 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -11,9 +11,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen" +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 098d0526f0..6862a8095f 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 19bcb7607c..4649fe130e 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -33,7 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index a87222cc3e..c9e1e73814 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -32,7 +32,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 01a06b7c27..fa24a3281b 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc index ada838f0d6..a9702cfce2 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.inc @@ -40,3 +40,30 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" + +MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" + +zaurus_make_installkit () { + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ + mkdir ${IMAGE_NAME}-installkit/ + + # Get the latest kernel using the zImage-<machine>.bin symlink + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + + if [ "${MACHINE}" = "spitz" ]; then + cp gnu-tar ${IMAGE_NAME}-installkit/ + cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz + else + cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin + fi + + # All zaurus machines except collie need updater.sh + if [ "${MACHINE}" != "collie" ]; then + cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh + fi + + tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ + md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ +} diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.inc index f66502eff1..f66502eff1 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.inc diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf index b5e8aebb54..1852455e2b 100644 --- a/conf/machine/palmt680.conf +++ b/conf/machine/palmt680.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Treo 680 -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Treo 680 require conf/machine/include/palm.conf diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index b1139c21fa..24d13c1381 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm TC -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Tungsten C require conf/machine/include/palm.conf diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf index 72b1f310ad..1f6d5c377d 100644 --- a/conf/machine/palmtt.conf +++ b/conf/machine/palmtt.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Tungsten T -#@DESCRIPTION: Machine configuration for Palm Zire 71 +#@DESCRIPTION: Machine configuration for Palm Tungsten T/T2 TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv5te" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a548f513d3..eee1edd53e 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,6 +2,6 @@ #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc ROOT_FLASH_SIZE = "22" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 81c789dcc4..3199065606 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index ddaf6e03c9..83227ee0c4 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc # newer kernels does not build PREFERRED_VERSION_linux-rp = "2.6.17" diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index f404def82d..416d393ccd 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -5,7 +5,13 @@ mkdir logs export LOGNAME=Changelog.`date -u "+%Y%m%d"` export REV_NOW=`mtn automate heads |head -n1` -for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \ +if test -e oldrev ; then + export OLD_REV=`cat oldrev` +else + export OLD_REV="l:\"1 week ago\"" +fi + +for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \ export REV=`echo $i | awk -F: '{print $2}'` export AUTHOR=`echo $i | awk -F: '{print $1}'` export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : ' '{ print $2 }'` @@ -37,5 +43,7 @@ cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${ echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME} +echo ${REV_NOW} > oldrev + rm -Rf logs diff --git a/delete.txt b/delete.txt new file mode 100644 index 0000000000..7c9dc251aa --- /dev/null +++ b/delete.txt @@ -0,0 +1,27 @@ +Packages to be removed from OpenEmbedded if no one will fix them. + +Dropping stuff from metadata is not best way so this file will be filled +with informations about which parts of metadata will be removed. + +Please sort by removal date + +Package Name: recipe, directory or subsystem name +Removal Date: YYYY-MM-DD +Maintainer: Surname Name + e-mail +Reason: description why it will get removed +Proposed by: person which want entry to be removed + +----------------------------------------------------------------------------- + +Package Name: Maemo +Removal Date: 2006-12-15 +Maintainer: none +Reason: Unfetchable, obsoleted by IT2006 release. +Proposed by: Marcin 'Hrw' Juszkiewicz + +Package Name: task-bootstrap* +Removal Date: 2006-12-22 +Maintainer: None +Reason: Obsoleted by task-base +Proposed by: Koen Kooi +Note: Moved to packages/obsolete/tasks on 2006-12-22 diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc index 3184be72b4..42fc6c7d6e 100644 --- a/packages/abiword/abiword-2.5.inc +++ b/packages/abiword/abiword-2.5.inc @@ -13,21 +13,21 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d, FILES_${PN} += " \ ${datadir}/icons/* \ - ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \ - ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \ - ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \ - ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \ -# ${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \ -# ${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \ - ${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt " + ${datadir}/abiword-${SHRT_VER}/AbiWord/glade \ + ${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \ + ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \ + ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \ +# ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \ +# ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ + ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \ + ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt " inherit autotools pkgconfig @@ -54,8 +54,8 @@ do_install_append() { PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates " -FILES_abiword-clipart += "${datadir}/AbiSuite-${SHRT_VER}/clipart" -FILES_abiword-icons += "${datadir}/AbiSuite-${SHRT_VER}/icons" -FILES_abiword-strings += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings" -FILES_abiword-systemprofiles += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*" -FILES_abiword-templates += "${datadir}/AbiSuite-${SHRT_VER}/templates" +FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart" +FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons" +FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings" +FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*" +FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates" diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb index 66d8fae0ad..5fcc1dd1a2 100644 --- a/packages/abiword/abiword_2.5.1.bb +++ b/packages/abiword/abiword_2.5.1.bb @@ -2,6 +2,6 @@ require abiword-2.5.inc DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r1" RCONFLICTS = "abiword-embedded" diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb index f3b5cd9008..2eb3a36804 100644 --- a/packages/angstrom/angstrom-x11-base-depends.bb +++ b/packages/angstrom/angstrom-x11-base-depends.bb @@ -1,13 +1,14 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r32" +PR = "r34" ALLOW_EMPTY = "1" XSERVER ?= "xserver-kdrive-fbdev" +PACKAGE_ARCH = "${MACHINE_ARCH}" + DEPENDS = "virtual/xserver" RDEPENDS = "\ - virtual/libx11 \ ${XSERVER} \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index 2bf37db5dc..83f00cce66 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/gtk+/gtk+-2.10.10/.mtn2git_empty b/packages/asterisk/asterisk-1.2.24/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.10/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.2.24/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.2.24/asterisk.patch b/packages/asterisk/asterisk-1.2.24/asterisk.patch new file mode 100644 index 0000000000..006b8e9291 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.24/asterisk.patch @@ -0,0 +1,221 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.2.9.1/./Makefile~asterisk ++++ asterisk-1.2.9.1/./Makefile +@@ -331,7 +331,7 @@ + ASTCFLAGS+= $(TRACE_FRAMES) + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) +-ASTCFLAGS+= $(OPTIONS) ++#ASTCFLAGS+= $(OPTIONS) + ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) + ASTCFLAGS+= -fomit-frame-pointer + endif +@@ -347,12 +347,12 @@ + netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ + cryptostub.o + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),) + OBJS+= poll.o + ASTCFLAGS+=-DPOLLCOMPAT + endif + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),) + OBJS+= dlfcn.o + ASTCFLAGS+=-DDLFCNCOMPAT + endif +@@ -397,7 +397,7 @@ + endif + + ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) +- CFLAGS+=$(ASTCFLAGS) ++override CFLAGS+=$(ASTCFLAGS) + endif + + # This is used when generating the doxygen documentation +@@ -519,7 +519,7 @@ + fi + rm -f include/asterisk/build.h.tmp + $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c +- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) $(AUDIO_LIBS) -o muted muted.o +--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk ++++ asterisk-1.2.9.1/codecs/gsm/Makefile +@@ -51,7 +51,7 @@ + ifneq (${PROC},ppc) + ifneq (${PROC},ppc64) + ifneq (${PROC},s390) +-OPTIMIZE+=-march=$(PROC) ++#OPTIMIZE+=-march=$(PROC) + endif + endif + endif +@@ -243,7 +243,7 @@ + ifneq (${PROC},arm) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_SOURCES+= $(SRC)/k6opt.s ++#GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif + endif +@@ -309,7 +309,7 @@ + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_OBJECTS+= $(SRC)/k6opt.o ++#GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif + endif +--- asterisk-1.2.9.1/res/Makefile~asterisk ++++ asterisk-1.2.9.1/res/Makefile +@@ -89,7 +89,7 @@ + fi + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.2.9.1/channels/Makefile~asterisk ++++ asterisk-1.2.9.1/channels/Makefile +@@ -73,7 +73,7 @@ + SOLINK+=-lrt + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),) + CHANNEL_LIBS+=chan_phone.so + endif + +@@ -88,16 +88,16 @@ + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),) + CHANNEL_LIBS+=chan_alsa.so + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),) + CFLAGS+=-DZAPATA_PRI + ZAPPRI=-lpri + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),) + CFLAGS+=-DZAPATA_R2 + ZAPR2=-lmfcr2 + endif +@@ -110,7 +110,7 @@ + endif + + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif +@@ -122,7 +122,7 @@ + endif + endif # WITHOUT_ZAPTEL + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),) + CHANNEL_LIBS+=chan_vpb.so + CFLAGS+=-DLINUX + endif +@@ -137,7 +137,7 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),) + CHANNEL_LIBS+=chan_nbs.so + endif + +@@ -158,7 +158,7 @@ + rm -f busy.h ringtone.h gentone gentone-ulaw + + %.so : %.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS} + + ifneq ($(wildcard .depend),) + include .depend +@@ -215,7 +215,7 @@ + chan_alsa.o: $(ALSA_SRC) + + chan_alsa.so: chan_alsa.o +- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl ++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS) + + chan_nbs.so: chan_nbs.o + $(CC) $(SOLINK) -o $@ $< -lnbs +--- asterisk-1.2.9.1/pbx/Makefile~asterisk ++++ asterisk-1.2.9.1/pbx/Makefile +@@ -59,7 +59,7 @@ + $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS) + + pbx_dundi.so: dundi-parser.o pbx_dundi.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS) + + %.moc : %.h + $(MOC) $< -o $@ +--- asterisk-1.2.9.1/formats/Makefile~asterisk ++++ asterisk-1.2.9.1/formats/Makefile +@@ -25,7 +25,7 @@ + # + # OGG/Vorbis format + # +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so + endif + +@@ -57,7 +57,7 @@ + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm + + format_ogg_vorbis.so : format_ogg_vorbis.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS) + + install: all + for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done +--- asterisk-1.2.9.1/utils/Makefile~asterisk ++++ asterisk-1.2.9.1/utils/Makefile +@@ -22,11 +22,11 @@ + + TARGET=stereorize streamplayer + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),) + TARGET+=smsq + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),) + TARGET+=astman + endif + +@@ -64,7 +64,7 @@ + $(CC) $(CFLAGS) -o $@ $^ + + smsq: smsq.o +- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt ++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS) + + streamplayer: streamplayer.o + $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS} diff --git a/packages/asterisk/asterisk-1.2.24/enable-speex.patch b/packages/asterisk/asterisk-1.2.24/enable-speex.patch new file mode 100644 index 0000000000..0f5c578bd9 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.24/enable-speex.patch @@ -0,0 +1,21 @@ +--- /codecs/orig-Makefile 2005-11-29 13:24:39.000000000 -0500 ++++ /codecs/Makefile 2007-02-28 09:54:42.000000000 -0500 +@@ -29,7 +29,7 @@ + endif + + UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) +-UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) ++UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/include/speex/speex.h) + ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) + ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) + ifneq (${UI_SPEEX},) +@@ -38,7 +38,8 @@ + endif + ifneq (${UIS_SPEEX},) + MODSPEEX=codec_speex.so +- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex ++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/include/speex ++ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/lib + LIBSPEEX+=-lspeex -lm + endif + ifneq (${ULI_SPEEX},) diff --git a/packages/asterisk/asterisk-1.2.24/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.24/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.24/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.24/uclibc-dns.patch b/packages/asterisk/asterisk-1.2.24/uclibc-dns.patch new file mode 100644 index 0000000000..4ba8b6205b --- /dev/null +++ b/packages/asterisk/asterisk-1.2.24/uclibc-dns.patch @@ -0,0 +1,18 @@ +--- /orig-dns.c 2007-07-16 23:46:58.000000000 +0300 ++++ /dns.c 2007-07-26 16:29:44.000000000 +0300 +@@ -237,7 +237,14 @@ + #if defined(res_ndestroy) + #define HAS_RES_NDESTROY + #endif +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#undef HAS_RES_NDESTROY ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/gtk+/gtk+-2.10.12/.mtn2git_empty b/packages/asterisk/asterisk-1.4.7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.12/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.4.7/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.4.7/Makefile.patch b/packages/asterisk/asterisk-1.4.7/Makefile.patch new file mode 100644 index 0000000000..a6d630949e --- /dev/null +++ b/packages/asterisk/asterisk-1.4.7/Makefile.patch @@ -0,0 +1,20 @@ +--- asterisk-1.4.5/Makefile 2007-05-24 15:05:08.000000000 -0400 ++++ asterisk-1.4.5/Makefile.new 2007-06-17 05:36:44.000000000 -0400 +@@ -115,7 +115,7 @@ else + ASTSBINDIR=$(sbindir) + ASTSPOOLDIR=$(localstatedir)/spool/asterisk + ASTLOGDIR=$(localstatedir)/log/asterisk +- ASTVARRUNDIR=$(localstatedir)/run ++ ASTVARRUNDIR=$(localstatedir)/run/asterisk + ASTMANDIR=$(mandir) + ifeq ($(OSARCH),FreeBSD) + ASTVARLIBDIR=$(prefix)/share/asterisk +@@ -468,7 +468,7 @@ oldmodcheck: + echo " WARNING WARNING WARNING" ;\ + fi + +-install: datafiles bininstall $(SUBDIRS_INSTALL) ++install: datafiles bininstall $(SUBDIRS_INSTALL) samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi diff --git a/packages/asterisk/asterisk-1.4.7/init b/packages/asterisk/asterisk-1.4.7/init new file mode 100644 index 0000000000..f26ad38db3 --- /dev/null +++ b/packages/asterisk/asterisk-1.4.7/init @@ -0,0 +1,77 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/openpbx and type +# > update-rc.d asterisk defaults 60 +# +asterisk=/usr/sbin/asterisk +pidfile=/var/run/asterisk/asterisk.pid +asterisk_args="-npqT -U asterisk -G asterisk" + +test -x "$asterisk" || exit 0 + +case "$1" in + start) + echo -n "Starting Asterisk" + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + echo "." + ;; + stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop gracefully" + sleep 4 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + force-stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop now" + sleep 2 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + restart) + echo -n "Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart gracefully" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + force-restart) + echo -n "Forcibly Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart now" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + reload) + echo -n "Reloading Asterisk Configuration" + if [ -f $pidfile ]; then + $asterisk -rx "reload" + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + logger-reload) + if [ -f $pidfile ]; then + $asterisk -rx "logger reload" + fi + ;; + *) + echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}" + exit 1 +esac + +exit 0 + diff --git a/packages/asterisk/asterisk-1.4.7/logrotate b/packages/asterisk/asterisk-1.4.7/logrotate new file mode 100644 index 0000000000..dfd25ee55c --- /dev/null +++ b/packages/asterisk/asterisk-1.4.7/logrotate @@ -0,0 +1,12 @@ +/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages { + daily + missingok + compress + delaycompress + rotate 30 + sharedscripts + postrotate + /etc/init.d/asterisk logger-reload + endscript +} + diff --git a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch b/packages/asterisk/asterisk-1.4.7/sounds.xml.patch new file mode 100644 index 0000000000..b549fea132 --- /dev/null +++ b/packages/asterisk/asterisk-1.4.7/sounds.xml.patch @@ -0,0 +1,18 @@ +--- asterisk-1.4.4/sounds/sounds.xml 2007-05-24 17:00:45.000000000 -0400 ++++ asterisk-1.4.4/sounds/sounds.xml.new 2007-05-25 13:23:41.000000000 -0400 +@@ -6,7 +6,6 @@ + <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> + </member> + <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> + </member> +@@ -39,7 +38,6 @@ + </category> + <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> + <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" > + </member> diff --git a/packages/asterisk/asterisk-1.4.7/volatiles b/packages/asterisk/asterisk-1.4.7/volatiles new file mode 100644 index 0000000000..c68e786c90 --- /dev/null +++ b/packages/asterisk/asterisk-1.4.7/volatiles @@ -0,0 +1,7 @@ +d asterisk asterisk 0775 /var/run/asterisk none +d asterisk asterisk 0775 /var/lib/asterisk none +d asterisk asterisk 0775 /var/log/asterisk none +d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none +d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none +d asterisk asterisk 0775 /var/spool/asterisk/outgoing none +d asterisk asterisk 0775 /var/spool/asterisk/voicemail none diff --git a/packages/asterisk/asterisk_1.2.24.bb b/packages/asterisk/asterisk_1.2.24.bb new file mode 100644 index 0000000000..01b825d19e --- /dev/null +++ b/packages/asterisk/asterisk_1.2.24.bb @@ -0,0 +1,46 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +DESCRIPTION="The Asterisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex" +SECTION = "console/telephony" +PR = "r0" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dns.patch;patch=1 \ + file://asterisk.patch;patch=1 \ + file://enable-speex.patch;patch=1" + +S = "${WORKDIR}/asterisk-${PV}" + + +export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" +export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" +export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" + +export CROSS_ARCH="Linux" +export CROSS_PROC="${TARGET_ARCH}" + +export MAKECMDGOALS="dont-optimize" + +# We will probably have to edit the CFLAG in the Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_stage () { + install -d ${STAGING_INCDIR}/asterisk + install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/ +} + + +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" +FILES_${PN}-dbg += "/var/lib/asterisk/agi-bin/.debug" + diff --git a/packages/asterisk/asterisk_1.4.7.bb b/packages/asterisk/asterisk_1.4.7.bb new file mode 100644 index 0000000000..3973ff41dd --- /dev/null +++ b/packages/asterisk/asterisk_1.4.7.bb @@ -0,0 +1,142 @@ +DESCRIPTION = "The Asterisk open source software PBX" +HOMEPAGE = "http://www.asterisk.org" +SECTION = "voip" +LICENSE = "GPLv2" +PRIORITY = "optional" +DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis" +RRECOMMENDS_${PN} = "logrotate" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ + file://sounds.xml.patch;patch=1\ + file://Makefile.patch;patch=1\ + file://logrotate \ + file://volatiles \ + file://init" + + +INITSCRIPT_NAME = "asterisk" +INITSCRIPT_PARAMS = "defaults 60" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}\ + --with-z=${STAGING_DIR}/${HOST_SYS}\ + --with-curl=${STAGING_DIR}/${HOST_SYS}\ + --with-termcap=${STAGING_DIR}/${HOST_SYS}\ + --with-ogg=${STAGING_DIR}/${HOST_SYS}\ + --with-vorbis=${STAGING_DIR}/${HOST_SYS}\ + --with-sqlite=${STAGING_DIR}/${HOST_SYS}\ + --with-popt=${STAGING_DIR}/${HOST_SYS}\ + --with-gnutls=${STAGING_DIR}/${HOST_SYS}\ + --without-curses\ + --with-ncurses=${STAGING_DIR}/${HOST_SYS}\ + --without-imap\ + --without-netsnmp\ + --without-odbc\ + --without-osptk\ + --without-nbs\ + --without-pwlib\ + --without-radius\ + --without-tds\ + --without-postgres\ + --without-zaptel\ + " + +#export NOISY_BUILD=yes + +export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" +export ASTLDFLAGS="${LDFLAGS}" + +do_configure_prepend () { + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate + sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles +} + +do_configure () { + # Looks like rebuilding configure doesn't work, so we are skipping + # that and are just using the shipped one + gnu-configize + libtoolize --force + oe_runconf +} + +do_install_append() { + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk + install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk + install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk +} + +pkg_postinst_prepend() { + grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk + grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk + chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk +} + +FILES_${PN} += "${libdir}/asterisk/modules/*" + +CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/modem.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf" + diff --git a/packages/autoconf/autoconf-native_2.61.bb b/packages/autoconf/autoconf-native_2.61.bb index 3efa04bdd2..e992de97b7 100644 --- a/packages/autoconf/autoconf-native_2.61.bb +++ b/packages/autoconf/autoconf-native_2.61.bb @@ -9,9 +9,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" inherit native # -# without it build break: +# without it the build breaks: # | make[1]: *** No rule to make target `../bin/autom4te', needed by `autoconf.in'. Stop. # PARALLEL_MAKE = "" -DEFAULT_PREFERENCE = "-1" diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb index e6a452c9a0..525e8d0f92 100644 --- a/packages/autoconf/autoconf_2.61.bb +++ b/packages/autoconf/autoconf_2.61.bb @@ -1,5 +1,7 @@ require autoconf.inc +PARALLEL_MAKE = "" + DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 gnu-config" @@ -11,4 +13,3 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://config-site.patch;patch=1 \ ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" -DEFAULT_PREFERENCE = "-1" diff --git a/packages/gtk+/gtk+-2.10.9/.mtn2git_empty b/packages/base-files/base-files/openmoko/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.9/.mtn2git_empty +++ b/packages/base-files/base-files/openmoko/.mtn2git_empty diff --git a/packages/base-files/base-files/openmoko/issue b/packages/base-files/base-files/openmoko/issue new file mode 100644 index 0000000000..fb0d224f9f --- /dev/null +++ b/packages/base-files/base-files/openmoko/issue @@ -0,0 +1,11 @@ +.-------. +| | .-. +| | |-----.-----.-----.| | .----..-----.-----. +| | | __ | ---'| '--.| .-'| | | +| | | | | |--- || --'| | | ' | | | | +'---'---'--'--'--. |-----''----''--' '-----'-'-'-' + -' | + '---' + +The OpenMoko Distribution -- powered by Angstrom \n \l + diff --git a/packages/base-files/base-files/openmoko/issue.net b/packages/base-files/base-files/openmoko/issue.net new file mode 100644 index 0000000000..1f19e8da8f --- /dev/null +++ b/packages/base-files/base-files/openmoko/issue.net @@ -0,0 +1,12 @@ +.-------. +| | .-. +| | |-----.-----.-----.| | .----..-----.-----. +| | | __ | ---'| '--.| .-'| | | +| | | | | |--- || --'| | | ' | | | | +'---'---'--'--'--. |-----''----''--' '-----'-'-'-' + -' | + '---' + +The OpenMoko Distribution -- powered by Angstrom %h + + diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 74c4c33711..d8335f7abb 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r68" +PR = "r69" LICENSE = "GPL" SRC_URI = " \ @@ -11,7 +11,7 @@ SRC_URI = " \ file://host.conf \ file://profile \ file://fstab \ - file://filesystems \ + file://filesystems \ file://issue.net \ file://issue \ file://usbd \ @@ -41,7 +41,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${localstatedir}/volatile/run \ /mnt /media /media/card /media/cf /media/net /media/ram \ /media/union /media/realroot /media/hdd \ - /media/mmc1" + /media/mmc1" volatiles = "cache run log lock tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ diff --git a/packages/bridge-utils/bridge-utils_1.2.bb b/packages/bridge-utils/bridge-utils_1.2.bb new file mode 100644 index 0000000000..3f1f25dc3f --- /dev/null +++ b/packages/bridge-utils/bridge-utils_1.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Tools for ethernet bridging." +HOMEPAGE = "http://bridge.sourceforge.net/" +SECTION = "console/network" +LICENSE = "GPL" +DEPENDS = "sysfsutils" +RRECOMMENDS = "kernel-module-bridge" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" diff --git a/packages/oprofile/oprofile-0.9.1/.mtn2git_empty b/packages/cacao/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/oprofile/oprofile-0.9.1/.mtn2git_empty +++ b/packages/cacao/.mtn2git_empty diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb new file mode 100644 index 0000000000..f7797206de --- /dev/null +++ b/packages/cacao/cacao-cldc_0.98.bb @@ -0,0 +1,35 @@ + +require cacao.inc + +SRC_URI +="file://midpath.patch;patch=1 \ + file://offsets_make.patch;patch=1 \ + file://classpath_var.patch;patch=1 \ + file://libmath.patch;patch=1 \ + file://arm_mmap.patch;patch=1 \ + " +SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1" + +DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool zlib" +RDEPENDS = "virtual/cldc-api-1.1" +RPROVIDES = "virtual/java" + +EXTRA_OECONF += "--with-classpath-libdir=${STAGING_LIBDIR}/classpath-minimal \ + --with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \ + --enable-jni \ + --enable-java=cldc1.1 \ + --with-classpath=cldc1.1 \ + --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \ + --with-target-classpath-classes=${libdir}/java/cldc1.1.jar \ + --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh \ + --disable-libjvm \ + " + +PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" + +FILES_${PN} = "${bindir}/cacao" +FILES_${PN}-doc = "${datadir}/man" +FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*" + +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/cacao" +ALTERNATIVE_PRIORITY = "10" diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc new file mode 100644 index 0000000000..1f783b8238 --- /dev/null +++ b/packages/cacao/cacao.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "cacao is a Java Virtual Machine, which uses GNU Classpath as default Java core library" +HOMEPAGE = "http://www.cacaojvm.org/" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "interpreters" + +inherit autotools + +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346" + +S = "${WORKDIR}/cacao-${PV}" + +EXTRA_OECONF = "--disable-debug \ + ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ + " diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb new file mode 100644 index 0000000000..e24225a042 --- /dev/null +++ b/packages/cacao/cacaoh-cldc-native_0.98.bb @@ -0,0 +1,16 @@ + +require cacao.inc + +DEPENDS = "ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool-native zlib-native" + +inherit native + +EXTRA_OECONF += "--with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \ + --enable-jni \ + --enable-java=cldc1.1 \ + --with-classpath=cldc1.1 \ + --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \ + " +do_stage() { + install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/ +} diff --git a/packages/psplash/files/fic-gta01/.mtn2git_empty b/packages/cacao/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/psplash/files/fic-gta01/.mtn2git_empty +++ b/packages/cacao/files/.mtn2git_empty diff --git a/packages/cacao/files/arm_mmap.patch b/packages/cacao/files/arm_mmap.patch new file mode 100644 index 0000000000..e34c7b7802 --- /dev/null +++ b/packages/cacao/files/arm_mmap.patch @@ -0,0 +1,21 @@ +--- cacao-0.98/src/vm/exceptions.c 2007/06/27 09:04:17 8146 ++++ cacao-0.98/src/vm/exceptions.c 2007/07/02 14:07:24 8175 +@@ -92,6 +92,10 @@ + + bool exceptions_init(void) + { ++#if !(defined(__ARM__) && defined(__LINUX__)) ++ /* On arm-linux the first memory page can't be mmap'ed, as it ++ contains the exception vectors. */ ++ + int pagesize; + + /* mmap a memory page at address 0x0, so our hardware-exceptions +@@ -100,6 +104,7 @@ + pagesize = getpagesize(); + + (void) memory_mmap_anon(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED); ++#endif + + /* check if we get into trouble with our hardware-exceptions */ + diff --git a/packages/cacao/files/classpath_var.patch b/packages/cacao/files/classpath_var.patch new file mode 100644 index 0000000000..a2a69f9d1c --- /dev/null +++ b/packages/cacao/files/classpath_var.patch @@ -0,0 +1,66 @@ +Index: cacao-0.98/configure.ac +=================================================================== +--- cacao-0.98.orig/configure.ac 2007-06-06 11:24:23.000000000 +0200 ++++ cacao-0.98/configure.ac 2007-07-18 23:26:43.000000000 +0200 +@@ -842,6 +842,7 @@ + AC_CHECK_WITH_CLASSPATH + AC_CHECK_WITH_CLASSPATH_PREFIX + AC_CHECK_WITH_CLASSPATH_CLASSES ++AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES + AC_CHECK_WITH_CLASSPATH_LIBDIR + AC_CHECK_WITH_CLASSPATH_INCLUDEDIR + +Index: cacao-0.98/src/vm/vm.c +=================================================================== +--- cacao-0.98.orig/src/vm/vm.c 2007-06-05 09:44:38.000000000 +0200 ++++ cacao-0.98/src/vm/vm.c 2007-07-18 23:26:43.000000000 +0200 +@@ -621,7 +621,7 @@ + #if defined(WITH_CLASSPATH_GNU) + puts(" java.boot.class.path : "CACAO_VM_ZIP":"CLASSPATH_CLASSES""); + #else +- puts(" java.boot.class.path : "CLASSPATH_CLASSES""); ++ puts(" java.boot.class.path : "TARGET_CLASSPATH_CLASSES""); + #endif + puts(" gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR"/classpath\n"); + +@@ -873,7 +873,7 @@ + strlen(CACAO_VM_ZIP) + + strlen(":") + + # endif +- strlen(CLASSPATH_CLASSES) + ++ strlen(TARGET_CLASSPATH_CLASSES) + + strlen("0"); + + _Jv_bootclasspath = MNEW(char, len); +@@ -881,7 +881,7 @@ + strcat(_Jv_bootclasspath, CACAO_VM_ZIP); + strcat(_Jv_bootclasspath, ":"); + # endif +- strcat(_Jv_bootclasspath, CLASSPATH_CLASSES); ++ strcat(_Jv_bootclasspath, TARGET_CLASSPATH_CLASSES); + #endif + } + +Index: cacao-0.98/m4/classpath.m4 +=================================================================== +--- cacao-0.98.orig/m4/classpath.m4 2007-04-23 22:06:07.000000000 +0200 ++++ cacao-0.98/m4/classpath.m4 2007-07-18 23:38:06.000000000 +0200 +@@ -82,6 +82,18 @@ + AC_SUBST(CLASSPATH_CLASSES) + ]) + ++dnl where are Java core library classes installed on the target ++ ++AC_DEFUN([AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES],[ ++AC_MSG_CHECKING(where Java core library classes are installed on the target) ++AC_ARG_WITH([target-classpath-classes], ++ [AS_HELP_STRING(--with-target-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])], ++ [TARGET_CLASSPATH_CLASSES=${withval}], ++ [TARGET_CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip]) ++AC_MSG_RESULT(${TARGET_CLASSPATH_CLASSES}) ++AC_DEFINE_UNQUOTED([TARGET_CLASSPATH_CLASSES], "${TARGET_CLASSPATH_CLASSES}", [Java core library classes on the target]) ++AC_SUBST(TARGET_CLASSPATH_CLASSES) ++]) + + dnl where are Java core library native libraries installed + diff --git a/packages/cacao/files/libmath.patch b/packages/cacao/files/libmath.patch new file mode 100644 index 0000000000..f8a4e837e2 --- /dev/null +++ b/packages/cacao/files/libmath.patch @@ -0,0 +1,53 @@ +Index: cacao-0.98/configure.ac +=================================================================== +--- cacao-0.98.orig/configure.ac 2007-07-21 12:11:47.000000000 +0200 ++++ cacao-0.98/configure.ac 2007-07-21 13:36:40.000000000 +0200 +@@ -234,6 +234,48 @@ + AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t])) + AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t])) + ++dnl The idea of this solutions comes from bochs-project configure.in ++dnl ++dnl Add the -lm library if math functions cannot be used without it. ++dnl This check is important on cygwin because of the bizarre way that they ++dnl have organized functions into libraries. On cygwin, both libc.a and ++dnl libm.a are symbolic links to a single lib libcygwin.a. This means that ++dnl 1) linking with -lm is not necessary, and ++dnl 2) linking with -lm is dangerous if the order of libraries is wrong ++dnl In particular, if you compile any program with -mno-cygwin and link with ++dnl -lm, it will crash instantly when it is run. This happens because the ++dnl linker incorrectly links the Cygwin libm.a (==libcygwin.a), which replaces ++dnl the ___main function instead of allowing it to be defined by ++dnl /usr/lib/mingw/libmingw32.a as it should be. ++dnl ++dnl On MacOS X, this test will find that -lm is unnecessary and leave it out. ++dnl ++dnl With uClibc and without libjvm cacao needs to be linked with -lm because of ++dnl the function scalbn ++dnl ++dnl Just check this math functions. If it is found without ++dnl -lm, then we must not need -lm. ++have_scalbn=0 ++AC_CHECK_FUNCS(scalbn, have_scalbn=1) ++AC_MSG_CHECKING(if math functions link without -lm) ++if test "$have_scalbn" = 1; then ++ AC_MSG_RESULT(yes) ++else ++ AC_MSG_RESULT(no) ++ LIBS="$LIBS -lm" ++ # use different functions to bypass configure caching ++ have_scalbl=0 ++ AC_CHECK_FUNCS(scalbl, have_scalbl=1) ++ AC_MSG_CHECKING(if math functions link with -lm) ++ if test "$have_scalbl" = 1; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no) ++ # not sure we should warn the user, crash, etc. ++ # expect link failure ++ fi ++fi ++ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_C_INLINE diff --git a/packages/cacao/files/midpath.patch b/packages/cacao/files/midpath.patch new file mode 100644 index 0000000000..b905f774af --- /dev/null +++ b/packages/cacao/files/midpath.patch @@ -0,0 +1,372 @@ +Index: cacao-0.98/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c +=================================================================== +--- cacao-0.98.orig/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c 2007-05-16 10:06:15.000000000 +0200 ++++ cacao-0.98/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c 2007-07-22 00:15:55.000000000 +0200 +@@ -26,25 +26,53 @@ + + */ + ++#include <sys/stat.h> ++#include <stdlib.h> + + #include "config.h" +-#include "vm/types.h" ++ ++#include "arch.h" ++#include "mm/memory.h" + + #include "native/jni.h" + #include "native/native.h" + + #include "native/include/java_lang_Object.h" + #include "native/include/java_lang_String.h" +- ++#include "native/include/java_lang_Integer.h" + #include "native/include/com_sun_cldc_io_ResourceInputStream.h" ++#include "native/include/com_sun_cldchi_jvm_FileDescriptor.h" + ++#include "vm/types.h" ++#include "vm/builtin.h" + #include "vm/vm.h" /* REMOVE ME: temporarily */ ++#include "vm/exceptions.h" ++#include "vm/initialize.h" ++#include "vm/stringlocal.h" ++#include "vm/properties.h" ++ ++#include "vmcore/class.h" ++#include "vmcore/classcache.h" ++#include "vmcore/linker.h" ++#include "vmcore/loader.h" ++#include "vmcore/options.h" ++#include "vmcore/statistics.h" ++#include "vmcore/suck.h" ++#include "vmcore/zip.h" ++ ++#include "toolbox/list.h" ++#include "toolbox/logging.h" ++#include "toolbox/util.h" + + + /* native methods implemented by this file ************************************/ + + static JNINativeMethod methods[] = { + { "open", "(Ljava/lang/String;)Ljava/lang/Object;", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_open }, ++ { "bytesRemain", "(Ljava/lang/Object;)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_bytesRemain }, ++ { "readByte", "(Ljava/lang/Object;)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_readByte }, ++ { "readBytes", "(Ljava/lang/Object;[BII)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_readBytes }, ++ { "clone", "(Ljava/lang/Object;)Ljava/lang/Object;", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_clone }, + }; + + /* _Jv_com_sun_cldc_io_ResourceInputStream_init ******************************** +@@ -68,13 +96,209 @@ + * Method: open + * Signature: (Ljava/lang/String;)Ljava/lang/Object; + */ +-JNIEXPORT java_lang_Object* JNICALL Java_com_sun_cldc_io_ResourceInputStream_open(JNIEnv *env, jclass clazz, java_lang_String *name) ++JNIEXPORT struct java_lang_Object* JNICALL Java_com_sun_cldc_io_ResourceInputStream_open(JNIEnv *env, jclass clazz, java_lang_String *name) + { +- vm_abort("Java_com_sun_cldc_io_ResourceInputStream_open: IMPLEMENT ME!"); ++ ++ list_classpath_entry *lce; ++ char *filename; ++ s4 filenamelen; ++ char *path; ++ FILE *classfile; ++ /*struct stat statBuffer; ++ int bufferSize = -1;*/ ++ utf *uname; ++ /*java_lang_Integer *fhandler;*/ ++ com_sun_cldchi_jvm_FileDescriptor *fileDescriptor; ++ classinfo *ci; ++ ++ ++ /* get the classname as char string (do it here for the warning at ++ the end of the function) */ ++ ++ uname = javastring_toutf((java_objectheader *)name, false); ++ filenamelen = utf_bytes(uname) + strlen("0"); ++ filename = MNEW(char, filenamelen); ++ utf_copy(filename, uname); ++ classfile = NULL; ++ ++ ++ /* walk through all classpath entries */ ++ ++ for (lce = list_first(list_classpath_entries); lce != NULL; ++ lce = list_next(list_classpath_entries, lce)) { ++ ++ path = MNEW(char, lce->pathlen + filenamelen); ++ strcpy(path, lce->path); ++ strcat(path, filename); ++ ++ classfile = fopen(path, "r"); ++ ++ MFREE(path, char, lce->pathlen + filenamelen); ++ ++ if (classfile) { /* file exists */ ++ break; ++ } ++ } ++ ++ MFREE(filename, char, filenamelen); ++ ++ if (classfile) { ++ ci = load_class_bootstrap(utf_new_char("com/sun/cldchi/jvm/FileDescriptor")); ++ fileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) native_new_and_init(ci); ++ fileDescriptor->handle = (int) classfile; ++ fileDescriptor->valid = (int) 0; ++ return (java_lang_Object*) fileDescriptor; ++ } else { ++ return NULL; ++ } ++ ++} ++ ++ ++/* ++ * Class: com_sun_cldc_io_ResourceInputStream ++ * Method: bytesRemain ++ * Signature: (Ljava/lang/Object;)I ++ */ ++JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_ResourceInputStream_bytesRemain(JNIEnv *env, jclass clazz, struct java_lang_Object* jobj) { ++ ++ com_sun_cldchi_jvm_FileDescriptor *fileDescriptor; ++ struct stat statBuffer; ++ FILE *file; ++ int fd; ++ int position; ++ int hposition; ++ ++ fileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) jobj; ++ file = (FILE *)fileDescriptor->handle; ++ ++ /* Change access position if needed */ ++ hposition = fileDescriptor->valid; ++ position = ftell(file); ++ if (position != hposition) { ++ fseek(file, hposition, SEEK_SET); ++ } ++ ++ fd = fileno(file); ++ if (fstat(fd, &statBuffer) != -1) { ++ return (statBuffer.st_size - hposition); ++ } else { ++ /* TODO Throw an IOException */ ++ return 0; ++ } + +- return NULL; + } + ++/* ++ * Class: com_sun_cldc_io_ResourceInputStream ++ * Method: readByte ++ * Signature: (Ljava/lang/Object;)I ++ */ ++JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_ResourceInputStream_readByte(JNIEnv *env, jclass clazz, struct java_lang_Object* jobj) { ++ ++ com_sun_cldchi_jvm_FileDescriptor *fileDescriptor; ++ int readBytes = -1; ++ char byte; ++ FILE * file; ++ int position; ++ int hposition; ++ ++ fileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) jobj; ++ file = (FILE *)fileDescriptor->handle; ++ ++ /* Change access position if needed */ ++ hposition = fileDescriptor->valid; ++ position = ftell(file); ++ if (position != hposition) { ++ fseek(file, hposition, SEEK_SET); ++ } ++ ++ readBytes = fread(&byte, 1, 1, file); ++ ++ /* Check if EOF or an error occurred */ ++ if (readBytes != 1) { ++ if (feof(file)) { ++ return -1; ++ } else if (ferror(file)) { ++ /* TODO: throw an IOException */ ++ } ++ } ++ ++ /* Update access position */ ++ fileDescriptor->valid = ftell(file); ++ ++ return (byte & 0xFF); ++ ++} ++ ++/* ++ * Class: com_sun_cldc_io_ResourceInputStream ++ * Method: readBytes ++ * Signature: (Ljava/lang/Object;[BII)I ++ */ ++JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_ResourceInputStream_readBytes(JNIEnv *env, jclass clazz, struct java_lang_Object* jobj, java_bytearray* byteArray, s4 off, s4 len) { ++ ++ com_sun_cldchi_jvm_FileDescriptor *fileDescriptor; ++ int readBytes = -1; ++ FILE * file; ++ int position; ++ int hposition; ++ void *buf; ++ ++ /* get pointer to the buffer */ ++ buf = &(byteArray->data[off]); ++ ++ fileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) jobj; ++ file = (FILE *)fileDescriptor->handle; ++ ++ /* Change access position if needed */ ++ hposition = fileDescriptor->valid; ++ position = ftell(file); ++ if (position != hposition) { ++ fseek(file, hposition, SEEK_SET); ++ } ++ ++ readBytes = fread(buf, 1, len, file); ++ ++ /* Check if EOF or an error occurred */ ++ if (readBytes != len) { ++ if ((readBytes == 0) && feof(file)) { ++ return -1; ++ } else if (ferror(file)) { ++ /* TODO: throw an IOException */ ++ } ++ } ++ ++ /* Update access position */ ++ fileDescriptor->valid = ftell(file); ++ ++ return readBytes; ++} ++ ++/* ++ * Class: com_sun_cldc_io_ResourceInputStream ++ * Method: clone ++ * Signature: (Ljava/lang/Object;)Ljava/lang/Object; ++ */ ++JNIEXPORT struct java_lang_Object* JNICALL Java_com_sun_cldc_io_ResourceInputStream_clone(JNIEnv *env, jclass clazz, struct java_lang_Object* jobj) { ++ ++ classinfo *ci; ++ com_sun_cldchi_jvm_FileDescriptor *srcFileDescriptor; ++ com_sun_cldchi_jvm_FileDescriptor *dstFileDescriptor; ++ ++ srcFileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) jobj; ++ ++ ci = load_class_bootstrap(utf_new_char("com/sun/cldchi/jvm/FileDescriptor")); ++ dstFileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) native_new_and_init(ci); ++ dstFileDescriptor->handle = srcFileDescriptor->handle; ++ dstFileDescriptor->valid = srcFileDescriptor->valid; ++ ++ return (java_lang_Object*) dstFileDescriptor; ++ ++} ++ ++ ++ + + /* + * These are local overrides for various environment variables in Emacs. +Index: cacao-0.98/src/native/vm/cldc1.1/Makefile.am +=================================================================== +--- cacao-0.98.orig/src/native/vm/cldc1.1/Makefile.am 2007-04-02 13:23:24.000000000 +0200 ++++ cacao-0.98/src/native/vm/cldc1.1/Makefile.am 2007-07-22 00:15:55.000000000 +0200 +@@ -38,6 +38,7 @@ + com_sun_cldc_io_j2me_socket_Protocol.c \ + com_sun_cldchi_io_ConsoleOutputStream.c \ + com_sun_cldchi_jvm_JVM.c \ ++ com_sun_cldchi_jvm_FileDescriptor.c \ + java_lang_Class.c \ + java_lang_Double.c \ + java_lang_Float.c \ +Index: cacao-0.98/src/native/include/Makefile.am +=================================================================== +--- cacao-0.98.orig/src/native/include/Makefile.am 2007-05-23 20:15:07.000000000 +0200 ++++ cacao-0.98/src/native/include/Makefile.am 2007-07-22 00:15:55.000000000 +0200 +@@ -74,6 +74,7 @@ + com_sun_cldc_io_j2me_socket_Protocol.h \ + com_sun_cldchi_io_ConsoleOutputStream.h \ + com_sun_cldchi_jvm_JVM.h \ ++ com_sun_cldchi_jvm_FileDescriptor.h \ + java_lang_Math.h \ + java_lang_Runtime.h \ + java_lang_System.h +Index: cacao-0.98/src/native/vm/cldc1.1/com_sun_cldchi_jvm_FileDescriptor.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ cacao-0.98/src/native/vm/cldc1.1/com_sun_cldchi_jvm_FileDescriptor.c 2007-07-22 00:18:01.000000000 +0200 +@@ -0,0 +1,70 @@ ++/* src/native/vm/cldc1.1/com_sun_cldchi_jvm_FileDescriptor.c ++ ++ Copyright (C) 2006, 2007 R. Grafl, A. Krall, C. Kruegel, C. Oates, ++ R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, ++ C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, ++ Institut f. Computersprachen - TU Wien ++ ++ This file is part of CACAO. ++ ++ 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ ++ $Id: java_lang_VMRuntime.c 5900 2006-11-04 17:30:44Z michi $ ++ ++*/ ++ ++#include "config.h" ++ ++#include <stdio.h> ++ ++#include "vm/types.h" ++ ++#include "native/jni.h" ++#include "native/native.h" ++ ++#include "native/include/com_sun_cldchi_jvm_FileDescriptor.h" ++ ++/* native methods implemented by this file ************************************/ ++ ++static JNINativeMethod methods[] = { ++ { "finalize", "()V", (void *) (ptrint) &Java_com_sun_cldchi_jvm_FileDescriptor_finalize }, ++}; ++ ++/* _Jv_com_sun_cldchi_jvm_FileDescriptor_init ****************************** ++ ++ Register native functions. ++ ++*******************************************************************************/ ++ ++void _Jv_com_sun_cldchi_jvm_FileDescriptor_init(void) ++{ ++ utf *u; ++ ++ u = utf_new_char("com/sun/cldchi/jvm/FileDescriptor"); ++ ++ native_method_register(u, methods, NATIVE_METHODS_COUNT); ++} ++ ++/* ++ * Class: com/sun/cldchi/jvm/FileDescriptor ++ * Method: finalize ++ * Signature: ()V ++ */ ++JNIEXPORT void JNICALL Java_com_sun_cldchi_jvm_FileDescriptor_finalize(JNIEnv *env, struct com_sun_cldchi_jvm_FileDescriptor* this) { ++ /* printf("close\n"); */ ++ fclose((FILE *)this->handle); ++ ++} diff --git a/packages/cacao/files/offset.h_arm.patch b/packages/cacao/files/offset.h_arm.patch new file mode 100644 index 0000000000..7011527540 --- /dev/null +++ b/packages/cacao/files/offset.h_arm.patch @@ -0,0 +1,35 @@ +Index: cacao-0.98/src/vm/jit/arm/offsets.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ cacao-0.98/src/vm/jit/arm/offsets.h 2007-07-17 23:35:56.000000000 +0200 +@@ -0,0 +1,30 @@ ++/* This file is machine generated, don't edit it! */ ++ ++/* define some sizeof()'s */ ++ ++#define sizevmarg 16 ++ ++ ++/* define some offsets */ ++ ++#define offobjvftbl 0 ++ ++ ++/* vftbl_t */ ++ ++#define offbaseval 20 ++#define offdiffval 24 ++ ++ ++/* classinfo */ ++ ++#define offclassvftbl 124 ++ ++ ++#define offvmargtype 0 ++#define offvmargdata 8 ++ ++ ++#define offcast_super_baseval 0 ++#define offcast_super_diffval 4 ++#define offcast_sub_baseval 8 diff --git a/packages/cacao/files/offsets_make.patch b/packages/cacao/files/offsets_make.patch new file mode 100644 index 0000000000..d6f9dbef3a --- /dev/null +++ b/packages/cacao/files/offsets_make.patch @@ -0,0 +1,25 @@ +Index: cacao-0.98/src/vm/jit/arm/Makefile.am +=================================================================== +--- cacao-0.98.orig/src/vm/jit/arm/Makefile.am 2007-04-02 13:23:22.000000000 +0200 ++++ cacao-0.98/src/vm/jit/arm/Makefile.am 2007-07-17 23:26:33.000000000 +0200 +@@ -40,10 +40,6 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) + +-BUILT_SOURCES = offsets.h +- +-CLEANFILES = offsets.h +- + noinst_HEADERS = \ + arch.h \ + machine-instr.h \ +@@ -72,9 +68,6 @@ + + $(srcdir)/asmpart.S: $(top_builddir)/config.h offsets.h + +-offsets.h: $(top_builddir)/src/vm/jit/tools/genoffsets $(top_builddir)/config.h +- $(top_builddir)/src/vm/jit/tools/genoffsets > offsets.h +- + + ## Local variables: + ## mode: Makefile diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb index f4d62ee7fb..6c527988a9 100644 --- a/packages/cairo/cairo_git.bb +++ b/packages/cairo/cairo_git.bb @@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" +DEPENDS = "pixman virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" @@ -15,10 +15,6 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" -do_configure_prepend() { - sed -i s:PKGCONFIG_REQUIRED=0.19:PKGCONFIG_REQUIRED=0.15: configure.in -} - do_compile_append() { cd ${S}/perf ; oe_runmake } diff --git a/packages/dbus/dbus-c++-native_svn.bb b/packages/dbus/dbus-c++-native_svn.bb new file mode 100644 index 0000000000..96eb2f3227 --- /dev/null +++ b/packages/dbus/dbus-c++-native_svn.bb @@ -0,0 +1,6 @@ +require dbus-c++_${PV}.bb +inherit native + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++" +# actually dbus-native and expat-native, but even the bearest build machine should have that nowadays... +DEPENDS = "" diff --git a/packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty b/packages/dbus/dbus-c++/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty +++ b/packages/dbus/dbus-c++/.mtn2git_empty diff --git a/packages/dbus/dbus-c++/fix-linking.patch b/packages/dbus/dbus-c++/fix-linking.patch new file mode 100644 index 0000000000..822216916b --- /dev/null +++ b/packages/dbus/dbus-c++/fix-linking.patch @@ -0,0 +1,13 @@ +Index: dbus/tools/Makefile.am +=================================================================== +--- dbus.orig/tools/Makefile.am ++++ dbus/tools/Makefile.am +@@ -16,7 +16,7 @@ endif + bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect + + dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp +-dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) ++dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -lexpat + + dbusxx_introspect_SOURCES = introspect.h introspect.cpp + dbusxx_introspect_LDADD = $(libdbus_cxx_la) diff --git a/packages/dbus/dbus-c++_svn.bb b/packages/dbus/dbus-c++_svn.bb new file mode 100644 index 0000000000..ea6c0fa8ea --- /dev/null +++ b/packages/dbus/dbus-c++_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "C++ bindings for dbus" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "dbus dbus-c++-native expat" + +SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http \ + file://fix-linking.patch;patch=1" +S = "${WORKDIR}/dbus" + +inherit autotools pkgconfig + +do_compile_prepend() { + find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,' +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect" +FILES_${PN}-dev += "${bindir}/.dev" +FILES_${PN} = "${libdir}/*.so.*" + diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc index 4c107d5f07..6744aed49f 100644 --- a/packages/exmap-console/exmap-console.inc +++ b/packages/exmap-console/exmap-console.inc @@ -2,60 +2,60 @@ DESCRIPTION = "Console based version of exmap, a memory usage analysis tool" HOMEPAGE = "http://projects.o-hand.com/exmap-console" SECTION = "devel" LICENSE = "GPL" -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel readline" SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" +TEMPPACKAGE_ARCH := "${PACKAGE_ARCH}" + inherit module-base inherit autotools MYPV := "${PV}" +PACKAGE_ARCH = "${TEMPPACKAGE_ARCH}" -PACKAGES += "exmap-server kernel-module-exmap" +PACKAGES =+ "exmap-server kernel-module-exmap" FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd" -PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}" RDEPENDS_exmap-console += "kernel-module-exmap" FILES_exmap-server = "${bindir}/exmapserver" -PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}" RDEPENDS_exmap-server += "kernel-module-exmap" FILES_kernel-module-exmap = "${base_libdir}" PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}" PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" -RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})" +RDEPENDS_kernel-module-exmap += "update-modules kernel-image-${KERNEL_VERSION}" S = "${WORKDIR}/exmap-console-${PV}" export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" do_compile() { - cd ${S}/src - make - - cd ${S}/kernel - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - ${MAKE_TARGETS} + cd ${S}/src + make + + cd ${S}/kernel + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + ${MAKE_TARGETS} } do_install() { - oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install + oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install } pkg_postinst_append_kernel-module-exmap () { - if [ -n "$D" ]; then - exit 1 - fi - depmod -a - update-modules || true + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true } pkg_postrm_append_kernel-module-exmap () { - update-modules || true + update-modules || true } - diff --git a/packages/exmap-console/exmap-console_0.4.bb b/packages/exmap-console/exmap-console_0.4.1.bb index 5d89f04937..17703321e8 100644 --- a/packages/exmap-console/exmap-console_0.4.bb +++ b/packages/exmap-console/exmap-console_0.4.1.bb @@ -1,2 +1,3 @@ require exmap-console.inc +PR = "r4" diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb index 9e6ca80dc0..7c21222d84 100644 --- a/packages/exmap-console/exmap-console_svn.bb +++ b/packages/exmap-console/exmap-console_svn.bb @@ -1,5 +1,7 @@ -PR = "r10" +require exmap-console.inc + PV = "0.4+svn${SRCDATE}" +PR = "r14" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" @@ -7,4 +9,3 @@ S = "${WORKDIR}/exmap-console" MYPV := "${PV}" PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" - diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 4098d721f9..b8bd365d51 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ffmpeg" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libvorbis faac liba52 lame" +DEPENDS = "libogg zlib libvorbis faac liba52 lame" PV = "0.4.9+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" @@ -11,17 +11,18 @@ SRC_URI = "svn://svn.mplayerhq.hu/ffmpeg/;module=trunk" S = "${WORKDIR}/trunk" -inherit autotools +inherit autotools pkgconfig TARGET_LDFLAGS_append = " -lm -la52 " EXTRA_OECONF = " \ - --enable-mp3lame \ - --enable-vorbis \ - --enable-faad \ - --enable-a52 \ - --enable-a52bin \ - --enable-pp \ + --enable-libmp3lame \ + --enable-libvorbis \ + --disable-libfaad \ + --enable-liba52 \ + --enable-liba52bin \ + --enable-libogg \ + --enable-pp \ --enable-shared \ --enable-pthreads \ --enable-gpl \ @@ -32,10 +33,12 @@ EXTRA_OECONF = " \ --disable-debug \ --disable-ffserver \ --disable-ffplay \ + --disable-strip \ \ --cross-prefix=${TARGET_PREFIX} \ \ --cpu=${PACKAGE_ARCH} \ + --arch=${PACKAGE_ARCH} \ " @@ -48,6 +51,8 @@ do_configure_prepend() { } oe_runconf () { + # make ffmpeg detect arm targets that don't end in 'l' + sed -i -e s:'armv\[4567\]\*l':'armv\[4567\]\*':g ${S}/configure if [ -x ${S}/configure ] ; then cfgcmd="${S}/configure \ --prefix=${prefix} \ diff --git a/packages/gaim/files/purple-OE-branding.patch b/packages/gaim/files/purple-OE-branding.patch new file mode 100644 index 0000000000..99c61375ce --- /dev/null +++ b/packages/gaim/files/purple-OE-branding.patch @@ -0,0 +1,14 @@ +--- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200 ++++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200 +@@ -35,9 +35,9 @@ + #define IRC_DEFAULT_SSL_PORT 994 + + #define IRC_DEFAULT_CHARSET "UTF-8" +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "OE-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb index e0f865722e..c01db89c04 100644 --- a/packages/gaim/pidgin_2.1.0.bb +++ b/packages/gaim/pidgin_2.1.0.bb @@ -4,6 +4,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch;patch=1 \ file://gconf-no-errors.patch;patch=1 \ file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding.patch;patch=1 \ " -PR = "r0" +PR = "r1" diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/git/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty +++ b/packages/git/files/.mtn2git_empty diff --git a/packages/git/files/autotools.patch b/packages/git/files/autotools.patch new file mode 100644 index 0000000000..0666118cde --- /dev/null +++ b/packages/git/files/autotools.patch @@ -0,0 +1,26 @@ +Index: git-1.5.2.3/configure.ac +=================================================================== +--- git-1.5.2.3.orig/configure.ac 2007-07-02 10:11:39.000000000 +0200 ++++ git-1.5.2.3/configure.ac 2007-08-04 00:02:13.000000000 +0200 +@@ -235,7 +235,8 @@ + else if (strcmp(buf, "12345")) + exit(2);]])], + [ac_cv_c_c99_format=yes], +- [ac_cv_c_c99_format=no]) ++ [ac_cv_c_c99_format=no], ++ [ac_cv_c_c99_format=yes]) + ]) + if test $ac_cv_c_c99_format = no; then + NO_C99_FORMAT=YesPlease +Index: git-1.5.2.3/config.mak.in +=================================================================== +--- git-1.5.2.3.orig/config.mak.in 2007-07-02 10:11:39.000000000 +0200 ++++ git-1.5.2.3/config.mak.in 2007-08-04 00:07:04.000000000 +0200 +@@ -3,6 +3,7 @@ + + CC = @CC@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + AR = @AR@ + TAR = @TAR@ + #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.4.4.2.bb deleted file mode 100644 index f91fd03ab1..0000000000 --- a/packages/git/git-native_1.4.4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require git.inc -inherit native -DEPENDS = "openssl-native curl-native" diff --git a/packages/git/git-native_1.5.2.3.bb b/packages/git/git-native_1.5.2.3.bb new file mode 100644 index 0000000000..7ddfee0d08 --- /dev/null +++ b/packages/git/git-native_1.5.2.3.bb @@ -0,0 +1,6 @@ + +inherit native +require git_${PV}.bb + +DEPENDS = "openssl-native curl-native zlib-native expat-native" +RDEPENDS = "" diff --git a/packages/git/git.inc b/packages/git/git.inc deleted file mode 100644 index 384dfaaeec..0000000000 --- a/packages/git/git.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The git revision control system used by the Linux kernel developers" -SECTION = "console/utils" -LICENSE = "GPL" - -SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2" -S = "${WORKDIR}/git-${PV}" - -do_install () { - oe_runmake install prefix=${D} bindir=${D}${bindir} \ - template_dir=${D}${datadir}/git-core/templates \ - GIT_PYTHON_DIR=${D}${datadir}/git-core/python -} - -FILES_${PN} += "${datadir}/git-core" - diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.4.4.2.bb deleted file mode 100644 index e6a1117316..0000000000 --- a/packages/git/git_1.4.4.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require git.inc -DEPENDS = "openssl curl" -RDEPENDS = "perl perl-module-file-path cpio findutils sed" - -PR="r2" - -do_install() { - oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ - template_dir="${datadir}/git-core/templates" \ - GIT_PYTHON_DIR="${datadir}/git-core/python" -} diff --git a/packages/git/git_1.5.2.3.bb b/packages/git/git_1.5.2.3.bb new file mode 100644 index 0000000000..db43aa71fd --- /dev/null +++ b/packages/git/git_1.5.2.3.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +SECTION = "console/utils" +LICENSE = "GPL" +PR="r4" + +inherit autotools + +SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ + file://autotools.patch;patch=1 \ + " + +S = "${WORKDIR}/git-${PV}" + +DEPENDS = "openssl curl zlib expat" +RDEPENDS = "perl perl-module-file-path cpio findutils sed" + +EXTRA_OEMAKE = "NO_TCLTK=1" + +do_install() { + oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ + template_dir="${datadir}/git-core/templates" \ + GIT_PYTHON_DIR="${datadir}/git-core/python" +} + +FILES_${PN} += "${datadir}/git-core" + diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb new file mode 100644 index 0000000000..02ba4c6273 --- /dev/null +++ b/packages/glibc/eglibc-initial_svn.bb @@ -0,0 +1,46 @@ +require eglibc_${PV}.bb + +DEPENDS = "linux-libc-headers" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PACKAGES = "" + +do_configure () { + sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure + chmod +x ${S}/configure + unset CFLAGS + CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ + --without-cvs --disable-sanity-checks \ + --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ + --enable-hacker-mode + if grep -q GLIBC_2.3 ${S}/ChangeLog; then + # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. + # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. + # Another workaround might be to tell configure to not use any cross options to $(CC). + # The real fix would be to get install-headers to not generate errlist-compat.c. + make sysdeps/gnu/errlist.c + mkdir -p stdio-common + touch stdio-common/errlist-compat.c + fi +} + +do_compile () { + : +} + +do_stage () { + oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers + + # Two headers -- stubs.h and features.h -- aren't installed by install-headers, + # so do them by hand. We can tolerate an empty stubs.h for the moment. + # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html + mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu + touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h + cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h +} + +do_install () { + : +} diff --git a/packages/glibc/eglibc-intermediate_svn.bb b/packages/glibc/eglibc-intermediate_svn.bb new file mode 100644 index 0000000000..c26f649031 --- /dev/null +++ b/packages/glibc/eglibc-intermediate_svn.bb @@ -0,0 +1,19 @@ +require eglibc_${PV}.bb + +do_install () { + : +} + +# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ +do_configure_prepend() { + sed -i s:-Werror:: ${S}/configure +} + + + +PACKAGES = "" +PACKAGES_DYNAMIC = "" +PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" +GLIBC_ADDONS = "nptl,ports" +GLIBC_EXTRA_OECONF = "" diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass new file mode 100644 index 0000000000..0f88227cdf --- /dev/null +++ b/packages/glibc/eglibc-package.bbclass @@ -0,0 +1,319 @@ +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a eglibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + + +# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION +# is set. The idea is to avoid running localedef on the target (at first boot) +# to decrease initial boot time and avoid localedef being killed by the OOM +# killer which used to effectively break i18n on machines with < 128MB RAM. + +# default to disabled until qemu works for everyone +ENABLE_BINARY_LOCALE_GENERATION ?= "0" + +# BINARY_LOCALE_ARCHES is a space separated list of regular expressions +BINARY_LOCALE_ARCHES ?= "arm.*" + +PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" +PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" + +libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" + +FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" +FILES_ldd = "${bindir}/ldd" +FILES_libsegfault = "/lib/libSegFault*" +FILES_eglibc-extra-nss = "/lib/libnss*" +FILES_sln = "/sbin/sln" +FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" +FILES_nscd = "${sbindir}/nscd*" +FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" +FILES_eglibc-gconv = "${libdir}/gconv/*" +FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" +FILES_eglibc-pcprofile = "/lib/libpcprofile.so" +FILES_eglibc-thread-db = "/lib/libthread_db*" +FILES_localedef = "${bindir}/localedef" +RPROVIDES_eglibc-dev += "libc-dev" + +DESCRIPTION_sln = "eglibc: create symbolic links between files" +DESCRIPTION_nscd = "eglibc: name service cache daemon for passwd, group, and hosts" +DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services" +DESCRIPTION_ldd = "eglibc: print shared library dependencies" +DESCRIPTION_localedef = "eglibc: compile locale definition files" +DESCRIPTION_eglibc-utils = "eglibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." + +def get_eglibc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return "" + +EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}" + +OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" + +do_install() { + oe_runmake install_root=${D} install + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ + done + install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ + install -d ${D}${libdir}/locale + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp + mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED + done + rm -f ${D}/etc/rpc +} + +TMP_LOCALE="/tmp/locale${libdir}/locale" + +locale_base_postinst() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s +mkdir -p ${libdir}/locale/ +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +locale_base_postrm() { +#!/bin/sh + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +python __anonymous () { + enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) + + if enabled and int(enabled): + import re + + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" + + for regexp in binary_arches.split(" "): + r = re.compile(regexp) + + if r.match(target_arch): + depends = bb.data.getVar("DEPENDS", d, 1) + depends = "%s qemu-native" % depends + bb.data.setVar("DEPENDS", depends, d) + bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d) + break +} + +do_prep_locale_tree() { + treedir=${WORKDIR}/locale-tree + rm -rf $treedir + mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale + cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + # unzip to avoid parsing errors + for i in $treedir/${datadir}/i18n/charmaps/*gz; do + gunzip $i + done + ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + fi + install -m 0755 ${D}${bindir}/localedef $treedir/bin +} + +do_collect_bins_from_locale_tree() { + treedir=${WORKDIR}/locale-tree + + mkdir -p ${D}${libdir} + cp -a $treedir/${libdir}/locale ${D}${libdir} +} + +python package_do_split_gconvs () { + import os, re + if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): + bb.note("package requested not splitting gconvs") + return + + if not bb.data.getVar('PACKAGES', d, 1): + return + + libdir = bb.data.getVar('libdir', d, 1) + if not libdir: + bb.error("libdir not defined") + return + datadir = bb.data.getVar('datadir', d, 1) + if not datadir: + bb.error("datadir not defined") + return + + gconv_libdir = base_path_join(libdir, "gconv") + charmap_dir = base_path_join(datadir, "i18n", "charmaps") + locales_dir = base_path_join(datadir, "i18n", "locales") + binary_locales_dir = base_path_join(libdir, "locale") + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv') + + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='') + + def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-localedata-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') + bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) + + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) + + dot_re = re.compile("(.*)\.(.*)") + + # Collate the locales by base and encoding + encodings = {} + for l in supported: + l = l[:-1] + (locale, charset) = l.split(" ") + m = dot_re.match(locale) + if m: + locale = m.group(1) + if not encodings.has_key(locale): + encodings[locale] = [] + encodings[locale].append(charset) + + def output_locale_source(name, locale, encoding): + pkgname = 'locale-base-' + legitimize_package_name(name) + + bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef eglibc-localedata-%s eglibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) + bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) + + def output_locale_binary(name, locale, encoding): + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + qemu = "qemu-%s -r 2.6.16" % target_arch + pkgname = 'locale-base-' + legitimize_package_name(name) + m = re.match("(.*)\.(.*)", name) + if m: + eglibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + eglibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + + treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + path = bb.data.getVar("PATH", d, 1) + i18npath = base_path_join(treedir, datadir, "i18n") + + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + bb.note("generating locale %s (%s)" % (locale, encoding)) + if os.system(cmd): + raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) + + def output_locale(name, locale, encoding): + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + output_locale_binary(name, locale, encoding) + else: + output_locale_source(name, locale, encoding) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + bb.note("preparing tree for binary locale generation") + bb.build.exec_func("do_prep_locale_tree", d) + + # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] + for l in encodings.keys(): + if len(encodings[l]) == 1: + output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) + else: + if "UTF-8" in encodings[l]: + output_locale(l, l, "UTF-8") + encodings[l].remove("UTF-8") + else: + non_utf8.append(l) + for e in encodings[l]: + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin: + bb.note("collecting binary locales from locale tree") + bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='eglibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + +} + +# We want to do this indirection so that we can safely 'return' +# from the called function even though we're prepending +python populate_packages_prepend () { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_eglibc', 'libc6', d) + bb.data.setVar('PKG_eglibc-dev', 'libc6-dev', d) + bb.build.exec_func('package_do_split_gconvs', d) +} diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glibc/eglibc-svn/.mtn2git_empty diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch new file mode 100644 index 0000000000..0bf6c57852 --- /dev/null +++ b/packages/glibc/eglibc-svn/export-fcntl2.patch @@ -0,0 +1,11 @@ +--- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700 ++++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700 +@@ -23,7 +23,7 @@ subdir := io + + headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ + sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ +- poll.h sys/poll.h bits/poll.h \ ++ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \ + utime.h ftw.h fts.h sys/sendfile.h + + routines := \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index bf5023ca85..21079bb895 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -1,10 +1,12 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" - +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.6+svn${SRCDATE}" SRC_URI = "svn://svn.eglibc.org;module=trunk \ - " + file://export-fcntl2.patch;patch=1 \ + file://etc/ld.so.conf \ + file://generate-supported.mk" S = "${WORKDIR}/trunk/libc" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -83,5 +85,51 @@ do_compile () { ) } +do_stage() { + rm -f ${STAGING_LIBDIR}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${STAGING_LIBDIR}/libc.so.6' \ + install-headers install-lib + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + + rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6 + oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ + install-headers install-lib + + install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ + ${CROSS_DIR}/${TARGET_SYS}/include/bits \ + ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ + done + + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so +} -require glibc-package.bbclass +require eglibc-package.bbclass diff --git a/packages/gpe-bootsplash/files/splash-l.svg b/packages/gpe-bootsplash/files/splash-l.svg index fa5ca4805e..f488057c37 100644 --- a/packages/gpe-bootsplash/files/splash-l.svg +++ b/packages/gpe-bootsplash/files/splash-l.svg @@ -6,15 +6,17 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" sodipodi:version="0.32" - inkscape:version="0.42" + inkscape:version="0.45" width="8.0000000cm" height="6.0000000cm" sodipodi:docname="splash-l.svg" - sodipodi:docbase="/home/koen/Desktop"> + sodipodi:docbase="/home/fuchs/Projekte/oe/dev/packages/gpe-bootsplash/files" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> <metadata id="metadata27"> <rdf:RDF> @@ -35,15 +37,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.0000000" + inkscape:zoom="2" inkscape:cx="130.17183" inkscape:cy="82.153473" inkscape:window-width="1024" inkscape:window-height="746" showguides="true" snaptoguides="true" - inkscape:window-x="1171" - inkscape:window-y="138" + inkscape:window-x="261" + inkscape:window-y="139" inkscape:current-layer="svg1" /> <path style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;" @@ -157,8 +159,7 @@ sodipodi:nodetypes="cssssss" /> </g> <path - transform="scale(1.016596,0.983675)" - style="font-size:24.295891px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans" - d="M 32.449651,158.02394 L 32.449651,153.26679 L 28.534786,153.26679 L 28.534786,151.29749 L 34.822297,151.29749 L 34.822297,158.90182 C 33.896949,159.55826 32.876713,160.05651 31.761584,160.39659 C 30.646428,160.72876 29.456152,160.89485 28.190753,160.89485 C 25.422659,160.89485 23.255645,160.08815 21.689704,158.47475 C 20.131664,156.85344 19.352646,154.59943 19.352648,151.71271 C 19.352646,148.81809 20.131664,146.56408 21.689704,144.95067 C 23.255645,143.32938 25.422659,142.51872 28.190753,142.51871 C 29.345429,142.51872 30.440799,142.66108 31.476867,142.94578 C 32.520816,143.23052 33.481737,143.64968 34.359631,144.20328 L 34.359631,146.75388 C 33.473828,146.00255 32.532680,145.43707 31.536183,145.05744 C 30.539659,144.67783 29.491742,144.48802 28.392428,144.48800 C 26.225403,144.48802 24.596188,145.09304 23.504778,146.30308 C 22.421265,147.51314 21.879511,149.31635 21.879515,151.71271 C 21.879511,154.10118 22.421265,155.90043 23.504778,157.11048 C 24.596188,158.32053 26.225403,158.92555 28.392428,158.92555 C 29.238660,158.92555 29.993951,158.85437 30.658304,158.71201 C 31.322631,158.56175 31.919747,158.33239 32.449651,158.02394 M 41.608064,144.80831 L 41.608064,151.46358 L 44.621324,151.46358 C 45.736458,151.46359 46.598518,151.17492 47.207507,150.59756 C 47.816475,150.02023 48.120964,149.19771 48.120976,148.13001 C 48.120964,147.07024 47.816475,146.25168 47.207507,145.67432 C 46.598518,145.09700 45.736458,144.80832 44.621324,144.80831 L 41.608064,144.80831 M 39.211692,142.83901 L 44.621324,142.83901 C 46.606427,142.83903 48.105147,143.28983 49.117487,144.19142 C 50.137711,145.08513 50.647829,146.39799 50.647843,148.13001 C 50.647829,149.87787 50.137711,151.19864 49.117487,152.09233 C 48.105147,152.98603 46.606427,153.43288 44.621324,153.43288 L 41.608064,153.43288 L 41.608064,160.55081 L 39.211692,160.55081 L 39.211692,142.83901 M 53.874640,142.83901 L 65.073527,142.83901 L 65.073527,144.85576 L 56.271012,144.85576 L 56.271012,150.09931 L 64.705767,150.09931 L 64.705767,152.11606 L 56.271012,152.11606 L 56.271012,158.53406 L 65.287065,158.53406 L 65.287065,160.55081 L 53.874640,160.55081 L 53.874640,142.83901 M 79.261950,158.53406 L 87.625525,158.53406 L 87.625525,160.55081 L 76.379185,160.55081 L 76.379185,158.53406 C 77.288697,157.59292 78.526425,156.33146 80.092375,154.74969 C 81.666223,153.16003 82.654825,152.13584 83.058182,151.67712 C 83.825329,150.81507 84.359173,150.08746 84.659718,149.49428 C 84.968152,148.89322 85.122374,148.30402 85.122384,147.72666 C 85.122374,146.78553 84.790204,146.01837 84.125873,145.42520 C 83.469432,144.83205 82.611326,144.53547 81.551552,144.53545 C 80.800209,144.53547 80.005373,144.66597 79.167044,144.92694 C 78.336614,145.18795 77.446873,145.58339 76.497817,146.11326 L 76.497817,143.69316 C 77.462690,143.30565 78.364295,143.01302 79.202633,142.81529 C 80.040963,142.61758 80.808117,142.51872 81.504100,142.51871 C 83.338937,142.51872 84.802067,142.97743 85.893494,143.89484 C 86.984899,144.81228 87.530606,146.03814 87.530619,147.57244 C 87.530606,148.30006 87.392202,148.99208 87.115406,149.64851 C 86.846494,150.29704 86.352194,151.06419 85.632503,151.94997 C 85.434772,152.17934 84.806021,152.84368 83.746250,153.94299 C 82.686460,155.03442 81.191695,156.56477 79.261950,158.53406 M 92.667394,157.53755 L 95.170535,157.53755 L 95.170535,160.55081 L 92.667394,160.55081 L 92.667394,157.53755 M 99.797195,142.83901 L 111.18589,142.83901 L 111.18589,143.85925 L 104.75602,160.55081 L 102.25288,160.55081 L 108.30313,144.85576 L 99.797195,144.85576 L 99.797195,142.83901" - id="text1432" /> + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 33.285156,155.60233 L 33.285156,150.90311 L 29.417969,150.90311 L 29.417969,148.95779 L 35.628906,148.95779 L 35.628906,156.46951 C 34.714828,157.11795 33.707017,157.61014 32.605469,157.94608 C 31.503894,158.2742 30.328114,158.43826 29.078125,158.43826 C 26.343743,158.43826 24.20312,157.64139 22.65625,156.04764 C 21.117185,154.44608 20.347655,152.21952 20.347656,149.36795 C 20.347655,146.50859 21.117185,144.28203 22.65625,142.68826 C 24.20312,141.08672 26.343743,140.28594 29.078125,140.28592 C 30.218739,140.28594 31.300769,140.42656 32.324219,140.70779 C 33.355454,140.98906 34.304672,141.40312 35.171875,141.94998 L 35.171875,144.46951 C 34.29686,143.72734 33.367173,143.16875 32.382812,142.79373 C 31.398425,142.41875 30.36327,142.23125 29.277344,142.23123 C 27.136711,142.23125 25.527337,142.8289 24.449219,144.0242 C 23.378902,145.21953 22.843746,147.00077 22.84375,149.36795 C 22.843746,151.72733 23.378902,153.50467 24.449219,154.69998 C 25.527337,155.8953 27.136711,156.49295 29.277344,156.49295 C 30.11327,156.49295 30.859363,156.42264 31.515625,156.28201 C 32.171862,156.13358 32.761705,155.90702 33.285156,155.60233 M 42.332031,142.54764 L 42.332031,149.12186 L 45.308594,149.12186 C 46.410147,149.12187 47.261709,148.83671 47.863281,148.26639 C 48.464833,147.69609 48.765614,146.88359 48.765625,145.82889 C 48.765614,144.78203 48.464833,143.97343 47.863281,143.40311 C 47.261709,142.83281 46.410147,142.54765 45.308594,142.54764 L 42.332031,142.54764 M 39.964844,140.60233 L 45.308594,140.60233 C 47.269522,140.60234 48.749989,141.04765 49.75,141.93826 C 50.757799,142.82109 51.261705,144.11796 51.261719,145.82889 C 51.261705,147.55546 50.757799,148.86015 49.75,149.74295 C 48.749989,150.62577 47.269522,151.06718 45.308594,151.06717 L 42.332031,151.06717 L 42.332031,158.09842 L 39.964844,158.09842 L 39.964844,140.60233 M 54.449219,140.60233 L 65.511719,140.60233 L 65.511719,142.59451 L 56.816406,142.59451 L 56.816406,147.7742 L 65.148438,147.7742 L 65.148438,149.76639 L 56.816406,149.76639 L 56.816406,156.10623 L 65.722656,156.10623 L 65.722656,158.09842 L 54.449219,158.09842 L 54.449219,140.60233 M 79.527344,156.10623 L 87.789062,156.10623 L 87.789062,158.09842 L 76.679688,158.09842 L 76.679688,156.10623 C 77.578122,155.17655 78.800777,153.93045 80.347656,152.36795 C 81.902337,150.79765 82.878898,149.78593 83.277344,149.33279 C 84.035147,148.48124 84.56249,147.76249 84.859375,147.17654 C 85.164052,146.58281 85.316396,146.00078 85.316406,145.43045 C 85.316396,144.50078 84.988271,143.74296 84.332031,143.15701 C 83.683585,142.57109 82.83593,142.27812 81.789062,142.27811 C 81.046869,142.27812 80.261713,142.40703 79.433594,142.66483 C 78.613278,142.92265 77.734372,143.31328 76.796875,143.8367 L 76.796875,141.44608 C 77.749997,141.06328 78.640621,140.77422 79.46875,140.57889 C 80.29687,140.38359 81.054681,140.28594 81.742188,140.28592 C 83.554679,140.28594 84.99999,140.73906 86.078125,141.64529 C 87.156238,142.55156 87.6953,143.7625 87.695312,145.27811 C 87.6953,145.99687 87.558581,146.68046 87.285156,147.32889 C 87.019519,147.96952 86.531238,148.72733 85.820312,149.60233 C 85.624989,149.8289 85.003896,150.48515 83.957031,151.57108 C 82.910148,152.64921 81.433587,154.16092 79.527344,156.10623 M 92.769531,155.12186 L 95.242188,155.12186 L 95.242188,158.09842 L 92.769531,158.09842 L 92.769531,155.12186 M 105.47266,149.78983 C 104.34765,149.78983 103.46093,150.09061 102.8125,150.69217 C 102.17187,151.29374 101.85156,152.12186 101.85156,153.17654 C 101.85156,154.23124 102.17187,155.05936 102.8125,155.66092 C 103.46093,156.26248 104.34765,156.56326 105.47266,156.56326 C 106.59765,156.56326 107.48437,156.26248 108.13281,155.66092 C 108.78124,155.05155 109.10546,154.22342 109.10547,153.17654 C 109.10546,152.12186 108.78124,151.29374 108.13281,150.69217 C 107.49218,150.09061 106.60546,149.78983 105.47266,149.78983 M 103.10547,148.78201 C 102.08984,148.53202 101.29687,148.05937 100.72656,147.36404 C 100.16406,146.66874 99.88281,145.82109 99.882812,144.82108 C 99.88281,143.42265 100.3789,142.31718 101.37109,141.50467 C 102.37109,140.69219 103.73828,140.28594 105.47266,140.28592 C 107.21483,140.28594 108.58202,140.69219 109.57422,141.50467 C 110.56639,142.31718 111.06249,143.42265 111.0625,144.82108 C 111.06249,145.82109 110.77733,146.66874 110.20703,147.36404 C 109.64452,148.05937 108.85936,148.53202 107.85156,148.78201 C 108.99218,149.04765 109.87889,149.56718 110.51172,150.34061 C 111.15233,151.11405 111.47264,152.05936 111.47266,153.17654 C 111.47264,154.87186 110.95311,156.17264 109.91406,157.07889 C 108.8828,157.98514 107.40233,158.43826 105.47266,158.43826 C 103.54296,158.43826 102.05859,157.98514 101.01953,157.07889 C 99.988279,156.17264 99.472655,154.87186 99.472656,153.17654 C 99.472655,152.05936 99.792967,151.11405 100.43359,150.34061 C 101.07422,149.56718 101.96484,149.04765 103.10547,148.78201 M 102.23828,145.04373 C 102.23828,145.94999 102.51953,146.65702 103.08203,147.16483 C 103.65234,147.67265 104.44921,147.92655 105.47266,147.92654 C 106.48827,147.92655 107.28124,147.67265 107.85156,147.16483 C 108.42968,146.65702 108.71874,145.94999 108.71875,145.04373 C 108.71874,144.1375 108.42968,143.43047 107.85156,142.92264 C 107.28124,142.41484 106.48827,142.16094 105.47266,142.16092 C 104.44921,142.16094 103.65234,142.41484 103.08203,142.92264 C 102.51953,143.43047 102.23828,144.1375 102.23828,145.04373" + id="text2179" /> </svg> diff --git a/packages/gpe-bootsplash/files/splash-p.svg b/packages/gpe-bootsplash/files/splash-p.svg index ae93bed70f..dc534d2384 100644 --- a/packages/gpe-bootsplash/files/splash-p.svg +++ b/packages/gpe-bootsplash/files/splash-p.svg @@ -6,15 +6,17 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" sodipodi:version="0.32" - inkscape:version="0.42" + inkscape:version="0.45" width="170.00000pt" height="226.00000pt" sodipodi:docname="splash-p.svg" - sodipodi:docbase="/home/koen/Desktop"> + sodipodi:docbase="/home/fuchs/Projekte/oe/dev/packages/gpe-bootsplash/files" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> <metadata id="metadata1148"> <rdf:RDF> @@ -52,14 +54,14 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.0000000" + inkscape:zoom="2" inkscape:cx="123.79126" - inkscape:cy="136.70730" - inkscape:window-width="674" + inkscape:cy="146.29532" + inkscape:window-width="893" inkscape:window-height="682" showguides="true" snaptoguides="true" - inkscape:window-x="1066" + inkscape:window-x="697" inkscape:window-y="190" inkscape:current-layer="svg1" showborder="true" @@ -178,7 +180,7 @@ sodipodi:nodetypes="cssssss" /> </g> <path - style="font-size:24.000000px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans" - d="M 70.932617,129.37206 L 70.932617,124.67284 L 67.065430,124.67284 L 67.065430,122.72753 L 73.276367,122.72753 L 73.276367,130.23925 C 72.362289,130.88769 71.354477,131.37988 70.252930,131.71581 C 69.151355,132.04394 67.975575,132.20800 66.725586,132.20800 C 63.991204,132.20800 61.850581,131.41113 60.303711,129.81738 C 58.764646,128.21582 57.995116,125.98926 57.995117,123.13769 C 57.995116,120.27832 58.764646,118.05176 60.303711,116.45800 C 61.850581,114.85645 63.991204,114.05567 66.725586,114.05566 C 67.866200,114.05567 68.948230,114.19630 69.971680,114.47753 C 71.002915,114.75880 71.952133,115.17286 72.819336,115.71972 L 72.819336,118.23925 C 71.944321,117.49708 71.014634,116.93848 70.030273,116.56347 C 69.045886,116.18848 68.010731,116.00098 66.924805,116.00097 C 64.784172,116.00098 63.174798,116.59864 62.096680,117.79394 C 61.026363,118.98926 60.491207,120.77051 60.491211,123.13769 C 60.491207,125.49707 61.026363,127.27441 62.096680,128.46972 C 63.174798,129.66503 64.784172,130.26269 66.924805,130.26269 C 67.760731,130.26269 68.506824,130.19238 69.163086,130.05175 C 69.819323,129.90331 70.409166,129.67675 70.932617,129.37206 M 79.979492,116.31738 L 79.979492,122.89159 L 82.956055,122.89159 C 84.057608,122.89160 84.909170,122.60645 85.510742,122.03613 C 86.112294,121.46582 86.413075,120.65332 86.413086,119.59863 C 86.413075,118.55176 86.112294,117.74317 85.510742,117.17284 C 84.909170,116.60255 84.057608,116.31739 82.956055,116.31738 L 79.979492,116.31738 M 77.612305,114.37206 L 82.956055,114.37206 C 84.916983,114.37208 86.397450,114.81739 87.397461,115.70800 C 88.405260,116.59083 88.909166,117.88770 88.909180,119.59863 C 88.909166,121.32520 88.405260,122.62988 87.397461,123.51269 C 86.397450,124.39551 84.916983,124.83691 82.956055,124.83691 L 79.979492,124.83691 L 79.979492,131.86816 L 77.612305,131.86816 L 77.612305,114.37206 M 92.096680,114.37206 L 103.15918,114.37206 L 103.15918,116.36425 L 94.463867,116.36425 L 94.463867,121.54394 L 102.79590,121.54394 L 102.79590,123.53613 L 94.463867,123.53613 L 94.463867,129.87597 L 103.37012,129.87597 L 103.37012,131.86816 L 92.096680,131.86816 L 92.096680,114.37206 M 117.17480,129.87597 L 125.43652,129.87597 L 125.43652,131.86816 L 114.32715,131.86816 L 114.32715,129.87597 C 115.22558,128.94628 116.44824,127.70019 117.99512,126.13769 C 119.54980,124.56738 120.52636,123.55566 120.92480,123.10253 C 121.68261,122.25098 122.20995,121.53223 122.50684,120.94628 C 122.81151,120.35254 122.96386,119.77051 122.96387,119.20019 C 122.96386,118.27051 122.63573,117.51270 121.97949,116.92675 C 121.33105,116.34083 120.48339,116.04786 119.43652,116.04784 C 118.69433,116.04786 117.90917,116.17677 117.08105,116.43456 C 116.26074,116.69239 115.38183,117.08301 114.44434,117.60644 L 114.44434,115.21581 C 115.39746,114.83302 116.28808,114.54396 117.11621,114.34863 C 117.94433,114.15333 118.70214,114.05567 119.38965,114.05566 C 121.20214,114.05567 122.64745,114.50880 123.72559,115.41503 C 124.80370,116.32130 125.34276,117.53223 125.34277,119.04784 C 125.34276,119.76661 125.20604,120.45020 124.93262,121.09863 C 124.66698,121.73926 124.17870,122.49707 123.46777,123.37206 C 123.27245,123.59863 122.65136,124.25488 121.60449,125.34081 C 120.55761,126.41894 119.08105,127.93066 117.17480,129.87597 M 130.41699,128.89159 L 132.88965,128.89159 L 132.88965,131.86816 L 130.41699,131.86816 L 130.41699,128.89159 M 137.45996,114.37206 L 148.70996,114.37206 L 148.70996,115.37988 L 142.35840,131.86816 L 139.88574,131.86816 L 145.86230,116.36425 L 137.45996,116.36425 L 137.45996,114.37206" - id="text1326" /> + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 66.166016,127.08789 L 66.166016,121.60547 L 61.654297,121.60547 L 61.654297,119.33594 L 68.900391,119.33594 L 68.900391,128.09961 C 67.833966,128.85612 66.658186,129.43034 65.373047,129.82227 C 64.087876,130.20508 62.716133,130.39648 61.257812,130.39648 C 58.0677,130.39648 55.570306,129.4668 53.765625,127.60742 C 51.97005,125.73894 51.072264,123.14128 51.072266,119.81445 C 51.072264,116.47853 51.97005,113.88088 53.765625,112.02148 C 55.570306,110.15301 58.0677,109.21877 61.257812,109.21875 C 62.588529,109.21877 63.850897,109.38283 65.044922,109.71094 C 66.24803,110.03908 67.355451,110.52215 68.367188,111.16016 L 68.367188,114.09961 C 67.346336,113.23374 66.261702,112.58205 65.113281,112.14453 C 63.964829,111.70705 62.757148,111.4883 61.490234,111.48828 C 58.992829,111.4883 57.115227,112.18556 55.857422,113.58008 C 54.608719,114.97462 53.984371,117.05275 53.984375,119.81445 C 53.984371,122.56706 54.608719,124.64063 55.857422,126.03516 C 57.115227,127.42969 58.992829,128.12695 61.490234,128.12695 C 62.465482,128.12695 63.335924,128.04492 64.101562,127.88086 C 64.867172,127.70768 65.555322,127.44336 66.166016,127.08789 M 76.720703,111.85742 L 76.720703,119.52734 L 80.193359,119.52734 C 81.478505,119.52735 82.471994,119.19467 83.173828,118.5293 C 83.875638,117.86394 84.226549,116.91603 84.226562,115.68555 C 84.226549,114.46421 83.875638,113.52085 83.173828,112.85547 C 82.471994,112.19012 81.478505,111.85744 80.193359,111.85742 L 76.720703,111.85742 M 73.958984,109.58789 L 80.193359,109.58789 C 82.481109,109.58791 84.20832,110.10744 85.375,111.14648 C 86.550766,112.17645 87.138656,113.68947 87.138672,115.68555 C 87.138656,117.69988 86.550766,119.22202 85.375,120.25195 C 84.20832,121.28191 82.481109,121.79688 80.193359,121.79688 L 76.720703,121.79688 L 76.720703,130 L 73.958984,130 L 73.958984,109.58789 M 90.857422,109.58789 L 103.76367,109.58789 L 103.76367,111.91211 L 93.619141,111.91211 L 93.619141,117.95508 L 103.33984,117.95508 L 103.33984,120.2793 L 93.619141,120.2793 L 93.619141,127.67578 L 104.00977,127.67578 L 104.00977,130 L 90.857422,130 L 90.857422,109.58789 M 120.11523,127.67578 L 129.75391,127.67578 L 129.75391,130 L 116.79297,130 L 116.79297,127.67578 C 117.84114,126.59115 119.26757,125.13737 121.07227,123.31445 C 122.88606,121.48243 124.02538,120.30209 124.49023,119.77344 C 125.37434,118.77996 125.98957,117.94142 126.33594,117.25781 C 126.69139,116.56512 126.86913,115.88608 126.86914,115.2207 C 126.86913,114.13608 126.48632,113.25197 125.7207,112.56836 C 124.96418,111.88478 123.97525,111.54299 122.75391,111.54297 C 121.88801,111.54299 120.972,111.69338 120.00586,111.99414 C 119.04882,112.29494 118.02343,112.75067 116.92969,113.36133 L 116.92969,110.57227 C 118.04166,110.12567 119.08072,109.78843 120.04688,109.56055 C 121.01301,109.3327 121.89713,109.21877 122.69922,109.21875 C 124.81379,109.21877 126.49999,109.74742 127.75781,110.80469 C 129.01561,111.862 129.64452,113.27476 129.64453,115.04297 C 129.64452,115.88152 129.48501,116.67905 129.16602,117.43555 C 128.85611,118.18295 128.28644,119.06707 127.45703,120.08789 C 127.22915,120.35222 126.50455,121.11785 125.2832,122.38477 C 124.06184,123.64258 122.33919,125.40625 120.11523,127.67578 M 135.56445,126.52734 L 138.44922,126.52734 L 138.44922,130 L 135.56445,130 L 135.56445,126.52734 M 150.38477,120.30664 C 149.07226,120.30665 148.03775,120.65756 147.28125,121.35938 C 146.53385,122.06121 146.16015,123.02735 146.16016,124.25781 C 146.16015,125.48829 146.53385,126.45443 147.28125,127.15625 C 148.03775,127.85808 149.07226,128.20899 150.38477,128.20898 C 151.69726,128.20899 152.73176,127.85808 153.48828,127.15625 C 154.24478,126.44532 154.62303,125.47917 154.62305,124.25781 C 154.62303,123.02735 154.24478,122.06121 153.48828,121.35938 C 152.74087,120.65756 151.70637,120.30665 150.38477,120.30664 M 147.62305,119.13086 C 146.43815,118.8392 145.51302,118.28777 144.84766,117.47656 C 144.1914,116.66538 143.86328,115.67645 143.86328,114.50977 C 143.86328,112.87827 144.44205,111.58856 145.59961,110.64062 C 146.76627,109.69273 148.36132,109.21877 150.38477,109.21875 C 152.41731,109.21877 154.01236,109.69273 155.16992,110.64062 C 156.32746,111.58856 156.90623,112.87827 156.90625,114.50977 C 156.90623,115.67645 156.57355,116.66538 155.9082,117.47656 C 155.25194,118.28777 154.33592,118.8392 153.16016,119.13086 C 154.49087,119.44077 155.52538,120.04688 156.26367,120.94922 C 157.01105,121.85157 157.38475,122.95443 157.38477,124.25781 C 157.38475,126.23568 156.77863,127.75326 155.56641,128.81055 C 154.36327,129.86784 152.63606,130.39648 150.38477,130.39648 C 148.13346,130.39648 146.40169,129.86784 145.18945,128.81055 C 143.98633,127.75326 143.38476,126.23568 143.38477,124.25781 C 143.38476,122.95443 143.75846,121.85157 144.50586,120.94922 C 145.25325,120.04688 146.29231,119.44077 147.62305,119.13086 M 146.61133,114.76953 C 146.61132,115.82684 146.93945,116.65171 147.5957,117.24414 C 148.26106,117.8366 149.19075,118.13282 150.38477,118.13281 C 151.56965,118.13282 152.49478,117.8366 153.16016,117.24414 C 153.83462,116.65171 154.17186,115.82684 154.17188,114.76953 C 154.17186,113.71226 153.83462,112.88739 153.16016,112.29492 C 152.49478,111.70249 151.56965,111.40627 150.38477,111.40625 C 149.19075,111.40627 148.26106,111.70249 147.5957,112.29492 C 146.93945,112.88739 146.61132,113.71226 146.61133,114.76953" + id="text2179" /> </svg> diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index fdb73492db..8c4428cfc2 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo" SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI += "file://splash-p.svg \ file://splash-l.svg \ diff --git a/packages/gpe-bootsplash/gpe-bootsplash_svn.bb b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb index df6d5da0c1..56267ce48a 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_svn.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb @@ -2,7 +2,7 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libsvg-cairo" -PR = "r0" +PR = "r1" PV = "1.15+svn-${SRCDATE}" inherit autotools diff --git a/packages/gpesyncd/gpesyncd_2.0.bb b/packages/gpesyncd/gpesyncd_2.0.bb new file mode 100644 index 0000000000..69e0a677ec --- /dev/null +++ b/packages/gpesyncd/gpesyncd_2.0.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +DESCRIPTION = "Sync daemon for GPE and OpenSync" + +DEPENDS = "libgpevtype libtododb libcontactsdb libeventdb sqlite libmimedir glib-2.0" + +PR = "r0" + +GPE_TARBALL_SUFFIX="bz2" +inherit autotools gpe + +FILES_${PN} += "${datadir}/gpe" + diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb new file mode 100644 index 0000000000..182790bdea --- /dev/null +++ b/packages/gstreamer/gst-meta-base_0.10.bb @@ -0,0 +1,52 @@ +# Copyright (C) 2006,2007 OpenedHand LTD + +DESCRIPTION = "Gstreamer package groups" +DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly" +PR = "r4" + +PACKAGES = "\ + gst-meta-base \ + gst-meta-audio \ + gst-meta-debug \ + gst-meta-video" + +ALLOW_EMPTY = "1" + +RDEPENDS_gst-meta-base = "\ + gstreamer \ + gst-plugin-playbin \ + gst-plugin-decodebin \ +# gst-plugin-gnomevfs \ + gst-plugin-alsa \ + gst-plugin-volume \ + gst-plugin-ximagesink \ + gst-plugin-audioconvert \ + gst-plugin-audioresample \ + gst-plugin-typefindfunctions \ + gst-plugin-videoscale \ + gst-plugin-ffmpegcolorspace \ + gst-plugin-autodetect" + + +RDEPENDS_gst-meta-audio = "\ + gst-meta-base \ + gst-plugin-ivorbis \ + gst-plugin-ogg \ + gst-plugin-mad" + + +RDEPENDS_gst-meta-debug = "\ + gst-meta-base \ + gst-plugin-debug \ + gst-plugin-audiotestsrc \ + gst-plugin-videotestsrc" + + +RDEPENDS_gst-meta-video = "\ + gst-meta-base \ + gst-plugin-avi \ + gst-plugin-matroska \ + gst-plugin-mpeg2dec" + +RRECOMMENDS_gst-meta-video = "\ + gst-meta-audio" diff --git a/packages/gstreamer/gst-plugins-bad/vorbisdec.h b/packages/gstreamer/gst-plugins-bad/vorbisdec.h new file mode 100644 index 0000000000..3bc29f22e6 --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad/vorbisdec.h @@ -0,0 +1,87 @@ +/* -*- c-basic-offset: 2 -*- + * GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * Tremor modifications <2006>: + * Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef __GST_IVORBIS_DEC_H__ +#define __GST_IVORBIS_DEC_H__ + + +#include <gst/gst.h> +#include <tremor/ivorbiscodec.h> + +G_BEGIN_DECLS + +#define GST_TYPE_IVORBIS_DEC \ + (gst_ivorbis_dec_get_type()) +#define GST_IVORBIS_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec)) +#define GST_IVORBIS_DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass)) +#define GST_IS_IVORBIS_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC)) +#define GST_IS_IVORBIS_DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC)) + +typedef struct _GstIVorbisDec GstIVorbisDec; +typedef struct _GstIVorbisDecClass GstIVorbisDecClass; + +/** + * GstIVorbisDec: + * + * Opaque data structure. + */ +struct _GstIVorbisDec { + GstElement element; + + GstPad * sinkpad; + GstPad * srcpad; + + vorbis_dsp_state vd; + vorbis_info vi; + vorbis_comment vc; + vorbis_block vb; + guint64 granulepos; + + gboolean initialized; + + GList *queued; + + GstSegment segment; + gboolean discont; + + GstClockTime cur_timestamp; /* only used with non-ogg container formats */ + GstClockTime prev_timestamp; /* only used with non-ogg container formats */ + + GList *pendingevents; + GstTagList *taglist; +}; + +struct _GstIVorbisDecClass { + GstElementClass parent_class; +}; + +GType gst_ivorbis_dec_get_type(void); + +G_END_DECLS + +#endif /* __GST_IVORBIS_DEC_H__ */ diff --git a/packages/gstreamer/gst-plugins-bad/vorbisenc.h b/packages/gstreamer/gst-plugins-bad/vorbisenc.h new file mode 100644 index 0000000000..7170baacd3 --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad/vorbisenc.h @@ -0,0 +1,101 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef __VORBISENC_H__ +#define __VORBISENC_H__ + + +#include <config.h> +#include <gst/gst.h> + +#include <tremor/codec.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define GST_TYPE_VORBISENC \ + (vorbisenc_get_type()) +#define GST_VORBISENC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) +#define GST_VORBISENC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) +#define GST_IS_VORBISENC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) +#define GST_IS_VORBISENC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) + +typedef struct _VorbisEnc VorbisEnc; +typedef struct _VorbisEncClass VorbisEncClass; + +struct _VorbisEnc { + GstElement element; + + GstPad *sinkpad, + *srcpad; + + ogg_stream_state os; /* take physical pages, weld into a logical + stream of packets */ + ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ + ogg_packet op; /* one raw packet of data for decode */ + + vorbis_info vi; /* struct that stores all the static vorbis bitstream + settings */ + vorbis_comment vc; /* struct that stores all the user comments */ + + vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ + vorbis_block vb; /* local working space for packet->PCM decode */ + + gboolean eos; + + gboolean managed; + gint bitrate; + gint min_bitrate; + gint max_bitrate; + gfloat quality; + gboolean quality_set; + gint serial; + + gint channels; + gint frequency; + + guint64 samples_in; + guint64 bytes_out; + + GstCaps *metadata; + + gboolean setup; + gboolean flush_header; + gchar *last_message; +}; + +struct _VorbisEncClass { + GstElementClass parent_class; +}; + +GType vorbisenc_get_type(void); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __VORBISENC_H__ */ diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb new file mode 100644 index 0000000000..4bd76f871c --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb @@ -0,0 +1,11 @@ +require gst-plugins.inc + +SRC_URI += "file://vorbisenc.h file://vorbisdec.h" +DEPENDS += "gst-plugins-base" + +do_compile_prepend() { + # work around missing files in upstream tarball (upstream bug #454078) + install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/ +} + +PR = "r0" diff --git a/packages/gstreamer/gst-plugins-base_0.10.14.bb b/packages/gstreamer/gst-plugins-base_0.10.14.bb new file mode 100644 index 0000000000..33b189a0ff --- /dev/null +++ b/packages/gstreamer/gst-plugins-base_0.10.14.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc + +PROVIDES += "gst-plugins" + +# gst-plugins-base only builds the alsa plugin +# if alsa has been built and is present. You will +# not get an error if this is not present, just +# a missing alsa plugin +DEPENDS += "alsa-lib" + +PR = "r2" + diff --git a/packages/gstreamer/gst-plugins-good_0.10.6.bb b/packages/gstreamer/gst-plugins-good_0.10.6.bb new file mode 100644 index 0000000000..e009145ead --- /dev/null +++ b/packages/gstreamer/gst-plugins-good_0.10.6.bb @@ -0,0 +1,5 @@ +require gst-plugins.inc + +EXTRA_OECONF += "--with-check=no" +DEPENDS += "gst-plugins-base" +PR = "r3" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb new file mode 100644 index 0000000000..4caf56e522 --- /dev/null +++ b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb @@ -0,0 +1,6 @@ +require gst-plugins.inc + +DEPENDS += "gst-plugins-base" +SRC_URI += "file://cross-compile.patch;patch=1" + +PR = "r0" diff --git a/packages/gstreamer/gstreamer_0.10.14.bb b/packages/gstreamer/gstreamer_0.10.14.bb new file mode 100644 index 0000000000..9e9ae62cb1 --- /dev/null +++ b/packages/gstreamer/gstreamer_0.10.14.bb @@ -0,0 +1,3 @@ +require gstreamer.inc + +PR = "r0" diff --git a/packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch b/packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch new file mode 100644 index 0000000000..6cf1c14991 --- /dev/null +++ b/packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch @@ -0,0 +1,13 @@ +Index: gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c +=================================================================== +--- gtk+-2.6.10.orig/modules/engines/pixbuf/pixbuf-render.c 2005-08-18 14:11:00.000000000 +0000 ++++ gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c 2007-05-24 11:16:50.000000000 +0000 +@@ -407,7 +407,7 @@ + 0, 0, rect.width, rect.height, + dest_x - rect.x, dest_y - rect.y, + x_scale, y_scale, +- GDK_INTERP_BILINEAR); ++ GDK_INTERP_NEAREST); + + g_object_unref (partial_src); + diff --git a/packages/gtk+/gtk+-2.10.10/automake-lossage.patch b/packages/gtk+/gtk+-2.10.10/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.10/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.10/disable-print.patch b/packages/gtk+/gtk+-2.10.10/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.10/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch deleted file mode 100644 index c31868462a..0000000000 --- a/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 -+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 -@@ -71,35 +71,24 @@ get_check_shift (int check_size) - return check_shift; - } - --static void --pixops_scale_nearest (guchar *dest_buf, -- int render_x0, -- int render_y0, -- int render_x1, -- int render_y1, -- int dest_rowstride, -- int dest_channels, -- gboolean dest_has_alpha, -- const guchar *src_buf, -- int src_width, -- int src_height, -- int src_rowstride, -- int src_channels, -- gboolean src_has_alpha, -- double scale_x, -- double scale_y) --{ -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -- const guchar *p; -+typedef struct { guchar a,b,c; } b3; -+extern void BUG_bad_size_of_struct_b3(void); - --#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ -+#define INNER_LOOP_PREP() \ -+ do { \ -+ x = render_x0 * x_step + x_step / 2; \ - xmax = x + (render_x1 - render_x0) * x_step; \ - xstart = MIN (0, xmax); \ - xstop = MIN (src_width << SCALE_SHIFT, xmax); \ -+ } while(0) -+ -+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ -+ do { \ -+ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ -+ y_pos = CLAMP (y_pos, 0, src_height - 1); \ -+ src = src_buf + y_pos * src_rowstride; \ -+ dest = dest_buf + i * dest_rowstride; \ -+ x = render_x0 * x_step + x_step / 2; \ - p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ - while (x < xstart) \ - { \ -@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des - ASSIGN_PIXEL; \ - dest += DEST_CHANNELS; \ - x += x_step; \ -- } -+ } \ -+ } while(0) - -- for (i = 0; i < (render_y1 - render_y0); i++) -- { -- const guchar *src; -- guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -+static void -+pixops_scale_nearest (guchar *dest_buf, -+ int render_x0, -+ int render_y0, -+ int render_x1, -+ int render_y1, -+ int dest_rowstride, -+ int dest_channels, -+ gboolean dest_has_alpha, -+ const guchar *src_buf, -+ int src_width, -+ int src_height, -+ int src_rowstride, -+ int src_channels, -+ gboolean src_has_alpha, -+ double scale_x, -+ double scale_y) -+{ -+ int i; -+ int x; -+ int x_step = (1 << SCALE_SHIFT) / scale_x; -+ int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int xmax, xstart, xstop, x_pos, y_pos; -+ const guchar *p; - -- x = render_x0 * x_step + x_step / 2; -+ const guchar *src; -+ guchar *dest; - -- if (src_channels == 3) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); -- } -- } -- else if (src_channels == 4) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- guint32 *p32; -- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); -- } -- } -+ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); -+ -+ INNER_LOOP_PREP(); -+ -+ if (src_channels == 3) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); -+ } -+ else if (src_channels == 4) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); - } - } - -@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; - -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha) / 0xff; - else -@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar - case 0: - break; - case 255: -- dest[0] = p[0]; -- dest[1] = p[1]; -- dest[2] = p[2]; -+ *(b3*)dest = *(b3*)p; - if (dest_has_alpha) - dest[3] = 0xff; - break; -@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; -- - - if (((i + check_y) >> check_shift) & 1) - { -@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar - } - - j = 0; -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha + 0xff) >> 8; - else -@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar - ); - } - } --#undef INNER_LOOP -+#undef INNER_LOOP_BODY -+#undef INNER_LOOP_PREP - - static void - composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1569,7 +1579,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch deleted file mode 100644 index 6adb0cfef6..0000000000 --- a/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 -+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 -@@ -371,7 +371,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -773,7 +773,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1611,7 +1611,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.10/integer-pixops.patch b/packages/gtk+/gtk+-2.10.10/integer-pixops.patch deleted file mode 100644 index 490a60dd8a..0000000000 --- a/packages/gtk+/gtk+-2.10.10/integer-pixops.patch +++ /dev/null @@ -1,348 +0,0 @@ ---- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 -+++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 -@@ -253,3 +253,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ ---- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 -+++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, ---- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 -+++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 -@@ -28,6 +28,10 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+#ifdef ENABLE_INTEGER_PIXOPS -+#define FRAC 0x10000ULL -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - -@@ -972,6 +976,29 @@ - (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); - } - -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+correct_total (int *weights, -+ int n_x, -+ int n_y, -+ int total, -+ unsigned long overall_alpha) -+{ -+ int correction = (int)(overall_alpha - total); -+ int i; -+ for (i = n_x * n_y - 1; i >= 0; i--) -+ { -+ if (*(weights + i) + correction >= 0) -+ { -+ *(weights + i) += correction; -+ break; -+ } -+ } -+} -+ -+#else -+ - static void - correct_total (int *weights, - int n_x, -@@ -998,6 +1025,8 @@ - } - } - -+#endif -+ - static int * - make_filter_table (PixopsFilter *filter) - { -@@ -1026,7 +1055,11 @@ - *(pixel_weights + n_x * i + j) = weight; - } - -- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -+#ifdef ENABLE_INTEGER_PIXOPS -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); -+#else -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+#endif - } - - return weights; -@@ -1178,6 +1211,93 @@ - /* Compute weights for reconstruction by replication followed by - * sampling with a box filter - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = FRAC / x_scale; -+ unsigned long y_scale_r = FRAC / y_scale; -+ -+ int n_x = ceil(1/x_scale_d + 1); -+ int n_y = ceil(1/y_scale_d + 1); -+ -+ filter->x_offset = 0; -+ filter->y_offset = 0; -+ filter->n_x = n_x; -+ filter->n_y = n_y; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long tw, th; -+ -+ if (i < y) -+ { -+ -+ if (i + FRAC > y) -+ th = MIN(i+FRAC, y + y_scale_r) - y; -+ else -+ th = 0; -+ } -+ else -+ { -+ if (y + FRAC/y_scale > i) -+ th = MIN(i+FRAC, y + y_scale_r) - i; -+ else -+ th = 0; -+ } -+ -+ for (j = 0; j < n_x; j++) -+ { -+ int weight; -+ -+ if (j < x) -+ { -+ if (j + FRAC > x) -+ tw = MIN(j+FRAC, x + x_scale_r) - x; -+ else -+ tw = 0; -+ } -+ else -+ { -+ if (x + FRAC/x_scale > j) -+ tw = MIN(j+FRAC, x + x_scale_r) - j; -+ else -+ tw = 0; -+ } -+ -+ { -+ unsigned long lweight = (tw * x_scale) / FRAC; -+ lweight = (lweight * th) / FRAC; -+ lweight = (lweight * y_scale) / FRAC; -+ lweight = (lweight * overall_alpha) / FRAC; -+ weight = lweight; -+ } -+ total += weight; -+ *(pixel_weights + n_x * i + j) = weight; -+ } -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+} -+ -+#else -+ - static void - tile_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1216,10 +1336,151 @@ - } - } - -+#endif -+ - /* Compute weights for a filter that, for minification - * is the same as 'tiles', and for magnification, is bilinear - * reconstruction followed by a sampling with a delta function. - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long *x_weights, *y_weights; -+ int n_x, n_y; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = (FRAC / x_scale_d); -+ unsigned long y_scale_r = (FRAC / y_scale_d); -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ n_x = 2; -+ filter->x_offset = 0.5 * (1/x_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_x = ceil(1.0 + 1.0/x_scale_d); -+ filter->x_offset = 0.0; -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ n_y = 2; -+ filter->y_offset = 0.5 * (1/y_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_y = ceil(1.0 + 1.0/y_scale_d); -+ filter->y_offset = 0.0; -+ } -+ -+ filter->n_y = n_y; -+ filter->n_x = n_x; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ x_weights = g_new (unsigned long, n_x); -+ y_weights = g_new (unsigned long, n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_x; i++) -+ { -+ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ -+ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); -+ x_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* x -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_x; i++) -+ { -+ if (i < x) -+ { -+ if (i + 1 > x) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ else -+ { -+ if (x + 1/x_scale > i) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ } -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); -+ y_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* y -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_y; i++) -+ { -+ if (i < y) -+ { -+ if (i + 1 > y) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ else -+ { -+ if (y + 1/y_scale > i) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ } -+ } -+ -+ for (i = 0; i < n_y; i++) -+ for (j = 0; j < n_x; j++) -+ { -+ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; -+ weight = (weight * y_weights[i]) / FRAC; -+ weight = (weight * y_scale) / FRAC; -+ weight = (weight * overall_alpha) / FRAC; -+ *(pixel_weights + n_x * i + j) = (unsigned long)weight; -+ total += (unsigned long)weight; -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+ -+ g_free (x_weights); -+ g_free (y_weights); -+} -+ -+#else -+ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1283,6 +1544,8 @@ - } - } - -+#endif -+ - /* Computes the integral from b0 to b1 of - * - * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.10/migration.patch b/packages/gtk+/gtk+-2.10.10/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.10/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * 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. -+ */ -+ -+#include <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.10/no-demos.patch b/packages/gtk+/gtk+-2.10.10/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.10/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.10/no-xwc.patch b/packages/gtk+/gtk+-2.10.10/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.10/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.10/plana-pixops.patch b/packages/gtk+/gtk+-2.10.10/plana-pixops.patch deleted file mode 100644 index 21fe4879c5..0000000000 --- a/packages/gtk+/gtk+-2.10.10/plana-pixops.patch +++ /dev/null @@ -1,569 +0,0 @@ -diff -urN gtk+-2.10.9.orig/config.h.in gtk+-2.10.9-integer-pixops/config.h.in ---- gtk+-2.10.9.orig/config.h.in 2007-01-22 09:01:23.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/config.h.in 2007-02-10 12:15:39.000000000 -0700 -@@ -259,3 +259,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ -diff -urN gtk+-2.10.9.orig/configure.in gtk+-2.10.9-integer-pixops/configure.in ---- gtk+-2.10.9.orig/configure.in 2007-01-22 08:59:41.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/configure.in 2007-02-10 12:15:39.000000000 -0700 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, -diff -urN gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c 2007-01-22 08:50:43.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c 2007-02-12 01:00:23.000000000 -0700 -@@ -28,21 +28,42 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+/* TODO: Add a FLOOR() and CEIL() macro to handle normalized values) */ -+/* TODO: Get rid of standard C numeric types (ie. int). Replace with glib types */ -+#ifdef ENABLE_INTEGER_PIXOPS -+/* The bigger the value of FRAC is, the better the accuracy. Be wary of -+ overflows, though */ -+#define FRAC 0x10000ULL -+#define NORMALIZE(d) (d * FRAC) -+#define UNNORMALIZE(t,i) ((t)(i) / FRAC) -+#define FLOOR(i) (int)((i) / FRAC) -+#define CEIL(i) (((i) - 1) / FRAC + 1) -+#define DOUBLE_TYPE gint32 -+#define BIG_DOUBLE_TYPE gint64 -+#else -+#define NORMALIZE(d) (d) -+#define UNNORMALIZE(t,i) (t)(i) -+#define FLOOR(i) floor(i) -+#define CEIL(i) ceil(i) -+#define DOUBLE_TYPE double -+#define BIG_DOUBLE_TYPE double -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - - struct _PixopsFilterDimension - { - int n; -- double offset; -- double *weights; -+ BIG_DOUBLE_TYPE offset; -+ DOUBLE_TYPE *weights; - }; - - struct _PixopsFilter - { - PixopsFilterDimension x; - PixopsFilterDimension y; -- double overall_alpha; -+ gint32 overall_alpha; /* Normalized: alpha * 255; Not sure why original devs chose 255 */ - }; - - typedef guchar *(*PixopsLineFunc) (int *weights, int n_x, int n_y, -@@ -86,13 +107,13 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y) -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y) - { - int i; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - -@@ -175,14 +196,14 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int overall_alpha) - { - int i; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; -@@ -260,8 +281,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int overall_alpha, - int check_x, - int check_y, -@@ -271,8 +292,8 @@ - { - int i, j; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int r1, g1, b1, r2, g2, b2; - int check_shift = get_check_shift (check_size); - int xmax, xstart, xstop, x_pos, y_pos; -@@ -977,9 +998,9 @@ - int n_x, - int n_y, - int total, -- double overall_alpha) -+ gint32 overall_alpha) - { -- int correction = (int)(0.5 + 65536 * overall_alpha) - total; -+ int correction = (int)(0.5 + 65536 / 255 * overall_alpha) - total; - int remaining, c, d, i; - - if (correction != 0) -@@ -1009,7 +1030,7 @@ - for (i_offset=0; i_offset < SUBSAMPLE; i_offset++) - for (j_offset=0; j_offset < SUBSAMPLE; j_offset++) - { -- double weight; -+ DOUBLE_TYPE weight; - int *pixel_weights = weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; - int total = 0; - int i, j; -@@ -1017,13 +1038,15 @@ - for (i=0; i < n_y; i++) - for (j=0; j < n_x; j++) - { -- weight = filter->x.weights[(j_offset * n_x) + j] * -+ weight = UNNORMALIZE(DOUBLE_TYPE, filter->x.weights[(j_offset * n_x) + j] * - filter->y.weights[(i_offset * n_y) + i] * -- filter->overall_alpha * 65536 + 0.5; -+ filter->overall_alpha * 65536 / 255) + NORMALIZE(0.5); -+ /* Wonder how I should treat the "+ 0.5" for scientific -+ rouding off */ - -- total += (int)weight; -+ total += UNNORMALIZE(int, weight); - -- *(pixel_weights + n_x * i + j) = weight; -+ *(pixel_weights + n_x * i + j) = UNNORMALIZE(int, weight); - } - - correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -@@ -1047,8 +1070,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int check_x, - int check_y, - int check_size, -@@ -1064,12 +1087,13 @@ - guchar **line_bufs = g_new (guchar *, filter->y.n); - int *filter_weights = make_filter_table (filter); - -- int x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ -- int y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; /* X step in source (fixed point) */ -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; /* Y step in source (fixed point) */ - - int check_shift = check_size ? get_check_shift (check_size) : 0; - -- int scaled_x_offset = floor (filter->x.offset * (1 << SCALE_SHIFT)); -+ /* Possible overflow when scale-shifting which is why offset is BIG_DOUBLE_TYPE */ -+ int scaled_x_offset = FLOOR(filter->x.offset * (1 << SCALE_SHIFT)); - - /* Compute the index where we run off the end of the source buffer. The furthest - * source pixel we access at index i is: -@@ -1087,7 +1111,7 @@ - int run_end_index = MYDIV (run_end_x + x_step - 1, x_step) - render_x0; - run_end_index = MIN (run_end_index, render_x1 - render_x0); - -- y = render_y0 * y_step + floor (filter->y.offset * (1 << SCALE_SHIFT)); -+ y = render_y0 * y_step + FLOOR(filter->y.offset * (1 << SCALE_SHIFT)); - for (i = 0; i < (render_y1 - render_y0); i++) - { - int dest_x; -@@ -1180,37 +1204,37 @@ - */ - static void - tile_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- int n = ceil (1 / scale + 1); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -+ int n = CEIL(NORMALIZE(NORMALIZE(1)) / scale + NORMALIZE(1)); /* Another possible overflow */ -+ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); - int offset; - int i; -- -+ - dim->n = n; -- dim->offset = 0; -+ dim->offset = NORMALIZE(0); - dim->weights = pixel_weights; - - for (offset = 0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -- double a = x + 1 / scale; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - for (i = 0; i < n; i++) - { -- if (i < x) -+ if (NORMALIZE(i) < x) - { -- if (i + 1 > x) -- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; -+ if (NORMALIZE(i + 1) > x) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - else - { -- if (a > i) -- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; -+ if (a > NORMALIZE(i)) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - } - } -@@ -1222,41 +1246,44 @@ - */ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- double *pixel_weights; -+ DOUBLE_TYPE *pixel_weights; - int n; - int offset; - int i; - -- if (scale > 1.0) /* Linear */ -+ if (scale > NORMALIZE(1.0)) /* Linear */ - { - n = 2; -- dim->offset = 0.5 * (1 / scale - 1); -+ dim->offset = NORMALIZE(NORMALIZE(0.5) / (scale - NORMALIZE(1))); - } - else /* Tile */ - { -- n = ceil (1.0 + 1.0 / scale); -- dim->offset = 0.0; -+ n = CEIL(NORMALIZE(1.0) + NORMALIZE(NORMALIZE(1.0)) / scale); -+ dim->offset = NORMALIZE(0.0); - } -- -+ - dim->n = n; -- dim->weights = g_new (double, SUBSAMPLE * n); -+ dim->weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); - - pixel_weights = dim->weights; - - for (offset=0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; - -- if (scale > 1.0) /* Linear */ -+ if (scale > NORMALIZE(1.0)) /* Linear */ - { - for (i = 0; i < n; i++) -- *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale; -+ /* In the original, what is the point of dividing by scale then multiplying by scale? */ -+ /* *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale;*/ -+ /* *(pixel_weights++) = i == 0 ? NORMALIZE(1) - x : x; */ -+ *(pixel_weights++) = (((i == 0) ? NORMALIZE(1) - x : x) / scale) * scale; - } - else /* Tile */ - { -- double a = x + 1 / scale; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - /* x - * ---------|--.-|----|--.-|------- SRC -@@ -1264,19 +1291,19 @@ - */ - for (i = 0; i < n; i++) - { -- if (i < x) -+ if (NORMALIZE(i) < x) - { -- if (i + 1 > x) -- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; -+ if (NORMALIZE(i + 1) > x) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - else - { -- if (a > i) -- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; -+ if (a > NORMALIZE(i)) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - } - } -@@ -1291,14 +1318,14 @@ - * We combine two of these to compute the convolution of - * a box filter with a triangular spike. - */ --static double --linear_box_half (double b0, double b1) -+static DOUBLE_TYPE -+linear_box_half (DOUBLE_TYPE b0, DOUBLE_TYPE b1) - { -- double a0, a1; -- double x0, x1; -+ DOUBLE_TYPE a0, a1; -+ DOUBLE_TYPE x0, x1; - -- a0 = 0.; -- a1 = 1.; -+ a0 = NORMALIZE(0.); -+ a1 = NORMALIZE(1.); - - if (a0 < b0) - { -@@ -1308,7 +1335,7 @@ - x1 = MIN (a1, b1); - } - else -- return 0; -+ return NORMALIZE(0); - } - else - { -@@ -1318,10 +1345,10 @@ - x1 = MIN (a1, b1); - } - else -- return 0; -+ return NORMALIZE(0); - } - -- return 0.5 * (x1*x1 - x0*x0); -+ return UNNORMALIZE(DOUBLE_TYPE, NORMALIZE(0.5) * UNNORMALIZE(DOUBLE_TYPE, (x1*x1 - x0*x0))); - } - - /* Compute weights for reconstructing with bilinear -@@ -1329,28 +1356,28 @@ - */ - static void - bilinear_box_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- int n = ceil (1/scale + 3.0); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -- double w; -+ int n = CEIL(NORMALIZE(NORMALIZE(1))/scale + NORMALIZE(3.0)); -+ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); -+ DOUBLE_TYPE w; - int offset, i; - -- dim->offset = -1.0; -+ dim->offset = NORMALIZE(-1.0); - dim->n = n; - dim->weights = pixel_weights; - - for (offset = 0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -- double a = x + 1 / scale; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - for (i = 0; i < n; i++) - { -- w = linear_box_half (0.5 + i - a, 0.5 + i - x); -- w += linear_box_half (1.5 + x - i, 1.5 + a - i); -+ w = linear_box_half (NORMALIZE(0.5) + NORMALIZE(i) - a, NORMALIZE(0.5) + NORMALIZE(i) - x); -+ w += linear_box_half (NORMALIZE(1.5) - NORMALIZE(i) + x, NORMALIZE(1.5) - NORMALIZE(i) + a); - -- *(pixel_weights++) = w * scale; -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, w * scale); - } - } - } -@@ -1358,8 +1385,8 @@ - static void - make_weights (PixopsFilter *filter, - PixopsInterpType interp_type, -- double scale_x, -- double scale_y) -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y) - { - switch (interp_type) - { -@@ -1399,8 +1426,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type, - int overall_alpha, - int check_x, -@@ -1409,6 +1436,8 @@ - guint32 color1, - guint32 color2) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1419,7 +1448,7 @@ - g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (!src_has_alpha && overall_alpha == 255) -@@ -1427,7 +1456,7 @@ - _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, - dest_rowstride, dest_channels, dest_has_alpha, - src_buf, src_width, src_height, src_rowstride, src_channels, -- src_has_alpha, scale_x, scale_y, interp_type); -+ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); - return; - } - -@@ -1441,7 +1470,8 @@ - return; - } - -- filter.overall_alpha = overall_alpha / 255.; -+ /* filter.overall_alpha = overall_alpha / 255.; /* Why is it 255 instead of 256? */ -+ filter.overall_alpha = overall_alpha; - make_weights (&filter, interp_type, scale_x, scale_y); - - #ifdef USE_MMX -@@ -1501,11 +1531,13 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type, - int overall_alpha) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1516,7 +1548,7 @@ - g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (!src_has_alpha && overall_alpha == 255) -@@ -1524,7 +1556,7 @@ - _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, - dest_rowstride, dest_channels, dest_has_alpha, - src_buf, src_width, src_height, src_rowstride, src_channels, -- src_has_alpha, scale_x, scale_y, interp_type); -+ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); - return; - } - -@@ -1537,7 +1569,7 @@ - return; - } - -- filter.overall_alpha = overall_alpha / 255.; -+ filter.overall_alpha = overall_alpha; - make_weights (&filter, interp_type, scale_x, scale_y); - - if (filter.x.n == 2 && filter.y.n == 2 && -@@ -1578,10 +1610,12 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1593,7 +1627,7 @@ - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - g_return_if_fail (!(src_has_alpha && !dest_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (interp_type == PIXOPS_INTERP_NEAREST) -@@ -1605,7 +1639,7 @@ - return; - } - -- filter.overall_alpha = 1.0; -+ filter.overall_alpha = 255; - make_weights (&filter, interp_type, scale_x, scale_y); - - if (filter.x.n == 2 && filter.y.n == 2 && dest_channels == 3 && src_channels == 3) diff --git a/packages/gtk+/gtk+-2.10.10/run-iconcache.patch b/packages/gtk+/gtk+-2.10.10/run-iconcache.patch deleted file mode 100644 index ac15e9ab24..0000000000 --- a/packages/gtk+/gtk+-2.10.10/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 -+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 -@@ -1128,11 +1128,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.10/scroll-timings.patch b/packages/gtk+/gtk+-2.10.10/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.10/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.10/single-click.patch b/packages/gtk+/gtk+-2.10.10/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.10/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.10/spinbutton.patch b/packages/gtk+/gtk+-2.10.10/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.10/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.10/xsettings.patch b/packages/gtk+/gtk+-2.10.10/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.10/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.10.12/automake-lossage.patch b/packages/gtk+/gtk+-2.10.12/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.12/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.12/disable-print.patch b/packages/gtk+/gtk+-2.10.12/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.12/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.12/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.12/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.12/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.12/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.12/gnome-bug-341177.patch deleted file mode 100644 index c31868462a..0000000000 --- a/packages/gtk+/gtk+-2.10.12/gnome-bug-341177.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 -+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 -@@ -71,35 +71,24 @@ get_check_shift (int check_size) - return check_shift; - } - --static void --pixops_scale_nearest (guchar *dest_buf, -- int render_x0, -- int render_y0, -- int render_x1, -- int render_y1, -- int dest_rowstride, -- int dest_channels, -- gboolean dest_has_alpha, -- const guchar *src_buf, -- int src_width, -- int src_height, -- int src_rowstride, -- int src_channels, -- gboolean src_has_alpha, -- double scale_x, -- double scale_y) --{ -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -- const guchar *p; -+typedef struct { guchar a,b,c; } b3; -+extern void BUG_bad_size_of_struct_b3(void); - --#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ -+#define INNER_LOOP_PREP() \ -+ do { \ -+ x = render_x0 * x_step + x_step / 2; \ - xmax = x + (render_x1 - render_x0) * x_step; \ - xstart = MIN (0, xmax); \ - xstop = MIN (src_width << SCALE_SHIFT, xmax); \ -+ } while(0) -+ -+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ -+ do { \ -+ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ -+ y_pos = CLAMP (y_pos, 0, src_height - 1); \ -+ src = src_buf + y_pos * src_rowstride; \ -+ dest = dest_buf + i * dest_rowstride; \ -+ x = render_x0 * x_step + x_step / 2; \ - p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ - while (x < xstart) \ - { \ -@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des - ASSIGN_PIXEL; \ - dest += DEST_CHANNELS; \ - x += x_step; \ -- } -+ } \ -+ } while(0) - -- for (i = 0; i < (render_y1 - render_y0); i++) -- { -- const guchar *src; -- guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -+static void -+pixops_scale_nearest (guchar *dest_buf, -+ int render_x0, -+ int render_y0, -+ int render_x1, -+ int render_y1, -+ int dest_rowstride, -+ int dest_channels, -+ gboolean dest_has_alpha, -+ const guchar *src_buf, -+ int src_width, -+ int src_height, -+ int src_rowstride, -+ int src_channels, -+ gboolean src_has_alpha, -+ double scale_x, -+ double scale_y) -+{ -+ int i; -+ int x; -+ int x_step = (1 << SCALE_SHIFT) / scale_x; -+ int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int xmax, xstart, xstop, x_pos, y_pos; -+ const guchar *p; - -- x = render_x0 * x_step + x_step / 2; -+ const guchar *src; -+ guchar *dest; - -- if (src_channels == 3) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); -- } -- } -- else if (src_channels == 4) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- guint32 *p32; -- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); -- } -- } -+ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); -+ -+ INNER_LOOP_PREP(); -+ -+ if (src_channels == 3) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); -+ } -+ else if (src_channels == 4) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); - } - } - -@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; - -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha) / 0xff; - else -@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar - case 0: - break; - case 255: -- dest[0] = p[0]; -- dest[1] = p[1]; -- dest[2] = p[2]; -+ *(b3*)dest = *(b3*)p; - if (dest_has_alpha) - dest[3] = 0xff; - break; -@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; -- - - if (((i + check_y) >> check_shift) & 1) - { -@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar - } - - j = 0; -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha + 0xff) >> 8; - else -@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar - ); - } - } --#undef INNER_LOOP -+#undef INNER_LOOP_BODY -+#undef INNER_LOOP_PREP - - static void - composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.12/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.12/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.12/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1569,7 +1579,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.12/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.12/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.12/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.12/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.12/hardcoded_libtool.patch deleted file mode 100644 index 6adb0cfef6..0000000000 --- a/packages/gtk+/gtk+-2.10.12/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 -+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 -@@ -371,7 +371,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -773,7 +773,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1611,7 +1611,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.12/integer-pixops.patch b/packages/gtk+/gtk+-2.10.12/integer-pixops.patch deleted file mode 100644 index 490a60dd8a..0000000000 --- a/packages/gtk+/gtk+-2.10.12/integer-pixops.patch +++ /dev/null @@ -1,348 +0,0 @@ ---- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 -+++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 -@@ -253,3 +253,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ ---- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 -+++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, ---- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 -+++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 -@@ -28,6 +28,10 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+#ifdef ENABLE_INTEGER_PIXOPS -+#define FRAC 0x10000ULL -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - -@@ -972,6 +976,29 @@ - (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); - } - -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+correct_total (int *weights, -+ int n_x, -+ int n_y, -+ int total, -+ unsigned long overall_alpha) -+{ -+ int correction = (int)(overall_alpha - total); -+ int i; -+ for (i = n_x * n_y - 1; i >= 0; i--) -+ { -+ if (*(weights + i) + correction >= 0) -+ { -+ *(weights + i) += correction; -+ break; -+ } -+ } -+} -+ -+#else -+ - static void - correct_total (int *weights, - int n_x, -@@ -998,6 +1025,8 @@ - } - } - -+#endif -+ - static int * - make_filter_table (PixopsFilter *filter) - { -@@ -1026,7 +1055,11 @@ - *(pixel_weights + n_x * i + j) = weight; - } - -- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -+#ifdef ENABLE_INTEGER_PIXOPS -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); -+#else -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+#endif - } - - return weights; -@@ -1178,6 +1211,93 @@ - /* Compute weights for reconstruction by replication followed by - * sampling with a box filter - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = FRAC / x_scale; -+ unsigned long y_scale_r = FRAC / y_scale; -+ -+ int n_x = ceil(1/x_scale_d + 1); -+ int n_y = ceil(1/y_scale_d + 1); -+ -+ filter->x_offset = 0; -+ filter->y_offset = 0; -+ filter->n_x = n_x; -+ filter->n_y = n_y; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long tw, th; -+ -+ if (i < y) -+ { -+ -+ if (i + FRAC > y) -+ th = MIN(i+FRAC, y + y_scale_r) - y; -+ else -+ th = 0; -+ } -+ else -+ { -+ if (y + FRAC/y_scale > i) -+ th = MIN(i+FRAC, y + y_scale_r) - i; -+ else -+ th = 0; -+ } -+ -+ for (j = 0; j < n_x; j++) -+ { -+ int weight; -+ -+ if (j < x) -+ { -+ if (j + FRAC > x) -+ tw = MIN(j+FRAC, x + x_scale_r) - x; -+ else -+ tw = 0; -+ } -+ else -+ { -+ if (x + FRAC/x_scale > j) -+ tw = MIN(j+FRAC, x + x_scale_r) - j; -+ else -+ tw = 0; -+ } -+ -+ { -+ unsigned long lweight = (tw * x_scale) / FRAC; -+ lweight = (lweight * th) / FRAC; -+ lweight = (lweight * y_scale) / FRAC; -+ lweight = (lweight * overall_alpha) / FRAC; -+ weight = lweight; -+ } -+ total += weight; -+ *(pixel_weights + n_x * i + j) = weight; -+ } -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+} -+ -+#else -+ - static void - tile_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1216,10 +1336,151 @@ - } - } - -+#endif -+ - /* Compute weights for a filter that, for minification - * is the same as 'tiles', and for magnification, is bilinear - * reconstruction followed by a sampling with a delta function. - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long *x_weights, *y_weights; -+ int n_x, n_y; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = (FRAC / x_scale_d); -+ unsigned long y_scale_r = (FRAC / y_scale_d); -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ n_x = 2; -+ filter->x_offset = 0.5 * (1/x_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_x = ceil(1.0 + 1.0/x_scale_d); -+ filter->x_offset = 0.0; -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ n_y = 2; -+ filter->y_offset = 0.5 * (1/y_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_y = ceil(1.0 + 1.0/y_scale_d); -+ filter->y_offset = 0.0; -+ } -+ -+ filter->n_y = n_y; -+ filter->n_x = n_x; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ x_weights = g_new (unsigned long, n_x); -+ y_weights = g_new (unsigned long, n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_x; i++) -+ { -+ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ -+ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); -+ x_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* x -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_x; i++) -+ { -+ if (i < x) -+ { -+ if (i + 1 > x) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ else -+ { -+ if (x + 1/x_scale > i) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ } -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); -+ y_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* y -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_y; i++) -+ { -+ if (i < y) -+ { -+ if (i + 1 > y) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ else -+ { -+ if (y + 1/y_scale > i) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ } -+ } -+ -+ for (i = 0; i < n_y; i++) -+ for (j = 0; j < n_x; j++) -+ { -+ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; -+ weight = (weight * y_weights[i]) / FRAC; -+ weight = (weight * y_scale) / FRAC; -+ weight = (weight * overall_alpha) / FRAC; -+ *(pixel_weights + n_x * i + j) = (unsigned long)weight; -+ total += (unsigned long)weight; -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+ -+ g_free (x_weights); -+ g_free (y_weights); -+} -+ -+#else -+ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1283,6 +1544,8 @@ - } - } - -+#endif -+ - /* Computes the integral from b0 to b1 of - * - * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.12/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.12/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.12/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.12/migration.patch b/packages/gtk+/gtk+-2.10.12/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.12/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * 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. -+ */ -+ -+#include <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.12/no-demos.patch b/packages/gtk+/gtk+-2.10.12/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.12/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.12/no-xwc.patch b/packages/gtk+/gtk+-2.10.12/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.12/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.12/plana-pixops.patch b/packages/gtk+/gtk+-2.10.12/plana-pixops.patch deleted file mode 100644 index 21fe4879c5..0000000000 --- a/packages/gtk+/gtk+-2.10.12/plana-pixops.patch +++ /dev/null @@ -1,569 +0,0 @@ -diff -urN gtk+-2.10.9.orig/config.h.in gtk+-2.10.9-integer-pixops/config.h.in ---- gtk+-2.10.9.orig/config.h.in 2007-01-22 09:01:23.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/config.h.in 2007-02-10 12:15:39.000000000 -0700 -@@ -259,3 +259,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ -diff -urN gtk+-2.10.9.orig/configure.in gtk+-2.10.9-integer-pixops/configure.in ---- gtk+-2.10.9.orig/configure.in 2007-01-22 08:59:41.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/configure.in 2007-02-10 12:15:39.000000000 -0700 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, -diff -urN gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c 2007-01-22 08:50:43.000000000 -0700 -+++ gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c 2007-02-12 01:00:23.000000000 -0700 -@@ -28,21 +28,42 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+/* TODO: Add a FLOOR() and CEIL() macro to handle normalized values) */ -+/* TODO: Get rid of standard C numeric types (ie. int). Replace with glib types */ -+#ifdef ENABLE_INTEGER_PIXOPS -+/* The bigger the value of FRAC is, the better the accuracy. Be wary of -+ overflows, though */ -+#define FRAC 0x10000ULL -+#define NORMALIZE(d) (d * FRAC) -+#define UNNORMALIZE(t,i) ((t)(i) / FRAC) -+#define FLOOR(i) (int)((i) / FRAC) -+#define CEIL(i) (((i) - 1) / FRAC + 1) -+#define DOUBLE_TYPE gint32 -+#define BIG_DOUBLE_TYPE gint64 -+#else -+#define NORMALIZE(d) (d) -+#define UNNORMALIZE(t,i) (t)(i) -+#define FLOOR(i) floor(i) -+#define CEIL(i) ceil(i) -+#define DOUBLE_TYPE double -+#define BIG_DOUBLE_TYPE double -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - - struct _PixopsFilterDimension - { - int n; -- double offset; -- double *weights; -+ BIG_DOUBLE_TYPE offset; -+ DOUBLE_TYPE *weights; - }; - - struct _PixopsFilter - { - PixopsFilterDimension x; - PixopsFilterDimension y; -- double overall_alpha; -+ gint32 overall_alpha; /* Normalized: alpha * 255; Not sure why original devs chose 255 */ - }; - - typedef guchar *(*PixopsLineFunc) (int *weights, int n_x, int n_y, -@@ -86,13 +107,13 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y) -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y) - { - int i; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - -@@ -175,14 +196,14 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int overall_alpha) - { - int i; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; -@@ -260,8 +281,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int overall_alpha, - int check_x, - int check_y, -@@ -271,8 +292,8 @@ - { - int i, j; - int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; - int r1, g1, b1, r2, g2, b2; - int check_shift = get_check_shift (check_size); - int xmax, xstart, xstop, x_pos, y_pos; -@@ -977,9 +998,9 @@ - int n_x, - int n_y, - int total, -- double overall_alpha) -+ gint32 overall_alpha) - { -- int correction = (int)(0.5 + 65536 * overall_alpha) - total; -+ int correction = (int)(0.5 + 65536 / 255 * overall_alpha) - total; - int remaining, c, d, i; - - if (correction != 0) -@@ -1009,7 +1030,7 @@ - for (i_offset=0; i_offset < SUBSAMPLE; i_offset++) - for (j_offset=0; j_offset < SUBSAMPLE; j_offset++) - { -- double weight; -+ DOUBLE_TYPE weight; - int *pixel_weights = weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; - int total = 0; - int i, j; -@@ -1017,13 +1038,15 @@ - for (i=0; i < n_y; i++) - for (j=0; j < n_x; j++) - { -- weight = filter->x.weights[(j_offset * n_x) + j] * -+ weight = UNNORMALIZE(DOUBLE_TYPE, filter->x.weights[(j_offset * n_x) + j] * - filter->y.weights[(i_offset * n_y) + i] * -- filter->overall_alpha * 65536 + 0.5; -+ filter->overall_alpha * 65536 / 255) + NORMALIZE(0.5); -+ /* Wonder how I should treat the "+ 0.5" for scientific -+ rouding off */ - -- total += (int)weight; -+ total += UNNORMALIZE(int, weight); - -- *(pixel_weights + n_x * i + j) = weight; -+ *(pixel_weights + n_x * i + j) = UNNORMALIZE(int, weight); - } - - correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -@@ -1047,8 +1070,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y, - int check_x, - int check_y, - int check_size, -@@ -1064,12 +1087,13 @@ - guchar **line_bufs = g_new (guchar *, filter->y.n); - int *filter_weights = make_filter_table (filter); - -- int x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ -- int y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ -+ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; /* X step in source (fixed point) */ -+ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; /* Y step in source (fixed point) */ - - int check_shift = check_size ? get_check_shift (check_size) : 0; - -- int scaled_x_offset = floor (filter->x.offset * (1 << SCALE_SHIFT)); -+ /* Possible overflow when scale-shifting which is why offset is BIG_DOUBLE_TYPE */ -+ int scaled_x_offset = FLOOR(filter->x.offset * (1 << SCALE_SHIFT)); - - /* Compute the index where we run off the end of the source buffer. The furthest - * source pixel we access at index i is: -@@ -1087,7 +1111,7 @@ - int run_end_index = MYDIV (run_end_x + x_step - 1, x_step) - render_x0; - run_end_index = MIN (run_end_index, render_x1 - render_x0); - -- y = render_y0 * y_step + floor (filter->y.offset * (1 << SCALE_SHIFT)); -+ y = render_y0 * y_step + FLOOR(filter->y.offset * (1 << SCALE_SHIFT)); - for (i = 0; i < (render_y1 - render_y0); i++) - { - int dest_x; -@@ -1180,37 +1204,37 @@ - */ - static void - tile_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- int n = ceil (1 / scale + 1); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -+ int n = CEIL(NORMALIZE(NORMALIZE(1)) / scale + NORMALIZE(1)); /* Another possible overflow */ -+ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); - int offset; - int i; -- -+ - dim->n = n; -- dim->offset = 0; -+ dim->offset = NORMALIZE(0); - dim->weights = pixel_weights; - - for (offset = 0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -- double a = x + 1 / scale; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - for (i = 0; i < n; i++) - { -- if (i < x) -+ if (NORMALIZE(i) < x) - { -- if (i + 1 > x) -- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; -+ if (NORMALIZE(i + 1) > x) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - else - { -- if (a > i) -- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; -+ if (a > NORMALIZE(i)) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - } - } -@@ -1222,41 +1246,44 @@ - */ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- double *pixel_weights; -+ DOUBLE_TYPE *pixel_weights; - int n; - int offset; - int i; - -- if (scale > 1.0) /* Linear */ -+ if (scale > NORMALIZE(1.0)) /* Linear */ - { - n = 2; -- dim->offset = 0.5 * (1 / scale - 1); -+ dim->offset = NORMALIZE(NORMALIZE(0.5) / (scale - NORMALIZE(1))); - } - else /* Tile */ - { -- n = ceil (1.0 + 1.0 / scale); -- dim->offset = 0.0; -+ n = CEIL(NORMALIZE(1.0) + NORMALIZE(NORMALIZE(1.0)) / scale); -+ dim->offset = NORMALIZE(0.0); - } -- -+ - dim->n = n; -- dim->weights = g_new (double, SUBSAMPLE * n); -+ dim->weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); - - pixel_weights = dim->weights; - - for (offset=0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; - -- if (scale > 1.0) /* Linear */ -+ if (scale > NORMALIZE(1.0)) /* Linear */ - { - for (i = 0; i < n; i++) -- *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale; -+ /* In the original, what is the point of dividing by scale then multiplying by scale? */ -+ /* *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale;*/ -+ /* *(pixel_weights++) = i == 0 ? NORMALIZE(1) - x : x; */ -+ *(pixel_weights++) = (((i == 0) ? NORMALIZE(1) - x : x) / scale) * scale; - } - else /* Tile */ - { -- double a = x + 1 / scale; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - /* x - * ---------|--.-|----|--.-|------- SRC -@@ -1264,19 +1291,19 @@ - */ - for (i = 0; i < n; i++) - { -- if (i < x) -+ if (NORMALIZE(i) < x) - { -- if (i + 1 > x) -- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; -+ if (NORMALIZE(i + 1) > x) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - else - { -- if (a > i) -- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; -+ if (a > NORMALIZE(i)) -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); - else -- *(pixel_weights++) = 0; -+ *(pixel_weights++) = NORMALIZE(0); - } - } - } -@@ -1291,14 +1318,14 @@ - * We combine two of these to compute the convolution of - * a box filter with a triangular spike. - */ --static double --linear_box_half (double b0, double b1) -+static DOUBLE_TYPE -+linear_box_half (DOUBLE_TYPE b0, DOUBLE_TYPE b1) - { -- double a0, a1; -- double x0, x1; -+ DOUBLE_TYPE a0, a1; -+ DOUBLE_TYPE x0, x1; - -- a0 = 0.; -- a1 = 1.; -+ a0 = NORMALIZE(0.); -+ a1 = NORMALIZE(1.); - - if (a0 < b0) - { -@@ -1308,7 +1335,7 @@ - x1 = MIN (a1, b1); - } - else -- return 0; -+ return NORMALIZE(0); - } - else - { -@@ -1318,10 +1345,10 @@ - x1 = MIN (a1, b1); - } - else -- return 0; -+ return NORMALIZE(0); - } - -- return 0.5 * (x1*x1 - x0*x0); -+ return UNNORMALIZE(DOUBLE_TYPE, NORMALIZE(0.5) * UNNORMALIZE(DOUBLE_TYPE, (x1*x1 - x0*x0))); - } - - /* Compute weights for reconstructing with bilinear -@@ -1329,28 +1356,28 @@ - */ - static void - bilinear_box_make_weights (PixopsFilterDimension *dim, -- double scale) -+ DOUBLE_TYPE scale) - { -- int n = ceil (1/scale + 3.0); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -- double w; -+ int n = CEIL(NORMALIZE(NORMALIZE(1))/scale + NORMALIZE(3.0)); -+ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); -+ DOUBLE_TYPE w; - int offset, i; - -- dim->offset = -1.0; -+ dim->offset = NORMALIZE(-1.0); - dim->n = n; - dim->weights = pixel_weights; - - for (offset = 0; offset < SUBSAMPLE; offset++) - { -- double x = (double)offset / SUBSAMPLE; -- double a = x + 1 / scale; -+ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; -+ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; - - for (i = 0; i < n; i++) - { -- w = linear_box_half (0.5 + i - a, 0.5 + i - x); -- w += linear_box_half (1.5 + x - i, 1.5 + a - i); -+ w = linear_box_half (NORMALIZE(0.5) + NORMALIZE(i) - a, NORMALIZE(0.5) + NORMALIZE(i) - x); -+ w += linear_box_half (NORMALIZE(1.5) - NORMALIZE(i) + x, NORMALIZE(1.5) - NORMALIZE(i) + a); - -- *(pixel_weights++) = w * scale; -+ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, w * scale); - } - } - } -@@ -1358,8 +1385,8 @@ - static void - make_weights (PixopsFilter *filter, - PixopsInterpType interp_type, -- double scale_x, -- double scale_y) -+ DOUBLE_TYPE scale_x, -+ DOUBLE_TYPE scale_y) - { - switch (interp_type) - { -@@ -1399,8 +1426,8 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type, - int overall_alpha, - int check_x, -@@ -1409,6 +1436,8 @@ - guint32 color1, - guint32 color2) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1419,7 +1448,7 @@ - g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (!src_has_alpha && overall_alpha == 255) -@@ -1427,7 +1456,7 @@ - _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, - dest_rowstride, dest_channels, dest_has_alpha, - src_buf, src_width, src_height, src_rowstride, src_channels, -- src_has_alpha, scale_x, scale_y, interp_type); -+ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); - return; - } - -@@ -1441,7 +1470,8 @@ - return; - } - -- filter.overall_alpha = overall_alpha / 255.; -+ /* filter.overall_alpha = overall_alpha / 255.; /* Why is it 255 instead of 256? */ -+ filter.overall_alpha = overall_alpha; - make_weights (&filter, interp_type, scale_x, scale_y); - - #ifdef USE_MMX -@@ -1501,11 +1531,13 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type, - int overall_alpha) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1516,7 +1548,7 @@ - g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (!src_has_alpha && overall_alpha == 255) -@@ -1524,7 +1556,7 @@ - _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, - dest_rowstride, dest_channels, dest_has_alpha, - src_buf, src_width, src_height, src_rowstride, src_channels, -- src_has_alpha, scale_x, scale_y, interp_type); -+ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); - return; - } - -@@ -1537,7 +1569,7 @@ - return; - } - -- filter.overall_alpha = overall_alpha / 255.; -+ filter.overall_alpha = overall_alpha; - make_weights (&filter, interp_type, scale_x, scale_y); - - if (filter.x.n == 2 && filter.y.n == 2 && -@@ -1578,10 +1610,12 @@ - int src_rowstride, - int src_channels, - gboolean src_has_alpha, -- double scale_x, -- double scale_y, -+ double scale_x_d, -+ double scale_y_d, - PixopsInterpType interp_type) - { -+ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); -+ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); - PixopsFilter filter; - PixopsLineFunc line_func; - -@@ -1593,7 +1627,7 @@ - g_return_if_fail (!(src_channels == 3 && src_has_alpha)); - g_return_if_fail (!(src_has_alpha && !dest_has_alpha)); - -- if (scale_x == 0 || scale_y == 0) -+ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) - return; - - if (interp_type == PIXOPS_INTERP_NEAREST) -@@ -1605,7 +1639,7 @@ - return; - } - -- filter.overall_alpha = 1.0; -+ filter.overall_alpha = 255; - make_weights (&filter, interp_type, scale_x, scale_y); - - if (filter.x.n == 2 && filter.y.n == 2 && dest_channels == 3 && src_channels == 3) diff --git a/packages/gtk+/gtk+-2.10.12/run-iconcache.patch b/packages/gtk+/gtk+-2.10.12/run-iconcache.patch deleted file mode 100644 index ac15e9ab24..0000000000 --- a/packages/gtk+/gtk+-2.10.12/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 -+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 -@@ -1128,11 +1128,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.12/scroll-timings.patch b/packages/gtk+/gtk+-2.10.12/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.12/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.12/single-click.patch b/packages/gtk+/gtk+-2.10.12/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.12/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.12/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.12/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.12/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.12/spinbutton.patch b/packages/gtk+/gtk+-2.10.12/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.12/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.12/xsettings.patch b/packages/gtk+/gtk+-2.10.12/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.12/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.10.9/automake-lossage.patch b/packages/gtk+/gtk+-2.10.9/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.9/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.9/disable-print.patch b/packages/gtk+/gtk+-2.10.9/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.9/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.9/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.9/gnome-bug-341177.patch deleted file mode 100644 index c31868462a..0000000000 --- a/packages/gtk+/gtk+-2.10.9/gnome-bug-341177.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 -+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 -@@ -71,35 +71,24 @@ get_check_shift (int check_size) - return check_shift; - } - --static void --pixops_scale_nearest (guchar *dest_buf, -- int render_x0, -- int render_y0, -- int render_x1, -- int render_y1, -- int dest_rowstride, -- int dest_channels, -- gboolean dest_has_alpha, -- const guchar *src_buf, -- int src_width, -- int src_height, -- int src_rowstride, -- int src_channels, -- gboolean src_has_alpha, -- double scale_x, -- double scale_y) --{ -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -- const guchar *p; -+typedef struct { guchar a,b,c; } b3; -+extern void BUG_bad_size_of_struct_b3(void); - --#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ -+#define INNER_LOOP_PREP() \ -+ do { \ -+ x = render_x0 * x_step + x_step / 2; \ - xmax = x + (render_x1 - render_x0) * x_step; \ - xstart = MIN (0, xmax); \ - xstop = MIN (src_width << SCALE_SHIFT, xmax); \ -+ } while(0) -+ -+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ -+ do { \ -+ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ -+ y_pos = CLAMP (y_pos, 0, src_height - 1); \ -+ src = src_buf + y_pos * src_rowstride; \ -+ dest = dest_buf + i * dest_rowstride; \ -+ x = render_x0 * x_step + x_step / 2; \ - p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ - while (x < xstart) \ - { \ -@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des - ASSIGN_PIXEL; \ - dest += DEST_CHANNELS; \ - x += x_step; \ -- } -+ } \ -+ } while(0) - -- for (i = 0; i < (render_y1 - render_y0); i++) -- { -- const guchar *src; -- guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -+static void -+pixops_scale_nearest (guchar *dest_buf, -+ int render_x0, -+ int render_y0, -+ int render_x1, -+ int render_y1, -+ int dest_rowstride, -+ int dest_channels, -+ gboolean dest_has_alpha, -+ const guchar *src_buf, -+ int src_width, -+ int src_height, -+ int src_rowstride, -+ int src_channels, -+ gboolean src_has_alpha, -+ double scale_x, -+ double scale_y) -+{ -+ int i; -+ int x; -+ int x_step = (1 << SCALE_SHIFT) / scale_x; -+ int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int xmax, xstart, xstop, x_pos, y_pos; -+ const guchar *p; - -- x = render_x0 * x_step + x_step / 2; -+ const guchar *src; -+ guchar *dest; - -- if (src_channels == 3) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); -- } -- } -- else if (src_channels == 4) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- guint32 *p32; -- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); -- } -- } -+ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); -+ -+ INNER_LOOP_PREP(); -+ -+ if (src_channels == 3) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); -+ } -+ else if (src_channels == 4) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); - } - } - -@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; - -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha) / 0xff; - else -@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar - case 0: - break; - case 255: -- dest[0] = p[0]; -- dest[1] = p[1]; -- dest[2] = p[2]; -+ *(b3*)dest = *(b3*)p; - if (dest_has_alpha) - dest[3] = 0xff; - break; -@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; -- - - if (((i + check_y) >> check_shift) & 1) - { -@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar - } - - j = 0; -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha + 0xff) >> 8; - else -@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar - ); - } - } --#undef INNER_LOOP -+#undef INNER_LOOP_BODY -+#undef INNER_LOOP_PREP - - static void - composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1569,7 +1579,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch deleted file mode 100644 index 6adb0cfef6..0000000000 --- a/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 -+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 -@@ -371,7 +371,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -773,7 +773,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1611,7 +1611,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.9/integer-pixops.patch b/packages/gtk+/gtk+-2.10.9/integer-pixops.patch deleted file mode 100644 index 490a60dd8a..0000000000 --- a/packages/gtk+/gtk+-2.10.9/integer-pixops.patch +++ /dev/null @@ -1,348 +0,0 @@ ---- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 -+++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 -@@ -253,3 +253,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ ---- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 -+++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, ---- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 -+++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 -@@ -28,6 +28,10 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+#ifdef ENABLE_INTEGER_PIXOPS -+#define FRAC 0x10000ULL -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - -@@ -972,6 +976,29 @@ - (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); - } - -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+correct_total (int *weights, -+ int n_x, -+ int n_y, -+ int total, -+ unsigned long overall_alpha) -+{ -+ int correction = (int)(overall_alpha - total); -+ int i; -+ for (i = n_x * n_y - 1; i >= 0; i--) -+ { -+ if (*(weights + i) + correction >= 0) -+ { -+ *(weights + i) += correction; -+ break; -+ } -+ } -+} -+ -+#else -+ - static void - correct_total (int *weights, - int n_x, -@@ -998,6 +1025,8 @@ - } - } - -+#endif -+ - static int * - make_filter_table (PixopsFilter *filter) - { -@@ -1026,7 +1055,11 @@ - *(pixel_weights + n_x * i + j) = weight; - } - -- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -+#ifdef ENABLE_INTEGER_PIXOPS -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); -+#else -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+#endif - } - - return weights; -@@ -1178,6 +1211,93 @@ - /* Compute weights for reconstruction by replication followed by - * sampling with a box filter - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = FRAC / x_scale; -+ unsigned long y_scale_r = FRAC / y_scale; -+ -+ int n_x = ceil(1/x_scale_d + 1); -+ int n_y = ceil(1/y_scale_d + 1); -+ -+ filter->x_offset = 0; -+ filter->y_offset = 0; -+ filter->n_x = n_x; -+ filter->n_y = n_y; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long tw, th; -+ -+ if (i < y) -+ { -+ -+ if (i + FRAC > y) -+ th = MIN(i+FRAC, y + y_scale_r) - y; -+ else -+ th = 0; -+ } -+ else -+ { -+ if (y + FRAC/y_scale > i) -+ th = MIN(i+FRAC, y + y_scale_r) - i; -+ else -+ th = 0; -+ } -+ -+ for (j = 0; j < n_x; j++) -+ { -+ int weight; -+ -+ if (j < x) -+ { -+ if (j + FRAC > x) -+ tw = MIN(j+FRAC, x + x_scale_r) - x; -+ else -+ tw = 0; -+ } -+ else -+ { -+ if (x + FRAC/x_scale > j) -+ tw = MIN(j+FRAC, x + x_scale_r) - j; -+ else -+ tw = 0; -+ } -+ -+ { -+ unsigned long lweight = (tw * x_scale) / FRAC; -+ lweight = (lweight * th) / FRAC; -+ lweight = (lweight * y_scale) / FRAC; -+ lweight = (lweight * overall_alpha) / FRAC; -+ weight = lweight; -+ } -+ total += weight; -+ *(pixel_weights + n_x * i + j) = weight; -+ } -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+} -+ -+#else -+ - static void - tile_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1216,10 +1336,151 @@ - } - } - -+#endif -+ - /* Compute weights for a filter that, for minification - * is the same as 'tiles', and for magnification, is bilinear - * reconstruction followed by a sampling with a delta function. - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long *x_weights, *y_weights; -+ int n_x, n_y; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = (FRAC / x_scale_d); -+ unsigned long y_scale_r = (FRAC / y_scale_d); -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ n_x = 2; -+ filter->x_offset = 0.5 * (1/x_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_x = ceil(1.0 + 1.0/x_scale_d); -+ filter->x_offset = 0.0; -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ n_y = 2; -+ filter->y_offset = 0.5 * (1/y_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_y = ceil(1.0 + 1.0/y_scale_d); -+ filter->y_offset = 0.0; -+ } -+ -+ filter->n_y = n_y; -+ filter->n_x = n_x; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ x_weights = g_new (unsigned long, n_x); -+ y_weights = g_new (unsigned long, n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_x; i++) -+ { -+ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ -+ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); -+ x_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* x -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_x; i++) -+ { -+ if (i < x) -+ { -+ if (i + 1 > x) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ else -+ { -+ if (x + 1/x_scale > i) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ } -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); -+ y_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* y -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_y; i++) -+ { -+ if (i < y) -+ { -+ if (i + 1 > y) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ else -+ { -+ if (y + 1/y_scale > i) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ } -+ } -+ -+ for (i = 0; i < n_y; i++) -+ for (j = 0; j < n_x; j++) -+ { -+ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; -+ weight = (weight * y_weights[i]) / FRAC; -+ weight = (weight * y_scale) / FRAC; -+ weight = (weight * overall_alpha) / FRAC; -+ *(pixel_weights + n_x * i + j) = (unsigned long)weight; -+ total += (unsigned long)weight; -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+ -+ g_free (x_weights); -+ g_free (y_weights); -+} -+ -+#else -+ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1283,6 +1544,8 @@ - } - } - -+#endif -+ - /* Computes the integral from b0 to b1 of - * - * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.9/migration.patch b/packages/gtk+/gtk+-2.10.9/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.9/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * 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. -+ */ -+ -+#include <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.9/no-demos.patch b/packages/gtk+/gtk+-2.10.9/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.9/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.9/no-xwc.patch b/packages/gtk+/gtk+-2.10.9/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.9/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.9/run-iconcache.patch b/packages/gtk+/gtk+-2.10.9/run-iconcache.patch deleted file mode 100644 index ac15e9ab24..0000000000 --- a/packages/gtk+/gtk+-2.10.9/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 -+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 -@@ -1128,11 +1128,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.9/scroll-timings.patch b/packages/gtk+/gtk+-2.10.9/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.9/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.9/single-click.patch b/packages/gtk+/gtk+-2.10.9/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.9/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.9/spinbutton.patch b/packages/gtk+/gtk+-2.10.9/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.9/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.9/xsettings.patch b/packages/gtk+/gtk+-2.10.9/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.9/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+_2.10.10.bb b/packages/gtk+/gtk+_2.10.10.bb deleted file mode 100644 index 3756d85062..0000000000 --- a/packages/gtk+/gtk+_2.10.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -require gtk-2.10.inc - -PR = "r0" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1 \ - " - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require gtk-fpu.inc -EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" diff --git a/packages/gtk+/gtk+_2.10.12.bb b/packages/gtk+/gtk+_2.10.12.bb deleted file mode 100644 index d344eb42ed..0000000000 --- a/packages/gtk+/gtk+_2.10.12.bb +++ /dev/null @@ -1,29 +0,0 @@ -require gtk-2.10.inc - -PR = "r2" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1 \ - file://filesel-fix-segfault.patch;patch=1 \ - " - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require gtk-fpu.inc -EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index 3aaa0d6bec..db546d2cb6 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,9 +1,6 @@ require gtk-2.10.inc -PR = "r1" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" +PR = "r3" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -31,3 +28,12 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require gtk-fpu.inc EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" + +# try to squeeze some more performance out of it +SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1" +# this doesn't seem to work +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" +# let's do it manually then +PACKAGE_ARCH_fic-gta01 = "fic-gta01" +PACKAGE_ARCH_fic-gta02 = "fic-gta02" diff --git a/packages/gtk+/gtk+_2.10.9.bb b/packages/gtk+/gtk+_2.10.9.bb deleted file mode 100644 index f78b9d459c..0000000000 --- a/packages/gtk+/gtk+_2.10.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -require gtk-2.10.inc - -PR = "r0" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1" - diff --git a/packages/gtkhtml/gtkhtml.inc b/packages/gtkhtml/gtkhtml.inc index f7a346a67a..091e17d15b 100644 --- a/packages/gtkhtml/gtkhtml.inc +++ b/packages/gtkhtml/gtkhtml.inc @@ -8,3 +8,8 @@ inherit gnome S = "${WORKDIR}/gtkhtml-${PV}" EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I${prefix}/include':'-I.':g +} diff --git a/packages/hal/files/20hal b/packages/hal/files/20hal new file mode 100644 index 0000000000..ff6ffc2b4c --- /dev/null +++ b/packages/hal/files/20hal @@ -0,0 +1,58 @@ +#! /bin/sh +# +# hal Start the Daemon that stores device informations +# for the Hardware abstraction layer +# +# Written by Martin Waitz based on skeleton code +# written by Miquel van Smoorenburg <miquels@cistron.nl>. +# Modified for Debian +# by Ian Murdock <imurdock@gnu.ai.mit.edu>. +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/hald +PIDDIR=/var/run/hald +PIDFILE=$PIDDIR/hald.pid +NAME=hald +DAEMONUSER=haldaemon +DESC="Hardware abstraction layer" + +test -x $DAEMON || exit 0 + +set -e + +do_start() { + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER:$DAEMONUSER $PIDDIR + fi + echo "Starting $DESC" "$NAME" + start-stop-daemon --start --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS +} + +do_stop() { + echo "Stopping $DESC" "$NAME" + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + restart|force-reload) + do_stop + sleep 5 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal index f983db9ee5..c82da990ba 100644 --- a/packages/hal/files/99_hal +++ b/packages/hal/files/99_hal @@ -1,2 +1,2 @@ d root root 0700 /var/run/hald none -d root root 0700 /var/cache/hald none +d haldaemon haldaemon 0755 /var/cache/hald none diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb deleted file mode 100644 index 468a948b1a..0000000000 --- a/packages/hal/hal_0.2.98.bb +++ /dev/null @@ -1,9 +0,0 @@ -require hal.inc - -DEPENDS = "dbus expat" -RDEPENDS += "hotplug" - -EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ - --with-hotplug=${sysconfdir}/hotplug.d" diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb deleted file mode 100644 index 1ca95e8739..0000000000 --- a/packages/hal/hal_0.5.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require hal.inc - -DEPENDS = "dbus expat" -RDEPENDS += "hotplug" -RRECOMMENDS = "udev-utils" - -EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ - --with-hotplug=${sysconfdir}/hotplug.d" - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so - install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so -} diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb deleted file mode 100644 index 1246637f67..0000000000 --- a/packages/hal/hal_0.5.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -require hal.inc - -DEPENDS = "dbus expat libusb" -RDEPENDS += "hotplug" -RDEPENDS_hal-device-manager = "python hal python-pygnome" -RRECOMMENDS = "udev-utils" -PR = "r1" - -EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ - --with-hotplug=${sysconfdir}/hotplug.d \ - --disable-docbook-docs" - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so - install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so -} - -PACKAGES += "hal-device-manager" -FILES_${PN} = "${sysconfdir} ${bindir}/lshal ${bindir}/hal-get-property ${bindir}/hal-set-property ${sbindir} ${libdir}/libhal.so* ${libdir}/libhal-storage.so* ${libexecdir} ${datadir}/hal/fdi" -FILES_hal-device-manager = "${datadir}/hal/device-manager/ ${bindir}/hal-device-manager" - diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb deleted file mode 100644 index 05a3ea010b..0000000000 --- a/packages/hal/hal_0.5.7.bb +++ /dev/null @@ -1,40 +0,0 @@ -require hal.inc - -DEPENDS = "dbus expat libusb" -RDEPENDS += "hotplug" -#RDEPENDS_hal-device-manager = "python hal python-pygnome" -RRECOMMENDS = "udev-utils" - -SRC_URI += "file://dbus-fix-api.patch;patch=1" - -EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ - --with-hotplug=${sysconfdir}/hotplug.d \ - --disable-docbook-docs" - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so - install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so -} - -#PACKAGES += "hal-device-manager" -FILES_${PN} = "${sysconfdir} \ - ${bindir}/lshal \ - ${bindir}/hal-find-by-capability \ - ${bindir}/hal-find-by-property \ - ${bindir}/hal-device \ - ${bindir}/hal-get-property \ - ${bindir}/hal-set-property \ - ${sbindir} \ - ${libdir}/libhal.so* \ - ${libdir}/libhal-storage.so* \ - ${libexecdir} \ - ${datadir}/hal/fdi \ - ${datadir}/hal/scripts" -#FILES_hal-device-manager = " \ -# ${datadir}/hal/device-manager/ \ -# ${bindir}/hal-device-manager" - diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb deleted file mode 100644 index d0b888192c..0000000000 --- a/packages/hal/hal_0.5.8.1.bb +++ /dev/null @@ -1,75 +0,0 @@ -require hal.inc - -DEPENDS = "dbus-glib udev intltool expat libusb" -RDEPENDS += "udev" -#RDEPENDS_hal-device-manager = "python hal python-pygnome" -RRECOMMENDS = "udev-utils" - -PR = "r2" - -SRC_URI += "file://99_hal" - -EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ - --with-hotplug=${sysconfdir}/hotplug.d \ - --disable-docbook-docs \ - --disable-policy-kit \ - " - -do_install_append() { - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles -} - -do_stage() { - autotools_stage_all - install -d ${STAGING_LIBDIR} - install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so - install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so -} - -# At the time the postinst runs, dbus might not be setup so only restart if running -pkg_postinst_hal () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - /etc/init.d/populate-volatile.sh update - - grep haldaemon /etc/group || addgroup haldaemon - grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_hal () { - deluser haldaemon || true - delgroup haldaemon || true -} - -#PACKAGES += "hal-device-manager" - -#FILES_hal-device-manager = " \ -# ${datadir}/hal/device-manager/ \ -# ${bindir}/hal-device-manager" - -FILES_${PN} = "${sysconfdir} \ - ${bindir}/lshal \ - ${bindir}/hal-find-by-capability \ - ${bindir}/hal-find-by-property \ - ${bindir}/hal-device \ - ${bindir}/hal-get-property \ - ${bindir}/hal-set-property \ - ${sbindir} \ - ${libdir}/libhal.so* \ - ${libdir}/libhal-storage.so* \ - ${libdir}/hal \ - ${libexecdir} \ - ${datadir}/hal/fdi \ - ${datadir}/hal/scripts" diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index 79d53970f3..72d5dc4e2d 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -5,9 +5,11 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r1" +PR = "r2" -SRC_URI += "file://99_hal" +SRC_URI += "file://99_hal \ + file://20hal \ + " EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ @@ -29,6 +31,8 @@ do_configure() { do_install_append() { install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles + install -d ${D}/etc/dbus-1/event.d + install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d } do_stage() { diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb deleted file mode 100644 index 7f1a54f4b1..0000000000 --- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb +++ /dev/null @@ -1,16 +0,0 @@ - -LICENSE = "GPL" -PR = "r3" - -inherit gpe pkgconfig - -DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" -SECTION = "x11/base" -RDEPENDS = "apm" - -DESCRIPTION = "Automatic sleep/suspend control daemon" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -#CPPFLAGS_append += " -DDEBUG" -#CFLAGS_append += " -DDEBUG" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb deleted file mode 100644 index 184a042d61..0000000000 --- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb +++ /dev/null @@ -1,10 +0,0 @@ - -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" -SECTION = "x11/base" -RDEPENDS = "apm" - -DESCRIPTION = "Automatic sleep/suspend control daemon" - diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index 2855dcd965..d41cacdf58 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit gpe pkgconfig -DEPENDS = "apmd virtual/xserver xextensions virtual/libx11 libxau xscrnsaverh libxss" +DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss" SECTION = "x11/base" RDEPENDS = "apm" diff --git a/packages/libmimedir/libmimedir_0.4.2.bb b/packages/libmimedir/libmimedir_0.4.2.bb new file mode 100644 index 0000000000..2f7cc4c3e8 --- /dev/null +++ b/packages/libmimedir/libmimedir_0.4.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native" +PR = "r0" + +inherit autotools pkgconfig gpe + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + + +PACKAGES += "libmimedir-utils" +FILES_libmimedir-utils = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 2e5772cd81..338ddd28bd 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc -PV = "1.2.2+cvs${SRCDATE}" -PR = "r10" +PV = "${OPIE_CVS_PV}" +PR = "r11" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libsndfile/libsndfile1_1.0.17.bb b/packages/libsndfile/libsndfile1_1.0.17.bb new file mode 100644 index 0000000000..cf3b6d8e48 --- /dev/null +++ b/packages/libsndfile/libsndfile1_1.0.17.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "An audio format Conversion library" +HOMEPAGE = "http://www.mega-nerd.com/libsndfile" +AUTHOR = "Erik de Castro Lopo" +SECTION = "libs/multimedia" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz" +S = "${WORKDIR}/libsndfile-${PV}" + +inherit autotools lib_package pkgconfig + +do_stage() { + oe_libinstall -a -so -C src libsndfile ${STAGING_LIBDIR} + install -m 0644 ${S}/src/sndfile.h ${STAGING_INCDIR}/ +} + diff --git a/packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty b/packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty diff --git a/packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch b/packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch new file mode 100644 index 0000000000..9a635c5cbc --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch @@ -0,0 +1,2850 @@ +From 0db989f536f29c343bb4e42dc0b34d892d86de60 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 18:55:59 -0400 +Subject: [PATCH] cm-x270-base2 + +--- + arch/arm/Kconfig | 8 +- + arch/arm/configs/cm_x270_defconfig | 1567 +++++++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 5 + + arch/arm/mach-pxa/Makefile | 7 + + arch/arm/mach-pxa/cm-x270.c | 821 ++++++++++++++++++ + drivers/leds/Kconfig | 6 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-cm-x270.c | 126 +++ + drivers/net/Kconfig | 8 + + drivers/net/dm9000.c | 6 + + include/asm-arm/arch-pxa/cm-x270.h | 71 ++ + include/asm-arm/arch-pxa/hardware.h | 11 + + include/asm-arm/arch-pxa/irqs.h | 20 + + include/asm-arm/memory.h | 10 + + 14 files changed, 2666 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/configs/cm_x270_defconfig + create mode 100644 arch/arm/mach-pxa/cm-x270.c + create mode 100644 drivers/leds/leds-cm-x270.c + create mode 100644 include/asm-arm/arch-pxa/cm-x270.h + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 50d9f3e..dec0a27 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -519,7 +519,7 @@ config ISA_DMA_API + bool + + config PCI +- bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 ++ bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE + help + Find out whether you have a PCI motherboard. PCI is the name of a + bus system, i.e. the way the CPU talks to the other stuff inside +@@ -537,6 +537,12 @@ config PCI_HOST_VIA82C505 + depends on PCI && ARCH_SHARK + default y + ++config PCI_HOST_ITE8152 ++ bool ++ depends on PCI && MACH_ARMCORE ++ default y ++ select DMABOUNCE ++ + source "drivers/pci/Kconfig" + + source "drivers/pcmcia/Kconfig" +diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/cm_x270_defconfig +new file mode 100644 +index 0000000..f728363 +--- /dev/null ++++ b/arch/arm/configs/cm_x270_defconfig +@@ -0,0 +1,1567 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: 2.6.21-rc4 ++# Wed Apr 4 16:42:03 2007 ++# ++CONFIG_ARM=y ++CONFIG_SYS_SUPPORTS_APM_EMULATION=y ++CONFIG_GENERIC_GPIO=y ++CONFIG_GENERIC_TIME=y ++CONFIG_MMU=y ++# CONFIG_NO_IOPORT is not set ++CONFIG_GENERIC_HARDIRQS=y ++CONFIG_TRACE_IRQFLAGS_SUPPORT=y ++CONFIG_HARDIRQS_SW_RESEND=y ++CONFIG_GENERIC_IRQ_PROBE=y ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_ARCH_HAS_ILOG2_U32 is not set ++# CONFIG_ARCH_HAS_ILOG2_U64 is not set ++CONFIG_GENERIC_HWEIGHT=y ++CONFIG_GENERIC_CALIBRATE_DELAY=y ++CONFIG_ZONE_DMA=y ++CONFIG_ARCH_MTD_XIP=y ++CONFIG_VECTORS_BASE=0xffff0000 ++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" ++ ++# ++# Code maturity level options ++# ++CONFIG_EXPERIMENTAL=y ++CONFIG_BROKEN_ON_SMP=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 ++ ++# ++# General setup ++# ++CONFIG_LOCALVERSION="" ++# CONFIG_LOCALVERSION_AUTO is not set ++CONFIG_SWAP=y ++CONFIG_SYSVIPC=y ++# CONFIG_IPC_NS is not set ++CONFIG_SYSVIPC_SYSCTL=y ++# CONFIG_POSIX_MQUEUE is not set ++# CONFIG_BSD_PROCESS_ACCT is not set ++# CONFIG_TASKSTATS is not set ++# CONFIG_UTS_NS is not set ++# CONFIG_AUDIT is not set ++CONFIG_IKCONFIG=y ++CONFIG_IKCONFIG_PROC=y ++CONFIG_SYSFS_DEPRECATED=y ++# CONFIG_RELAY is not set ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_SYSCTL=y ++CONFIG_EMBEDDED=y ++CONFIG_UID16=y ++CONFIG_SYSCTL_SYSCALL=y ++CONFIG_KALLSYMS=y ++# CONFIG_KALLSYMS_ALL is not set ++# CONFIG_KALLSYMS_EXTRA_PASS is not set ++CONFIG_HOTPLUG=y ++CONFIG_PRINTK=y ++CONFIG_BUG=y ++CONFIG_ELF_CORE=y ++CONFIG_BASE_FULL=y ++CONFIG_FUTEX=y ++CONFIG_EPOLL=y ++CONFIG_SHMEM=y ++CONFIG_SLAB=y ++CONFIG_VM_EVENT_COUNTERS=y ++CONFIG_RT_MUTEXES=y ++# CONFIG_TINY_SHMEM is not set ++CONFIG_BASE_SMALL=0 ++# CONFIG_SLOB is not set ++ ++# ++# Loadable module support ++# ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++CONFIG_MODULE_FORCE_UNLOAD=y ++# CONFIG_MODVERSIONS is not set ++# CONFIG_MODULE_SRCVERSION_ALL is not set ++CONFIG_KMOD=y ++ ++# ++# Block layer ++# ++CONFIG_BLOCK=y ++# CONFIG_LBD is not set ++# CONFIG_BLK_DEV_IO_TRACE is not set ++# CONFIG_LSF is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++CONFIG_IOSCHED_AS=y ++CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_CFQ=y ++CONFIG_DEFAULT_AS=y ++# CONFIG_DEFAULT_DEADLINE is not set ++# CONFIG_DEFAULT_CFQ is not set ++# CONFIG_DEFAULT_NOOP is not set ++CONFIG_DEFAULT_IOSCHED="anticipatory" ++ ++# ++# System Type ++# ++# CONFIG_ARCH_AAEC2000 is not set ++# CONFIG_ARCH_INTEGRATOR is not set ++# CONFIG_ARCH_REALVIEW is not set ++# CONFIG_ARCH_VERSATILE is not set ++# CONFIG_ARCH_AT91 is not set ++# CONFIG_ARCH_CLPS7500 is not set ++# CONFIG_ARCH_CLPS711X is not set ++# CONFIG_ARCH_CO285 is not set ++# CONFIG_ARCH_EBSA110 is not set ++# CONFIG_ARCH_EP93XX is not set ++# CONFIG_ARCH_FOOTBRIDGE is not set ++# CONFIG_ARCH_NETX is not set ++# CONFIG_ARCH_H720X is not set ++# CONFIG_ARCH_IMX is not set ++# CONFIG_ARCH_IOP32X is not set ++# CONFIG_ARCH_IOP33X is not set ++# CONFIG_ARCH_IOP13XX is not set ++# CONFIG_ARCH_IXP4XX is not set ++# CONFIG_ARCH_IXP2000 is not set ++# CONFIG_ARCH_IXP23XX is not set ++# CONFIG_ARCH_L7200 is not set ++# CONFIG_ARCH_NS9XXX is not set ++# CONFIG_ARCH_PNX4008 is not set ++CONFIG_ARCH_PXA=y ++# 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_DMABOUNCE=y ++ ++# ++# Intel PXA2xx Implementations ++# ++# CONFIG_ARCH_LUBBOCK is not set ++# CONFIG_MACH_LOGICPD_PXA270 is not set ++# CONFIG_MACH_MAINSTONE is not set ++# CONFIG_ARCH_PXA_IDP is not set ++# CONFIG_PXA_SHARPSL is not set ++# CONFIG_MACH_TRIZEPS4 is not set ++CONFIG_MACH_ARMCORE=y ++CONFIG_PXA27x=y ++ ++# ++# Processor Type ++# ++CONFIG_CPU_32=y ++CONFIG_CPU_XSCALE=y ++CONFIG_CPU_32v5=y ++CONFIG_CPU_ABRT_EV5T=y ++CONFIG_CPU_CACHE_VIVT=y ++CONFIG_CPU_TLB_V4WBI=y ++CONFIG_CPU_CP15=y ++CONFIG_CPU_CP15_MMU=y ++ ++# ++# Processor Features ++# ++CONFIG_ARM_THUMB=y ++# CONFIG_CPU_DCACHE_DISABLE is not set ++# CONFIG_OUTER_CACHE is not set ++CONFIG_IWMMXT=y ++CONFIG_XSCALE_PMU=y ++ ++# ++# Bus support ++# ++CONFIG_PCI=y ++CONFIG_PCI_HOST_ITE8152=y ++# CONFIG_PCI_DEBUG is not set ++ ++# ++# PCCARD (PCMCIA/CardBus) support ++# ++CONFIG_PCCARD=y ++# CONFIG_PCMCIA_DEBUG is not set ++CONFIG_PCMCIA=m ++# CONFIG_PCMCIA_LOAD_CIS is not set ++CONFIG_PCMCIA_IOCTL=y ++CONFIG_CARDBUS=y ++ ++# ++# PC-card bridges ++# ++# CONFIG_YENTA is not set ++# CONFIG_PD6729 is not set ++# CONFIG_I82092 is not set ++CONFIG_PCMCIA_PXA2XX=m ++ ++# ++# Kernel Features ++# ++# CONFIG_PREEMPT is not set ++# CONFIG_NO_IDLE_HZ is not set ++CONFIG_HZ=100 ++# CONFIG_AEABI is not set ++# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set ++CONFIG_SELECT_MEMORY_MODEL=y ++CONFIG_FLATMEM_MANUAL=y ++# CONFIG_DISCONTIGMEM_MANUAL is not set ++# CONFIG_SPARSEMEM_MANUAL is not set ++CONFIG_FLATMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++# CONFIG_SPARSEMEM_STATIC is not set ++CONFIG_SPLIT_PTLOCK_CPUS=4096 ++# CONFIG_RESOURCES_64BIT is not set ++CONFIG_ZONE_DMA_FLAG=1 ++CONFIG_ALIGNMENT_TRAP=y ++ ++# ++# Boot options ++# ++CONFIG_ZBOOT_ROM_TEXT=0x0 ++CONFIG_ZBOOT_ROM_BSS=0x0 ++CONFIG_CMDLINE="" ++# CONFIG_XIP_KERNEL is not set ++# CONFIG_KEXEC is not set ++ ++# ++# Floating point emulation ++# ++ ++# ++# At least one emulation must be selected ++# ++CONFIG_FPE_NWFPE=y ++# CONFIG_FPE_NWFPE_XP is not set ++# CONFIG_FPE_FASTFPE is not set ++ ++# ++# 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=y ++# CONFIG_PM_LEGACY is not set ++# CONFIG_PM_DEBUG is not set ++# CONFIG_PM_SYSFS_DEPRECATED is not set ++# CONFIG_APM_EMULATION is not set ++ ++# ++# Networking ++# ++CONFIG_NET=y ++ ++# ++# Networking options ++# ++# CONFIG_NETDEBUG is not set ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++CONFIG_UNIX=y ++CONFIG_XFRM=y ++# CONFIG_XFRM_USER is not set ++# CONFIG_XFRM_SUB_POLICY is not set ++# CONFIG_XFRM_MIGRATE is not set ++# CONFIG_NET_KEY is not set ++CONFIG_INET=y ++# CONFIG_IP_MULTICAST is not set ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y ++CONFIG_IP_PNP=y ++CONFIG_IP_PNP_DHCP=y ++CONFIG_IP_PNP_BOOTP=y ++# CONFIG_IP_PNP_RARP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_ARPD is not set ++# CONFIG_SYN_COOKIES is not set ++# CONFIG_INET_AH is not set ++# CONFIG_INET_ESP is not set ++# CONFIG_INET_IPCOMP is not set ++# CONFIG_INET_XFRM_TUNNEL is not set ++# CONFIG_INET_TUNNEL is not set ++CONFIG_INET_XFRM_MODE_TRANSPORT=y ++CONFIG_INET_XFRM_MODE_TUNNEL=y ++CONFIG_INET_XFRM_MODE_BEET=y ++CONFIG_INET_DIAG=y ++CONFIG_INET_TCP_DIAG=y ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_CUBIC=y ++CONFIG_DEFAULT_TCP_CONG="cubic" ++# CONFIG_TCP_MD5SIG is not set ++# CONFIG_IPV6 is not set ++# CONFIG_INET6_XFRM_TUNNEL is not set ++# CONFIG_INET6_TUNNEL is not set ++# CONFIG_NETWORK_SECMARK is not set ++# CONFIG_NETFILTER is not set ++ ++# ++# DCCP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_DCCP is not set ++ ++# ++# SCTP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_SCTP is not set ++ ++# ++# TIPC Configuration (EXPERIMENTAL) ++# ++# CONFIG_TIPC is not set ++# CONFIG_ATM is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_VLAN_8021Q is not set ++# CONFIG_DECNET is not set ++# CONFIG_LLC2 is not set ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++ ++# ++# QoS and/or fair queueing ++# ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++# CONFIG_HAMRADIO is not set ++# CONFIG_IRDA is not set ++# CONFIG_BT is not set ++CONFIG_IEEE80211=m ++# CONFIG_IEEE80211_DEBUG is not set ++CONFIG_IEEE80211_CRYPT_WEP=m ++CONFIG_IEEE80211_CRYPT_CCMP=m ++# CONFIG_IEEE80211_CRYPT_TKIP is not set ++# CONFIG_IEEE80211_SOFTMAC is not set ++CONFIG_WIRELESS_EXT=y ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++CONFIG_STANDALONE=y ++CONFIG_PREVENT_FIRMWARE_BUILD=y ++CONFIG_FW_LOADER=y ++# CONFIG_DEBUG_DRIVER is not set ++# CONFIG_DEBUG_DEVRES is not set ++# CONFIG_SYS_HYPERVISOR is not set ++ ++# ++# Connector - unified userspace <-> kernelspace linker ++# ++# CONFIG_CONNECTOR is not set ++ ++# ++# Memory Technology Devices (MTD) ++# ++CONFIG_MTD=m ++# 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_AFS_PARTS is not set ++ ++# ++# User Modules And Translation Layers ++# ++CONFIG_MTD_CHAR=m ++CONFIG_MTD_BLKDEVS=m ++CONFIG_MTD_BLOCK=m ++# CONFIG_MTD_BLOCK_RO is not set ++# CONFIG_FTL is not set ++# CONFIG_NFTL is not set ++# CONFIG_INFTL is not set ++# CONFIG_RFD_FTL is not set ++# CONFIG_SSFDC is not set ++ ++# ++# RAM/ROM/Flash chip drivers ++# ++# CONFIG_MTD_CFI is not set ++# CONFIG_MTD_JEDECPROBE is not set ++CONFIG_MTD_MAP_BANK_WIDTH_1=y ++CONFIG_MTD_MAP_BANK_WIDTH_2=y ++CONFIG_MTD_MAP_BANK_WIDTH_4=y ++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set ++CONFIG_MTD_CFI_I1=y ++CONFIG_MTD_CFI_I2=y ++# CONFIG_MTD_CFI_I4 is not set ++# CONFIG_MTD_CFI_I8 is not set ++# CONFIG_MTD_RAM is not set ++# CONFIG_MTD_ROM is not set ++# CONFIG_MTD_ABSENT is not set ++# CONFIG_MTD_OBSOLETE_CHIPS is not set ++ ++# ++# Mapping drivers for chip access ++# ++# CONFIG_MTD_COMPLEX_MAPPINGS is not set ++# CONFIG_MTD_SHARP_SL is not set ++# CONFIG_MTD_PLATRAM 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_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=m ++# CONFIG_MTD_NAND_VERIFY_WRITE is not set ++# CONFIG_MTD_NAND_ECC_SMC is not set ++# CONFIG_MTD_NAND_H1900 is not set ++CONFIG_MTD_NAND_IDS=m ++# CONFIG_MTD_NAND_DISKONCHIP is not set ++# CONFIG_MTD_NAND_SHARPSL is not set ++# CONFIG_MTD_NAND_CAFE is not set ++CONFIG_MTD_NAND_CM_X270=m ++# CONFIG_MTD_NAND_NANDSIM is not set ++ ++# ++# OneNAND Flash Device Drivers ++# ++# CONFIG_MTD_ONENAND is not set ++ ++# ++# Parallel port support ++# ++# CONFIG_PARPORT is not set ++ ++# ++# Plug and Play support ++# ++# CONFIG_PNPACPI is not set ++ ++# ++# 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=16 ++CONFIG_BLK_DEV_RAM_SIZE=12000 ++CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 ++# CONFIG_CDROM_PKTCDVD is not set ++# CONFIG_ATA_OVER_ETH is not set ++ ++# ++# ATA/ATAPI/MFM/RLL support ++# ++CONFIG_IDE=m ++CONFIG_IDE_MAX_HWIFS=4 ++CONFIG_BLK_DEV_IDE=m ++ ++# ++# Please see Documentation/ide.txt for help/info on IDE drives ++# ++# CONFIG_BLK_DEV_IDE_SATA is not set ++CONFIG_BLK_DEV_IDEDISK=m ++# CONFIG_IDEDISK_MULTI_MODE is not set ++CONFIG_BLK_DEV_IDECS=m ++# CONFIG_BLK_DEV_DELKIN is not set ++CONFIG_BLK_DEV_IDECD=m ++# CONFIG_BLK_DEV_IDETAPE is not set ++# CONFIG_BLK_DEV_IDEFLOPPY is not set ++# CONFIG_BLK_DEV_IDESCSI is not set ++# CONFIG_IDE_TASK_IOCTL is not set ++ ++# ++# IDE chipset support/bugfixes ++# ++# CONFIG_IDE_GENERIC is not set ++# CONFIG_BLK_DEV_IDEPCI is not set ++# CONFIG_IDE_ARM is not set ++CONFIG_BLK_DEV_IDE_CM_X270=m ++# CONFIG_BLK_DEV_IDEDMA is not set ++# CONFIG_BLK_DEV_HD is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++CONFIG_SCSI=y ++# CONFIG_SCSI_TGT is not set ++# CONFIG_SCSI_NETLINK is not set ++# CONFIG_SCSI_PROC_FS is not set ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++# CONFIG_CHR_DEV_ST is not set ++# CONFIG_CHR_DEV_OSST is not set ++# CONFIG_BLK_DEV_SR is not set ++# CONFIG_CHR_DEV_SG is not set ++# CONFIG_CHR_DEV_SCH is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_MULTI_LUN is not set ++# CONFIG_SCSI_CONSTANTS is not set ++# CONFIG_SCSI_LOGGING is not set ++# CONFIG_SCSI_SCAN_ASYNC is not set ++ ++# ++# SCSI Transports ++# ++# CONFIG_SCSI_SPI_ATTRS is not set ++# CONFIG_SCSI_FC_ATTRS is not set ++# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_ATTRS is not set ++# CONFIG_SCSI_SAS_LIBSAS is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_ISCSI_TCP is not set ++# CONFIG_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_AIC94XX is not set ++# CONFIG_SCSI_DPT_I2O is not set ++# CONFIG_SCSI_ARCMSR is not set ++# CONFIG_MEGARAID_NEWGEN is not set ++# CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set ++# CONFIG_SCSI_HPTIOP is not set ++# CONFIG_SCSI_DMX3191D is not set ++# CONFIG_SCSI_FUTURE_DOMAIN is not set ++# CONFIG_SCSI_IPS is not set ++# CONFIG_SCSI_INITIO is not set ++# CONFIG_SCSI_INIA100 is not set ++# CONFIG_SCSI_STEX is not set ++# CONFIG_SCSI_SYM53C8XX_2 is not set ++# CONFIG_SCSI_QLOGIC_1280 is not set ++# CONFIG_SCSI_QLA_FC is not set ++# CONFIG_SCSI_QLA_ISCSI 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 ++# CONFIG_SCSI_SRP is not set ++ ++# ++# PCMCIA SCSI adapter support ++# ++# CONFIG_PCMCIA_AHA152X is not set ++# CONFIG_PCMCIA_FDOMAIN is not set ++# CONFIG_PCMCIA_NINJA_SCSI is not set ++# CONFIG_PCMCIA_QLOGIC is not set ++# CONFIG_PCMCIA_SYM53C500 is not set ++ ++# ++# Serial ATA (prod) and Parallel ATA (experimental) drivers ++# ++# CONFIG_ATA is not set ++ ++# ++# Multi-device support (RAID and LVM) ++# ++# CONFIG_MD is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++# CONFIG_FUSION_SPI is not set ++# CONFIG_FUSION_FC is not set ++# CONFIG_FUSION_SAS is not set ++ ++# ++# IEEE 1394 (FireWire) support ++# ++# CONFIG_IEEE1394 is not set ++ ++# ++# I2O device support ++# ++# CONFIG_I2O is not set ++ ++# ++# Network device support ++# ++CONFIG_NETDEVICES=y ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++ ++# ++# ARCnet devices ++# ++# CONFIG_ARCNET is not set ++ ++# ++# PHY device support ++# ++# CONFIG_PHYLIB 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_CASSINI is not set ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_SMC91X is not set ++CONFIG_DM9000=y ++CONFIG_DM9000_NOEPROM=y ++# CONFIG_SMC911X is not set ++ ++# ++# Tulip family network device support ++# ++# CONFIG_NET_TULIP is not set ++# CONFIG_HP100 is not set ++CONFIG_NET_PCI=y ++# CONFIG_PCNET32 is not set ++# CONFIG_AMD8111_ETH is not set ++# CONFIG_ADAPTEC_STARFIRE is not set ++# CONFIG_B44 is not set ++# CONFIG_FORCEDETH is not set ++# CONFIG_DGRS is not set ++# CONFIG_EEPRO100 is not set ++# CONFIG_E100 is not set ++# CONFIG_FEALNX is not set ++# CONFIG_NATSEMI is not set ++# CONFIG_NE2K_PCI is not set ++# CONFIG_8139CP is not set ++CONFIG_8139TOO=m ++# CONFIG_8139TOO_PIO is not set ++# CONFIG_8139TOO_TUNE_TWISTER is not set ++# CONFIG_8139TOO_8129 is not set ++# CONFIG_8139_OLD_RX_RESET is not set ++# CONFIG_SIS900 is not set ++# CONFIG_EPIC100 is not set ++# CONFIG_SUNDANCE is not set ++# CONFIG_TLAN is not set ++# CONFIG_VIA_RHINE is not set ++# CONFIG_SC92031 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_SIS190 is not set ++# CONFIG_SKGE is not set ++# CONFIG_SKY2 is not set ++# CONFIG_SK98LIN is not set ++# CONFIG_VIA_VELOCITY is not set ++# CONFIG_TIGON3 is not set ++# CONFIG_BNX2 is not set ++# CONFIG_QLA3XXX is not set ++# CONFIG_ATL1 is not set ++ ++# ++# Ethernet (10000 Mbit) ++# ++# CONFIG_CHELSIO_T1 is not set ++# CONFIG_CHELSIO_T3 is not set ++# CONFIG_IXGB is not set ++# CONFIG_S2IO is not set ++# CONFIG_MYRI10GE is not set ++# CONFIG_NETXEN_NIC is not set ++ ++# ++# Token Ring devices ++# ++# CONFIG_TR is not set ++ ++# ++# Wireless LAN (non-hamradio) ++# ++CONFIG_NET_RADIO=y ++# CONFIG_NET_WIRELESS_RTNETLINK is not set ++ ++# ++# Obsolete Wireless cards support (pre-802.11) ++# ++# CONFIG_STRIP is not set ++# CONFIG_PCMCIA_WAVELAN is not set ++# CONFIG_PCMCIA_NETWAVE is not set ++ ++# ++# Wireless 802.11 Frequency Hopping cards support ++# ++# CONFIG_PCMCIA_RAYCS is not set ++ ++# ++# Wireless 802.11b ISA/PCI cards support ++# ++# CONFIG_IPW2100 is not set ++# CONFIG_IPW2200 is not set ++# CONFIG_HERMES is not set ++# CONFIG_ATMEL is not set ++ ++# ++# Wireless 802.11b Pcmcia/Cardbus cards support ++# ++# CONFIG_AIRO_CS is not set ++# CONFIG_PCMCIA_WL3501 is not set ++ ++# ++# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support ++# ++# CONFIG_PRISM54 is not set ++# CONFIG_USB_ZD1201 is not set ++# CONFIG_HOSTAP is not set ++CONFIG_NET_WIRELESS=y ++ ++# ++# PCMCIA network device support ++# ++CONFIG_NET_PCMCIA=y ++# CONFIG_PCMCIA_3C589 is not set ++# CONFIG_PCMCIA_3C574 is not set ++# CONFIG_PCMCIA_FMVJ18X is not set ++CONFIG_PCMCIA_PCNET=m ++# CONFIG_PCMCIA_NMCLAN is not set ++# CONFIG_PCMCIA_SMC91C92 is not set ++# CONFIG_PCMCIA_XIRC2PS is not set ++# CONFIG_PCMCIA_AXNET 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 ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set ++ ++# ++# ISDN subsystem ++# ++# CONFIG_ISDN is not set ++ ++# ++# Input device support ++# ++CONFIG_INPUT=y ++# CONFIG_INPUT_FF_MEMLESS is not set ++ ++# ++# Userland interfaces ++# ++# CONFIG_INPUT_MOUSEDEV is not set ++# CONFIG_INPUT_JOYDEV is not set ++# CONFIG_INPUT_TSDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_EVBUG is not set ++ ++# ++# Input Device Drivers ++# ++# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_INPUT_MOUSE is not set ++# CONFIG_INPUT_JOYSTICK is not set ++CONFIG_INPUT_TOUCHSCREEN=y ++# CONFIG_TOUCHSCREEN_GUNZE is not set ++# CONFIG_TOUCHSCREEN_ELO is not set ++# CONFIG_TOUCHSCREEN_MTOUCH is not set ++# CONFIG_TOUCHSCREEN_MK712 is not set ++# CONFIG_TOUCHSCREEN_PENMOUNT is not set ++# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set ++# CONFIG_TOUCHSCREEN_TOUCHWIN is not set ++CONFIG_TOUCHSCREEN_UCB1400=m ++# 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_VT_HW_CONSOLE_BINDING is not set ++# CONFIG_SERIAL_NONSTANDARD is not set ++ ++# ++# Serial drivers ++# ++# CONFIG_SERIAL_8250 is not set ++ ++# ++# Non-8250 serial port support ++# ++CONFIG_SERIAL_PXA=y ++CONFIG_SERIAL_PXA_CONSOLE=y ++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=256 ++ ++# ++# IPMI ++# ++# CONFIG_IPMI_HANDLER is not set ++ ++# ++# Watchdog Cards ++# ++# CONFIG_WATCHDOG is not set ++CONFIG_HW_RANDOM=m ++# CONFIG_NVRAM is not set ++# CONFIG_DTLK is not set ++# CONFIG_R3964 is not set ++# CONFIG_APPLICOM is not set ++# CONFIG_DRM is not set ++ ++# ++# PCMCIA character devices ++# ++# CONFIG_SYNCLINK_CS is not set ++# CONFIG_CARDMAN_4000 is not set ++# CONFIG_CARDMAN_4040 is not set ++# CONFIG_RAW_DRIVER is not set ++ ++# ++# TPM devices ++# ++# CONFIG_TCG_TPM is not set ++ ++# ++# I2C support ++# ++# CONFIG_I2C is not set ++ ++# ++# SPI support ++# ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++ ++# ++# Dallas's 1-wire bus ++# ++# CONFIG_W1 is not set ++ ++# ++# Hardware Monitoring support ++# ++# CONFIG_HWMON is not set ++# CONFIG_HWMON_VID is not set ++ ++# ++# Misc devices ++# ++# CONFIG_SGI_IOC4 is not set ++# CONFIG_TIFM_CORE is not set ++ ++# ++# Multifunction device drivers ++# ++# CONFIG_MFD_SM501 is not set ++ ++# ++# LED devices ++# ++CONFIG_NEW_LEDS=y ++CONFIG_LEDS_CLASS=y ++ ++# ++# LED drivers ++# ++CONFIG_LEDS_CM_X270=y ++ ++# ++# LED Triggers ++# ++CONFIG_LEDS_TRIGGERS=y ++# CONFIG_LEDS_TRIGGER_TIMER is not set ++# CONFIG_LEDS_TRIGGER_IDE_DISK is not set ++CONFIG_LEDS_TRIGGER_HEARTBEAT=y ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++ ++# ++# Digital Video Broadcasting Devices ++# ++# CONFIG_DVB is not set ++# CONFIG_USB_DABUSB is not set ++ ++# ++# Graphics support ++# ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++CONFIG_FB=y ++# CONFIG_FIRMWARE_EDID is not set ++# CONFIG_FB_DDC is not set ++CONFIG_FB_CFB_FILLRECT=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 is not set ++# CONFIG_FB_TILEBLITTING is not set ++ ++# ++# Frambuffer hardware drivers ++# ++# CONFIG_FB_CIRRUS is not set ++# CONFIG_FB_PM2 is not set ++# CONFIG_FB_CYBER2000 is not set ++# CONFIG_FB_ASILIANT is not set ++# CONFIG_FB_IMSTT is not set ++# CONFIG_FB_S1D13XXX is not set ++# CONFIG_FB_NVIDIA is not set ++# CONFIG_FB_RIVA is not set ++# CONFIG_FB_MATROX is not set ++# CONFIG_FB_RADEON is not set ++# CONFIG_FB_ATY128 is not set ++# CONFIG_FB_ATY is not set ++# CONFIG_FB_S3 is not set ++# CONFIG_FB_SAVAGE is not set ++# CONFIG_FB_SIS is not set ++# CONFIG_FB_NEOMAGIC is not set ++# CONFIG_FB_KYRO is not set ++# CONFIG_FB_3DFX is not set ++# CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_TRIDENT is not set ++CONFIG_FB_PXA=y ++# CONFIG_FB_PXA_PARAMETERS is not set ++CONFIG_FB_MBX=m ++# CONFIG_FB_VIRTUAL is not set ++ ++# ++# Console display driver support ++# ++# CONFIG_VGA_CONSOLE is not set ++CONFIG_DUMMY_CONSOLE=y ++CONFIG_FRAMEBUFFER_CONSOLE=y ++# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set ++# CONFIG_FONTS is not set ++CONFIG_FONT_8x8=y ++CONFIG_FONT_8x16=y ++ ++# ++# Logo configuration ++# ++CONFIG_LOGO=y ++CONFIG_LOGO_LINUX_MONO=y ++CONFIG_LOGO_LINUX_VGA16=y ++CONFIG_LOGO_LINUX_CLUT224=y ++ ++# ++# Sound ++# ++CONFIG_SOUND=m ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=m ++CONFIG_SND_TIMER=m ++CONFIG_SND_PCM=m ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=m ++CONFIG_SND_PCM_OSS=m ++CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++# CONFIG_SND_VERBOSE_PRINTK is not set ++# CONFIG_SND_DEBUG is not set ++ ++# ++# Generic devices ++# ++CONFIG_SND_AC97_CODEC=m ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# PCI devices ++# ++# CONFIG_SND_AD1889 is not set ++# CONFIG_SND_ALS300 is not set ++# CONFIG_SND_ALI5451 is not set ++# CONFIG_SND_ATIIXP is not set ++# CONFIG_SND_ATIIXP_MODEM is not set ++# CONFIG_SND_AU8810 is not set ++# CONFIG_SND_AU8820 is not set ++# CONFIG_SND_AU8830 is not set ++# CONFIG_SND_AZT3328 is not set ++# CONFIG_SND_BT87X is not set ++# CONFIG_SND_CA0106 is not set ++# CONFIG_SND_CMIPCI is not set ++# CONFIG_SND_CS4281 is not set ++# CONFIG_SND_CS46XX is not set ++# CONFIG_SND_DARLA20 is not set ++# CONFIG_SND_GINA20 is not set ++# CONFIG_SND_LAYLA20 is not set ++# CONFIG_SND_DARLA24 is not set ++# CONFIG_SND_GINA24 is not set ++# CONFIG_SND_LAYLA24 is not set ++# CONFIG_SND_MONA is not set ++# CONFIG_SND_MIA is not set ++# CONFIG_SND_ECHO3G is not set ++# CONFIG_SND_INDIGO is not set ++# CONFIG_SND_INDIGOIO is not set ++# CONFIG_SND_INDIGODJ is not set ++# CONFIG_SND_EMU10K1 is not set ++# CONFIG_SND_EMU10K1X is not set ++# CONFIG_SND_ENS1370 is not set ++# CONFIG_SND_ENS1371 is not set ++# CONFIG_SND_ES1938 is not set ++# CONFIG_SND_ES1968 is not set ++# CONFIG_SND_FM801 is not set ++# CONFIG_SND_HDA_INTEL is not set ++# CONFIG_SND_HDSP is not set ++# CONFIG_SND_HDSPM is not set ++# CONFIG_SND_ICE1712 is not set ++# CONFIG_SND_ICE1724 is not set ++# CONFIG_SND_INTEL8X0 is not set ++# CONFIG_SND_INTEL8X0M is not set ++# CONFIG_SND_KORG1212 is not set ++# CONFIG_SND_MAESTRO3 is not set ++# CONFIG_SND_MIXART is not set ++# CONFIG_SND_NM256 is not set ++# CONFIG_SND_PCXHR is not set ++# CONFIG_SND_RIPTIDE is not set ++# CONFIG_SND_RME32 is not set ++# CONFIG_SND_RME96 is not set ++# CONFIG_SND_RME9652 is not set ++# CONFIG_SND_SONICVIBES is not set ++# CONFIG_SND_TRIDENT is not set ++# CONFIG_SND_VIA82XX is not set ++# CONFIG_SND_VIA82XX_MODEM is not set ++# CONFIG_SND_VX222 is not set ++# CONFIG_SND_YMFPCI is not set ++# CONFIG_SND_AC97_POWER_SAVE is not set ++ ++# ++# ALSA ARM devices ++# ++CONFIG_SND_PXA2XX_PCM=m ++CONFIG_SND_PXA2XX_AC97=m ++ ++# ++# USB devices ++# ++# CONFIG_SND_USB_AUDIO is not set ++ ++# ++# PCMCIA devices ++# ++# CONFIG_SND_VXPOCKET is not set ++# CONFIG_SND_PDAUDIOCF is not set ++ ++# ++# SoC audio support ++# ++# CONFIG_SND_SOC is not set ++ ++# ++# Open Sound System ++# ++# CONFIG_SOUND_PRIME is not set ++CONFIG_AC97_BUS=m ++ ++# ++# HID Devices ++# ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++ ++# ++# USB support ++# ++CONFIG_USB_ARCH_HAS_HCD=y ++CONFIG_USB_ARCH_HAS_OHCI=y ++CONFIG_USB_ARCH_HAS_EHCI=y ++CONFIG_USB=y ++# CONFIG_USB_DEBUG is not set ++ ++# ++# Miscellaneous USB options ++# ++CONFIG_USB_DEVICEFS=y ++# CONFIG_USB_DYNAMIC_MINORS is not set ++# CONFIG_USB_SUSPEND is not set ++# CONFIG_USB_OTG is not set ++ ++# ++# USB Host Controller Drivers ++# ++# CONFIG_USB_EHCI_HCD is not set ++# CONFIG_USB_ISP116X_HCD is not set ++CONFIG_USB_OHCI_HCD=y ++# 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_UHCI_HCD is not set ++# CONFIG_USB_SL811_HCD is not set ++ ++# ++# USB Device Class drivers ++# ++# CONFIG_USB_ACM is not set ++# CONFIG_USB_PRINTER is not set ++ ++# ++# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' ++# ++ ++# ++# may also be needed; see USB_STORAGE Help for more information ++# ++CONFIG_USB_STORAGE=y ++# CONFIG_USB_STORAGE_DEBUG is not set ++# CONFIG_USB_STORAGE_DATAFAB is not set ++# CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_DPCM is not set ++# CONFIG_USB_STORAGE_USBAT is not set ++# CONFIG_USB_STORAGE_SDDR09 is not set ++# CONFIG_USB_STORAGE_SDDR55 is not set ++# CONFIG_USB_STORAGE_JUMPSHOT is not set ++# CONFIG_USB_STORAGE_ALAUDA is not set ++# CONFIG_USB_STORAGE_KARMA is not set ++# CONFIG_USB_LIBUSUAL is not set ++ ++# ++# USB Input Devices ++# ++CONFIG_USB_HID=y ++# CONFIG_USB_HIDINPUT_POWERBOOK is not set ++# CONFIG_HID_FF is not set ++# CONFIG_USB_HIDDEV is not set ++# CONFIG_USB_AIPTEK is not set ++# CONFIG_USB_WACOM is not set ++# CONFIG_USB_ACECAD is not set ++# CONFIG_USB_KBTAB is not set ++# CONFIG_USB_POWERMATE is not set ++# CONFIG_USB_TOUCHSCREEN is not set ++# CONFIG_USB_YEALINK is not set ++# CONFIG_USB_XPAD is not set ++# CONFIG_USB_ATI_REMOTE is not set ++# CONFIG_USB_ATI_REMOTE2 is not set ++# CONFIG_USB_KEYSPAN_REMOTE is not set ++# CONFIG_USB_APPLETOUCH is not set ++# CONFIG_USB_GTCO is not set ++ ++# ++# USB Imaging devices ++# ++# CONFIG_USB_MDC800 is not set ++# CONFIG_USB_MICROTEK is not set ++ ++# ++# USB Network Adapters ++# ++# CONFIG_USB_CATC is not set ++# CONFIG_USB_KAWETH is not set ++# CONFIG_USB_PEGASUS is not set ++# CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_USBNET_MII is not set ++# CONFIG_USB_USBNET is not set ++CONFIG_USB_MON=y ++ ++# ++# USB port drivers ++# ++ ++# ++# USB Serial Converter support ++# ++# CONFIG_USB_SERIAL is not set ++ ++# ++# USB Miscellaneous drivers ++# ++# CONFIG_USB_EMI62 is not set ++# CONFIG_USB_EMI26 is not set ++# CONFIG_USB_ADUTUX is not set ++# CONFIG_USB_AUERSWALD is not set ++# CONFIG_USB_RIO500 is not set ++# CONFIG_USB_LEGOTOWER is not set ++# CONFIG_USB_LCD is not set ++# CONFIG_USB_BERRY_CHARGE is not set ++# CONFIG_USB_LED is not set ++# CONFIG_USB_CYPRESS_CY7C63 is not set ++# CONFIG_USB_CYTHERM is not set ++# CONFIG_USB_PHIDGET is not set ++# CONFIG_USB_IDMOUSE is not set ++# CONFIG_USB_FTDI_ELAN is not set ++# CONFIG_USB_APPLEDISPLAY is not set ++# CONFIG_USB_LD is not set ++# CONFIG_USB_TRANCEVIBRATOR is not set ++# CONFIG_USB_IOWARRIOR is not set ++# CONFIG_USB_TEST is not set ++ ++# ++# USB DSL modem support ++# ++ ++# ++# USB Gadget Support ++# ++# CONFIG_USB_GADGET is not set ++ ++# ++# MMC/SD Card support ++# ++CONFIG_MMC=m ++# CONFIG_MMC_DEBUG is not set ++CONFIG_MMC_BLOCK=m ++CONFIG_MMC_PXA=m ++# CONFIG_MMC_SDHCI is not set ++# CONFIG_MMC_TIFM_SD is not set ++ ++# ++# Real Time Clock ++# ++CONFIG_RTC_LIB=y ++CONFIG_RTC_CLASS=y ++CONFIG_RTC_HCTOSYS=y ++CONFIG_RTC_HCTOSYS_DEVICE="rtc0" ++# CONFIG_RTC_DEBUG is not set ++ ++# ++# RTC interfaces ++# ++CONFIG_RTC_INTF_SYSFS=y ++CONFIG_RTC_INTF_PROC=y ++CONFIG_RTC_INTF_DEV=y ++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set ++ ++# ++# RTC drivers ++# ++# CONFIG_RTC_DRV_CMOS is not set ++# CONFIG_RTC_DRV_DS1553 is not set ++# CONFIG_RTC_DRV_DS1742 is not set ++# CONFIG_RTC_DRV_M48T86 is not set ++CONFIG_RTC_DRV_SA1100=y ++# CONFIG_RTC_DRV_TEST is not set ++CONFIG_RTC_DRV_V3020=y ++ ++# ++# File systems ++# ++CONFIG_EXT2_FS=y ++# CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set ++CONFIG_EXT3_FS=y ++CONFIG_EXT3_FS_XATTR=y ++# CONFIG_EXT3_FS_POSIX_ACL is not set ++# CONFIG_EXT3_FS_SECURITY is not set ++# CONFIG_EXT4DEV_FS is not set ++CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set ++CONFIG_FS_MBCACHE=y ++# CONFIG_REISERFS_FS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_FS_POSIX_ACL is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_GFS2_FS is not set ++# CONFIG_OCFS2_FS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_ROMFS_FS is not set ++CONFIG_INOTIFY=y ++CONFIG_INOTIFY_USER=y ++# CONFIG_QUOTA is not set ++CONFIG_DNOTIFY=y ++# CONFIG_AUTOFS_FS is not set ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_FUSE_FS is not set ++ ++# ++# CD-ROM/DVD Filesystems ++# ++# CONFIG_ISO9660_FS is not set ++# CONFIG_UDF_FS is not set ++ ++# ++# DOS/FAT/NT Filesystems ++# ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_FAT_DEFAULT_CODEPAGE=437 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ++# CONFIG_NTFS_FS is not set ++ ++# ++# Pseudo filesystems ++# ++CONFIG_PROC_FS=y ++CONFIG_PROC_SYSCTL=y ++CONFIG_SYSFS=y ++CONFIG_TMPFS=y ++# CONFIG_TMPFS_POSIX_ACL is not set ++# CONFIG_HUGETLB_PAGE is not set ++CONFIG_RAMFS=y ++# CONFIG_CONFIGFS_FS is not set ++ ++# ++# Miscellaneous filesystems ++# ++# CONFIG_ADFS_FS is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BFS_FS is not set ++# CONFIG_EFS_FS is not set ++# CONFIG_JFFS2_FS 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_V3_ACL is not set ++# 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_NFS_COMMON=y ++CONFIG_SUNRPC=y ++# CONFIG_RPCSEC_GSS_KRB5 is not set ++# CONFIG_RPCSEC_GSS_SPKM3 is not set ++CONFIG_SMB_FS=y ++# CONFIG_SMB_NLS_DEFAULT is not set ++# CONFIG_CIFS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_CODA_FS is not set ++# CONFIG_AFS_FS is not set ++# CONFIG_9P_FS is not set ++ ++# ++# Partition Types ++# ++# CONFIG_PARTITION_ADVANCED is not set ++CONFIG_MSDOS_PARTITION=y ++ ++# ++# Native Language Support ++# ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-1" ++CONFIG_NLS_CODEPAGE_437=y ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ASCII is not set ++CONFIG_NLS_ISO8859_1=y ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++ ++# ++# Distributed Lock Manager ++# ++# CONFIG_DLM is not set ++ ++# ++# Profiling support ++# ++# CONFIG_PROFILING is not set ++ ++# ++# Kernel hacking ++# ++# CONFIG_PRINTK_TIME is not set ++CONFIG_ENABLE_MUST_CHECK=y ++CONFIG_MAGIC_SYSRQ=y ++# CONFIG_UNUSED_SYMBOLS is not set ++# 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=17 ++# CONFIG_DETECT_SOFTLOCKUP is not set ++# CONFIG_SCHEDSTATS is not set ++# CONFIG_TIMER_STATS is not set ++# CONFIG_DEBUG_SLAB is not set ++# CONFIG_DEBUG_RT_MUTEXES is not set ++# CONFIG_RT_MUTEX_TESTER is not set ++# CONFIG_DEBUG_SPINLOCK is not set ++# CONFIG_DEBUG_MUTEXES is not set ++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set ++# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set ++# CONFIG_DEBUG_KOBJECT is not set ++# CONFIG_DEBUG_BUGVERBOSE is not set ++CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_VM is not set ++# CONFIG_DEBUG_LIST is not set ++CONFIG_FRAME_POINTER=y ++CONFIG_FORCED_INLINING=y ++# CONFIG_RCU_TORTURE_TEST is not set ++# CONFIG_FAULT_INJECTION is not set ++CONFIG_DEBUG_USER=y ++CONFIG_DEBUG_ERRORS=y ++CONFIG_DEBUG_LL=y ++# CONFIG_DEBUG_ICEDCC is not set ++ ++# ++# Security options ++# ++# CONFIG_KEYS is not set ++# CONFIG_SECURITY is not set ++ ++# ++# Cryptographic options ++# ++CONFIG_CRYPTO=y ++CONFIG_CRYPTO_ALGAPI=m ++CONFIG_CRYPTO_BLKCIPHER=m ++CONFIG_CRYPTO_MANAGER=m ++# CONFIG_CRYPTO_HMAC is not set ++# CONFIG_CRYPTO_XCBC is not set ++# CONFIG_CRYPTO_NULL is not set ++# CONFIG_CRYPTO_MD4 is not set ++# CONFIG_CRYPTO_MD5 is not set ++# CONFIG_CRYPTO_SHA1 is not set ++# CONFIG_CRYPTO_SHA256 is not set ++# CONFIG_CRYPTO_SHA512 is not set ++# CONFIG_CRYPTO_WP512 is not set ++# CONFIG_CRYPTO_TGR192 is not set ++# CONFIG_CRYPTO_GF128MUL is not set ++CONFIG_CRYPTO_ECB=m ++CONFIG_CRYPTO_CBC=m ++CONFIG_CRYPTO_PCBC=m ++# CONFIG_CRYPTO_LRW is not set ++# CONFIG_CRYPTO_DES is not set ++# CONFIG_CRYPTO_FCRYPT is not set ++# CONFIG_CRYPTO_BLOWFISH is not set ++# CONFIG_CRYPTO_TWOFISH is not set ++# CONFIG_CRYPTO_SERPENT is not set ++CONFIG_CRYPTO_AES=m ++# CONFIG_CRYPTO_CAST5 is not set ++# CONFIG_CRYPTO_CAST6 is not set ++# CONFIG_CRYPTO_TEA is not set ++CONFIG_CRYPTO_ARC4=m ++# CONFIG_CRYPTO_KHAZAD is not set ++# CONFIG_CRYPTO_ANUBIS is not set ++# CONFIG_CRYPTO_DEFLATE is not set ++# CONFIG_CRYPTO_MICHAEL_MIC is not set ++# CONFIG_CRYPTO_CRC32C is not set ++# CONFIG_CRYPTO_CAMELLIA is not set ++# CONFIG_CRYPTO_TEST is not set ++ ++# ++# Hardware crypto devices ++# ++ ++# ++# Library routines ++# ++CONFIG_BITREVERSE=y ++# CONFIG_CRC_CCITT is not set ++# CONFIG_CRC16 is not set ++CONFIG_CRC32=y ++# CONFIG_LIBCRC32C is not set ++CONFIG_PLIST=y ++CONFIG_HAS_IOMEM=y ++CONFIG_HAS_IOPORT=y +diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig +index 5c0a100..e1cd439 100644 +--- a/arch/arm/mach-pxa/Kconfig ++++ b/arch/arm/mach-pxa/Kconfig +@@ -37,6 +37,11 @@ config MACH_TRIZEPS4 + bool "Keith und Koep Trizeps4 DIMM-Module" + select PXA27x + ++config MACH_ARMCORE ++ bool "CompuLab CM-X270 modules" ++ select PXA27x ++ select IWMMXT ++ + endchoice + + if PXA_SHARPSL +diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile +index 9093eb1..2a110f8 100644 +--- a/arch/arm/mach-pxa/Makefile ++++ b/arch/arm/mach-pxa/Makefile +@@ -18,6 +18,7 @@ obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o sp + obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o + obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o + obj-$(CONFIG_MACH_TOSA) += tosa.o ++obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o + + # Support for blinky lights + led-y := leds.o +@@ -25,6 +26,8 @@ led-$(CONFIG_ARCH_LUBBOCK) += leds-lubbock.o + led-$(CONFIG_MACH_MAINSTONE) += leds-mainstone.o + led-$(CONFIG_ARCH_PXA_IDP) += leds-idp.o + led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o ++# FIXME: use driver/leds instead ++led-$(CONFIG_MACH_ARMCORE) += leds-cm-x270.o + + obj-$(CONFIG_LEDS) += $(led-y) + +@@ -35,3 +38,7 @@ obj-$(CONFIG_PXA_SSP) += ssp.o + ifeq ($(CONFIG_PXA27x),y) + obj-$(CONFIG_PM) += standby.o + endif ++ ++ifeq ($(CONFIG_PCI),y) ++obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o ++endif +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +new file mode 100644 +index 0000000..88b080d +--- /dev/null ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -0,0 +1,821 @@ ++/* ++ * linux/arch/arm/mach-pxa/cm-x270.c ++ * ++ * Copyright (C) 2007 CompuLab, Ltd. ++ * Mike Rapoport <mike@compulab.co.il> ++ * ++ * 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. ++ */ ++ ++#include <linux/pm.h> ++#include <linux/fb.h> ++#include <linux/platform_device.h> ++#include <linux/sysdev.h> ++#include <linux/dm9000.h> ++#include <linux/rtc-v3020.h> ++#include <linux/serial_8250.h> ++#include <video/mbxfb.h> ++ ++#include <asm/types.h> ++#include <asm/setup.h> ++#include <asm/memory.h> ++#include <asm/mach-types.h> ++#include <asm/hardware.h> ++#include <asm/irq.h> ++#include <asm/io.h> ++#include <asm/delay.h> ++ ++#include <asm/mach/arch.h> ++#include <asm/mach/map.h> ++#include <asm/mach/irq.h> ++ ++#include <asm/arch/pxa-regs.h> ++#include <asm/arch/pxafb.h> ++#include <asm/arch/ohci.h> ++#include <asm/arch/mmc.h> ++#include <asm/arch/bitfield.h> ++#include <asm/arch/cm-x270.h> ++ ++#include <asm/hardware/it8152.h> ++ ++#include "generic.h" ++ ++#define RTC_PHYS_BASE (PXA_CS1_PHYS + (5 << 22)) ++#define DM9000_PHYS_BASE (PXA_CS1_PHYS + (6 << 22)) ++ ++static struct resource cmx270_dm9k_resource[] = { ++ [0] = { ++ .start = DM9000_PHYS_BASE, ++ .end = DM9000_PHYS_BASE + 4, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = DM9000_PHYS_BASE + 8, ++ .end = DM9000_PHYS_BASE + 8 + 500, ++ .flags = IORESOURCE_MEM, ++ }, ++ [2] = { ++ .start = CMX270_ETHIRQ, ++ .end = CMX270_ETHIRQ, ++ .flags = IORESOURCE_IRQ, ++ } ++}; ++ ++/* for the moment we limit ourselves to 32bit IO until some ++ * better IO routines can be written and tested ++ */ ++static struct dm9000_plat_data cmx270_dm9k_platdata = { ++ .flags = DM9000_PLATF_32BITONLY, ++}; ++ ++/* Ethernet device */ ++static struct platform_device cmx270_device_dm9k = { ++ .name = "dm9000", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(cmx270_dm9k_resource), ++ .resource = cmx270_dm9k_resource, ++ .dev = { ++ .platform_data = &cmx270_dm9k_platdata, ++ } ++}; ++ ++/* audio device */ ++static struct platform_device cmx270_audio_device = { ++ .name = "pxa2xx-ac97", ++ .id = -1, ++}; ++ ++/* touchscreen controller */ ++static struct platform_device cmx270_ts_device = { ++ .name = "ucb1x00-ts", ++ .id = -1, ++}; ++ ++/* RTC */ ++static struct resource cmx270_v3020_resource[] = { ++ [0] = { ++ .start = RTC_PHYS_BASE, ++ .end = RTC_PHYS_BASE + 4, ++ .flags = IORESOURCE_MEM, ++ }, ++}; ++ ++struct v3020_platform_data cmx270_v3020_pdata = { ++ .leftshift = 16, ++}; ++ ++static struct platform_device cmx270_rtc_device = { ++ .name = "v3020", ++ .num_resources = ARRAY_SIZE(cmx270_v3020_resource), ++ .resource = cmx270_v3020_resource, ++ .id = -1, ++ .dev = { ++ .platform_data = &cmx270_v3020_pdata, ++ } ++}; ++ ++/* ++ * CM-X270 LEDs ++ */ ++static struct platform_device cmx270led_device = { ++ .name = "cm-x270-led", ++ .id = -1, ++}; ++ ++/* 2700G graphics */ ++static u64 fb_dma_mask = ~(u64)0; ++ ++static struct resource cmx270_2700G_resource[] = { ++ /* frame buffer memory including ODFB and External SDRAM */ ++ [0] = { ++ .start = MARATHON_PHYS, ++ .end = MARATHON_PHYS + 0x02000000, ++ .flags = IORESOURCE_MEM, ++ }, ++ /* Marathon registers */ ++ [1] = { ++ .start = MARATHON_PHYS + 0x03fe0000, ++ .end = MARATHON_PHYS + 0x03ffffff, ++ .flags = IORESOURCE_MEM, ++ }, ++}; ++ ++static unsigned long save_lcd_regs[10]; ++ ++static int cmx270_marathon_probe(struct fb_info *fb) ++{ ++ /* save PXA-270 pin settings before enabling 2700G */ ++ save_lcd_regs[0] = GPDR1; ++ save_lcd_regs[1] = GPDR2; ++ save_lcd_regs[2] = GAFR1_U; ++ save_lcd_regs[3] = GAFR2_L; ++ save_lcd_regs[4] = GAFR2_U; ++ ++ /* Disable PXA-270 on-chip controller driving pins */ ++ GPDR1 &= ~(0xfc000000); ++ GPDR2 &= ~(0x00c03fff); ++ GAFR1_U &= ~(0xfff00000); ++ GAFR2_L &= ~(0x0fffffff); ++ GAFR2_U &= ~(0x0000f000); ++ return 0; ++} ++ ++static int cmx270_marathon_remove(struct fb_info *fb) ++{ ++ GPDR1 = save_lcd_regs[0]; ++ GPDR2 = save_lcd_regs[1]; ++ GAFR1_U = save_lcd_regs[2]; ++ GAFR2_L = save_lcd_regs[3]; ++ GAFR2_U = save_lcd_regs[4]; ++ return 0; ++} ++ ++static struct mbxfb_platform_data cmx270_2700G_data = { ++ .xres = { ++ .min = 240, ++ .max = 1200, ++ .defval = 640, ++ }, ++ .yres = { ++ .min = 240, ++ .max = 1200, ++ .defval = 480, ++ }, ++ .bpp = { ++ .min = 16, ++ .max = 32, ++ .defval = 16, ++ }, ++ .memsize = 8*1024*1024, ++ .probe = cmx270_marathon_probe, ++ .remove = cmx270_marathon_remove, ++}; ++ ++static struct platform_device cmx270_2700G = { ++ .name = "mbx-fb", ++ .dev = { ++ .platform_data = &cmx270_2700G_data, ++ .dma_mask = &fb_dma_mask, ++ .coherent_dma_mask = 0xffffffff, ++ }, ++ .num_resources = ARRAY_SIZE(cmx270_2700G_resource), ++ .resource = cmx270_2700G_resource, ++ .id = -1, ++}; ++ ++/* platform devices */ ++static struct platform_device *platform_devices[] __initdata = { ++ &cmx270_device_dm9k, ++ &cmx270_audio_device, ++ &cmx270_rtc_device, ++ &cmx270_2700G, ++ &cmx270led_device, ++}; ++ ++#ifdef CONFIG_PCI ++/* ++ * Install handler for IT8152 IRQ. Yes, yes... we are way down the IRQ ++ * cascade which is not good for IRQ latency, but the hardware has been ++ * designed that way... ++ */ ++static inline void cmx270_irq(int irq, struct pt_regs *regs) ++{ ++ struct irq_desc *desc; ++ desc = irq_desc + irq; ++ desc_handle_irq(irq, desc); ++} ++ ++static void cmx270_irq_demux(unsigned int irq, struct irqdesc *desc, ++ struct pt_regs *regs) ++{ ++ unsigned long pdcnimr, ldcnimr; ++ int pdcnirr, ldcnir; ++ ++ /* clear our parent irq */ ++ GEDR(GPIO_IT8152_IRQ) = GPIO_bit(GPIO_IT8152_IRQ); ++ ++ /* read pending IRQs in the chip registers and clear them */ ++ pdcnirr = IT8152_INTC_PDCNIRR; ++ ldcnir = IT8152_INTC_LDCNIRR; ++ IT8152_INTC_PDCNIRR = ~pdcnirr; ++ IT8152_INTC_LDCNIRR = ~ldcnir; ++ ++ /* mask ITE irqs */ ++ pdcnimr = IT8152_INTC_PDCNIMR; ++ ldcnimr = IT8152_INTC_LDCNIMR; ++ IT8152_INTC_PDCNIMR = 0xffff; ++ IT8152_INTC_LDCNIMR = 0xffff; ++ ++ pdcnirr &= (PCISERR_BIT | H2PTADR_BIT | H2PMAR_BIT | ++ PCI_INTD_BIT | PCI_INTC_BIT | PCI_INTB_BIT | PCI_INTA_BIT | ++ USB_INT_BIT | CDMA_INT_BIT); ++ ++ ldcnir &= ITESER_BIT; ++ ++ IT8152_INTC_PDCNIRR = ~pdcnirr; ++ IT8152_INTC_LDCNIRR = ~ldcnir; ++ ++ /* are there interrupts pending ? */ ++ if( (pdcnirr | ldcnir) ) { ++ if (pdcnirr) { ++ if( pdcnirr & PCISERR_BIT ) ++ cmx270_irq(PCISERR, regs); ++ if( pdcnirr & H2PTADR_BIT ) ++ cmx270_irq(H2PTADR, regs); ++ if( pdcnirr & H2PMAR_BIT ) ++ cmx270_irq(H2PMAR, regs); ++ if( pdcnirr & PCI_INTA_BIT ) ++ cmx270_irq(PCI_INTA, regs); ++ if( pdcnirr & PCI_INTB_BIT ) ++ cmx270_irq(PCI_INTB, regs); ++ if( pdcnirr & PCI_INTC_BIT ) ++ cmx270_irq(PCI_INTC, regs); ++ if( pdcnirr & PCI_INTD_BIT ) ++ cmx270_irq(PCI_INTD, regs); ++ if( pdcnirr & USB_INT_BIT ) ++ cmx270_irq(USB_INT, regs); ++ if( pdcnirr & CDMA_INT_BIT ) ++ cmx270_irq(CDMA_INT, regs); ++ } ++ if(ldcnir) { ++ if( ldcnir & ITESER_BIT ) ++ cmx270_irq(IRQ_ITESER, regs); ++ } ++ } ++ ++ /* re-enable ITE interrupts */ ++ IT8152_INTC_PDCNIMR = pdcnimr; ++ IT8152_INTC_LDCNIMR = ldcnimr; ++} ++#else ++unsigned long it8152_base_address = CMX270_IT8152_VIRT; ++#endif ++ ++/* #define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + PXA_CS_SIZE - (8<<20)) */ ++/* Map PCI companion and IDE/General Purpose CS statically */ ++static struct map_desc cmx270_io_desc[] __initdata = { ++ [0] = { /* IDE/general purpose space */ ++ .virtual = CMX270_IDE104_VIRT, ++ .pfn = __phys_to_pfn(CMX270_IDE104_PHYS), ++ .length = PXA_CS_SIZE - (8<<20), ++ .type = MT_DEVICE ++ }, ++ [1] = { /* PCI bridge */ ++ .virtual = CMX270_IT8152_VIRT, ++ .pfn = __phys_to_pfn(CMX270_IT8152_PHYS), ++ .length = PXA_CS_SIZE, ++ .type = MT_DEVICE ++ }, ++}; ++ ++/* ++ Display definitions ++ keep these for backwards compatibility, although symbolic names (as ++ e.g. in lpd270.c) looks better ++ */ ++#define MTYPE_STN320x240 0 ++#define MTYPE_TFT640x480 1 ++#define MTYPE_CRT640x480 2 ++#define MTYPE_CRT800x600 3 ++#define MTYPE_TFT320x240 6 ++#define MTYPE_STN640x480 7 ++ ++static struct pxafb_mode_info generic_stn_320x240_mode = { ++ .pixclock = 76923, ++ .bpp = 8, ++ .xres = 320, ++ .yres = 240, ++ .hsync_len = 3, ++ .vsync_len = 2, ++ .left_margin = 3, ++ .upper_margin = 0, ++ .right_margin = 3, ++ .lower_margin = 0, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_stn_320x240 = { ++ .modes = &generic_stn_320x240_mode, ++ .num_modes = 1, ++ .lccr0 = 0, ++ .lccr3 = (LCCR3_PixClkDiv(0x03) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mode_info generic_tft_640x480_mode = { ++ .pixclock = 38461, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 60, ++ .vsync_len = 2, ++ .left_margin = 70, ++ .upper_margin = 10, ++ .right_margin = 70, ++ .lower_margin = 5, ++ .sync = 0, ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_tft_640x480 = { ++ .modes = &generic_tft_640x480_mode, ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mode_info generic_crt_640x480_mode = { ++ .pixclock = 38461, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 63, ++ .vsync_len = 2, ++ .left_margin = 81, ++ .upper_margin = 33, ++ .right_margin = 16, ++ .lower_margin = 10, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_crt_640x480 = { ++ .modes = &generic_crt_640x480_mode, ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff)), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mode_info generic_crt_800x600_mode = { ++ .pixclock = 28846, ++ .bpp = 8, ++ .xres = 800, ++ .yres = 600, ++ .hsync_len = 63, ++ .vsync_len = 2, ++ .left_margin = 26, ++ .upper_margin = 21, ++ .right_margin = 26, ++ .lower_margin = 11, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_crt_800x600 = { ++ .modes = &generic_crt_800x600_mode, ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x02) | ++ LCCR3_Acb(0xff)), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mode_info generic_tft_320x240_mode = { ++ .pixclock = 134615, ++ .bpp = 16, ++ .xres = 320, ++ .yres = 240, ++ .hsync_len = 63, ++ .vsync_len = 7, ++ .left_margin = 75, ++ .upper_margin = 0, ++ .right_margin = 15, ++ .lower_margin = 15, ++ .sync = 0, ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_tft_320x240 = { ++ .modes = &generic_tft_320x240_mode, ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x06) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mode_info generic_stn_640x480_mode = { ++ .pixclock = 57692, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 4, ++ .vsync_len = 2, ++ .left_margin = 10, ++ .upper_margin = 5, ++ .right_margin = 10, ++ .lower_margin = 5, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .cmap_greyscale = 0, ++}; ++ ++static struct pxafb_mach_info generic_stn_640x480 = { ++ .modes = &generic_stn_640x480_mode, ++ .num_modes = 1, ++ .lccr0 = 0, ++ .lccr3 = (LCCR3_PixClkDiv(0x02) | ++ LCCR3_Acb(0xff)), ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++}; ++ ++static struct pxafb_mach_info *cmx270_display = &generic_crt_640x480; ++ ++static int __init cmx270_set_display(char *str) ++{ ++ int disp_type = simple_strtol(str, NULL, 0); ++ switch (disp_type) { ++ case MTYPE_STN320x240: ++ cmx270_display = &generic_stn_320x240; ++ break; ++ case MTYPE_TFT640x480: ++ cmx270_display = &generic_tft_640x480; ++ break; ++ case MTYPE_CRT640x480: ++ cmx270_display = &generic_crt_640x480; ++ break; ++ case MTYPE_CRT800x600: ++ cmx270_display = &generic_crt_800x600; ++ break; ++ case MTYPE_TFT320x240: ++ cmx270_display = &generic_tft_320x240; ++ break; ++ case MTYPE_STN640x480: ++ cmx270_display = &generic_stn_640x480; ++ break; ++ default: /* fallback to CRT 640x480 */ ++ cmx270_display = &generic_crt_640x480; ++ break; ++ } ++ return 1; ++} ++ ++__setup("monitor=", cmx270_set_display); ++ ++/* PXA27x OHCI controller setup */ ++static int cmx270_ohci_init(struct device *dev) ++{ ++ /* Set the Power Control Polarity Low */ ++ UHCHR = (UHCHR | UHCHR_PCPL) & ++ ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE); ++ ++ return 0; ++} ++ ++static struct pxaohci_platform_data cmx270_ohci_platform_data = { ++ .port_mode = PMM_PERPORT_MODE, ++ .init = cmx270_ohci_init, ++}; ++ ++ ++static int cmx270_mci_init(struct device *dev, irq_handler_t cmx270_detect_int, void *data) ++{ ++ int err; ++ ++ /* ++ * setup GPIO for PXA27x MMC controller ++ */ ++ pxa_gpio_mode(GPIO32_MMCCLK_MD); ++ pxa_gpio_mode(GPIO112_MMCCMD_MD); ++ pxa_gpio_mode(GPIO92_MMCDAT0_MD); ++ pxa_gpio_mode(GPIO109_MMCDAT1_MD); ++ pxa_gpio_mode(GPIO110_MMCDAT2_MD); ++ pxa_gpio_mode(GPIO111_MMCDAT3_MD); ++ ++ /* SB-X270 uses GPIO105 as SD power enable */ ++ pxa_gpio_mode(105 | GPIO_OUT); ++ ++ /* card detect IRQ on GPIO 83 */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_MMC_IRQ)); ++ set_irq_type(CMX270_MMC_IRQ, IRQT_FALLING); ++ ++ err = request_irq(CMX270_MMC_IRQ, cmx270_detect_int, SA_INTERRUPT, ++ "MMC card detect", data); ++ if (err) { ++ printk(KERN_ERR "cmx270_mci_init: MMC/SD: can't request MMC card detect IRQ\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static void cmx270_mci_setpower(struct device *dev, unsigned int vdd) ++{ ++ struct pxamci_platform_data* p_d = dev->platform_data; ++ ++ if (( 1 << vdd) & p_d->ocr_mask) { ++ printk(KERN_DEBUG "%s: on\n", __FUNCTION__); ++ GPCR(105) = GPIO_bit(105); ++ } else { ++ GPSR(105) = GPIO_bit(105); ++ printk(KERN_DEBUG "%s: off\n", __FUNCTION__); ++ } ++} ++ ++static void cmx270_mci_exit(struct device *dev, void *data) ++{ ++ free_irq(CMX270_MMC_IRQ, data); ++} ++ ++static struct pxamci_platform_data cmx270_mci_platform_data = { ++ .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, ++ .init = cmx270_mci_init, ++ .setpower = cmx270_mci_setpower, ++ .exit = cmx270_mci_exit, ++}; ++ ++#ifdef CONFIG_PM ++/* extern struct subsystem power_subsys; */ ++static unsigned long sleep_save_ite[10]; ++static unsigned long sleep_save_msc[10]; ++ ++static int cmx270_suspend(struct sys_device *dev, pm_message_t state) ++{ ++#ifdef CONFIG_PCI ++ /* save ITE state */ ++ sleep_save_ite[0] = IT8152_INTC_PDCNIMR; ++ sleep_save_ite[1] = IT8152_INTC_LPCNIMR; ++ sleep_save_ite[2] = IT8152_INTC_LPNIAR; ++ ++ /* Clear ITE IRQ's */ ++ IT8152_INTC_PDCNIRR = 0; ++ IT8152_INTC_LPCNIRR = 0; ++#endif ++ ++ /* save MSC registers */ ++ sleep_save_msc[0] = MSC0; ++ sleep_save_msc[1] = MSC1; ++ sleep_save_msc[2] = MSC2; ++ ++ /* setup power saving mode registers */ ++ PCFR = 0x0; ++ PSLR = 0xff400000; ++ PMCR = 0x00000005; ++ PWER = 0x80000000; ++ PFER = 0x00000000; ++ PRER = 0x00000000; ++ PGSR0 = 0xC0018800; ++ PGSR1 = 0x004F0002; ++ PGSR2 = 0x6021C000; ++ PGSR3 = 0x00020000; ++ ++ return 0; ++} ++ ++static int cmx270_resume(struct sys_device *dev) ++{ ++#ifdef CONFIG_PCI ++ /* restore IT8152 state */ ++ IT8152_INTC_PDCNIMR = sleep_save_ite[0]; ++ IT8152_INTC_LPCNIMR = sleep_save_ite[1]; ++ IT8152_INTC_LPNIAR = sleep_save_ite[2]; ++#endif ++ ++ /* restore MSC registers */ ++ MSC0 = sleep_save_msc[0]; ++ MSC1 = sleep_save_msc[1]; ++ MSC2 = sleep_save_msc[2]; ++ ++ return 0; ++} ++ ++static struct sysdev_class cmx270_pm_sysclass = { ++ set_kset_name("pm"), ++ .resume = cmx270_resume, ++ .suspend = cmx270_suspend, ++}; ++ ++static struct sys_device cmx270_pm_device = { ++ .cls = &cmx270_pm_sysclass, ++}; ++ ++static int __init cmx270_pm_init(void) ++{ ++ int error; ++ error = sysdev_class_register(&cmx270_pm_sysclass); ++ if (error == 0) ++ error = sysdev_register(&cmx270_pm_device); ++ return error; ++} ++#else ++static int __init cmx270_pm_init(void) { return 0; } ++#endif ++ ++static void __init cmx270_init(void) ++{ ++ cmx270_pm_init(); ++ ++ set_pxa_fb_info(cmx270_display); ++ ++ /* register CM-X270 platform devices */ ++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); ++ ++ /* set MCI and OHCI platform parameters */ ++ pxa_set_mci_info(&cmx270_mci_platform_data); ++ pxa_set_ohci_info(&cmx270_ohci_platform_data); ++ ++ /* This enables the STUART */ ++ pxa_gpio_mode(GPIO46_STRXD_MD); ++ pxa_gpio_mode(GPIO47_STTXD_MD); ++ ++ /* This enables the BTUART */ ++ pxa_gpio_mode(GPIO42_BTRXD_MD); ++ pxa_gpio_mode(GPIO43_BTTXD_MD); ++ pxa_gpio_mode(GPIO44_BTCTS_MD); ++ pxa_gpio_mode(GPIO45_BTRTS_MD); ++} ++ ++#ifdef CONFIG_PCI ++static void cmx270_mask_irq(unsigned int irq) ++{ ++ switch(irq) { ++ case IT8152_IRQ(0): ++ IT8152_INTC_PDCNIMR |= PCISERR_BIT; ++ break; ++ case IT8152_IRQ(1): ++ IT8152_INTC_PDCNIMR |= H2PTADR_BIT; ++ break; ++ case IT8152_IRQ(2): ++ IT8152_INTC_PDCNIMR |= H2PMAR_BIT; ++ break; ++ case IT8152_IRQ(3): ++ IT8152_INTC_PDCNIMR |= PCI_INTA_BIT; ++ break; ++ case IT8152_IRQ(4): ++ IT8152_INTC_PDCNIMR |= PCI_INTB_BIT; ++ break; ++ case IT8152_IRQ(5): ++ IT8152_INTC_PDCNIMR |= PCI_INTC_BIT; ++ break; ++ case IT8152_IRQ(6): ++ IT8152_INTC_PDCNIMR |= PCI_INTD_BIT; ++ break; ++ case IT8152_IRQ(7): ++ IT8152_INTC_PDCNIMR |= USB_INT_BIT; ++ break; ++ case IT8152_IRQ(9): ++ IT8152_INTC_PDCNIMR |= CDMA_INT_BIT; ++ break; ++ case IT8152_IRQ(10): ++ IT8152_INTC_LDCNIMR |= ITESER_BIT; ++ break; ++ } ++} ++ ++static void cmx270_unmask_irq(unsigned int irq) ++{ ++ switch(irq) { ++ case IT8152_IRQ(0): ++ IT8152_INTC_PDCNIMR &= (~PCISERR_BIT); ++ break; ++ case IT8152_IRQ(1): ++ IT8152_INTC_PDCNIMR &= (~H2PTADR_BIT); ++ break; ++ case IT8152_IRQ(2): ++ IT8152_INTC_PDCNIMR &= (~H2PMAR_BIT); ++ break; ++ case IT8152_IRQ(3): ++ IT8152_INTC_PDCNIMR &= (~PCI_INTA_BIT); ++ break; ++ case IT8152_IRQ(4): ++ IT8152_INTC_PDCNIMR &= (~PCI_INTB_BIT); ++ break; ++ case IT8152_IRQ(5): ++ IT8152_INTC_PDCNIMR &= (~PCI_INTC_BIT); ++ break; ++ case IT8152_IRQ(6): ++ IT8152_INTC_PDCNIMR &= (~PCI_INTD_BIT); ++ break; ++ case IT8152_IRQ(7): ++ IT8152_INTC_PDCNIMR &= (~USB_INT_BIT); ++ break; ++ case IT8152_IRQ(9): ++ IT8152_INTC_PDCNIMR &= (~CDMA_INT_BIT); ++ break; ++ case IT8152_IRQ(10): ++ IT8152_INTC_LDCNIMR &= (~ITESER_BIT); ++ break; ++ } ++} ++ ++static struct irq_chip cmx270_irq_chip = { ++ .ack = cmx270_mask_irq, ++ .mask = cmx270_mask_irq, ++ .unmask = cmx270_unmask_irq, ++}; ++#endif ++ ++static void __init cmx270_init_irq(void) ++{ ++ int irq; ++ ++ pxa_init_irq(); ++ ++ IT8152_INTC_PDCNIMR = 0xffff; ++ ++#ifdef CONFIG_PCI ++ /* Disable and clear IRQ's for ITE8152 */ ++ IT8152_INTC_PDCNIMR = 0xffff; ++ IT8152_INTC_PDCNIRR = 0; ++ IT8152_INTC_LPCNIMR = 0xffff; ++ IT8152_INTC_LPCNIRR = 0; ++ IT8152_INTC_LDCNIMR = 0xffff; ++ IT8152_INTC_LDCNIRR = 0; ++ ++ for(irq = IT8152_IRQ(0); irq <= IT8152_IRQ_MAX; irq++) { ++ set_irq_chip(irq, &cmx270_irq_chip); ++ set_irq_handler(irq, handle_level_irq); ++ set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); ++ } ++ ++ /* INTC signal from IT8152 is connected to GPIO0 */ ++ pxa_gpio_mode(IRQ_GPIO_IT8152_IRQ); ++ set_irq_chained_handler(IRQ_GPIO_IT8152_IRQ, cmx270_irq_demux); ++ set_irq_type(IRQ_GPIO_IT8152_IRQ, IRQT_RISING); ++#endif ++ ++ /* Setup interrupt for dm9000 */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_ETHIRQ)); ++ set_irq_type(CMX270_ETHIRQ, IRQT_RISING); ++ ++ /* Setup interrupt for 2700G */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_GFXIRQ)); ++ set_irq_type(CMX270_GFXIRQ, IRQT_FALLING); ++} ++ ++static void __init cmx270_map_io(void) ++{ ++ pxa_map_io(); ++ iotable_init(cmx270_io_desc, ARRAY_SIZE(cmx270_io_desc)); ++} ++ ++ ++MACHINE_START(ARMCORE, "Compulab CM-x270") ++ .boot_params = 0xa0000100, ++ .phys_io = 0x40000000, ++ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, ++ .map_io = cmx270_map_io, ++ .init_irq = cmx270_init_irq, ++ .timer = &pxa_timer, ++ .init_machine = cmx270_init, ++MACHINE_END +diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig +index 87d2046..1023411 100644 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -89,6 +89,12 @@ config LEDS_H1940 + help + This option enables support for the LEDs on the h1940. + ++config LEDS_CM_X270 ++ tristate "LED Support for the CM-X270 LEDs" ++ depends on LEDS_CLASS && MACH_ARMCORE ++ help ++ This option enables support for the CM-X270 LEDs. ++ + config LEDS_COBALT + tristate "LED Support for Cobalt Server front LED" + depends on LEDS_CLASS && MIPS_COBALT +diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile +index aa2c18e..808900c 100644 +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o + obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o + obj-$(CONFIG_LEDS_H1940) += leds-h1940.o + obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o ++obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o + + # LED Triggers + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o +diff --git a/drivers/leds/leds-cm-x270.c b/drivers/leds/leds-cm-x270.c +new file mode 100644 +index 0000000..63b7e9e +--- /dev/null ++++ b/drivers/leds/leds-cm-x270.c +@@ -0,0 +1,126 @@ ++/* ++ * drivers/leds/leds-cm-x270.c ++ * ++ * Copyright 2007 CompuLab Ltd. ++ * Author: Mike Rapoport <mike@compulab.co.il> ++ * ++ * Based on leds-corgi.c ++ * Author: Richard Purdie <rpurdie@openedhand.com> ++ * ++ * 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. ++ * ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/leds.h> ++ ++#include <asm/arch/hardware.h> ++#include <asm/arch/pxa-regs.h> ++ ++#define GPIO_RED_LED (93) ++#define GPIO_GREEN_LED (94) ++ ++#define CMX270_RED_ON() GPCR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_RED_OFF() GPSR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_GREEN_ON() GPCR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++#define CMX270_GREEN_OFF() GPSR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++ ++ ++static void cmx270_red_set(struct led_classdev *led_cdev, enum led_brightness value) ++{ ++ if (value) ++ CMX270_RED_ON(); ++ else ++ CMX270_RED_OFF(); ++} ++ ++static void cmx270_green_set(struct led_classdev *led_cdev, enum led_brightness value) ++{ ++ if (value) ++ CMX270_GREEN_ON(); ++ else ++ CMX270_GREEN_OFF(); ++} ++ ++static struct led_classdev cmx270_red_led = { ++ .name = "cm-x270:red", ++ .default_trigger = "nand-disk", ++ .brightness_set = cmx270_red_set, ++}; ++ ++static struct led_classdev cmx270_green_led = { ++ .name = "cm-x270:green", ++ .default_trigger = "heartbeat", ++ .brightness_set = cmx270_green_set, ++}; ++ ++#ifdef CONFIG_PM ++static int cmx270led_suspend(struct platform_device *dev, pm_message_t state) ++{ ++ led_classdev_suspend(&cmx270_red_led); ++ led_classdev_suspend(&cmx270_green_led); ++ return 0; ++} ++ ++static int cmx270led_resume(struct platform_device *dev) ++{ ++ led_classdev_resume(&cmx270_red_led); ++ led_classdev_resume(&cmx270_green_led); ++ return 0; ++} ++#endif ++ ++static int cmx270led_probe(struct platform_device *pdev) ++{ ++ int ret; ++ ++ ret = led_classdev_register(&pdev->dev, &cmx270_red_led); ++ if (ret < 0) ++ return ret; ++ ++ ret = led_classdev_register(&pdev->dev, &cmx270_green_led); ++ if (ret < 0) ++ led_classdev_unregister(&cmx270_red_led); ++ ++ return ret; ++} ++ ++static int cmx270led_remove(struct platform_device *pdev) ++{ ++ led_classdev_unregister(&cmx270_red_led); ++ led_classdev_unregister(&cmx270_green_led); ++ return 0; ++} ++ ++static struct platform_driver cmx270led_driver = { ++ .probe = cmx270led_probe, ++ .remove = cmx270led_remove, ++#ifdef CONFIG_PM ++ .suspend = cmx270led_suspend, ++ .resume = cmx270led_resume, ++#endif ++ .driver = { ++ .name = "cm-x270-led", ++ }, ++}; ++ ++static int __init cmx270led_init(void) ++{ ++ return platform_driver_register(&cmx270led_driver); ++} ++ ++static void __exit cmx270led_exit(void) ++{ ++ platform_driver_unregister(&cmx270led_driver); ++} ++ ++module_init(cmx270led_init); ++module_exit(cmx270led_exit); ++ ++MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>"); ++MODULE_DESCRIPTION("Corgi LED driver"); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig +index b49375a..7ee6561 100644 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -875,6 +875,14 @@ config DM9000 + <file:Documentation/networking/net-modules.txt>. The module will be + called dm9000. + ++config DM9000_NOEPROM ++ bool "DM9000 without EEPROM attached" ++ depends on DM9000 ++ ---help--- ++ Select this option if you have DM9000 chipset without EEPROM ++ containing the MAC address. In this case MAC address should ++ be set either by the bootloader or using ifconfig ++ + config SMC911X + tristate "SMSC LAN911[5678] support" + select CRC32 +diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c +index 264fa0e..4e2954b 100644 +--- a/drivers/net/dm9000.c ++++ b/drivers/net/dm9000.c +@@ -562,6 +562,7 @@ dm9000_probe(struct platform_device *pdev) + db->mii.mdio_read = dm9000_phy_read; + db->mii.mdio_write = dm9000_phy_write; + ++#ifndef CONFIG_DM9000_NOEPROM + /* Read SROM content */ + for (i = 0; i < 64; i++) + ((u16 *) db->srom)[i] = read_srom_word(db, i); +@@ -569,6 +570,11 @@ dm9000_probe(struct platform_device *pdev) + /* Set Node Address */ + for (i = 0; i < 6; i++) + ndev->dev_addr[i] = db->srom[i]; ++#else ++ /* The Node Address was set by bootloader */ ++ for (i=0; i<6; i++) ++ ndev->dev_addr[i] = ior(db, 0x10+i); ++#endif + + if (!is_valid_ether_addr(ndev->dev_addr)) { + /* try reading from mac */ +diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h +new file mode 100644 +index 0000000..24613a5 +--- /dev/null ++++ b/include/asm-arm/arch-pxa/cm-x270.h +@@ -0,0 +1,71 @@ ++/* ++ * linux/include/asm/arch-pxa/armcore.h ++ * ++ * Compulab Ltd., 2003 ++ * ++ * ARMCore registers ++ */ ++ ++ ++#define CMX270_CS1_PHYS (PXA_CS1_PHYS) ++#define MARATHON_PHYS (PXA_CS2_PHYS) ++#define CMX270_IDE104_PHYS (PXA_CS3_PHYS) ++#define CMX270_IT8152_PHYS (PXA_CS4_PHYS) ++ ++#define PXA_CS_SIZE (64*1024*1024) ++ ++/* Virtual map */ ++ ++#define CMX270_VIRT_BASE (0xe8000000) ++ ++#define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) ++#define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + PXA_CS_SIZE) ++ ++ ++/* GPIO related definitions */ ++#define GPIO_IT8152_IRQ (22) ++#define GPIO_RED_LED (93) ++#define GPIO_GREEN_LED (94) ++ ++ ++#define IRQ_GPIO_IT8152_IRQ IRQ_GPIO(GPIO_IT8152_IRQ) ++#define PME_IRQ IRQ_GPIO(0) ++#define CMX270_IDE_IRQ IRQ_GPIO(100) ++#define CMX270_GPIRQ1 IRQ_GPIO(101) ++#define CMX270_TOUCHIRQ IRQ_GPIO(96) ++#define CMX270_ETHIRQ IRQ_GPIO(10) ++#define CMX270_GFXIRQ IRQ_GPIO(95) ++#define CMX270_NANDIRQ IRQ_GPIO(89) ++#define CMX270_MMC_IRQ IRQ_GPIO(83) ++ ++/* LED macros */ ++#define CMX270_RED_ON() GPCR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_RED_OFF() GPSR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_GREEN_ON() GPCR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++#define CMX270_GREEN_OFF() GPSR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++ ++/* PCMCIA related definitions */ ++#define PCC_DETECT(x) (GPLR(84 - (x)) & GPIO_bit(84 - (x))) ++#define PCC_READY(x) (GPLR(82 - (x)) & GPIO_bit(81 - (x))) ++ ++#define PCMCIA_S0_CD_VALID IRQ_GPIO(84) ++#define PCMCIA_S0_CD_VALID_EDGE GPIO_BOTH_EDGES ++ ++#define PCMCIA_S1_CD_VALID IRQ_GPIO(83) ++#define PCMCIA_S1_CD_VALID_EDGE GPIO_BOTH_EDGES ++ ++#define PCMCIA_S0_RDYINT IRQ_GPIO(82) ++#define PCMCIA_S1_RDYINT IRQ_GPIO(81) ++ ++#define PCMCIA_RESET_GPIO 53 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h +index e2bdc2f..989303a 100644 +--- a/include/asm-arm/arch-pxa/hardware.h ++++ b/include/asm-arm/arch-pxa/hardware.h +@@ -90,4 +90,15 @@ extern unsigned int get_lcdclk_frequency_10khz(void); + + #endif + ++#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) ++#define HAVE_ARCH_PCI_SET_DMA_MASK ++#ifndef __ASSEMBLY__ ++extern unsigned long armcore_pcibios_min_io; ++extern unsigned long armcore_pcibios_min_mem; ++#endif ++#define PCIBIOS_MIN_IO (armcore_pcibios_min_io) ++#define PCIBIOS_MIN_MEM (armcore_pcibios_min_mem) ++#define pcibios_assign_all_busses() 1 ++#endif ++ + #endif /* _ASM_ARCH_HARDWARE_H */ +diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h +index 67ed436..f9c075f 100644 +--- a/include/asm-arm/arch-pxa/irqs.h ++++ b/include/asm-arm/arch-pxa/irqs.h +@@ -222,3 +222,23 @@ + #define IRQ_LOCOMO_GPIO_BASE (IRQ_BOARD_START + 1) + #define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2) + #define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3) ++ ++/* ITE8152 irqs on CM-x2xx */ ++#ifdef CONFIG_MACH_ARMCORE ++#define IT8152_IRQ(x) (IRQ_BOARD_START + (x)) ++#define PCISERR IT8152_IRQ(0) ++#define H2PTADR IT8152_IRQ(1) ++#define H2PMAR IT8152_IRQ(2) ++#define PCI_INTA IT8152_IRQ(3) ++#define PCI_INTB IT8152_IRQ(4) ++#define PCI_INTC IT8152_IRQ(5) ++#define PCI_INTD IT8152_IRQ(6) ++#define USB_INT IT8152_IRQ(7) ++#define AUDIO_INT IT8152_IRQ(8) ++#define CDMA_INT IT8152_IRQ(9) ++#define IRQ_ITESER IT8152_IRQ(10) ++#define IT8152_IRQ_MAX IT8152_IRQ(10) ++ ++#undef NR_IRQS ++#define NR_IRQS IT8152_IRQ_MAX+1 ++#endif +diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h +index d9bfb39..83db3cb 100644 +--- a/include/asm-arm/memory.h ++++ b/include/asm-arm/memory.h +@@ -141,6 +141,16 @@ + * allocations. This must be the smallest DMA mask in the system, + * so a successful GFP_DMA allocation will always satisfy this. + */ ++ ++#ifdef CONFIG_PCI_HOST_ITE8152 ++void it8152_adjust_zones(int node, unsigned long *size, unsigned long *holes); ++ ++#define arch_adjust_zones(node, size, holes) \ ++ it8152_adjust_zones(node, size, holes) ++ ++#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) ++#endif ++ + #ifndef ISA_DMA_THRESHOLD + #define ISA_DMA_THRESHOLD (0xffffffffULL) + #endif +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch b/packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch new file mode 100644 index 0000000000..68da30191c --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch @@ -0,0 +1,25 @@ +From e566813cedb9f91724597df45c11075023a7b589 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 18:58:27 -0400 +Subject: [PATCH] cm-x270-match-type + +--- + arch/arm/boot/compressed/head-xscale.S | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S +index 73c5d9e..dc89459 100644 +--- a/arch/arm/boot/compressed/head-xscale.S ++++ b/arch/arm/boot/compressed/head-xscale.S +@@ -53,3 +53,8 @@ __XScale_start: + str r1, [r0, #0x18] + #endif + ++#if defined(CONFIG_MACH_ARMCORE) ++ mov r7, #(MACH_TYPE_ARMCORE & 0xFF00) ++ add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF) ++#endif ++ +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch b/packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch new file mode 100644 index 0000000000..0ff115efc8 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch @@ -0,0 +1,186 @@ +From f260d5fa4c99cd7df949e6408af59807f8ccf224 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 18:59:39 -0400 +Subject: [PATCH] cm-x270-ide + +--- + drivers/ide/Kconfig | 8 +++ + drivers/ide/arm/Makefile | 1 + + drivers/ide/arm/cm-x270-ide.c | 135 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 144 insertions(+), 0 deletions(-) + create mode 100644 drivers/ide/arm/cm-x270-ide.c + +diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig +index b1a9b81..7de4155 100644 +--- a/drivers/ide/Kconfig ++++ b/drivers/ide/Kconfig +@@ -864,6 +864,14 @@ config BLK_DEV_IDE_BAST + Say Y here if you want to support the onboard IDE channels on the + Simtec BAST or the Thorcom VR1000 + ++config BLK_DEV_IDE_CM_X270 ++ tristate "CompuLab CM-X270 IDE support" ++ depends on ARM && (MACH_ARMCORE) ++ help ++ Say Y here if you want to support the onboard IDE channels on the ++ CompuLab CM-X270 module ++ ++ + config BLK_DEV_GAYLE + bool "Amiga Gayle IDE interface support" + depends on AMIGA +diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile +index 6a78f07..e5cadb7 100644 +--- a/drivers/ide/arm/Makefile ++++ b/drivers/ide/arm/Makefile +@@ -2,5 +2,6 @@ + obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o + obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o + obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o ++obj-$(CONFIG_BLK_DEV_IDE_CM_X270) += cm-x270-ide.o + + EXTRA_CFLAGS := -Idrivers/ide +diff --git a/drivers/ide/arm/cm-x270-ide.c b/drivers/ide/arm/cm-x270-ide.c +new file mode 100644 +index 0000000..a8b15aa +--- /dev/null ++++ b/drivers/ide/arm/cm-x270-ide.c +@@ -0,0 +1,135 @@ ++/* linux/drivers/ide/arm/cm-x270-ide.c ++ * ++ * Copyright (c) 2006 CompuLab, Ltd ++ * Mike Rapoport <mike@compulab.co.il> ++ * ++ * Based on linux/drivers/ide/arm/bast-ide.c ++ * Copyright (c) 2003-2004 Simtec Electronics ++ * Ben Dooks <ben@simtec.co.uk> ++ * ++ * 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. ++ * ++ */ ++ ++#include <linux/module.h> ++#include <linux/errno.h> ++#include <linux/ide.h> ++#include <linux/init.h> ++#include <linux/irq.h> ++ ++#include <asm/mach-types.h> ++ ++#include <asm/io.h> ++#include <asm/arch/pxa-regs.h> ++#include <asm/arch/cm-x270.h> ++ ++#define CMX270_SB270_IDECS0_VIRT (CMX270_IDE104_VIRT + (1<<24) + (1<<25)) ++#define CMX270_SB270_IDECS1_VIRT (CMX270_IDE104_VIRT + (1<<25)) ++#define CMX270_ATX_IDECS0_VIRT (CMX270_IDE104_VIRT + (1<<25)) ++#define CMX270_ATX_IDECS1_VIRT (CMX270_IDE104_VIRT + (1<<25) + (1<<22)) ++ ++/* list of registered interfaces */ ++static ide_hwif_t *ifs[1]; ++ ++static int __init ++cmx270_ide_register(unsigned int base, unsigned int aux, int irq, ++ ide_hwif_t **hwif) ++{ ++ hw_regs_t hw; ++ ++ memset(&hw, 0, sizeof(hw)); ++ ++ if(!base || !aux) return -EINVAL; ++ ++ printk(KERN_DEBUG "%s: base = %08x, aux = %08x\n", __FUNCTION__, ++ base, aux); ++ ++ /* Different mappings for local bus IDE and PCMCIA IDE */ ++ if(base == CMX270_SB270_IDECS0_VIRT) { ++ hw.io_ports[IDE_DATA_OFFSET] = base + 0; ++ hw.io_ports[IDE_ERROR_OFFSET] = base + (0x1<<3); ++ hw.io_ports[IDE_NSECTOR_OFFSET]= base + (0x2<<3); ++ hw.io_ports[IDE_SECTOR_OFFSET]= base + (0x3<<3); ++ hw.io_ports[IDE_LCYL_OFFSET]= base + (0x4<<3); ++ hw.io_ports[IDE_HCYL_OFFSET]= base + (0x5<<3); ++ hw.io_ports[IDE_SELECT_OFFSET]= base + (0x6<<3); ++ hw.io_ports[IDE_STATUS_OFFSET]= base + (0x7<<3); ++ hw.io_ports[IDE_CONTROL_OFFSET] = aux+(0x6<<3); ++ } ++ else if (base == CMX270_ATX_IDECS0_VIRT) { /* atx base */ ++ hw.io_ports[IDE_DATA_OFFSET] = base + 0; ++ hw.io_ports[IDE_ERROR_OFFSET] = base + 8; ++ hw.io_ports[IDE_NSECTOR_OFFSET]= base + 2; ++ hw.io_ports[IDE_SECTOR_OFFSET]= base + 10; ++ hw.io_ports[IDE_LCYL_OFFSET]= base + 4; ++ hw.io_ports[IDE_HCYL_OFFSET]= base + 12; ++ hw.io_ports[IDE_SELECT_OFFSET]= base + 6; //6; ++ hw.io_ports[IDE_STATUS_OFFSET]= base + 14; ++ hw.io_ports[IDE_CONTROL_OFFSET] = (aux+0x6); ++ } else { ++ printk(KERN_DEBUG "%s: registering wrong IDE i/f\n", __FUNCTION__); ++ hw.io_ports[IDE_DATA_OFFSET] = base + 8; ++ hw.io_ports[IDE_ERROR_OFFSET] = base + 13; ++ hw.io_ports[IDE_NSECTOR_OFFSET] = base + 2; ++ hw.io_ports[IDE_SECTOR_OFFSET] = base + 3; ++ hw.io_ports[IDE_LCYL_OFFSET] = base + 4; ++ hw.io_ports[IDE_HCYL_OFFSET] = base + 5; ++ hw.io_ports[IDE_SELECT_OFFSET] = base + 6; ++ hw.io_ports[IDE_STATUS_OFFSET] = base + 7; ++ hw.io_ports[IDE_CONTROL_OFFSET] = aux; ++ } ++ ++ hw.irq = irq; ++ ++ return ide_register_hw(&hw, hwif); ++} ++ ++static int __init cmx270_ide_init(void) ++{ ++ int retval = 0; ++ ++ if (!(machine_is_armcore())) ++ goto out; ++ ++ printk("CM-X270: initializing IDE interface\n"); ++ ++ MSC1 = 0x7ffc7ff4; ++ ++ /* Interrupts on rising edge: lines are inverted before they get to ++ the PXA */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_IDE_IRQ)); ++ ++ /* try SB-X270 */ ++ set_irq_type(CMX270_IDE_IRQ, IRQ_TYPE_EDGE_RISING); ++ retval = cmx270_ide_register(CMX270_SB270_IDECS0_VIRT, ++ CMX270_SB270_IDECS1_VIRT, ++ CMX270_IDE_IRQ, &ifs[0]); ++ if (retval >= 0) { ++ printk(KERN_DEBUG "%s: found IDE interface on SB-X270\n", ++ __FUNCTION__); ++ goto out; ++ } ++ ++ /* SB-X270 detection failed, try ATX */ ++ set_irq_type(CMX270_IDE_IRQ, IRQ_TYPE_EDGE_FALLING); ++ retval = cmx270_ide_register(CMX270_ATX_IDECS0_VIRT, ++ CMX270_ATX_IDECS1_VIRT, ++ CMX270_IDE_IRQ, &ifs[0]); ++ ++ if ( retval >= 0 ) { ++ printk(KERN_DEBUG "%s: found IDE interface on ATX\n", ++ __FUNCTION__); ++ goto out; ++ } ++ ++ out: ++ return retval; ++} ++ ++module_init(cmx270_ide_init); ++ ++MODULE_AUTHOR("CompuLab"); ++MODULE_LICENSE("GPL"); ++MODULE_DESCRIPTION("CompuLab CM-X270 IDE driver"); +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch b/packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch new file mode 100644 index 0000000000..274eaf24d8 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch @@ -0,0 +1,496 @@ +From 1306abec905df1ff5cf2b1d91ac0d94d18d96c5b Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:00:07 -0400 +Subject: [PATCH] cm-x270-it8152 + +--- + arch/arm/common/Makefile | 1 + + arch/arm/common/it8152.c | 272 +++++++++++++++++++++++++++++++++++++ + arch/arm/kernel/bios32.c | 28 ++++- + include/asm-arm/hardware/it8152.h | 104 ++++++++++++++ + include/asm-arm/pci.h | 7 + + include/linux/pci_ids.h | 1 + + 6 files changed, 410 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/common/it8152.c + create mode 100644 include/asm-arm/hardware/it8152.h + +diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile +index e1289a2..3d0b9fa 100644 +--- a/arch/arm/common/Makefile ++++ b/arch/arm/common/Makefile +@@ -17,3 +17,4 @@ obj-$(CONFIG_SHARPSL_PM) += sharpsl_pm.o + obj-$(CONFIG_SHARP_SCOOP) += scoop.o + obj-$(CONFIG_ARCH_IXP2000) += uengine.o + obj-$(CONFIG_ARCH_IXP23XX) += uengine.o ++obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o +diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c +new file mode 100644 +index 0000000..8563610 +--- /dev/null ++++ b/arch/arm/common/it8152.c +@@ -0,0 +1,272 @@ ++/* ++ * arch/arm/common/it8152.c: PCI functions for IT8152 ++ * ++ * Compulab Ltd, 2002-2006 ++ * ++ * The DMA bouncing is taken from arch/arm/mach-ixp4xx/common-pci.c ++ * (see this file for respective copyrights) ++ * ++ * 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. ++ */ ++ ++#include <linux/sched.h> ++#include <linux/kernel.h> ++#include <linux/pci.h> ++#include <linux/ptrace.h> ++#include <linux/interrupt.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include <linux/init.h> ++#include <linux/ioport.h> ++#include <asm/mach/map.h> ++ ++ ++#include <asm/io.h> ++#include <asm/irq.h> ++#include <asm/system.h> ++#include <asm/mach/pci.h> ++#include <asm/hardware/it8152.h> ++ ++#define MAX_SLOTS 21 ++ ++static unsigned long ++it8152_pci_dev_base_address(struct pci_bus *bus, unsigned int devfn) ++{ ++ unsigned long addr = 0; ++ ++ if (bus->number == 0) { ++ if (devfn < PCI_DEVFN(MAX_SLOTS, 0)) ++ addr = (devfn << 8); ++ } else ++ addr = (bus->number << 16) | (devfn << 8); ++ ++ return addr; ++} ++ ++static int ++it8152_pci_read_config(struct pci_bus *bus, unsigned int devfn, int where, ++ int size, u32 *value) ++{ ++ unsigned long addr = it8152_pci_dev_base_address(bus, devfn); ++ u32 v; ++ int shift; ++ ++#ifdef CONFIG_MACH_ARMCORE ++ if(devfn!=0) IT8152_GPIO_GPLR=0x00; ++#endif ++ shift = (where & 3); ++ ++ IT8152_PCI_CFG_ADDR = (addr + where); ++ v = (IT8152_PCI_CFG_DATA >> (8 * (shift))); ++ ++ *value = v; ++ ++#ifdef CONFIG_MACH_ARMCORE ++ if(devfn!=0) IT8152_GPIO_GPLR=0x20; ++#endif ++ ++ return PCIBIOS_SUCCESSFUL; ++} ++ ++ ++static int ++it8152_pci_write_config(struct pci_bus *bus, unsigned int devfn, int where, ++ int size, u32 value) ++{ ++ unsigned long addr = it8152_pci_dev_base_address(bus, devfn); ++ u32 v, vtemp, mask=0; ++ int shift; ++ ++#ifdef CONFIG_MACH_ARMCORE ++ if(devfn!=0) IT8152_GPIO_GPLR=0x00; ++#endif ++ ++ if(size==1) mask=0xff; ++ if(size==2) mask=0xffff; ++ ++ shift = (where & 3); ++ ++ IT8152_PCI_CFG_ADDR = addr + where; ++ vtemp = IT8152_PCI_CFG_DATA; ++ ++ if(mask) vtemp &= ~(mask << (8 * shift)); ++ else vtemp = 0; ++ ++ v = (value << (8 * shift)); ++ IT8152_PCI_CFG_ADDR = addr + where; ++ IT8152_PCI_CFG_DATA = (v | vtemp); ++ ++#ifdef CONFIG_MACH_ARMCORE ++ if(devfn!=0) IT8152_GPIO_GPLR=0x20; ++#endif ++ ++ return PCIBIOS_SUCCESSFUL; ++} ++ ++static struct pci_ops it8152_ops = { ++ .read = it8152_pci_read_config, ++ .write = it8152_pci_write_config, ++}; ++ ++static struct resource it8152_io = { ++ .name = "IT8152 PCI I/O region", ++ .flags = IORESOURCE_IO, ++}; ++ ++static struct resource it8152_mem1 = { ++ .name = "First IT8152 PCI memory region", ++ .start = 0x10000000, ++ .end = 0x13e00000, ++ .flags = IORESOURCE_MEM, ++}; ++ ++/* ++ * The following functions are needed for DMA bouncing. ++ * ITE8152 chip can addrees up to 64MByte, so all the devices ++ * connected to ITE8152 (PCI and USB) should have limited DMA window ++ */ ++ ++/* ++ * Setup DMA mask to 64MB on devices connected to ITE8152. Ignore all ++ * other devices. ++ */ ++static int it8152_pci_platform_notify(struct device *dev) ++{ ++ if ( dev->bus == &pci_bus_type ) { ++ if ( dev->dma_mask ) ++ *dev->dma_mask = (SZ_64M - 1) | PHYS_OFFSET; ++ dev->coherent_dma_mask = (SZ_64M - 1) | PHYS_OFFSET; ++ dmabounce_register_dev(dev, 2048, 4096); ++ } ++ return 0; ++} ++ ++static int it8152_pci_platform_notify_remove(struct device *dev) ++{ ++ if ( dev->bus == &pci_bus_type ) { ++ dmabounce_unregister_dev(dev); ++ } ++ return 0; ++} ++ ++int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) ++{ ++ dev_dbg(dev, "%s: dma_addr %08x, size %08x\n", ++ __FUNCTION__, dma_addr, size); ++ return (dev->bus == &pci_bus_type ) && ++ ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); ++} ++ ++/* ++ * Only first 64MB of memory can be accessed via PCI. ++ * We use GFP_DMA to allocate safe buffers to do map/unmap. ++ * This is really ugly and we need a better way of specifying ++ * DMA-capable regions of memory. ++ */ ++void __init it8152_adjust_zones(int node, unsigned long *zone_size, ++ unsigned long *zhole_size) ++{ ++ unsigned int sz = SZ_64M >> PAGE_SHIFT; ++ ++ /* ++ * Only adjust if > 64M on current system ++ */ ++ if (node || (zone_size[0] <= sz)) ++ return; ++ ++ zone_size[1] = zone_size[0] - sz; ++ zone_size[0] = sz; ++ zhole_size[1] = zhole_size[0]; ++ zhole_size[0] = 0; ++} ++ ++/* ++ * We override these so we properly do dmabounce otherwise drivers ++ * are able to set the dma_mask to 0xffffffff and we can no longer ++ * trap bounces. :( ++ * ++ * We just return true on everyhing except for < 64MB in which case ++ * we will fail miseralby and die since we can't handle that case. ++ */ ++int ++pci_set_dma_mask(struct pci_dev *dev, u64 mask) ++{ ++ printk(KERN_INFO "===> %s: %s %x\n", __FUNCTION__, dev->dev.bus_id, mask); ++ if (mask >= PHYS_OFFSET + SZ_64M - 1 ) ++ return 0; ++ ++ return -EIO; ++} ++ ++int ++pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) ++{ ++ printk(KERN_INFO "===> %s: %s %x\n", __FUNCTION__, dev->dev.bus_id, mask); ++ if (mask >= PHYS_OFFSET + SZ_64M - 1 ) ++ return 0; ++ ++ return -EIO; ++} ++ ++EXPORT_SYMBOL(pci_set_dma_mask); ++EXPORT_SYMBOL(pci_set_consistent_dma_mask); ++ ++ ++int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) ++{ ++ it8152_io.start = IT8152_IO_BASE + 0x12000; ++ it8152_io.end = IT8152_IO_BASE + 0x100000; ++ ++ if (request_resource(&ioport_resource, &it8152_io)) { ++ printk(KERN_ERR "PCI: unable to allocate IO region\n"); ++ return -EBUSY; ++ } ++ if (request_resource(&iomem_resource, &it8152_mem1)) { ++ printk(KERN_ERR "PCI: unable to allocate memory region\n"); ++ return -EBUSY; ++ } ++ ++ sys->resource[0] = &it8152_io; ++ sys->resource[1] = &it8152_mem1; ++ ++ if (platform_notify || platform_notify_remove) { ++ printk(KERN_ERR "PCI: Can't use platform_notify\n"); ++ return -EBUSY; ++ } ++ ++ platform_notify = it8152_pci_platform_notify; ++ platform_notify_remove = it8152_pci_platform_notify_remove; ++ ++ return 1; ++} ++ ++/* ++ * If we set up a device for bus mastering, we need to check the latency ++ * timer as we don't have even crappy BIOSes to set it properly. ++ * The implementation is from arch/i386/pci/i386.c ++ */ ++unsigned int pcibios_max_latency = 255; ++ ++void pcibios_set_master(struct pci_dev *dev) ++{ ++ u8 lat; ++ ++ pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); ++ if (lat < 16) ++ lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency; ++ else if (lat > pcibios_max_latency) ++ lat = pcibios_max_latency; ++ else ++ return; ++ printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat); ++ pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); ++} ++ ++ ++struct pci_bus * __init it8152_pci_scan_bus(int nr, struct pci_sys_data *sys) ++{ ++ return pci_scan_bus(nr, &it8152_ops, sys); ++} ++ +diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c +index 240c448..d8d2352 100644 +--- a/arch/arm/kernel/bios32.c ++++ b/arch/arm/kernel/bios32.c +@@ -279,6 +279,25 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) + } + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693); + ++static void __init pci_fixup_it8152(struct pci_dev *dev) ++{ ++ int i; ++ /* fixup for ITE 8152 devices */ ++ /* FIXME: add defines for class 0x68000 and 0x80103 */ ++ if ((dev->class >> 8) == PCI_CLASS_BRIDGE_HOST || ++ dev->class == 0x68000 || ++ dev->class == 0x80103) { ++ for (i = 0; i < PCI_NUM_RESOURCES; i++) { ++ dev->resource[i].start = 0; ++ dev->resource[i].end = 0; ++ dev->resource[i].flags = 0; ++ } ++ } ++} ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8152, pci_fixup_it8152); ++ ++ ++ + void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) + { + if (debug_pci) +@@ -292,9 +311,12 @@ void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) + */ + static inline int pdev_bad_for_parity(struct pci_dev *dev) + { +- return (dev->vendor == PCI_VENDOR_ID_INTERG && +- (dev->device == PCI_DEVICE_ID_INTERG_2000 || +- dev->device == PCI_DEVICE_ID_INTERG_2010)); ++ return ((dev->vendor == PCI_VENDOR_ID_INTERG && ++ (dev->device == PCI_DEVICE_ID_INTERG_2000 || ++ dev->device == PCI_DEVICE_ID_INTERG_2010)) || ++ (dev->vendor == PCI_VENDOR_ID_ITE && ++ dev->device == PCI_DEVICE_ID_ITE_8152)); ++ + } + + /* +diff --git a/include/asm-arm/hardware/it8152.h b/include/asm-arm/hardware/it8152.h +new file mode 100644 +index 0000000..d28210d +--- /dev/null ++++ b/include/asm-arm/hardware/it8152.h +@@ -0,0 +1,104 @@ ++/* ++ * arch/arm/mach-pxa/it8152.h ++ * ++ * Compulab Ltd., 2006 ++ * ++ * ITE 8152 companion chip definitions ++ */ ++ ++ ++/* #define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) */ ++ ++ ++extern unsigned long it8152_base_address; ++ ++#define IT8152_IO_BASE (it8152_base_address + 0x03e00000) ++#define IT8152_CFGREG_BASE (it8152_base_address + 0x03f00000) ++ ++/* #define IRQ_GPIO_IT8152_IRQ IRQ_GPIO(GPIO_IT8152_IRQ) */ ++ ++#define IT8152_SHORT_IO(x) (*((volatile unsigned short *)(IT8152_CFGREG_BASE+(x)))) ++#define IT8152_LONG_IO(x) (*((volatile unsigned long *)(IT8152_CFGREG_BASE+(x)))) ++ ++ ++#define IT8152_PCI_MEMBASE (*((volatile unsigned long *)(it8152_base_address))) ++/* #define IT8152_PCI_IOBASE (*((volatile unsigned long *)(it8152_base_address + 0x3e00000))) */ ++ ++#define IT8152_PCI_IACK (*((volatile unsigned long *)(it8152_base_address + 0x3f00808))) ++#define IT8152_PCI_CFG_ADDR (*((volatile unsigned long *)(it8152_base_address + 0x3f00800))) ++#define IT8152_PCI_CFG_DATA (*((volatile unsigned long *)(it8152_base_address + 0x3f00804))) ++ ++#define IT_BUSNUM_SHF 16 ++#define IT_DEVNUM_SHF 11 ++#define IT_FUNCNUM_SHF 8 ++#define IT_REGNUM_SHF 2 ++ ++/* Power management & PLL registers */ ++#define IT8152_PMPLL_DSR IT8152_LONG_IO(0x00) ++#define IT8152_PMPLL_DSSR IT8152_LONG_IO(0x04) ++#define IT8152_PMPLL_PLLCR IT8152_LONG_IO(0x20) ++#define IT8152_PMPLL_MFSR IT8152_LONG_IO(0x24) ++ ++/* Memory controller */ ++#define IT8152_MC_REG_OFFSET 0x100 ++ ++#define IT8152_MC_SDCR IT8152_LONG_IO(IT8152_MC_REG_OFFSET + 0x00) ++#define IT8152_MC_PCICR IT8152_LONG_IO(IT8152_MC_REG_OFFSET + 0x04) ++ ++/* Interrupt related definitions */ ++#define IT8152_INTC_REG_OFFSET 0x300 ++ ++#define IT8152_INTC_LDCNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x00) ++#define IT8152_INTC_LDPNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x04) ++#define IT8152_INTC_LDCNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x08) ++#define IT8152_INTC_LDPNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x0C) ++#define IT8152_INTC_LDNITR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x10) ++#define IT8152_INTC_LDNIAR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x14) ++#define IT8152_INTC_LPCNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x20) ++#define IT8152_INTC_LPPNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x24) ++#define IT8152_INTC_LPCNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x28) ++#define IT8152_INTC_LPPNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x2C) ++#define IT8152_INTC_LPNITR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x30) ++#define IT8152_INTC_LPNIAR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x34) ++#define IT8152_INTC_PDCNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x40) ++#define IT8152_INTC_PDPNIRR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x44) ++#define IT8152_INTC_PDCNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x48) ++#define IT8152_INTC_PDPNIMR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x4C) ++#define IT8152_INTC_PDNITR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x50) ++#define IT8152_INTC_PDNIAR IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0x54) ++#define IT8152_INTC_INTC_TYPER IT8152_LONG_IO(IT8152_INTC_REG_OFFSET + 0xFC) ++ ++#define IT8152_UART_BASE IT8152_LONG_IO(0x200) ++ ++#define IT8152_GPIO_REG_OFFSET 0x500 ++ ++#define IT8152_GPIO_GPLR IT8152_LONG_IO(IT8152_GPIO_REG_OFFSET) ++#define IT8152_GPIO_GPCR12 IT8152_LONG_IO(IT8152_GPIO_REG_OFFSET + 0x04) ++#define IT8152_GPIO_GPCR34 IT8152_LONG_IO(IT8152_GPIO_REG_OFFSET + 0x08) ++ ++ ++/* Interrupt bit definitions */ ++#define PCISERR_BIT (1<<14) ++#define H2PTADR_BIT (1<<13) ++#define H2PMAR_BIT (1<<12) ++#define PCI_INTD_BIT (1<<11) ++#define PCI_INTC_BIT (1<<10) ++#define PCI_INTB_BIT (1<<9) ++#define PCI_INTA_BIT (1<<8) ++#define CDMA_INT_BIT (1<<2) ++#define USB_INT_BIT (1<<1) ++#define AUDIO_INT_BIT (1<<0) ++ ++/* IT8152 UART */ ++#define ITESER_BIT (1<<5) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h +index f21abd4..2cf30bf 100644 +--- a/include/asm-arm/pci.h ++++ b/include/asm-arm/pci.h +@@ -8,10 +8,17 @@ + + #define pcibios_scan_all_fns(a, b) 0 + ++#ifdef CONFIG_PCI_HOST_ITE8152 ++/* ITE bridge requires setting latency timer to avoid early bus access ++ termination by PIC bus mater devices ++*/ ++extern void pcibios_set_master(struct pci_dev *dev); ++#else + static inline void pcibios_set_master(struct pci_dev *dev) + { + /* No special bus mastering setup handling */ + } ++#endif + + static inline void pcibios_penalize_isa_irq(int irq, int active) + { +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index 5b1c999..b4c81d5 100644 +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -1650,6 +1650,7 @@ + #define PCI_DEVICE_ID_ITE_8211 0x8211 + #define PCI_DEVICE_ID_ITE_8212 0x8212 + #define PCI_DEVICE_ID_ITE_8213 0x8213 ++#define PCI_DEVICE_ID_ITE_8152 0x8152 + #define PCI_DEVICE_ID_ITE_8872 0x8872 + #define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886 + +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch b/packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch new file mode 100644 index 0000000000..7dceff5c9d --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch @@ -0,0 +1,228 @@ +From 338653da8f8afcdf8afc7e8a5a0104d5083597cc Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:01:27 -0400 +Subject: [PATCH] cm-x270-pcmcia + +--- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_cm_x270.c | 198 +++++++++++++++++++++++++++++++++++++++ + 2 files changed, 199 insertions(+), 0 deletions(-) + create mode 100644 drivers/pcmcia/pxa2xx_cm_x270.c + +diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile +index 4276965..353d5b7 100644 +--- a/drivers/pcmcia/Makefile ++++ b/drivers/pcmcia/Makefile +@@ -69,4 +69,5 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o + pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o + pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o + pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o ++pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x270.o + +diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c +new file mode 100644 +index 0000000..25e369f +--- /dev/null ++++ b/drivers/pcmcia/pxa2xx_cm_x270.c +@@ -0,0 +1,198 @@ ++/* ++ * linux/drivers/pcmcia/pxa/pxa_armcore.c ++ * ++ * 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. ++ * ++ * Compulab Ltd., 2003 ++ * ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/platform_device.h> ++#include <linux/irq.h> ++ ++#include <pcmcia/ss.h> ++#include <asm/delay.h> ++#include <asm/hardware.h> ++ ++#include <asm/arch/pxa-regs.h> ++#include <asm/arch/cm-x270.h> ++ ++#include "soc_common.h" ++ ++ ++static struct pcmcia_irqs irqs[] = { ++ { 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" }, ++ { 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" }, ++}; ++ ++ ++static int ++cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt) ++{ ++ int return_val=0; ++ ++ GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) | ++ GPIO_bit(GPIO49_nPWE) | ++ GPIO_bit(GPIO50_nPIOR) | ++ GPIO_bit(GPIO51_nPIOW) | ++ GPIO_bit(GPIO85_nPCE_1) | ++ GPIO_bit(GPIO54_nPCE_2); ++ ++ pxa_gpio_mode(GPIO48_nPOE_MD); ++ pxa_gpio_mode(GPIO49_nPWE_MD); ++ pxa_gpio_mode(GPIO50_nPIOR_MD); ++ pxa_gpio_mode(GPIO51_nPIOW_MD); ++ pxa_gpio_mode(GPIO85_nPCE_1_MD); ++ pxa_gpio_mode(GPIO54_nPCE_2_MD); ++ //pxa_gpio_mode(GPIO79_pSKTSEL_MD); /* REVISIT: s/b dependent on num sockets (on ATX base not routed)*/ ++ pxa_gpio_mode(GPIO55_nPREG_MD); ++ pxa_gpio_mode(GPIO56_nPWAIT_MD); ++ pxa_gpio_mode(GPIO57_nIOIS16_MD); ++ ++ // Reset signal ++ GPDR(GPIO53_nPCE_2) |= GPIO_bit(GPIO53_nPCE_2); ++ GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2); ++ ++ GPDR(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID)); ++ GPDR(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID)); ++ ++ set_irq_type(PCMCIA_S0_CD_VALID, IRQ_TYPE_EDGE_BOTH); ++ set_irq_type(PCMCIA_S1_CD_VALID, IRQ_TYPE_EDGE_BOTH); ++ ++ //irq's for slots: ++ GPDR(IRQ_TO_GPIO(PCMCIA_S0_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S0_RDYINT)); ++ GPDR(IRQ_TO_GPIO(PCMCIA_S1_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO(PCMCIA_S1_RDYINT)); ++ ++ set_irq_type(PCMCIA_S0_RDYINT, IRQ_TYPE_EDGE_FALLING); ++ set_irq_type(PCMCIA_S1_RDYINT, IRQ_TYPE_EDGE_FALLING); ++ ++ skt->irq = (skt->nr == 0) ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT; ++ return_val = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); ++ ++ return return_val; ++} ++ ++ ++static void cmx270_pcmcia_shutdown(struct soc_pcmcia_socket *skt) ++{ ++ soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs)); ++ ++ set_irq_type(IRQ_TO_GPIO(PCMCIA_S0_CD_VALID), IRQ_TYPE_NONE); ++ set_irq_type(IRQ_TO_GPIO(PCMCIA_S1_CD_VALID), IRQ_TYPE_NONE); ++ ++ set_irq_type(IRQ_TO_GPIO(PCMCIA_S0_RDYINT), IRQ_TYPE_NONE); ++ set_irq_type(IRQ_TO_GPIO(PCMCIA_S1_RDYINT), IRQ_TYPE_NONE); ++} ++ ++ ++static void cmx270_pcmcia_socket_state(struct soc_pcmcia_socket *skt, ++ struct pcmcia_state *state) ++{ ++ ++ state->detect = (PCC_DETECT(skt->nr) == 0) ? 1 : 0; ++ state->ready = (PCC_READY(skt->nr) == 0) ? 0 : 1; ++ state->bvd1 = 1; ++ state->bvd2 = 1; ++ state->vs_3v = 0; ++ state->vs_Xv = 0; ++ state->wrprot = 0; /* not available */ ++ ++} ++ ++ ++static int ++cmx270_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, ++ const socket_state_t *state) ++{ ++ ++ GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE); ++ pxa_gpio_mode(GPIO49_nPWE | GPIO_OUT); ++ //pxa_gpio_mode(GPIO79_pSKTSEL_MD | GPIO_OUT); /* For 2-socket mode */ ++ ++ switch(skt->nr){ ++ case 0: ++ if(state->flags & SS_RESET) { ++ //GPCR(GPIO79_pSKTSEL) = GPIO_bit(GPIO79_pSKTSEL); /* For 2-socket mode */ ++ //udelay(1); ++ GPCR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE); ++ GPSR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2); ++ udelay(10); ++ GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2); ++ GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE); ++ } ++ break; ++ case 1: ++ if(state->flags & SS_RESET) { ++ //GPCR(GPIO79_pSKTSEL) = GPIO_bit(GPIO79_pSKTSEL); /* For 2-socket mode */ ++ //udelay(1); ++ GPCR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE); ++ GPSR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2); ++ udelay(10); ++ GPCR(GPIO53_nPCE_2) = GPIO_bit(GPIO53_nPCE_2); ++ GPSR(GPIO49_nPWE) = GPIO_bit(GPIO49_nPWE); ++ } ++ break; ++ } ++ ++ pxa_gpio_mode(GPIO49_nPWE_MD); ++ //pxa_gpio_mode(GPIO79_pSKTSEL_MD); /* For 2-socket mode */ ++ ++ ++ return 0; ++} ++ ++static void cmx270_pcmcia_socket_init(struct soc_pcmcia_socket *skt) ++{ ++} ++ ++static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) ++{ ++} ++ ++ ++static struct pcmcia_low_level cmx270_pcmcia_ops = { ++ .owner = THIS_MODULE, ++ .hw_init = cmx270_pcmcia_hw_init, ++ .hw_shutdown = cmx270_pcmcia_shutdown, ++ .socket_state = cmx270_pcmcia_socket_state, ++ .configure_socket = cmx270_pcmcia_configure_socket, ++ .socket_init = cmx270_pcmcia_socket_init, ++ .socket_suspend = cmx270_pcmcia_socket_suspend, ++ .nr = 2, ++}; ++ ++static struct platform_device *cmx270_pcmcia_device; ++ ++static int __init cmx270_pcmcia_init(void) ++{ ++ int ret; ++ ++ cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); ++ ++ if (!cmx270_pcmcia_device) ++ return -ENOMEM; ++ ++ cmx270_pcmcia_device->dev.platform_data = &cmx270_pcmcia_ops; ++ ++ printk ("Registering cm-x270 PCMCIA interface.\n"); ++ ret = platform_device_add(cmx270_pcmcia_device); ++ ++ if (ret) ++ platform_device_put(cmx270_pcmcia_device); ++ ++ return ret; ++} ++ ++static void __exit cmx270_pcmcia_exit(void) ++{ ++ platform_device_unregister(cmx270_pcmcia_device); ++} ++ ++module_init(cmx270_pcmcia_init); ++module_exit(cmx270_pcmcia_exit); ++ ++MODULE_LICENSE("GPL"); +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch b/packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch new file mode 100644 index 0000000000..aa25dd9bfc --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch @@ -0,0 +1,80 @@ +From ca4508b1266109208f62e986b51397ce2788e255 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:01:50 -0400 +Subject: [PATCH] ramdisk_load + +--- + arch/arm/mach-pxa/cm-x270.c | 6 ++++++ + include/asm-arm/arch-pxa/cm-x270.h | 2 ++ + init/initramfs.c | 16 ++++++++++++++++ + 3 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +index 88b080d..c6ec489 100644 +--- a/arch/arm/mach-pxa/cm-x270.c ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -308,6 +308,12 @@ static struct map_desc cmx270_io_desc[] __initdata = { + .length = PXA_CS_SIZE, + .type = MT_DEVICE + }, ++ [2] = { /* NOR flash */ ++ .virtual = CMX270_FLASH_VIRT, ++ .pfn = __phys_to_pfn(PXA_CS0_PHYS), ++ .length = (8<<20), /* up to 8 MByte flash */ ++ .type = MT_DEVICE ++ }, + }; + + /* +diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h +index 24613a5..aad152e 100644 +--- a/include/asm-arm/arch-pxa/cm-x270.h ++++ b/include/asm-arm/arch-pxa/cm-x270.h +@@ -20,7 +20,9 @@ + + #define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) + #define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + PXA_CS_SIZE) ++#define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + PXA_CS_SIZE) + ++#define CMX270_FLASH_RAMDISK_VIRT (CMX270_FLASH_VIRT + 0x1c0000) + + /* GPIO related definitions */ + #define GPIO_IT8152_IRQ (22) +diff --git a/init/initramfs.c b/init/initramfs.c +index 00eff7a..0ecd40b 100644 +--- a/init/initramfs.c ++++ b/init/initramfs.c +@@ -7,6 +7,9 @@ + #include <linux/string.h> + #include <linux/syscalls.h> + ++// HACK for compulab cm-x270 ++#include <asm/arch/cm-x270.h> ++ + static __initdata char *message; + static void __init error(char *x) + { +@@ -550,7 +553,20 @@ static int __init populate_rootfs(void) + #ifdef CONFIG_BLK_DEV_INITRD + if (initrd_start) { + #ifdef CONFIG_BLK_DEV_RAM ++ ++ /* hack to make initramfs work because the ++ * compulab BL does not zero out the ++ * initrd memory. This only seems to affect loading ++ * initramfs (cpio.gz) archives. Does not seem to ++ * affect ramdisks. ++ */ ++ int initrd_size = *(int *)(CMX270_FLASH_RAMDISK_VIRT); + int fd; ++ ++ initrd_end = initrd_start + initrd_size; ++ //printk("CLIFF: initrd_start = 0x%x\n", initrd_start); ++ //printk("CLIFF: initrd_end = 0x%x\n", initrd_end); ++ + printk(KERN_INFO "checking if image is initramfs..."); + err = unpack_to_rootfs((char *)initrd_start, + initrd_end - initrd_start, 1); +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch b/packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch new file mode 100644 index 0000000000..90e66b5308 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch @@ -0,0 +1,36 @@ +From 26638b93f7479dc597a58e2e2b2832c6ff4c8f7b Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:02:55 -0400 +Subject: [PATCH] mmcsd_large_cards-r0 + +--- + drivers/mmc/card/block.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c +index 540ff4b..1f8d67d 100644 +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -403,6 +403,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + { + struct mmc_blk_data *md; + int devidx, ret; ++ unsigned long cap; + + devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS); + if (devidx >= MMC_NUM_MINORS) +@@ -467,6 +468,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + + sprintf(md->disk->disk_name, "mmcblk%d", devidx); + ++ if (card->csd.read_blkbits > 9) ++ md->block_bits = 9; ++ else ++ md->block_bits = card->csd.read_blkbits; ++ + blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); + + if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) { +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch b/packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch new file mode 100644 index 0000000000..c07f049e56 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch @@ -0,0 +1,25 @@ +From e1a243564a40d7542a62d4684f2e6ce0b95fa267 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:04:12 -0400 +Subject: [PATCH] cm-x270-nand-simplify-name + +--- + drivers/mtd/nand/cmx270_nand.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c +index cb663ef..3654ce4 100644 +--- a/drivers/mtd/nand/cmx270_nand.c ++++ b/drivers/mtd/nand/cmx270_nand.c +@@ -191,6 +191,8 @@ static int cmx270_init(void) + cmx270_nand_mtd->owner = THIS_MODULE; + cmx270_nand_mtd->priv = this; + ++ cmx270_nand_mtd->name = "cm-x270-nand"; ++ + /* insert callbacks */ + this->IO_ADDR_R = cmx270_nand_io; + this->IO_ADDR_W = cmx270_nand_io; +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch b/packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch new file mode 100644 index 0000000000..08b0db36b0 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch @@ -0,0 +1,43 @@ +From 94a59c25e4e0aec3c4d12e0c63e144e6af447368 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:04:42 -0400 +Subject: [PATCH] cursor-fix + +--- + drivers/char/vt.c | 4 ++-- + drivers/char/vt_ioctl.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/char/vt.c b/drivers/char/vt.c +index 6650ae1..649474e 100644 +--- a/drivers/char/vt.c ++++ b/drivers/char/vt.c +@@ -3491,8 +3491,8 @@ void do_blank_screen(int entering_gfx) + } + return; + } +- if (blank_state != blank_normal_wait) +- return; ++ //if (blank_state != blank_normal_wait) ++ // return; + blank_state = blank_off; + + /* entering graphics mode? */ +diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c +index c6f6f42..94121ff 100644 +--- a/drivers/char/vt_ioctl.c ++++ b/drivers/char/vt_ioctl.c +@@ -489,8 +489,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, + if (vc->vc_mode == (unsigned char) arg) + return 0; + vc->vc_mode = (unsigned char) arg; +- if (console != fg_console) +- return 0; ++ //if (console != fg_console) ++ // return 0; + /* + * explicitly blank/unblank the screen if switching modes + */ +-- +1.5.1.6 + diff --git a/packages/linux/compulab-pxa270-2.6.22/defconfig b/packages/linux/compulab-pxa270-2.6.22/defconfig new file mode 100644 index 0000000000..a6966d2dad --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.22/defconfig @@ -0,0 +1,1234 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22 +# Tue Aug 7 15:22:23 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +# CONFIG_GENERIC_CLOCKEVENTS is not set +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="-cm-x270" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# 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_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# 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_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_MACH_ARMCORE=y +CONFIG_PXA27x=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# +# CONFIG_PCI is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_TICK_ONESHOT is not set +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data)" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS 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 is not set +CONFIG_MTD_CFI_AMDSTD=y +# 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=0x0 +CONFIG_MTD_PHYSMAP_LEN=0x400000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_SHARPSL is not set +CONFIG_MTD_NAND_CM_X270=y +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=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 is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_SMC91X is not set +CONFIG_DM9000=y +CONFIG_DM9000_NOEPROM=y +# CONFIG_SMC911X is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# 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=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_PXA27x is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_LIFEBOOK is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_UCB1400=m +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# 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_GPIO is not set +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_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_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_CM_X270=y + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGERS is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID 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_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# 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 + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_PXA=m + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb new file mode 100644 index 0000000000..84e66e3c8f --- /dev/null +++ b/packages/linux/compulab-pxa270_2.6.22.bb @@ -0,0 +1,77 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for the Compulab PXA270 system" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ + file://0001-cm-x270-base2.patch;patch=1 \ + file://0002-cm-x270-match-type.patch;patch=1 \ + file://0003-cm-x270-ide.patch;patch=1 \ + file://0004-cm-x270-it8152.patch;patch=1 \ + file://0005-cm-x270-pcmcia.patch;patch=1 \ + file://0006-ramdisk_load.patch;patch=1 \ + file://0007-mmcsd_large_cards-r0.patch;patch=1 \ + file://0008-cm-x270-nand-simplify-name.patch;patch=1 \ + file://defconfig \ + " + +# file://0009-cursor-fix.patch + +# Note, for 2.6.22, we are no longer using the compulab binary +# flash driver -- use JFFS2 instead +# see notes in conf/machine/compulab-pxa270.conf + +S = "${WORKDIR}/linux-2.6.22" + +COMPATIBLE_HOST = 'arm.*-linux' + +inherit kernel +inherit package + +ARCH = "arm" +KERNEL_IMAGETYPE = "zImage" + +FILES_kernel-image = "" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_deploy() { + KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME} +} + +python do_compulab_image() { + import os + import os.path + import struct + + deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1) + kernel_name = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGETYPE}-${MACHINE}.bin', d)) + + img_file = os.path.join(deploy_dir, 'zImage-compulab-pxa270.cmx270') + + fo = open(img_file, 'wb') + + image_data = open(kernel_name, 'rb').read() + + # first write size into first 4 bytes + size_s = struct.pack('i', len(image_data)) + + # truncate size if we are running on a 64-bit host + size_s = size_s[:4] + + fo.write(size_s) + fo.write(image_data) + fo.close() +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_install after do_compile +addtask compulab_image before do_install after do_deploy + +COMPATIBLE_MACHINE = "compulab-pxa270" + diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 56474d512a..0fbb58a561 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -885,7 +885,7 @@ CONFIG_TUN=m CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_IXP4XX_QMGR=m -CONFIG_IXP4XX_NPE=m +CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_NPE_FW_LOAD=y CONFIG_IXP4XX_NPE_FW_MTD=y CONFIG_IXP4XX_MAC=m diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index ff90bcb3b3..b0ba8ba787 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "914" +IXP4XX_KERNEL_SVN_REV = "915" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 098ae9d069..8554d2413c 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -3,7 +3,7 @@ SECTION = "kernel" AUTHOR = "Harald Welte <laforge@openmoko.org>" HOMEPAGE = "N/A" LICENSE = "GPL" -DEPENDS += "quilt-native uboot-gta01" +DEPENDS += "quilt-native uboot-openmoko" inherit kernel @@ -93,6 +93,7 @@ do_deploy() { rm -f linux.bin.gz gzip -9 linux.bin ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin rm -f linux.bin.gz } diff --git a/packages/linux/linux-gta01_2.6.21.3.bb b/packages/linux/linux-gta01_2.6.21.3.bb index cccc4dd6a1..18af85973a 100644 --- a/packages/linux/linux-gta01_2.6.21.3.bb +++ b/packages/linux/linux-gta01_2.6.21.3.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r3" +PR = "${MOKOR}-r4" VANILLA_VERSION = "2.6.21.3" diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb index ced24462e7..9463138cf0 100644 --- a/packages/linux/linux-gta01_2.6.21.5.bb +++ b/packages/linux/linux-gta01_2.6.21.5.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r1" +PR = "r2" VANILLA_VERSION = "2.6.21.5" diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig index 0411281aae..432e70379f 100644 --- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-hnd0 -# Wed Mar 28 10:35:44 2007 +# Linux kernel version: 2.6.21-hnd3 +# Wed Aug 8 12:55:12 2007 # CONFIG_ARM=y -# CONFIG_GENERIC_TIME is not set +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -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_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -35,6 +39,7 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set @@ -44,6 +49,7 @@ CONFIG_BSD_PROCESS_ACCT=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 @@ -122,6 +128,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=y # CONFIG_ARCH_RPC is not set @@ -130,6 +137,8 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +# CONFIG_BOARD_IRQ_MAP_BIG is not set # # Intel PXA2xx Implementations @@ -158,6 +167,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X50 is not set @@ -171,7 +181,6 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set CONFIG_MACH_XSCALE_PALMTX=y -# CONFIG_PALMTX_PCMCIA is not set # CONFIG_PALMTX_DEBUG is not set CONFIG_PALMTX_BATTERY=m CONFIG_PALMTX_PM=y @@ -180,6 +189,9 @@ CONFIG_PALMTX_PM=y # CONFIG_MACH_ZIRE31 is not set CONFIG_GPIOED=m CONFIG_GPIOEDNG=m +# CONFIG_MACH_GHI270HG is not set +# CONFIG_MACH_GHI270 is not set +# CONFIG_MACH_LOOXC550 is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y @@ -206,18 +218,10 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set CONFIG_IWMMXT=y # CONFIG_ARMBOOT_PROC is not set CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set - -# -# Compaq/iPAQ Drivers -# - -# -# Compaq/HP iPAQ Drivers -# # # Bus support @@ -246,6 +250,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 # @@ -255,6 +260,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="mem=32M" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set +# CONFIG_TXTOFFSET_DELTA is not set # # CPU Frequency scaling @@ -287,7 +294,7 @@ CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set # CONFIG_DPM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=y +CONFIG_APM_EMULATION=y # # Networking @@ -304,6 +311,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 @@ -423,6 +431,7 @@ CONFIG_BT=m CONFIG_BT_HCIUART=m # CONFIG_BT_HCIUART_H4 is not set # CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_BCM2035UART is not set # CONFIG_BT_HCIVHCI is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -462,6 +471,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # # Plug and Play support # +# CONFIG_PNPACPI is not set # # Block devices @@ -474,7 +484,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 is not set @@ -594,6 +603,7 @@ CONFIG_INPUT_TSDEV_SCREEN_X=320 CONFIG_INPUT_TSDEV_SCREEN_Y=480 CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_LED_TRIGGER is not set # # Input Device Drivers @@ -605,9 +615,10 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_GPIO_KEYS is not set +# CONFIG_GPIODEV_KEYS is not set +# CONFIG_GPIODEV_DIAGONAL is not set CONFIG_KEYBOARD_PXA27x=y -# CONFIG_KEYBOARD_PALMWK is not set +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -619,9 +630,8 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_ADC is not set -# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_PALMTC is not set CONFIG_TOUCHSCREEN_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set CONFIG_TOUCHSCREEN_WM9712=y @@ -661,6 +671,7 @@ CONFIG_SERIAL_PXA_COUNT=4 # CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -676,9 +687,9 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set +# CONFIG_TIHTC is not set # CONFIG_RAW_DRIVER is not set # @@ -706,6 +717,7 @@ CONFIG_SPI_PXA2XX=y # # SPI Protocol Masters # +# CONFIG_SPI_AT25 is not set # # Dallas's 1-wire bus @@ -717,44 +729,53 @@ CONFIG_SPI_PXA2XX=y # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +# CONFIG_BATTERY_DS2760 is not set # -# Hardware Monitoring - Battery +# L3 serial bus support # -CONFIG_BATTERY_MONITOR=y -# CONFIG_ADC_BATTERY is not set +# CONFIG_L3 is not set # -# L3 serial bus support +# Misc devices # -# CONFIG_L3 is not set +# CONFIG_BATTCHARGE_MONITOR is not set # -# SoC drivers +# Multimedia Capabilities Port drivers # -# CONFIG_SOC_MQ11XX is not set -# CONFIG_SOC_T7L66XB is not set -# CONFIG_SOC_TC6387XB is not set -# CONFIG_SOC_TC6393XB is not set -# CONFIG_SOC_SAMCOP is not set -# CONFIG_SOC_HAMCOP is not set -# CONFIG_HTC_ASIC2 is not set -# CONFIG_HTC_ASIC3 is not set -# CONFIG_HTC_ASIC3_DS1WM is not set -# CONFIG_SOC_TSC2200 is not set +# CONFIG_ADC is not set # -# Misc devices +# Compaq/iPAQ Drivers # -# CONFIG_BATTCHARGE_MONITOR is not set # -# Multimedia Capabilities Port drivers +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_SLEEVE is not set +# CONFIG_SLEEVE_DEBUG is not set + +# +# Multifunction device drivers # -# CONFIG_MCP is not set -# CONFIG_ADC_ADS7846_SSP is not set -# CONFIG_ADC_AD7877 is not set -# CONFIG_TIFM_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_TSC2200 is not set # # LED devices @@ -773,6 +794,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LEDS_TRIGGER_HWTIMER is not set CONFIG_LEDS_TRIGGER_MMC_CARD=y +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_SHARED is not set @@ -793,9 +815,8 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_ADV_DEBUG=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_CPIA is not set -# CONFIG_PXA_CAMERA is not set +# CONFIG_PXACI is not set # # Radio Adapters @@ -809,15 +830,26 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # # Graphics support # -CONFIG_FIRMWARE_EDID=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# 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 is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y @@ -852,12 +884,6 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_DEVICE=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CORGI=y -# CONFIG_BACKLIGHT_PXAPWM is not set # # Sound @@ -912,6 +938,7 @@ CONFIG_AC97_BUS=y # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -936,6 +963,7 @@ CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_PXA27X=y CONFIG_USB_PXA27X=y # CONFIG_USB_PXA27X_DMA is not set +# CONFIG_USB_GADGET_SX2 is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set @@ -952,6 +980,7 @@ CONFIG_USB_ETH=m # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set # # MMC/SD Card support @@ -960,7 +989,6 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y -# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set @@ -982,6 +1010,7 @@ CONFIG_RTC_INTF_DEV=m # # RTC drivers # +# CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_RS5C348 is not set @@ -1047,6 +1076,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_AUFS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -1187,8 +1217,10 @@ CONFIG_CRYPTO_MANAGER=m # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set @@ -1202,6 +1234,7 @@ CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set # @@ -1218,4 +1251,5 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index f480f68a34..fdae8f4ec1 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r8" +PR = "r9" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc index ac7d398122..e2b168e454 100644 --- a/packages/linux/linux-omap1.inc +++ b/packages/linux/linux-omap1.inc @@ -7,8 +7,7 @@ COMPATIBLE_MACHINE = "omap5912osk" inherit kernel -KERNEL_IMAGETYPE = "vmlinux" -KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}" +KERNEL_IMAGETYPE = "uImage" module_autoload_ohci-hcd_omap5912osk = "ohci-hcd" @@ -22,15 +21,9 @@ do_configure_prepend() { oe_runmake oldconfig } - do_deploy() { - if [ "${MACHINE}" == "omap5912osk" ]; then - install -d ${DEPLOY_DIR_IMAGE} - ${OBJCOPY} -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${S}/linux.bin - gzip -f -9 ${S}/linux.bin - mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}-${MACHINE}-${DATETIME}.bin - rm ${S}/linux.bin.gz - fi + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } do_deploy[dirs] = "${S}" diff --git a/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch b/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch deleted file mode 100644 index 7ecc48f956..0000000000 --- a/packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch +++ /dev/null @@ -1,947 +0,0 @@ -Index: linux-2.6.21/drivers/spi/Kconfig -=================================================================== ---- linux-2.6.21.orig/drivers/spi/Kconfig 2007-04-26 05:08:32.000000000 +0200 -+++ linux-2.6.21/drivers/spi/Kconfig 2007-07-03 21:40:52.000000000 +0200 -@@ -89,6 +89,10 @@ - This enables using the Freescale iMX SPI controller in master - mode. - -+config SPI_LOCOMO -+ tristate "Locomo SPI master" -+ depends on SPI_MASTER && SHARP_LOCOMO && EXPERIMENTAL -+ - config SPI_MPC83xx - tristate "Freescale MPC83xx SPI controller" - depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL -Index: linux-2.6.21/drivers/spi/locomo_spi.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/drivers/spi/locomo_spi.c 2007-07-03 21:40:52.000000000 +0200 -@@ -0,0 +1,873 @@ -+#include <asm/io.h> -+#include <asm/irq.h> -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/device.h> -+#include <linux/stat.h> -+#include <linux/delay.h> -+#include <linux/interrupt.h> -+#include <asm/hardware/locomo.h> -+#include <linux/mmc/host.h> -+#include <linux/spi/spi.h> -+#include <linux/spi/mmc_spi.h> -+#include <linux/workqueue.h> -+#include <linux/spinlock.h> -+#include <linux/list.h> -+#include "locomo_spi.h" -+static struct locomospi_dev * spidev; -+static struct work_struct transfer_wq; -+int verbose=0; -+/* MMC_SPI functions *********************************************************/ -+ -+static int locomommcspi_init(struct device *dev, irqreturn_t (*isr)(int, void*), void *mmc) -+{ -+ int result; -+ locomo_gpio_set_irq(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_DETECT, LOCOMO_GPIO_IRQ_ON_RISE | LOCOMO_GPIO_IRQ_ON_FALL); -+ spidev->mmc_spi_isr = isr; -+ result=request_irq(IRQ_LOCOMO_CARDDETECT, locomospi_cardisr, SA_SHIRQ, "locomo-spi", mmc); -+ return result; -+} -+ -+static void locomommcspi_exit(struct device *dev, void* mmc) -+{ -+ free_irq(IRQ_LOCOMO_CARDDETECT, mmc); -+} -+ -+static int locomommcspi_getro(struct device *dev) -+{ -+ return locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROTECT) > 0 ? 1 : 0; -+} -+ -+static void locomommcspi_powermode(struct device *dev, unsigned char mode) -+{ -+ if(mode == MMC_POWER_OFF && spidev->card_power != 0) -+ locomospi_power(0); -+ else if( spidev->card_power != 1) -+ locomospi_power(1); -+ -+} -+ -+static void locomommcspi_reset(void) -+{ -+ /* transmit card reset sequence, should be done from mmc_layer */ -+ locomospi_setcs(1); -+ tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10); -+ locomospi_setcs(0); -+} -+ -+ -+static struct mmc_spi_platform_data colliemmc ={ -+ .init = locomommcspi_init, -+ .exit = locomommcspi_exit, -+ .detect_delay = HZ, -+ .get_ro = locomommcspi_getro, -+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, -+ .setpowermode = locomommcspi_powermode, -+ .reset = locomommcspi_reset, -+}; -+ -+/* Utility function **********************************************************/ -+ -+static irqreturn_t locomospi_cardisr(int irq, void *dev_id) -+{ -+ u16 r; -+ if(locomospi_carddetect()){ -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r |= 0x80; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r |= 0x40; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ /* transmit card reset sequence, should be done from mmc_layer */ -+// locomospi_setcs(1); -+ // tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10); -+// locomospi_setcs(0); -+ } else { -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r &= ~0x80; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r &= ~0x40; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ } -+ return spidev->mmc_spi_isr(irq, dev_id); -+} -+ -+static void locomospi_power(int on) -+{ -+ locomo_gpio_write(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_POWER, on); -+ spidev->card_power=on; -+ set_current_state(TASK_INTERRUPTIBLE); -+ if(on){ -+ schedule_timeout(HZ/10); -+ } else { -+ schedule_timeout(2*HZ); -+ } -+ -+} -+ -+static void locomospi_setclock(unsigned int base, unsigned int mult) -+{ -+ u16 r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ base &= 0x7; -+ mult &= 0x3; -+ r &= ~(0x7 | 0x18 | 0x40); -+ locomo_writel(r,spidev->base+LOCOMO_SPIMD); -+ r |= (base | (mult <<3) | 0x40); -+ locomo_writel(r,spidev->base+LOCOMO_SPIMD); -+ spidev->clock_base = base; -+ spidev->clock_mult = mult; -+ -+} -+// returns 1 if card ist present, 0 otherwise -+static int locomospi_carddetect() -+{ -+ return (locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1; -+} -+ -+static void locomospi_togglecs() -+{ -+ u16 r; -+ r = locomo_readl(spidev->base + LOCOMO_SPICT); -+ r ^= 0x40; // I think this is CHIPSELECTHIGH -+ locomo_writel(r, spidev->base + LOCOMO_SPICT); -+} -+ -+static void locomospi_setcs(int high) -+{ -+ u16 r; -+ r = locomo_readl(spidev->base + LOCOMO_SPICT); -+ if(high) -+ r |= 0x40; -+ else -+ r &= ~0x40; -+ locomo_writel(r, spidev->base + LOCOMO_SPICT); -+} -+ -+static void locomospi_reg_open() -+{ -+ u16 r; -+ spidev->clock_base = 4; -+ spidev->clock_mult = 0; -+ locomospi_power(1); -+ locomo_writel( 0x6c00 | (2 <<3)|4, spidev->base+LOCOMO_SPIMD); -+ if(locomospi_carddetect()){ -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r |= 0x80; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r |= 0x40; -+ locomo_writel( r, spidev->base+LOCOMO_SPIMD); -+ } -+ locomo_writel( 0x40, spidev->base+LOCOMO_SPICT); -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ r |= 0x80; -+ locomo_writel( r, spidev->base+LOCOMO_SPICT); -+ udelay(200); -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ locomo_writel(r, spidev->base+LOCOMO_SPICT); -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ r |= 0x1; -+ locomo_writel(r, spidev->base+LOCOMO_SPICT); -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ r &= ~0x40; -+ locomo_writel(r, spidev->base+LOCOMO_SPICT); -+} -+ -+static void locomospi_reg_release() -+{ -+ u16 r; -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ r &= ~0x80; -+ locomo_writel(r, spidev->base+LOCOMO_SPICT); -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r &= ~0x40; -+ locomo_writel(r, spidev->base+LOCOMO_SPIMD); -+ r = locomo_readl(spidev->base+LOCOMO_SPIMD); -+ r &= ~0x80; -+ locomo_writel(r, spidev->base+LOCOMO_SPIMD); -+ r = locomo_readl(spidev->base+LOCOMO_SPICT); -+ r |= 0x40; -+ locomo_writel(r, spidev->base+LOCOMO_SPICT); -+ locomospi_power(0); -+} -+ -+static int tx(const char* buffer, int size) -+{ -+ int i=0,j=0; -+// int result=0; -+ int wait; -+ if(!spidev->clock_base && !spidev->clock_mult) -+ return 0; -+ if(spidev->clock_base == 4) -+ wait = 0x10000; -+ else -+ wait = 8; -+ -+ for(i=0; i<size; i++){ -+/* if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)){ -+ result = wait_event_interruptible(spidev->waitqueue, locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW); -+ if(result) { -+ dev_err(&spidev->sdev->dev, "received Signal. giving up tx."); -+ return i; -+ } -+ }*/ -+ for(j=0; j <= wait; j++){ -+ if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW) -+ break; -+ } -+ locomo_writel((u16) buffer[i], spidev->base+LOCOMO_SPITD); -+ if(verbose) -+ printk(KERN_DEBUG "locomospi: sent: char :%x\n", (u16) buffer[i]); -+ if(spidev->clock_base){ -+ for(j=0; j <= wait; j++){ -+ if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)) -+ break; -+ } -+ } -+ } -+ if(spidev->clock_base){ -+ for(i=0; i <= wait; i++){ -+ if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_TEND) -+ break; -+ } -+ } -+ return j; -+} -+ -+static int rx(char* buffer, int size) -+{ -+ int i,j; -+// int result=0; -+ int wait; -+ u16 rd; -+ if(!spidev->clock_base && !spidev->clock_mult) -+ return 0; -+ if(spidev->clock_base == 4) -+ wait = 0x10000; -+ else -+ wait = 8; -+ -+ for(i=0; i<size; i++){ -+/* if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)){ -+ result = wait_event_interruptible(spidev->waitqueue, locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW); -+ if(result) { -+ dev_err(&spidev->sdev->dev, "received Signal. giving up tx."); -+ return i; -+ } -+ }*/ -+ for(j=0; j <= wait; j++){ -+ if(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR) -+ break; -+ } -+ rd= locomo_readl(spidev->base+LOCOMO_SPIRD); -+ if(verbose) -+ printk(KERN_DEBUG "locomospi: received: char :%x\n", (u16) buffer[i]); -+ buffer[i]=(char) rd; -+ if(spidev->clock_base){ -+ for(j=0; j <= wait; j++){ -+ if(!(locomo_readl(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)) -+ break; -+ } -+ } -+ } -+ return i; -+} -+ -+/* -+static irqreturn_t locomospi_rwready(int irq, void *dev_id) -+{ -+ struct locomospi_dev* dev=(struct locomospi_dev*) dev_id; -+// dev_dbg(&spidev->sdev->dev, "IRQ: %d\n", irq); -+// printk(KERN_DEBUG "locomospi: IRQ: %d\n", irq); -+ wake_up_interruptible(&dev->waitqueue); -+ return IRQ_HANDLED; -+} -+ -+static irqreturn_t locomospi_testisr(int irq, void *dev_id) -+{ -+ char *buf=""; -+ switch(irq){ -+ case IRQ_LOCOMO_SPI_RFR: buf="RFR"; -+ break; -+ case IRQ_LOCOMO_SPI_RFW: buf="RFW"; -+ break; -+ case IRQ_LOCOMO_SPI_OVRN:buf="OVRN"; -+ break; -+ case IRQ_LOCOMO_SPI_TEND:buf="TEND"; -+ break; -+ case IRQ_LOCOMO_CARDDETECT: -+ buf="CARD_DETECT"; -+ break; -+ default: return IRQ_NONE; -+ } -+ printk(KERN_DEBUG "locomospi: IRQ: %s\n",buf); -+// dev_dbg(&spidev->sdev->dev, "IRQ: %s\n",buf); -+ return IRQ_HANDLED; -+} -+*/ -+/* sysfs attributes used for debug *******************************************/ -+ -+/* SPI registers */ -+ssize_t locomospi_showspimd(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIMD)); -+} -+ -+ssize_t locomospi_storespimd(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIMD); -+ return count; -+} -+static DRIVER_ATTR(spimd, S_IWUSR | S_IRUGO, locomospi_showspimd, locomospi_storespimd); -+ -+ssize_t locomospi_showspict(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPICT)); -+} -+ -+ssize_t locomospi_storespict(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPICT); -+ return count; -+} -+static DRIVER_ATTR(spict, S_IWUSR | S_IRUGO, locomospi_showspict, locomospi_storespict); -+ -+ssize_t locomospi_showspist(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIST)); -+} -+ -+ssize_t locomospi_storespist(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIST); -+ return count; -+} -+static DRIVER_ATTR(spist, S_IWUSR | S_IRUGO, locomospi_showspist, locomospi_storespist); -+ -+ssize_t locomospi_showspiis(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIS)); -+} -+ -+ssize_t locomospi_storespiis(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIS); -+ return count; -+} -+static DRIVER_ATTR(spiis, S_IWUSR | S_IRUGO, locomospi_showspiis, locomospi_storespiis); -+ -+ssize_t locomospi_showspiwe(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIWE)); -+} -+ -+ssize_t locomospi_storespiwe(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIWE); -+ return count; -+} -+static DRIVER_ATTR(spiwe, S_IWUSR | S_IRUGO, locomospi_showspiwe, locomospi_storespiwe); -+ -+ssize_t locomospi_showspiie(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIE)); -+} -+ -+ssize_t locomospi_storespiie(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIE); -+ return count; -+} -+static DRIVER_ATTR(spiie, S_IWUSR | S_IRUGO, locomospi_showspiie, locomospi_storespiie); -+ -+ssize_t locomospi_showspiir(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIIR)); -+} -+ -+ssize_t locomospi_storespiir(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIIR); -+ return count; -+} -+static DRIVER_ATTR(spiir, S_IWUSR | S_IRUGO, locomospi_showspiir, locomospi_storespiir); -+ -+ssize_t locomospi_showspitd(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPITD)); -+} -+ -+ssize_t locomospi_storespitd(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITD); -+ return count; -+} -+static DRIVER_ATTR(spitd, S_IWUSR | S_IRUGO, locomospi_showspitd, locomospi_storespitd); -+ -+ssize_t locomospi_showspird(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIRD)); -+} -+ -+ssize_t locomospi_storespird(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRD); -+ return count; -+} -+static DRIVER_ATTR(spird, S_IWUSR | S_IRUGO, locomospi_showspird, locomospi_storespird); -+ -+ssize_t locomospi_showspits(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPITS)); -+} -+ -+ssize_t locomospi_storespits(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITS); -+ return count; -+} -+static DRIVER_ATTR(spits, S_IWUSR | S_IRUGO, locomospi_showspits, locomospi_storespits); -+ -+ssize_t locomospi_showspirs(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "0x%x\n", locomo_readl(spidev->base+LOCOMO_SPIRS)); -+} -+ -+ssize_t locomospi_storespirs(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomo_writel(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRS); -+ return count; -+} -+static DRIVER_ATTR(spirs, S_IWUSR | S_IRUGO, locomospi_showspirs, locomospi_storespirs); -+ -+/* MMC Card status */ -+ -+ssize_t locomospi_showpower(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n", spidev->card_power); -+} -+ -+ssize_t locomospi_storepower(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomospi_power(simple_strtoul(buf, NULL, 10)); -+ return count; -+} -+static DRIVER_ATTR(cardpower, S_IWUSR | S_IRUGO, locomospi_showpower, locomospi_storepower); -+ -+ssize_t locomospi_detectcard(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1); -+} -+static DRIVER_ATTR(carddetect, S_IRUGO, locomospi_detectcard, NULL); -+ -+ssize_t locomospi_writeprotect(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROTECT)>0)?1:0); -+} -+static DRIVER_ATTR(cardwriteprotect, S_IRUGO, locomospi_writeprotect, NULL); -+ -+ssize_t locomospi_showclockbase(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n", spidev->clock_base); -+} -+ -+ssize_t locomospi_storeclockbase(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomospi_setclock(simple_strtoul(buf, NULL, 10), spidev->clock_mult); -+ return count; -+} -+static DRIVER_ATTR(clockbase, S_IWUSR | S_IRUGO, locomospi_showclockbase, locomospi_storeclockbase); -+ -+ssize_t locomospi_showclockmult(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n", spidev->clock_mult); -+} -+ -+ssize_t locomospi_storeclockmult(struct device_driver *drv, const char *buf, size_t count) -+{ -+ locomospi_setclock(spidev->clock_base, simple_strtoul(buf, NULL, 10)); -+ return count; -+} -+static DRIVER_ATTR(clockmult, S_IWUSR | S_IRUGO, locomospi_showclockmult, locomospi_storeclockmult); -+ -+/* debug */ -+ -+ssize_t locomospi_reset(struct device_driver *drv, const char *buf, size_t count) -+{ -+ int choice = simple_strtoul(buf, NULL, 10); -+// char buff[10]; -+ switch(choice){ -+ case 0: locomospi_reg_release(); -+ locomospi_reg_open(); -+ break; -+ case 1: tx("\x40\x00\x00\x00\x00\x95",6); -+ break; -+ case 2: locomospi_setcs(1); -+ tx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",10); -+ locomospi_setcs(0); -+ break; -+ default: /* do nothing */; -+ } -+ return count; -+} -+static DRIVER_ATTR(reset, S_IWUSR, NULL, locomospi_reset); -+ -+ssize_t locomospi_showverbose(struct device_driver *drv, char *buf) -+{ -+ return sprintf(buf, "%d\n", verbose); -+} -+ -+ssize_t locomospi_storeverbose(struct device_driver *drv, const char *buf, size_t count) -+{ -+ verbose=simple_strtoul(buf, NULL, 10); -+ return count; -+} -+static DRIVER_ATTR(verbose, S_IWUSR | S_IRUGO, locomospi_showverbose, locomospi_storeverbose); -+ -+/* SPI functions *************************************************************/ -+ -+static void locomospi_do_transfer(struct work_struct *wrk) -+{ -+ struct list_head *mptr, *tptr, *mptr2; -+ struct spi_transfer *entry; -+ struct spi_message *msg; -+ -+ list_for_each_safe(mptr, mptr2, &spidev->message_list){ -+ int i; -+ msg = list_entry(mptr, struct spi_message, queue); -+ -+ msg->status = 0; -+ msg->actual_length = 0; -+ list_for_each(tptr, &msg->transfers){ -+ entry = list_entry(tptr, struct spi_transfer, transfer_list); -+ if(entry->tx_buf && entry->rx_buf){ //duplex -+ for(i=0; i< entry->len; i++){ -+ tx(((char*) entry->tx_buf)+i*sizeof(char),1); -+ rx(((char*) entry->rx_buf)+i*sizeof(char),1); -+ } -+ msg->actual_length += entry->len; -+ } else if(entry->tx_buf && !entry->rx_buf){ //write -+ tx((char*) entry->tx_buf, entry->len); -+ msg->actual_length += entry->len; -+ } else if(!entry->tx_buf && entry->rx_buf){ //read -+ rx((char*) entry->rx_buf, entry->len); -+ msg->actual_length += entry->len; -+ } else if(!entry->tx_buf && !entry->rx_buf){ //error -+ dev_err(&spidev->sdev->dev, "do_transfer: no buffers allocated\n"); -+ msg->status = -EFAULT; -+ } -+ } -+ spin_lock(&spidev->message_lock); -+ list_del(mptr); -+ spin_unlock(&spidev->message_lock); -+ msg->complete(msg->context); -+ } -+} -+ -+static int locomospi_setup(struct spi_device *spi) -+{ -+ if((spi->mode & SPI_CS_HIGH) != (spidev->spimode & SPI_CS_HIGH)) -+ locomospi_togglecs(); -+ spidev->spimode = spi->mode; -+ -+ if(spi->max_speed_hz == 0) -+ locomospi_setclock(0, 0); -+ else if(spi->max_speed_hz >= 25000000) -+ locomospi_setclock(0, 2); -+ else if(spi->max_speed_hz >= 22500000) -+ locomospi_setclock(0, 1); -+ else if(spi->max_speed_hz >= 12500000) -+ locomospi_setclock(1, 2); -+ else if(spi->max_speed_hz >= 10000000) -+ locomospi_setclock(1, 1); -+ else if(spi->max_speed_hz >= 9000000) -+ locomospi_setclock(1, 0); -+ else if(spi->max_speed_hz >= 6230000) -+ locomospi_setclock(2, 2); -+ else if(spi->max_speed_hz >= 5660000) -+ locomospi_setclock(2, 1); -+ else if(spi->max_speed_hz >= 4640000) -+ locomospi_setclock(2, 0); -+ else if(spi->max_speed_hz >= 3030000) -+ locomospi_setclock(3, 2); -+ else if(spi->max_speed_hz >= 2870000) -+ locomospi_setclock(3, 1); -+ else if(spi->max_speed_hz >= 2330000) -+ locomospi_setclock(3, 0); -+ else if(spi->max_speed_hz >= 383000) -+ locomospi_setclock(4, 2); -+ else if(spi->max_speed_hz >= 350000) -+ locomospi_setclock(4, 1); -+ else -+ locomospi_setclock(4, 0); -+ return 0; -+} -+ -+static int locomospi_transfer(struct spi_device *spi, struct spi_message *msg) -+{ -+ -+ spin_lock(&spidev->message_lock); -+ list_add_tail(&msg->queue, &spidev->message_list); -+ spin_unlock(&spidev->message_lock); -+ schedule_work(&transfer_wq); -+ return 0; -+} -+ -+static struct locomo_driver locomo_spi_driver = { -+ .drv = { -+ .name = "locomo-spi", -+ }, -+ .devid = LOCOMO_DEVID_SPI, -+ .probe = locomospi_probe, -+ .remove = locomospi_remove, -+#ifdef CONFIG_PM -+ .suspend = locomospi_suspend, -+ .resume = locomospi_resume, -+#endif -+}; -+ -+static struct spi_board_info board = { -+ .modalias = "mmc_spi", -+ .platform_data = (void*) &colliemmc, -+ .controller_data= NULL, -+ .irq = 0, -+ .max_speed_hz = 25000000, -+ .bus_num = 0, -+ .chip_select = 0, -+ .mode = 0, -+}; -+ -+#ifdef CONFIG_PM -+static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state) -+{ -+ disable_irq(IRQ_LOCOMO_CARDDETECT); -+ return 0; -+} -+ -+static int locomospi_resume(struct locomo_dev *dev) -+{ -+ enable_irq(IRQ_LOCOMO_CARDDETECT); -+ return 0; -+} -+#endif -+ -+static int locomospi_probe(struct locomo_dev *dev) -+{ -+ int result=0; -+ printk(KERN_DEBUG "Collie MMC over SPI Driver\n"); -+ spidev=kmalloc(sizeof(struct locomospi_dev),GFP_KERNEL); -+ if(!spidev){ -+ return -ENOMEM; -+ } -+ spidev->ldev = dev; -+ spidev->card_power = 0; -+ spidev->spimode = 0; -+ if(!request_mem_region((unsigned long) dev->mapbase, dev->length, LOCOMO_DRIVER_NAME(dev))) { -+ dev_err(&dev->dev, " Can't aquire access to io memory\n"); -+ return -EBUSY; -+ } -+ spidev->base=(unsigned long) dev->mapbase; -+ -+ locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_POWER, 0); -+ locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_DETECT, 1); -+ locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_WRITE_PROTECT, 1); -+ -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardpower); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_carddetect); -+ if(result){ -+ dev_err(&dev->dev,"error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardwriteprotect); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spimd); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spict); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spist); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiis); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiwe); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiie); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spiir); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spitd); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spird); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spits); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spirs); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_clockbase); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_clockmult); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_reset); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_verbose); -+ if(result){ -+ dev_err(&dev->dev, "error creating driver attribute\n"); -+ goto region; -+ } -+ INIT_WORK(&transfer_wq, locomospi_do_transfer); -+ INIT_LIST_HEAD(&spidev->message_list); -+ spin_lock_init(&spidev->message_lock); -+ init_waitqueue_head(&spidev->waitqueue); -+ spidev->master=spi_alloc_master(&dev->dev,0); -+ if(!spidev->master){ -+ result=-ENOMEM; -+ goto region; -+ } -+ spidev->master->bus_num = 0; -+ spidev->master->num_chipselect = 0; -+ spidev->master->setup = locomospi_setup; -+ spidev->master->transfer = locomospi_transfer; -+ spidev->sdev = spi_new_device(spidev->master, &board); -+ if(!spidev->sdev){ -+ dev_err(&dev->dev, "failed to register spi device\n"); -+ goto master; -+ } -+/* result=request_irq(IRQ_LOCOMO_SPI_RFR, locomospi_rwready, SA_SHIRQ, "locomo-spi", (void*) spidev); -+ if(result) { -+ dev_err(&dev->dev, "Could not get IRQ: RFR\n"); -+ goto regdev; -+ } -+ result=request_irq(IRQ_LOCOMO_SPI_RFW, locomospi_rwready, SA_SHIRQ, "locomo-spi", (void*) spidev); -+ if(result) { -+ dev_err(&dev->dev, "Could not get IRQ: RFW\n"); -+ goto irq1; -+ } -+ result=request_irq(IRQ_LOCOMO_SPI_OVRN, locomospi_testisr, SA_SHIRQ, "locomo-spi", (void*) spidev); -+ if(result) { -+ dev_err(&dev->dev, "Could not get IRQ: OVRN\n"); -+ goto irq2; -+ }*/ -+/* result=request_irq(IRQ_LOCOMO_SPI_TEND, locomospi_testisr, SA_SHIRQ, "locomo-spi", (void*) spidev); -+ if(result) { -+ dev_err(&dev->dev, "Could not get IRQ: TEND\n"); -+ goto irq3; -+ }*/ -+ locomospi_reg_open(); -+ spidev->workqueue = create_singlethread_workqueue("locomo-spi"); -+ if(!spidev->workqueue){ -+ dev_err(&dev->dev, "failed to create workqueue\n"); -+ goto irq3; -+ } -+ result=spi_register_master(spidev->master); -+ if(result){ -+ dev_err(&dev->dev, "failed to register spimaster\n"); -+ goto wq; -+ } -+ return 0; -+wq: -+ destroy_workqueue(spidev->workqueue); -+irq3: -+// free_irq(IRQ_LOCOMO_SPI_OVRN, (void*) spidev); -+//irq2: -+// free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev); -+//irq1: -+// free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev); -+//regdev: -+ spi_unregister_device(spidev->sdev); -+master: -+ spi_master_put(spidev->master); -+region: -+ release_mem_region((unsigned long) dev->mapbase, dev->length); -+ kfree(spidev); -+ return result; -+ -+} -+ -+static int locomospi_remove(struct locomo_dev *dev) -+{ -+ spi_unregister_device(spidev->sdev); -+ spi_unregister_master(spidev->master); -+ destroy_workqueue(spidev->workqueue); -+ locomospi_reg_release(); -+// free_irq(IRQ_LOCOMO_SPI_TEND, (void*) spidev); -+// free_irq(IRQ_LOCOMO_SPI_OVRN, (void*) spidev); -+// free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev); -+// free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev); -+ spi_master_put(spidev->master); -+ release_mem_region((unsigned long) dev->mapbase, dev->length); -+ kfree(spidev); -+ return 0; -+} -+ -+ -+ -+static int __init locomospi_init(void) -+{ -+ int ret = locomo_driver_register(&locomo_spi_driver); -+ if (ret) -+ return ret; -+ -+ -+ return 0; -+} -+ -+static void __exit locomospi_exit(void) -+{ -+ locomo_driver_unregister(&locomo_spi_driver); -+} -+ -+module_init(locomospi_init); -+module_exit(locomospi_exit); -+ -+MODULE_AUTHOR("Thomas Kunze thommy@tabao.de"); -+MODULE_DESCRIPTION("Collie mmc driver"); -+MODULE_LICENSE("GPL"); -Index: linux-2.6.21/drivers/spi/locomo_spi.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/drivers/spi/locomo_spi.h 2007-07-03 21:40:52.000000000 +0200 -@@ -0,0 +1,37 @@ -+#include <asm/hardware/locomo.h> -+#ifndef __LOCOMO_SPI_H__ -+#define __LOCOMO_SPI_H__ -+#define IRQ_LOCOMO_CARDDETECT IRQ_LOCOMO_GPIO13 -+#define HIGH 1 -+#define LOW 0 -+struct locomospi_dev { -+ struct locomo_dev *ldev; -+ struct spi_master *master; -+ struct spi_device *sdev; -+ int card_power; -+ int clock_base; -+ int clock_mult; -+ unsigned long base; -+ u8 spimode; -+ wait_queue_head_t waitqueue; -+ struct workqueue_struct *workqueue; -+ struct list_head message_list; -+ spinlock_t message_lock; -+ irqreturn_t (*mmc_spi_isr)(int, void*); -+}; -+ -+ -+static irqreturn_t locomospi_cardisr(int, void*); -+static int locomospi_probe(struct locomo_dev*); -+static int locomospi_remove(struct locomo_dev*); -+static int locomospi_carddetect(void); -+static void locomospi_reg_open(void); -+static void locomospi_reg_release(void); -+static int tx(const char*, int); -+static int rx(char *, int); -+static void locomospi_togglecs(void); -+static void locomospi_power(int on); -+static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state); -+static int locomospi_resume(struct locomo_dev *dev); -+static void locomospi_setcs(int high); -+#endif -Index: linux-2.6.21/drivers/spi/Makefile -=================================================================== ---- linux-2.6.21.orig/drivers/spi/Makefile 2007-04-26 05:08:32.000000000 +0200 -+++ linux-2.6.21/drivers/spi/Makefile 2007-07-03 21:41:16.000000000 +0200 -@@ -20,6 +20,7 @@ - obj-$(CONFIG_SPI_MPC83xx) += spi_mpc83xx.o - obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o - obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o -+obj-$(CONFIG_SPI_LOCOMO) += locomo_spi.o - # ... add above this line ... - - # SPI protocol drivers (device/link on bus) diff --git a/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch b/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch deleted file mode 100644 index 9e7632fe0a..0000000000 --- a/packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch +++ /dev/null @@ -1,213 +0,0 @@ -Index: linux-2.6.21/arch/arm/common/sharpsl_pm.c -=================================================================== ---- linux-2.6.21.orig/arch/arm/common/sharpsl_pm.c 2007-07-03 21:42:09.000000000 +0200 -+++ linux-2.6.21/arch/arm/common/sharpsl_pm.c 2007-07-03 21:42:57.000000000 +0200 -@@ -28,10 +28,8 @@ - #include <asm/hardware.h> - #include <asm/mach-types.h> - #include <asm/irq.h> --#include <asm/arch/pm.h> --#include <asm/arch/pxa-regs.h> --#include <asm/arch/sharpsl.h> - #include <asm/hardware/sharpsl_pm.h> -+#include "sharpsl_pm.h" - - /* - * Constants -@@ -153,7 +151,7 @@ - sharpsl_pm.battstat.mainbat_percent = percent; - } - -- dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %d\n", voltage, -+ dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, - sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); - - /* If battery is low. limit backlight intensity to save power. */ -@@ -504,7 +502,7 @@ - - static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state) - { -- dev_dbg(sharpsl_pm.dev, "Time is: %08x\n",RCNR); -+ dev_dbg(sharpsl_pm.dev, "Time is: %08lx\n",RCNR); - - dev_dbg(sharpsl_pm.dev, "Offline Charge Activate = %d\n",sharpsl_pm.flags & SHARPSL_DO_OFFLINE_CHRG); - /* not charging and AC-IN! */ -@@ -518,28 +516,28 @@ - - sharpsl_pm.machinfo->presuspend(); - -- PEDR = 0xffffffff; /* clear it */ -+ clear_pedr_on_pxa(); - - sharpsl_pm.flags &= ~SHARPSL_ALARM_ACTIVE; - if ((sharpsl_pm.charge_mode == CHRG_ON) && ((alarm_enable && ((alarm_time - RCNR) > (SHARPSL_BATCHK_TIME_SUSPEND + 30))) || !alarm_enable)) { -- RTSR &= RTSR_ALE; -+ enable_alarm_irq(); - RTAR = RCNR + SHARPSL_BATCHK_TIME_SUSPEND; -- dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08x\n",RTAR); -+ dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08lx\n",RTAR); - sharpsl_pm.flags |= SHARPSL_ALARM_ACTIVE; - } else if (alarm_enable) { -- RTSR &= RTSR_ALE; -+ enable_alarm_irq(); - RTAR = alarm_time; -- dev_dbg(sharpsl_pm.dev, "User alarm at: %08x\n",RTAR); -+ dev_dbg(sharpsl_pm.dev, "User alarm at: %08lx\n",RTAR); - } else { - dev_dbg(sharpsl_pm.dev, "No alarms set.\n"); - RTAR = 0; - } - -- pxa_pm_enter(state); -+ sharpsl_pm_enter(state); - - sharpsl_pm.machinfo->postsuspend(); - -- dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n",PEDR); -+ dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n",pedr_on_pxa()); - } - - static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state) -@@ -572,7 +570,7 @@ - static int corgi_pxa_pm_enter(suspend_state_t state) - { - unsigned long alarm_time = RTAR; -- unsigned int alarm_status = ((RTSR & RTSR_ALE) != 0); -+ unsigned int alarm_status = get_alarm_status(); - - dev_dbg(sharpsl_pm.dev, "SharpSL suspending for first time.\n"); - -@@ -633,7 +631,7 @@ - } - - temp = get_select_val(buff); -- dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT)); -+ dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %ld\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT)); - - if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) || - (!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt))) -@@ -782,9 +780,9 @@ - - static struct pm_ops sharpsl_pm_ops = { - .pm_disk_mode = PM_DISK_FIRMWARE, -- .prepare = pxa_pm_prepare, -+ .prepare = sharpsl_pm_prepare, - .enter = corgi_pxa_pm_enter, -- .finish = pxa_pm_finish, -+ .finish = sharpsl_pm_finish, - }; - - static int __init sharpsl_pm_probe(struct platform_device *pdev) -@@ -813,7 +811,7 @@ - apm_get_power_status = sharpsl_apm_get_power_status; - - pm_set_ops(&sharpsl_pm_ops); -- -+ printk(KERN_DEBUG "sharpsl register pm_ops\n"); - mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); - - return 0; -Index: linux-2.6.21/arch/arm/common/sharpsl_pm.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/common/sharpsl_pm.h 2007-07-03 21:42:26.000000000 +0200 -@@ -0,0 +1,78 @@ -+ -+#ifdef CONFIG_ARCH_PXA -+# include <asm/arch/pm.h> -+# include <asm/arch/pxa-regs.h> -+# include <asm/arch/sharpsl.h> -+static inline void clear_pedr_on_pxa(void) -+{ -+ PEDR = 0xffffffff; /* clear it */ -+} -+ -+static inline void enable_alarm_irq(void) -+{ -+ RTSR &= RTSR_ALE; -+} -+ -+static inline int pedr_on_pxa(void) -+{ -+ return PEDR; -+} -+ -+static inline int get_alarm_status(void) -+{ -+ return ((RTSR & RTSR_ALE) != 0); -+} -+ -+static inline int sharpsl_pm_enter(suspend_state_t state) -+{ -+ return pxa_pm_enter(state); -+} -+static inline int sharpsl_pm_prepare(suspend_state_t state) -+{ -+ return pxa_pm_prepare(state); -+} -+ -+int sharpsl_pm_finish(suspend_state_t state) -+{ -+ return pxa_pm_finish(state); -+} -+#endif -+ -+#ifdef CONFIG_ARCH_SA1100 -+# include <asm/arch/SA-1100.h> -+extern int sa11x0_pm_enter(suspend_state_t state); -+ -+static inline void clear_pedr_on_pxa(void) {} -+static inline void enable_alarm_irq(void) {} -+static inline int pedr_on_pxa(void) -+{ -+ return GPLR; -+} -+ -+static inline int get_alarm_status(void) -+{ -+ return 1; -+} -+ -+static inline int sharpsl_pm_enter(suspend_state_t state) -+{ -+ return sa11x0_pm_enter(state); -+} -+ -+static inline int sharpsl_pm_prepare(suspend_state_t state) -+{ -+ switch (state) { -+ case PM_SUSPEND_MEM: -+ case PM_SUSPEND_STANDBY: -+ return 0; -+ default: -+ return -EINVAL; -+ } -+} -+ -+int sharpsl_pm_finish(suspend_state_t state) -+{ -+ return 0; -+} -+#endif -+ -Index: linux-2.6.21/arch/arm/mach-sa1100/pm.c -=================================================================== ---- linux-2.6.21.orig/arch/arm/mach-sa1100/pm.c 2007-04-26 05:08:32.000000000 +0200 -+++ linux-2.6.21/arch/arm/mach-sa1100/pm.c 2007-07-03 21:42:26.000000000 +0200 -@@ -54,7 +54,7 @@ - }; - - --static int sa11x0_pm_enter(suspend_state_t state) -+int sa11x0_pm_enter(suspend_state_t state) - { - unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE]; - struct timespec delta, rtc; -@@ -128,6 +128,7 @@ - - return 0; - } -+EXPORT_SYMBOL(sa1x00_pm_enter); - - unsigned long sleep_phys_sp(void *sp) - { diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb index b97ebd7327..6d129baea1 100644 --- a/packages/linux/linux-smdk2443_2.6.20+git.bb +++ b/packages/linux/linux-smdk2443_2.6.20+git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" SECTION = "kernel" LICENSE = "GPL" -DEPENDS += "u-boot-mkimage-gta01-native" +DEPENDS += "u-boot-mkimage-openmoko-native" PR = "r1" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 1e4e58b089..3ded7ec467 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -3,14 +3,15 @@ SECTION = "kernel" LICENSE = "GPL" # These devices need mkimage to generate a kernel image -DEPENDS_kb9202 = "u-boot-mkimage-gta01-native" -DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native" -DEPENDS_atngw100 = "u-boot-mkimage-gta01-native" -DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" -DEPENDS_sarge-at91 = "u-boot-mkimage-gta01-native" +DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native" +DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" +DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native" +DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native" +DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native" inherit kernel +KERNEL_IMAGETYPE_alix = "bzImage" KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_kb9202 = "uImage" diff --git a/packages/linux/linux/alix/.mtn2git_empty b/packages/linux/linux/alix/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux/alix/.mtn2git_empty diff --git a/packages/linux/linux/alix/defconfig b/packages/linux/linux/alix/defconfig new file mode 100644 index 0000000000..c1c82931bb --- /dev/null +++ b/packages/linux/linux/alix/defconfig @@ -0,0 +1,1787 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22 +# Tue Aug 7 15:04:11 2007 +# +CONFIG_X86_32=y +CONFIG_GENERIC_TIME=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_X86=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_QUICKLIST=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# 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_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_SMP is not set +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_PARAVIRT is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MCORE2 is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +CONFIG_MGEODE_LX=y +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_X86_GENERIC is not set +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_XADD=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_MODEL=4 +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCE_NONFATAL is not set +# CONFIG_X86_MCE_P4THERMAL is not set +CONFIG_VM86=y +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +# CONFIG_X86_REBOOTFIXUPS is not set +# CONFIG_MICROCODE is not set +# CONFIG_X86_MSR is not set +# CONFIG_X86_CPUID is not set + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +# CONFIG_VMSPLIT_3G is not set +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_NR_QUICK=1 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +# CONFIG_COMPAT_VDSO is not set + +# +# Power management options (ACPI, APM) +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_SOFTWARE_SUSPEND is not set + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_AC is not set +# CONFIG_ACPI_BATTERY is not set +# CONFIG_ACPI_BUTTON is not set +# CONFIG_ACPI_FAN is not set +# CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_ACPI_DEBUG=y +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +# CONFIG_ACPI_CONTAINER is not set +# CONFIG_ACPI_SBS is not set +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set +CONFIG_X86_GX_SUSPMOD=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_P4_CLOCKMOD is not set +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +# CONFIG_X86_LONGRUN is not set +# CONFIG_X86_LONGHAUL is not set +# CONFIG_X86_E_POWERSAVER is not set + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +# CONFIG_X86_SPEEDSTEP_LIB is not set + +# +# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +# CONFIG_HT_IRQ is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m + +# +# Networking +# +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_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_EXT=y +# CONFIG_MAC80211 is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +# CONFIG_RFKILL is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +CONFIG_PNPACPI=y + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_PARIDE is not set +# 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=m +# 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 is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# Misc devices +# +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_SONY_LAPTOP is not set +# CONFIG_THINKPAD_ACPI is not set +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_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_AIC94XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP 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_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI 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 +# CONFIG_SCSI_SRP is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +CONFIG_PATA_CS5535=y +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_NET_SB1000 is not set +# CONFIG_ARCNET is not set +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set + +# +# Tulip family network device support +# +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_DGRS is not set +# CONFIG_EEPRO100 is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_RHINE_NAPI=y +# CONFIG_SC92031 is not set +# CONFIG_NET_POCKET is not set +CONFIG_NETDEV_1000=y +# 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_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_LIBERTAS is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +CONFIG_USB_ZD1201=m +# CONFIG_HOSTAP is not set +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +# CONFIG_USB_NET_AX8817X is not set +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP 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 +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=y +# CONFIG_INPUT_WISTRON_BTNS is not set +# CONFIG_INPUT_ATLAS_BTNS is not set +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_UINPUT is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# 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 is not set +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_AMD is not set +CONFIG_HW_RANDOM_GEODE=y +# CONFIG_HW_RANDOM_VIA is not set +# CONFIG_NVRAM is not set +CONFIG_RTC=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_MWAVE is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +CONFIG_CS5535_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +# 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_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set +CONFIG_SCx200_ACB=m +# 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_TINY_USB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_CORETEMP 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_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +CONFIG_SENSORS_W83627HF=m +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_SENSORS_APPLESMC is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID 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_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_VESA is not set +# CONFIG_FB_HECUBA is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I810 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_INTEL is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_CYBLA is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_GX=y +# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set +# CONFIG_FB_GEODE_GX1 is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VIDEO_SELECT=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_RTCTIMER=m +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# 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 + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +CONFIG_SND_CS5535AUDIO=m +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_AC97_POWER_SAVE is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# 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 + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# 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_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_MON is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA 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 + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +# CONFIG_MMC is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# +# CONFIG_EDAC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +# CONFIG_RTC_INTF_PROC is not set +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices +# + +# +# Auxiliary Display support +# +# CONFIG_KS0108 is not set + +# +# Virtualization +# +# CONFIG_KVM is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_CRAMFS=m +# 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=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BIND34=y +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_EXPERIMENTAL=y +# CONFIG_NCP_FS is not set +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf-8" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +CONFIG_NLS_CODEPAGE_852=m +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=m +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Instrumentation Support +# +# CONFIG_PROFILING is not set +# CONFIG_KPROBES is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_EARLY_PRINTK=y +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# +# CONFIG_CRYPTO_DEV_PADLOCK is not set +CONFIG_CRYPTO_DEV_GEODE=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_KTIME_SCALAR=y diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb new file mode 100644 index 0000000000..b4e18dd5e1 --- /dev/null +++ b/packages/linux/linux_2.6.22.bb @@ -0,0 +1,14 @@ +require linux.inc + +# Mark archs/machines that this kernel supports +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_alix = "1" +DEFAULT_PREFERENCE_avr32 = "1" + +PR = "r1" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ + file://defconfig \ + " + +SRC_URI_append_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.22.atmel.3.patch.bz2;patch=1" diff --git a/packages/lsof/lsof_4.78.bb b/packages/lsof/lsof_4.78.bb index 8a7138396b..51f0b8b2c4 100644 --- a/packages/lsof/lsof_4.78.bb +++ b/packages/lsof/lsof_4.78.bb @@ -15,9 +15,10 @@ python do_unpack () { bb.data.setVar('SRC_URI', src_uri, d) } -LSOF_OS = "${TARGET_OS}" +export LSOF_OS = "${TARGET_OS}" LSOF_OS_linux-uclibc = "linux" LSOF_OS_linux-gnueabi = "linux" +export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { yes | ./Configure ${LSOF_OS} diff --git a/packages/maemo3/hildon-libs_0.15.1.bb b/packages/maemo3/hildon-libs_0.15.1.bb new file mode 100644 index 0000000000..cb89376776 --- /dev/null +++ b/packages/maemo3/hildon-libs_0.15.1.bb @@ -0,0 +1,26 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia hildon librares" + +DEPENDS = "gtk-doc-native libosso" + +PR = "r0" + +SRC_URI = "http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/${PN}" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac + touch gtk-doc.make +} + +do_stage() { + autotools_stage_all +} + + +FILES_${PN} += "${libdir}/hildon-widgets/*" + diff --git a/packages/maemo3/hildon-thumbnail_0.11.bb b/packages/maemo3/hildon-thumbnail_0.11.bb new file mode 100644 index 0000000000..54646e7630 --- /dev/null +++ b/packages/maemo3/hildon-thumbnail_0.11.bb @@ -0,0 +1,25 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia hildon thumbnail library" + +DEPENDS = "libhildonmime hildon-libs osso-thumbnail" + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/h/${PN}/${PN}_${PV}.tar.gz \ + " + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/${PV}" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac + touch gtk-doc.make +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/libhildonhelp_1.9.1.bb b/packages/maemo3/libhildonhelp_1.9.1.bb new file mode 100644 index 0000000000..b04efe2660 --- /dev/null +++ b/packages/maemo3/libhildonhelp_1.9.1.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia hildon help library" + +DEPENDS = "libart libpng jpeg libxml2 gtkhtml-3.8 libosso" + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libh/libhildonhelp/libhildonhelp_${PV}-1.tar.gz" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/${PV}-1" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/libhildonmime_1.9.5.bb b/packages/maemo3/libhildonmime_1.9.5.bb new file mode 100644 index 0000000000..3379cb7168 --- /dev/null +++ b/packages/maemo3/libhildonmime_1.9.5.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia hildon mime library" + +DEPENDS = "libosso" + +PR = "r0" + +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_${PV}-1ubuntu1.tar.gz" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/${PN}" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.in +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/libosso-help_2.1.2.bb b/packages/maemo3/libosso-help_2.1.2.bb new file mode 100644 index 0000000000..8a35e1a4f0 --- /dev/null +++ b/packages/maemo3/libosso-help_2.1.2.bb @@ -0,0 +1,24 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia osso help library" + +DEPENDS = "libhildonhelp libosso gtkhtml-3.8 libxml2 " + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_${PV}-2.tar.gz" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/2.1.2-2" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac + sed -i -e s:AC_CONFIG_SRCDIR:#AC_CONFIG_SRCDIR:g configure.ac +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/mce-dev_1.5.6.bb b/packages/maemo3/mce-dev_1.5.6.bb index dd1fcf364a..6168cbe31e 100644 --- a/packages/maemo3/mce-dev_1.5.6.bb +++ b/packages/maemo3/mce-dev_1.5.6.bb @@ -1,15 +1,26 @@ LICENSE = "LGPL" +DESCRIPTION = "Nokia MCE headers" -SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz" +PR = "r0" -inherit autotools pkgconfig +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_${PV}.tar.gz" + +inherit pkgconfig do_compile() { - sed -i 's:@$(DOXYGEN):echo:g' Makefile - sed -i 's:-o\ root\ -g\ root::' Makefile + : +} + + +do_install() { + install -d ${D}${prefix}/include + install -d ${D}${libdir}/pkgconfig + cp -pPr include/* ${D}${prefix}/include + cp *.pc ${D}${libdir}/pkgconfig/ } do_stage() { - autotools_stage_includes -} + cp -pPr include/* ${STAGING_INCDIR}/ +} + diff --git a/packages/maemo3/osso-gwconnect_1.0.8.bb b/packages/maemo3/osso-gwconnect_1.0.8.bb new file mode 100644 index 0000000000..66b47ebac2 --- /dev/null +++ b/packages/maemo3/osso-gwconnect_1.0.8.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia osso connection library" + +DEPENDS = "hildon-1 libosso" + +PR = "r1" + +SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz" + +inherit autotools pkgconfig + + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/osso-ic-oss/.mtn2git_empty b/packages/maemo3/osso-ic-oss/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo3/osso-ic-oss/.mtn2git_empty diff --git a/packages/maemo3/osso-ic-oss/dbus-api-update.patch b/packages/maemo3/osso-ic-oss/dbus-api-update.patch new file mode 100644 index 0000000000..425f959d79 --- /dev/null +++ b/packages/maemo3/osso-ic-oss/dbus-api-update.patch @@ -0,0 +1,33 @@ +--- /tmp/osso-iap-connect.c 2007-08-07 12:06:51.000000000 +0200 ++++ osso-ic-oss-1.0.4/examples/osso-iap-connect.c 2007-08-07 12:07:32.698400000 +0200 +@@ -276,7 +276,7 @@ + g_main_loop_run(ctxt.loop); + + /* Clean up */ +- dbus_connection_disconnect(conn); ++ dbus_connection_close(conn); + dbus_connection_unref(conn); + + g_main_loop_unref(ctxt.loop); +--- /tmp/ic-compat-preload.c 2007-08-07 12:06:57.000000000 +0200 ++++ osso-ic-oss-1.0.4/src/ic-compat-preload.c 2007-08-07 12:07:40.268400000 +0200 +@@ -140,7 +140,7 @@ + return NULL; + + if (!dbus_bus_register(connection, NULL)) { +- dbus_connection_disconnect(connection); ++ dbus_connection_close(connection); + dbus_connection_unref(connection); + connection = NULL; + return NULL; +--- /tmp/ic-api.c 2007-08-07 12:06:57.000000000 +0200 ++++ osso-ic-oss-1.0.4/src/ic-api.c 2007-08-07 12:07:55.628400000 +0200 +@@ -145,7 +145,7 @@ + if (dbus_connection_register_object_path( + connection, ICD_DBUS_PATH, + &icd_vtable, arg) == FALSE) { +- dbus_connection_disconnect(connection); ++ dbus_connection_close(connection); + dbus_connection_unref(connection); + connection = NULL; + return NULL; diff --git a/packages/maemo3/osso-ic-oss_1.0.4.bb b/packages/maemo3/osso-ic-oss_1.0.4.bb new file mode 100644 index 0000000000..4f9b742fb7 --- /dev/null +++ b/packages/maemo3/osso-ic-oss_1.0.4.bb @@ -0,0 +1,25 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia osso-ic library" + +DEPENDS = "dbus-glib glib-2.0 outo libosso" + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \ + file://dbus-api-update.patch;patch=1 " + +inherit autotools pkgconfig lib_package + + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac +} + +PARALLEL_MAKE = "" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/maemo3/osso-thumbnail_0.7.bb b/packages/maemo3/osso-thumbnail_0.7.bb new file mode 100644 index 0000000000..d99ee786b5 --- /dev/null +++ b/packages/maemo3/osso-thumbnail_0.7.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia osso thumbnail library" + +DEPENDS = "gnome-vfs gconf-dbus hildon-1 libosso" + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz" + +inherit autotools pkgconfig lib_package + + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 63e6dd9265..44d23e1a55 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -2,9 +2,8 @@ DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ apmd startup-notification" - PV = "0.1+svn${SRCDATE}" -PR = "r6" +PR = "r8" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" @@ -24,4 +23,5 @@ do_stage() { PACKAGES += "${PN}-applets" FILES_${PN}-applets = "${libdir}/matchbox-panel/lib*.so* ${datadir}/*" +FILES_${PN}-dev += "${libdir}/matchbox-panel/lib*.a ${libdir}/matchbox-panel/lib*.la" diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb index c159333539..9912ddbf30 100644 --- a/packages/meta/meta-gpephone.bb +++ b/packages/meta/meta-gpephone.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" LICENSE = "MIT" -PR = "r0" +PR = "r1" RDEPENDS = "\ - gpe-base-depends \ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ diff --git a/packages/midpath/.mtn2git_empty b/packages/midpath/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/midpath/.mtn2git_empty diff --git a/packages/midpath/midpath-alsa_svn.bb b/packages/midpath/midpath-alsa_svn.bb new file mode 100644 index 0000000000..7d230f3cd0 --- /dev/null +++ b/packages/midpath/midpath-alsa_svn.bb @@ -0,0 +1,42 @@ + +require midpath_${PV}.bb + +DEPENDS += "alsa-lib" +RDEPENDS = "alsa-lib" + +do_configure() { + cd ${S}/native/alsa + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|sound.backend:NULL|sound.backend:ALSA|" configuration.cfg +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build native code + +# Build the ALSA native part +cd ${S}/native/alsa +make || exit 1 +cp *.so ${S}/dist + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 dist/libmidpathalsa.so ${D}${libdir} + install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathalsa.so \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath-cldc-x11_svn.bb b/packages/midpath/midpath-cldc-x11_svn.bb new file mode 100644 index 0000000000..1aac20265b --- /dev/null +++ b/packages/midpath/midpath-cldc-x11_svn.bb @@ -0,0 +1,43 @@ + +require midpath_${PV}.bb + +DEPENDS += "virtual/libx11 virtual/cldc-api-1.1" +RDEPENDS = "libx11" + +CLDC_PATH = ${STAGING_LIBDIR}/java/cldc1.1.jar + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:X11|" configuration.cfg + +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build Escher X11 library +cd ${S}/external/escher-cldc/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 dist/escher-x11-cldc.jar ${D}${libdir} + install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/java/escher-x11-cldc.jar \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath-gtk_svn.bb b/packages/midpath/midpath-gtk_svn.bb new file mode 100644 index 0000000000..3ee0d40f3d --- /dev/null +++ b/packages/midpath/midpath-gtk_svn.bb @@ -0,0 +1,43 @@ + +require midpath_${PV}.bb + +DEPENDS += "gtk+" +RDEPENDS = "gtk+" + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:GTK|" configuration.cfg + + cd ${S}/native/gtk + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile + +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the GTK native part +cd ${S}/native/gtk +make || exit 1 +cp *.so ${S}/dist + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 dist/libmidpathgtk.so ${D}${libdir} + install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathgtk.so \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath-native_svn.bb b/packages/midpath/midpath-native_svn.bb new file mode 100644 index 0000000000..199facdeb1 --- /dev/null +++ b/packages/midpath/midpath-native_svn.bb @@ -0,0 +1,34 @@ + +inherit native + +require midpath_${PV}.bb + +DEPENDS = "ecj-native fastjar-native classpath-minimal-native" +PROVIDES = "virtual/cldc-api-1.1" + +PACKAGES = " " + + +do_configure() { + : +} + +do_compile() { +mkdir -p ${S}/dist + +# Build CLDC1.1 +# Build base classes +cd ${S}/external/cldc1.1/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1 +# Build CLDC extra classes for MIDP2 +cd ${S}/src/cldc-glue +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes +# Make a jar +fastjar cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . +} + +do_install() { + : +} diff --git a/packages/midpath/midpath-qt3x11_svn.bb b/packages/midpath/midpath-qt3x11_svn.bb new file mode 100644 index 0000000000..30e855a636 --- /dev/null +++ b/packages/midpath/midpath-qt3x11_svn.bb @@ -0,0 +1,48 @@ + +require midpath_${PV}.bb + +DEPENDS += "qt-mt" +RDEPENDS = "qt-mt" +RCONFILCTS = "midpath-qte" + +inherit qt3x11 + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg + + cd ${S}/native/qt + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" \ + -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQT_THREAD_SUPPORT|" \ + -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqt-mt -lsupc++|" \ + Makefile +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the QT native part +cd ${S}/native/qt +make || exit 1 +cp *.so ${S}/dist + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 dist/libmidpathqt.so ${D}${libdir} + install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathqt.so \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath-qte_svn.bb b/packages/midpath/midpath-qte_svn.bb new file mode 100644 index 0000000000..478883e559 --- /dev/null +++ b/packages/midpath/midpath-qte_svn.bb @@ -0,0 +1,46 @@ + +require midpath_${PV}.bb + +DEPENDS += "qte-mt" +RDEPENDS = "qte-mt" +RCONFLICTS = "midpath-qt3x11" + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg + + cd ${S}/native/qt + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal -DQWS|" \ + -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQWS -DQT_THREAD_SUPPORT|" \ + -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqte-mt -lsupc++|" \ + Makefile +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the QT native part +cd ${S}/native/qt +make || exit 1 +cp *.so ${S}/dist + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 dist/libmidpathqt.so ${D}${libdir} + install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathqt.so \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath_svn.bb b/packages/midpath/midpath_svn.bb new file mode 100644 index 0000000000..0de15a3d15 --- /dev/null +++ b/packages/midpath/midpath_svn.bb @@ -0,0 +1,110 @@ +DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" +HOMEPAGE = "http://midpath.thenesis.org/" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "interpreters" + +SRC_URI = "svn://midpath.svn.sourceforge.net/svnroot/midpath;module=trunk;proto=https" + +S = "${WORKDIR}/trunk" + +DEPENDS = "ecj-native fastjar-native classpath-minimal" +RPROVIDES_midpath-cldc = "virtual/cldc-api-1.1" + +JAVAC_CMD=${STAGING_BINDIR_NATIVE}/ecj + +GNU_CLASSPATH_PATH=${STAGING_LIBDIR}/java/classpath-minimal/glibj.zip + +do_compile() { + +mkdir -p ${S}/dist + +# Build CLDC1.1 +# Build base classes +cd ${S}/external/cldc1.1/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1 +# Build CLDC extra classes for MIDP2 +cd ${S}/src/cldc-glue +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes +# Make a jar +fastjar cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . + +CLDC_PATH=${S}/dist/cldc1.1.jar + +# Build SDLJava for CLDC +cd ${S}/external/sdljava-cldc +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/sdljava-cldc/sdljava-cldc.jar ${S}/dist + +# Build Escher X11 library +cd ${S}/external/escher-cldc/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist + +# Build MP3 library +cd ${S}/external/jlayerme-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist + +# Build OGG library +cd ${S}/external/jorbis-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist + +# Build Bluetooth library +cd ${S}/external/javabluetooth/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:$CLDC_PATH:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:$CLDC_PATH:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist + +# Build MIDPath +cd ${S}/src/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1 +# Compile JVM.java separately as it can't be compiled against cldc.jar +ecj -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java +jar cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes . + +cd ${S}/tests +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/dist/midpath.jar:$CLDC_PATH -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/dist/midpath.jar:$CLDC_PATH -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/tests/midpath-tests.jar ${S}/dist + +# Add other required libraries to the dist directory +cp ${S}/lib/kxml2-2.3.0.jar ${S}/dist +} + +do_install() { + install -d ${D}${libdir}/java + install -m 0644 dist/*.jar ${D}${libdir}/java + install -d ${D}${libdir}/java/resources-embedded + cp -rf resources-embedded/* ${D}${libdir}/java/resources-embedded/ + rm -rf ${D}${libdir}/java/resources-embedded/.svn +} + +do_stage() { + install -d ${STAGING_LIBDIR}/java + install -m 0644 dist/cldc1.1.jar ${STAGING_LIBDIR}/java +} + +PACKAGES = "${PN} ${PN}-cldc" + +FILES_${PN} = "${libdir}/java/midpath.jar \ + ${libdir}/java/midpath-tests.jar \ + ${libdir}/java/kxml2-2.3.0.jar \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/ \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/chameleon/ \ + ${libdir}/java/resources-embedded/com/sun/midp/configuration/l10n/ \ + ${libdir}/java/resources-embedded/com/sun/midp/chameleon/skins/resources/images/ \ + + ${libdir}/java/resources-embedded/org/thenesis/midpath/font/bdf/ \ + " +FILES_${PN}-cldc = "${libdir}/java/cldc1.1.jar" + +CONFFILES_${PN} = "${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/mrxvt/mrxvt_0.5.2.bb b/packages/mrxvt/mrxvt_0.5.2.bb index 4a5b71f0c9..9b1b4a4c24 100644 --- a/packages/mrxvt/mrxvt_0.5.2.bb +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/applications" -RDEPENDS = "freetype fontconfig libxft" DEPENDS = "freetype fontconfig libxft virtual/libx11" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ + ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;pnum=0;patch=1 \ file://fix-compile.patch;patch=1" inherit autotools diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb index 9238bbd1eb..85e8ea777f 100644 --- a/packages/openmoko-apps/openmoko-terminal_svn.bb +++ b/packages/openmoko-apps/openmoko-terminal_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "gtkterm2" -PV = "1.0.0+svn${SRCDATE}" +PV = "1.0.0" PR = "r1" inherit openmoko diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb new file mode 100644 index 0000000000..fd417c69f3 --- /dev/null +++ b/packages/openmoko2/neod_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" +SECTION = "openmoko/daemons" +DEPENDS = "gtk+ pulseaudio" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 17bba22a72..672f5d8cb1 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,8 +1,9 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer" +RDEPENDS = "gst-meta-audio" PV = "0.1.0+svn${SVNREV}" -PR = "r1" +PR = "r2" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop new file mode 100644 index 0000000000..2777736039 --- /dev/null +++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Terminal +Comment=Command Line Interface Terminal +Exec=mrxvt +Icon=openmoko-terminal +Terminal=false +Type=Application +Categories=GTK;Application;PIM;Office +MimeType=text/x-vcard; +SingleInstance=false +StartupNotify=true diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png Binary files differnew file mode 100644 index 0000000000..56e8e59628 --- /dev/null +++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb new file mode 100644 index 0000000000..8d9a5245ca --- /dev/null +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "The OpenMoko Command Line Console" +SECTION = "openmoko/applications" +RDEPENDS += "mrxvt" +PR = "r1" + +inherit openmoko2 + +SRC_URI = "file://openmoko-terminal.png \ + file://openmoko-terminal.desktop" + +do_install() { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/ +} + +pkg_postinst_${PN}() { + if [ "x$D" != "x" ]; then + exit 1 + fi + echo "adding font defaults to system-wide mrxvtrc..." + cat <<EOF >> ${sysconfdir}/mrxvt/mrxvtrc +# +# ---------------------------------- FONTS ----------------------------------- # +# +Mrxvt.xft: 1 +Mrxvt.xftFont: Bitstream Vera Sans Mono +Mrxvt.xftSize: 8 +Mrxvt.xftAntialias: 1 + +# Don't load a multi-char font. This will reduce the line space if your multi +# char font has different dimensions than the regular font. You might need to +# comment it out if you want to use XIM and non-english fonts. +Mrxvt.xftNomFont: 1 + +# Font to use for tab bar / menus. This need not be mono-spaced ;). +Mrxvt.xftPFont: Bitstream Vera Sans +Mrxvt.xftPSize: 8 +EOF + +} diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index c998504af1..93e0b47456 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,6 +1,8 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm" +DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" +RDEPENDS = "libedata-cal" PV = "0.1.0+svn${SVNREV}" +PR = "r1" inherit openmoko2 gtk-icon-cache diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index 98ac64a4c1..a919c3094b 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,9 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" - -# file://sysconfig-bluetooth.patch;patch=1" + ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \ + file://sysconfig-bluetooth.patch;patch=1" diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index ccd75ca89a..787b40833f 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html " diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb index 6532cd170c..3e269e73ef 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \ ${HANDHELDS_CVS};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index 9bce52188f..94401fab78 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" - +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index e7c33b6da0..5f2d834b74 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" - +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb index c81cd23eb9..d18339a046 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/etc" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb index 23898147b1..3cb7f8551e 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" -PV = "${OPIE_CVS_PV}" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb index bbfbd25e2b..b2e826ae59 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" -PV = "${OPIE_CVS_PV}" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb index ac3f961b3c..d091f50903 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" -PV = "${OPIE_CVS_PV}" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb index 10a119a48a..ca44bfc3af 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -2,8 +2,9 @@ DESCRIPTION = "Skin for opie-mediaplayer2" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" -PV = "${OPIE_CVS_PV}" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index b080b3ce92..2badc15abd 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 185ff2f338..593ea5bf9c 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index 5f36686636..5e69e87688 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,4 +1,5 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +#Remove the dash below when 1.2.1 changes +PV = "1.2.2+cvs-${SRCDATE}" PR = "r1" diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index bbd3046b64..818a1c48f1 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/sounds" diff --git a/packages/oprofile/oprofile-0.9.1/acinclude.m4 b/packages/oprofile/oprofile-0.9.1/acinclude.m4 deleted file mode 100644 index ffaa8288df..0000000000 --- a/packages/oprofile/oprofile-0.9.1/acinclude.m4 +++ /dev/null @@ -1,600 +0,0 @@ -dnl AX_KERNEL_OPTION(option, action-if-found, action-if-not-found) -dnl see if autoconf.h defines the option -AC_DEFUN([AX_KERNEL_OPTION], [ -SAVE_CFLAGS=$CFLAGS -CFLAGS="-I$KINC -O2 -D__KERNEL__" -AC_TRY_COMPILE( [#include <linux/config.h>], -[ -#ifndef $1 -break_me_hard(\\\); -#endif -],[$2],[$3],) -CFLAGS=$SAVE_CFLAGS -]) - -dnl Handle the 2.4 module inside module/ -AC_DEFUN([AX_CONFIG_MODULE], -[ -if test ! -f $KINC/linux/autoconf.h; then - AC_MSG_ERROR([no suitably configured kernel include tree found]) -fi - -dnl --- Get Linux kernel version and compile parameters --- - -AC_SUBST(KVERS) -AC_MSG_CHECKING([for kernel version]) -dnl it's like this to handle mandrake's fubar version.h - bug #471448 -eval KVERS=`gcc -I$KINC -E -dM $KINC/linux/version.h | grep -w UTS_RELEASE | awk '{print $[]3}'` -AC_MSG_RESULT([$KVERS]) -case "$KVERS" in -2.2.*|2.4.*) ;; -*) AC_MSG_ERROR([Unsupported kernel version]) -esac - -dnl Check for the minimal kernel version supported -AC_MSG_CHECKING([kernel version]) -AX_KERNEL_VERSION(2, 2, 10, <=, AC_MSG_RESULT([ok]), AC_MSG_ERROR([check html documentation install section])) - -dnl linux/spinlock.h added at some point in past -AC_MSG_CHECKING([for $KINC/linux/spinlock.h]) -if test -f $KINC/linux/spinlock.h; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DHAVE_LINUX_SPINLOCK_HEADER" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -AC_MSG_CHECKING([for rtc_lock]) -gcc -I$KINC -E $KINC/linux/mc146818rtc.h | grep rtc_lock >/dev/null -if test "$?" -eq 0; then - EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DRTC_LOCK" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -arch="unknown" -AC_MSG_CHECKING(for x86-64 architecture) -AX_KERNEL_OPTION(CONFIG_X86_64, x8664=1, x8664=0) -AX_MSG_RESULT_YN($x8664) -BUILD_HAMMER=no -if test "$x8664" -eq 1; then - arch="x86" - BUILD_HAMMER=yes -else - AC_MSG_CHECKING(for x86 architecture) - AX_KERNEL_OPTION(CONFIG_X86, x86=1, x86=0) - AX_KERNEL_OPTION(CONFIG_X86_WP_WORKS_OK, x86=1, x86=$x86) - AX_MSG_RESULT_YN($x86) - test "$x86" = 1 && arch="x86" - - if test "$arch" = "unknown"; then - AC_MSG_CHECKING(for ia64 architecture) - AX_KERNEL_OPTION(CONFIG_IA64, ia64=1, ia64=0) - AX_MSG_RESULT_YN($ia64) - test "$ia64" = 1 && arch="ia64" - fi - -fi -AC_SUBST(BUILD_HAMMER) - -test "$arch" = "unknown" && AC_MSG_ERROR(Unsupported architecture) - -dnl check to see if kernel verion appropriate for arch -AC_MSG_CHECKING(arch/kernel version combination) -case "$arch" in -ia64) - AX_KERNEL_VERSION(2, 4, 18, <, AC_MSG_RESULT([ok]), - AC_MSG_ERROR([unsupported arch/kernel])) ;; -*) AC_MSG_RESULT([ok]) -esac - -dnl for now we do not support PREEMPT patch -AC_MSG_CHECKING([for preempt patch]) -AX_KERNEL_OPTION(CONFIG_PREEMPT,preempt=1,preempt=0) -AX_MSG_RESULT_YN([$preempt]) -test "$preempt" = 0 || AC_MSG_ERROR([unsupported kernel configuration : CONFIG_PREEMPT]) - -AC_SUBST(KINC) - -MODINSTALLDIR=/lib/modules/$KVERS - -OPROFILE_MODULE_ARCH=$arch -AC_SUBST(OPROFILE_MODULE_ARCH) -] -) - -dnl AX_KERNEL_VERSION(major, minor, level, comparison, action-if-true, action-if-false) -AC_DEFUN([AX_KERNEL_VERSION], [ -SAVE_CFLAGS=$CFLAGS -CFLAGS="-I$KINC -D__KERNEL__ -Werror" -AC_TRY_COMPILE( - [ - #include <linux/version.h> - #include <linux/config.h> - ], - [ - #if LINUX_VERSION_CODE $4 KERNEL_VERSION($1, $2, $3) - break_me_hard(\\\); - #endif - ], -[$5],[$6],) -CFLAGS=$SAVE_CFLAGS -]) - - -dnl AX_MSG_RESULT_YN(a) -dnl results "yes" iff a==1, "no" else -AC_DEFUN([AX_MSG_RESULT_YN], [x=no -test "x$1" = "x1" && x=yes -AC_MSG_RESULT($x)]) - -dnl AX_MALLOC_ATTRIBUTE - see if gcc will take __attribute__((malloc)) -AC_DEFUN([AX_MALLOC_ATTRIBUTE], -[ -AC_MSG_CHECKING([whether malloc attribute is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_COMPILE(,[ -void monkey() __attribute__((malloc)); -],AC_MSG_RESULT([yes]); AC_DEFINE(MALLOC_ATTRIBUTE_OK, 1, [whether malloc attribute is understood]), AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl builtin_expect is used in module we can't add that in config.h -AC_DEFUN([AX_BUILTIN_EXPECT], -[ -AC_MSG_CHECKING([whether __builtin_expect is understood]) -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" -AC_TRY_LINK(,[ -int i; -if (__builtin_expect(i, 0)) { } -], -AC_MSG_RESULT([yes]); EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DEXPECT_OK", -AC_MSG_RESULT([no]);) -CFLAGS=$SAVE_CFLAGS -] -) - -dnl AX_EXTRA_DIRS - Let user specify extra dirs for include/libs -AC_DEFUN([AX_EXTRA_DIRS], -[ -AC_ARG_WITH(extra-includes, -[ --with-extra-includes=DIR add extra include paths], - use_extra_includes="$withval", - use_extra_includes=NO -) -if test -n "$use_extra_includes" && \ - test "$use_extra_includes" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_includes; do - extra_includes="$extra_includes -I$dir" - done - IFS=$ac_save_ifs - CPPFLAGS="$CPPFLAGS $extra_includes" -fi - -AC_ARG_WITH(extra-libs, -[ --with-extra-libs=DIR add extra library paths], - use_extra_libs=$withval, - use_extra_libs=NO -) -if test -n "$use_extra_libs" && \ - test "$use_extra_libs" != "NO"; then - ac_save_ifs=$IFS - IFS=':' - for dir in $use_extra_libs; do - extra_libraries="$extra_libraries -L$dir" - done - IFS=$ac_save_ifs - LDFLAGS="$LDFLAGS $extra_libraries" -fi -] -) - -dnl AX_POPT_CONST - check popt prototype -AC_DEFUN([AX_POPT_CONST], -[ -AC_MSG_CHECKING([popt prototype]) -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-Werror $CXXFLAGS" -AC_TRY_COMPILE([#include <popt.h>], -[ -int c; char **v; -poptGetContext(0, c, v, 0, 0); -], -AC_MSG_RESULT([takes char **]);, -AC_MSG_RESULT([takes const char **]); AC_DEFINE(CONST_POPT, 1, [whether popt prototype takes a const char **])) -CXXFLAGS="$SAVE_CXXFLAGS" -] -) - -dnl AX_CHECK_SSTREAM - check if local sstream is needed to compile OK -AC_DEFUN([AX_CHECK_SSTREAM], -[ -AC_MSG_CHECKING([whether to use included sstream]) -AC_TRY_COMPILE([#include <sstream>], [], -AC_MSG_RESULT([no]);, -AC_MSG_RESULT([yes]); OP_CXXFLAGS="$OP_CXXFLAGS -I\${top_srcdir}/include") -] -) - -dnl AX_CHECK_TYPEDEF(typedef_name, type, action-if-true, action-if-false) -dnl exec action-if-true if typedef_name is a typedef to type else exec -dnl action-if-false -dnl currently work only with type typedef'ed in stddef.h -AC_DEFUN([AX_CHECK_TYPEDEF], [ -dnl AC_LANG_PUSH(C) not in autoconf 2.13 -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS="-Werror $CFLAGS" - -AC_TRY_COMPILE( - [ - #include <stddef.h> - ], - [ - typedef void (*fct1)($1); - typedef void (*fct2)($2); - fct1 f1 = 0; - fct2 f2 = 0; - if (f1 == f2) {} - ], -[$3],[$4]) - -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_TYPEDEFED_NAME(typedef_name, candidate_list, var_name) -dnl set var_name to the typedef name of $1 which must be in canditate_list -dnl else produce a fatal error -AC_DEFUN([AX_TYPEDEFED_NAME], [ - AC_MSG_CHECKING([type of $1]) - for f in $2; do - AX_CHECK_TYPEDEF($1, $f, $3="$f", $3="") - if test -n "${$3}"; then - break - fi - done - if test -n "${$3}"; then - AC_MSG_RESULT([${$3}]) - else - AC_MSG_ERROR([not found]) - fi -]) - -dnl find a binary in the path -AC_DEFUN([QT_FIND_PATH], -[ - AC_MSG_CHECKING([for $1]) - AC_CACHE_VAL(qt_cv_path_$1, - [ - qt_cv_path_$1="NONE" - if test -n "$$2"; then - qt_cv_path_$1="$$2"; - else - dirs="$3" - qt_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - dirs="$dirs $dir" - done - IFS=$qt_save_IFS - - for dir in $dirs; do - if test -x "$dir/$1"; then - if test -n "$5"; then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - qt_cv_path_$1="$dir/$1" - break - fi - else - qt_cv_path_$1="$dir/$1" - break - fi - fi - done - fi - ]) - - if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then - AC_MSG_RESULT(not found) - $4 - else - AC_MSG_RESULT($qt_cv_path_$1) - $2=$qt_cv_path_$1 - fi -]) - -dnl Find the uic compiler on the path or in qt_cv_dir -AC_DEFUN([QT_FIND_UIC], -[ - QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin) - if test -z "$ac_uic" -a "$FATAL" = 1; then - AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl Find the right moc in path/qt_cv_dir -AC_DEFUN([QT_FIND_MOC], -[ - QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin) - QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin) - - if test -n "$ac_moc1" -a -n "$ac_moc2"; then - dnl found both. Prefer Qt3's if it exists else moc2 - $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null - if test "$?" = 0; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - else - if test -n "$ac_moc1"; then - ac_moc=$ac_moc1; - else - ac_moc=$ac_moc2; - fi - fi - - if test -z "$ac_moc" -a "$FATAL" = 1; then - AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !]) - fi -]) - -dnl check a particular libname -AC_DEFUN([QT_TRY_LINK], -[ - SAVE_LIBS="$LIBS" - LIBS="$LIBS $1" - AC_TRY_LINK([ - #include <qglobal.h> - #include <qstring.h> - ], - [ - QString s("mangle_failure"); - #if (QT_VERSION < 221) - break_me_(\\\); - #endif - ], - qt_cv_libname=$1, - ) - LIBS="$SAVE_LIBS" -]) - -dnl check we can do a compile -AC_DEFUN([QT_CHECK_COMPILE], -[ - AC_MSG_CHECKING([for Qt library name]) - - AC_CACHE_VAL(qt_cv_libname, - [ - AC_LANG_CPLUSPLUS - SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" - - for libname in -lqt-mt -lqt3 -lqt2 -lqt; - do - QT_TRY_LINK($libname) - if test -n "$qt_cv_libname"; then - break; - fi - done - - CXXFLAGS=$SAVE_CXXFLAGS - ]) - - if test -z "$qt_cv_libname"; then - AC_MSG_RESULT([failed]) - if test "$FATAL" = 1 ; then - AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !]) - fi - else - AC_MSG_RESULT([$qt_cv_libname]) - fi -]) - -dnl get Qt version we're using -AC_DEFUN([QT_GET_VERSION], -[ - AC_CACHE_CHECK([Qt version],lyx_cv_qtversion, - [ - AC_LANG_CPLUSPLUS - SAVE_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $QT_INCLUDES" - - cat > conftest.$ac_ext <<EOF -#line __oline__ "configure" -#include "confdefs.h" -#include <qglobal.h> -"%%%"QT_VERSION_STR"%%%" -EOF - lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ - grep '^"%%%"' 2>/dev/null | \ - sed -e 's/"%%%"//g' -e 's/"//g'` - rm -f conftest.$ac_ext - CPPFLAGS=$SAVE_CPPFLAGS - ]) - - QT_VERSION=$lyx_cv_qtversion - AC_SUBST(QT_VERSION) -]) - -dnl start here -AC_DEFUN([QT_DO_IT_ALL], -[ - dnl Please leave this alone. I use this file in - dnl oprofile. - FATAL=0 - - AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is installed ], - [ qt_cv_dir=`eval echo "$withval"/` ]) - - AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are. ], - [ qt_cv_includes=`eval echo "$withval"` ]) - - AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is installed.], - [ qt_cv_libraries=`eval echo "$withval"` ]) - - dnl pay attention to $QTDIR unless overridden - if test -z "$qt_cv_dir"; then - qt_cv_dir=$QTDIR - fi - - dnl derive inc/lib if needed - if test -n "$qt_cv_dir"; then - if test -z "$qt_cv_includes"; then - qt_cv_includes=$qt_cv_dir/include - fi - if test -z "$qt_cv_libraries"; then - qt_cv_libraries=$qt_cv_dir/lib - fi - fi - - dnl flags for compilation - QT_INCLUDES= - QT_LDFLAGS= - if test -n "$qt_cv_includes"; then - QT_INCLUDES="-I$qt_cv_includes" - fi - if test -n "$qt_cv_libraries"; then - QT_LDFLAGS="-L$qt_cv_libraries" - fi - AC_SUBST(QT_INCLUDES) - AC_SUBST(QT_LDFLAGS) - - QT_FIND_MOC - MOC=$ac_moc - AC_SUBST(MOC) - QT_FIND_UIC - UIC=$ac_uic - AC_SUBST(UIC) - - QT_CHECK_COMPILE - - QT_LIB=$qt_cv_libname; - AC_SUBST(QT_LIB) - - if test -n "$qt_cv_libname"; then - QT_GET_VERSION - fi -]) - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CHECK_PRECOMPILED_HEADER], [ -AC_MSG_CHECKING([whether ${CXX} support precompiled header]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -dnl we consider than if -Winvalid-pch is accepted pch will works ... -CXXFLAGS=-Winvalid-pch -dnl but we don't want -Winvalid-pch else compilation will fail due -Werror and -dnl the fact than some pch will be invalid for the given compilation option -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} -include bits/stdc++.h", AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_CHECK_DOCBOOK -AC_DEFUN([AX_CHECK_DOCBOOK], [ -# It's just rude to go over the net to build -XSLTPROC_FLAGS=--nonet -DOCBOOK_ROOT= -if test ! -f /etc/xml/catalog; then - for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/; - do - if test -d "$i"; then - DOCBOOK_ROOT=$i - fi - done - - # Last resort - try net - if test -z "$DOCBOOK_ROOT"; then - XSLTPROC_FLAGS= - fi -else - XML_CATALOG=/etc/xml/catalog - CAT_ENTRY_START='<!--' - CAT_ENTRY_END='-->' -fi - -AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,) -XSLTPROC_WORKS=no -if test -n "$XSLTPROC"; then - AC_MSG_CHECKING([whether xsltproc works]) - - if test -n "$XML_CATALOG"; then - DB_FILE="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" - else - DB_FILE="$DOCBOOK_ROOT/docbook.xsl" - fi - - $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END -<?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<book id="test"> -</book> -END - if test "$?" = 0; then - XSLTPROC_WORKS=yes - fi - AC_MSG_RESULT($XSLTPROC_WORKS) -fi -AM_CONDITIONAL(have_xsltproc, test "$XSLTPROC_WORKS" = "yes") - -AC_SUBST(XML_CATALOG) -AC_SUBST(XSLTPROC_FLAGS) -AC_SUBST(DOCBOOK_ROOT) -AC_SUBST(CAT_ENTRY_START) -AC_SUBST(CAT_ENTRY_END) -]) - -dnl AX_CFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CC support it. -AC_DEFUN([AX_CFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CC} $2 is understood]) -AC_LANG_SAVE -AC_LANG_C -SAVE_CFLAGS=$CFLAGS -CFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CFLAGS=$SAVE_CFLAGS -AC_LANG_RESTORE -]) - - -dnl AX_CXXFLAGS_OPTIONS(var-name, option) -dnl add option to var-name if $CXX support it. -AC_DEFUN([AX_CXXFLAGS_OPTION], [ -AC_MSG_CHECKING([whether ${CXX} $2 is understood]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS=$2 -AC_TRY_COMPILE(,[;],AC_MSG_RESULT([yes]); $1="${$1} $2",AC_MSG_RESULT([no])) -CXXFLAGS=$SAVE_CXXFLAGS -AC_LANG_RESTORE -]) - -dnl AX_COPY_IF_CHANGE(source, dest) -dnl copy source to dest if they don't compare equally or if dest doesn't exist -AC_DEFUN([AX_COPY_IF_CHANGE], [ -if test -r $2; then - if cmp $1 $2 > /dev/null; then - echo $2 is unchanged - else - cp -f $1 $2 - fi -else - cp -f $1 $2 -fi -]) - diff --git a/packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch b/packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch deleted file mode 100644 index 4c07e5c735..0000000000 --- a/packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: oprofile-0.9/libutil++/bfd_support.cpp -=================================================================== ---- oprofile-0.9.orig/libutil++/bfd_support.cpp 2005-05-05 15:43:46.000000000 +0100 -+++ oprofile-0.9/libutil++/bfd_support.cpp 2005-06-10 10:18:24.000000000 +0100 -@@ -330,6 +330,11 @@ - // returning true for fix up in op_bfd_symbol() - if (!sym->name || sym->name[0] == '\0') - return true; -+ /* ARM assembler internal mapping symbols aren't interesting */ -+ if ((strcmp("$a", sym->name) == 0) || -+ (strcmp("$t", sym->name) == 0) || -+ (strcmp("$d", sym->name) == 0)) -+ return false; - - // C++ exception stuff - if (sym->name[0] == '.' && sym->name[1] == 'L') diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb new file mode 100644 index 0000000000..d758b97549 --- /dev/null +++ b/packages/oprofile/oprofile_0.9.3.bb @@ -0,0 +1,38 @@ +SECTION = "devel" +DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ +of profiling all running code at low overhead." +LICENSE = "GPL" +DEPENDS = "popt binutils" + +SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ + file://acinclude.m4" +S = "${WORKDIR}/oprofile-${PV}" + +inherit autotools + +# NOTE: this disables the build of the kernel modules. +# Should add the oprofile kernel modules, for those with 2.4 +# kernels, as a seperate .oe file. +EXTRA_OECONF = "--with-kernel-support \ + --without-x \ + --disable-werror " + +do_configure () { + cp ${WORKDIR}/acinclude.m4 ${S}/ + autotools_do_configure +} +# Available config options +# --enable-abi enable abi portability code (default is disabled) +# --enable-pch enable precompiled header (default is disabled) +# --enable-gcov enable option for gcov coverage testing (default is disabled) +# --disable-werror disable -Werror flag (default is enabled for non-release) +# --disable-optimization disable optimization flags (default is enabled) +# --with-kernel-support Use 2.6 kernel (no kernel source tree required) +# --with-linux=dir Path to Linux source tree +# --with-module-dir=dir Path to module installation directory +# --with-extra-includes=DIR add extra include paths +# --with-extra-libs=DIR add extra library paths +# --with-x use the X Window System +# --with-qt-dir where the root of Qt is installed +# --with-qt-includes where the Qt includes are. +# --with-qt-libraries where the Qt library is installed. diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb index 902c569e85..2eec2a7836 100644 --- a/packages/oprofile/oprofile_cvs.bb +++ b/packages/oprofile/oprofile_cvs.bb @@ -9,8 +9,6 @@ DEPENDS = "popt binutils" DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ - file://no_arm_mapping_syms.patch;patch=1 \ - file://opcontrol_bashisms.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/oprofile" diff --git a/packages/p3scan/files/configure.in-add-newline.patch b/packages/p3scan/files/configure.in-add-newline.patch new file mode 100644 index 0000000000..0b1ff182e6 --- /dev/null +++ b/packages/p3scan/files/configure.in-add-newline.patch @@ -0,0 +1,14 @@ +Recent autotools/m4 updates don't like configure.in files without a newline +at the end. Fix this up. + +Index: p3scan-2.9.05d/configure.in +=================================================================== +--- p3scan-2.9.05d.orig/configure.in 2007-08-08 21:39:49.000000000 +1000 ++++ p3scan-2.9.05d/configure.in 2007-08-08 21:39:49.000000000 +1000 +@@ -456,4 +456,4 @@ + echo "Please consider donating to this project at http://p3scan.sourceforge.net" + echo "Mahalo Nui Loa and Enjoy!" + echo +-#EOF +\ No newline at end of file ++#EOF diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb index 328ae6ede0..38739341e6 100644 --- a/packages/p3scan/p3scan_2.9.05d.bb +++ b/packages/p3scan/p3scan_2.9.05d.bb @@ -6,11 +6,12 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "gmp bzip2 zlib clamav openssl" RDEPENDS_${PN} = "${PN}-templates-en" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \ file://libtool-fix.patch;patch=1 \ file://dont-search-use-include.patch;patch=1 \ + file://configure.in-add-newline.patch;patch=1 \ file://p3scan.init \ file://p3scan.conf \ file://doc.configure.txt \ diff --git a/packages/pkgconfig/pkgconfig-0.22/autofoo.patch b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch new file mode 100644 index 0000000000..97293cee1f --- /dev/null +++ b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch @@ -0,0 +1,513 @@ +--- + glib-1.2.8/acglib.m4 | 12 +- + glib-1.2.8/configure.in | 212 ++++++++++++++++++++++++++++++------------------ + 2 files changed, 140 insertions(+), 84 deletions(-) + +Index: pkg-config-0.22/glib-1.2.8/acglib.m4 +=================================================================== +--- pkg-config-0.22.orig/glib-1.2.8/acglib.m4 2007-08-01 20:00:00.000000000 +0100 ++++ pkg-config-0.22/glib-1.2.8/acglib.m4 2007-08-01 20:11:08.000000000 +0100 +@@ -10,7 +10,7 @@ $1 + AC_DIVERT_POP()])])]) + + dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION]) +-AC_DEFUN(GLIB_IF_VAR_EQ,[ ++AC_DEFUN([GLIB_IF_VAR_EQ],[ + case "$[$1]" in + "[$2]"[)] + [$3] +@@ -21,7 +21,7 @@ AC_DEFUN(GLIB_IF_VAR_EQ,[ + esac + ]) + dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION]) +-AC_DEFUN(GLIB_STR_CONTAINS,[ ++AC_DEFUN([GLIB_STR_CONTAINS],[ + case "[$1]" in + *"[$2]"*[)] + [$3] +@@ -32,12 +32,12 @@ AC_DEFUN(GLIB_STR_CONTAINS,[ + esac + ]) + dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING) +-AC_DEFUN(GLIB_ADD_TO_VAR,[ ++AC_DEFUN([GLIB_ADD_TO_VAR],[ + GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") + ]) + + dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) +-AC_DEFUN(GLIB_SIZEOF, ++AC_DEFUN([GLIB_SIZEOF], + [changequote(<<, >>)dnl + dnl The name to #define. + define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl +@@ -62,7 +62,7 @@ undefine([AC_CV_NAME])dnl + ]) + + dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER) +-AC_DEFUN(GLIB_BYTE_CONTENTS, ++AC_DEFUN([GLIB_BYTE_CONTENTS], + [changequote(<<, >>)dnl + dnl The name to #define. + define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl +@@ -92,7 +92,7 @@ undefine([AC_CV_NAME])dnl + ]) + + dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX]) +-AC_DEFUN(GLIB_SYSDEFS, ++AC_DEFUN([GLIB_SYSDEFS], + [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])" + glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'` + if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then +Index: pkg-config-0.22/glib-1.2.8/configure.in +=================================================================== +--- pkg-config-0.22.orig/glib-1.2.8/configure.in 2007-08-01 18:03:34.000000000 +0100 ++++ pkg-config-0.22/glib-1.2.8/configure.in 2007-05-23 11:47:53.000000000 +0100 +@@ -1,10 +1,11 @@ + dnl *********************************** + dnl *** include special GLib macros *** + dnl *********************************** +-builtin(include, acglib.m4)dnl ++dnl no need, just use aclocal -I . --CL ++dnl builtin(include, acglib.m4)dnl + + # require autoconf 2.13 +-AC_PREREQ(2.13) ++AC_PREREQ(2.53) + + # init autoconf (and check for presence of glist.c) + AC_INIT(glist.c) +@@ -13,11 +14,48 @@ AC_INIT(glist.c) + cflags_set=${CFLAGS+set} + + # we rewrite this file ++if test "x$cross_compiling" != "xyes"; then + rm -f glibconfig-sysdefs.h ++fi ++ ++# config defines ++ ++AH_TEMPLATE([ENABLE_MEM_CHECK], ++ [Define if enabling memory checking]) ++AH_TEMPLATE([ENABLE_MEM_PROFILE], []) ++AH_TEMPLATE([GLIB_BINARY_AGE], []) ++AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], []) ++AH_TEMPLATE([GLIB_INTERFACE_AGE], []) ++AH_TEMPLATE([GLIB_MAJOR_VERSION], []) ++AH_TEMPLATE([GLIB_MINOR_VERSION], []) ++AH_TEMPLATE([GLIB_MICRO_VERSION], []) ++AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], []) ++AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], []) ++AH_TEMPLATE([G_HAVE_INLINE], []) ++AH_TEMPLATE([G_HAVE___INLINE], []) ++AH_TEMPLATE([G_HAVE___INLINE__], []) ++AH_TEMPLATE([G_THREAD_SOURCE], []) ++AH_TEMPLATE([G_VA_COPY], []) ++AH_TEMPLATE([G_VA_COPY_AS_ARRAY], []) ++AH_TEMPLATE([HAVE_BROKEN_WCTYPE], []) ++AH_TEMPLATE([HAVE_GETPWUID_R], []) ++AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], []) ++AH_TEMPLATE([HAVE_WCHAR_H], []) ++AH_TEMPLATE([HAVE_WCTYPE_H], []) ++AH_TEMPLATE([NO_FD_SET], []) ++AH_TEMPLATE([NO_SYS_ERRLIST], []) ++AH_TEMPLATE([NO_SYS_SIGLIST], []) ++AH_TEMPLATE([NO_SYS_SIGLIST_DECL], []) ++AH_TEMPLATE([REALLOC_0_WORKS], []) ++ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-GLIB_AC_DIVERT_BEFORE_HELP([ ++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE) ++#dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -38,7 +76,7 @@ GLIB_INTERFACE_AGE=8 + GLIB_BINARY_AGE=8 + GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION + dnl +-]) ++#AC_DIVERT_POP()dnl + + AC_SUBST(GLIB_MAJOR_VERSION) + AC_SUBST(GLIB_MINOR_VERSION) +@@ -72,22 +110,20 @@ AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $ + AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE) + + dnl Initialize libtool +-AC_PROG_LIBTOOL ++AM_PROG_LIBTOOL + + dnl Initialize maintainer mode + AM_MAINTAINER_MODE + +-AC_CANONICAL_HOST +- + dnl figure debugging default, prior to $ac_help setup + dnl +-GLIB_AC_DIVERT_BEFORE_HELP([ ++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else + debug_default=minimum + fi +-]) dnl ++#AC_DIVERT_POP()dnl + + dnl declare --enable-* args and collect ac_help strings + AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) +@@ -173,7 +209,9 @@ AC_TRY_RUN([#include <math.h> + CFLAGS=$glib_save_CFLAGS + AC_MSG_WARN( + [No ANSI prototypes found in library. (-std1 didn't work.)]) ++ , AC_MSG_WARN([Skipping test due to crosscompilation]) + ) ++ , AC_MSG_WARN([Skipping test due to crosscompilation]) + ) + LIBS=$glib_save_LIBS + +@@ -315,7 +353,7 @@ AC_TRY_COMPILE([#include <sys/types.h>], + if test $gtk_ok = yes; then + AC_MSG_RESULT([yes, found in sys/types.h]) + else +- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) ++ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) + if test $gtk_ok = yes; then + AC_DEFINE(HAVE_SYS_SELECT_H) + AC_MSG_RESULT([yes, found in sys/select.h]) +@@ -388,7 +426,7 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[ + glib_cv_sane_realloc=no + ,) + ]) +-if test x$glib_cv_sane_realloc = xyes; then ++if test "x$glib_cv_sane_realloc" = "xyes"; then + AC_DEFINE(REALLOC_0_WORKS) + fi + AC_MSG_RESULT($glib_cv_sane_realloc) +@@ -466,7 +504,8 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[ + ]) + if test "x$glib_cv_va_copy" = "xyes"; then + AC_DEFINE(G_VA_COPY, va_copy) +-else if test "x$glib_cv___va_copy" = "xyes"; then ++else ++if test "x$glib_cv___va_copy" = "xyes"; then + AC_DEFINE(G_VA_COPY, __va_copy) + fi + fi +@@ -475,6 +514,7 @@ if test "x$glib_cv_va_val_copy" = "xno"; + fi + AC_MSG_RESULT($glib_cv_va_val_copy) + ++AC_MSG_WARN([hi mom]) + + dnl *********************** + dnl *** g_module checks *** +@@ -485,23 +525,27 @@ dnl G_MODULE_IMPL= don't reset, so cmd-l + G_MODULE_NEED_USCORE=0 + G_MODULE_HAVE_DLERROR=0 + dnl *** dlopen() and dlsym() in system libraries ++AC_CHECK_FUNC(dlopen,[ ++ AC_CHECK_FUNC(dlsym,[ ++ G_MODULE_IMPL=G_MODULE_IMPL_DL ++ ], ++ )], ++) + if test -z "$G_MODULE_IMPL"; then +- AC_CHECK_FUNC(dlopen, +- [AC_CHECK_FUNC(dlsym, ++ AC_CHECK_FUNC(dlopen,[ ++ AC_CHECK_FUNC(dlsym,[ + G_MODULE_IMPL=G_MODULE_IMPL_DL +- ,)] +- ,) +- ++ ])], ++ ) + fi +- + dnl *** dlopen() and dlsym() in libdl + if test -z "$G_MODULE_IMPL"; then +- AC_CHECK_LIB(dl, dlopen, +- [AC_CHECK_LIB(dl, dlsym, ++ AC_CHECK_LIB(dl, dlopen,[ ++ AC_CHECK_LIB(dl, dlsym,[ + G_MODULE_LIBS=-ldl + G_MODULE_IMPL=G_MODULE_IMPL_DL +- ,)] +- ,) ++ ])] ++ ) + fi + dnl *** shl_load() in libdld (HP-UX) + if test -z "$G_MODULE_IMPL"; then +@@ -580,6 +624,7 @@ AC_SUBST(G_MODULE_LDFLAGS) + AC_SUBST(G_MODULE_HAVE_DLERROR) + AC_SUBST(G_MODULE_NEED_USCORE) + AC_SUBST(GLIB_DEBUG_FLAGS) ++AC_MSG_WARN([hi mom]) + + + dnl *********************** +@@ -816,40 +861,50 @@ if test x"$have_threads" != xnone; then + fi + if test x"$have_threads" = xposix; then + LIBS="$LIBS $G_THREAD_LIBS" +- AC_MSG_CHECKING(whether pthread_getspecific is posix like) + # PCThreads has pthread_getspecific(pthread_key_t, void **); +- AC_TRY_COMPILE([#include <pthread.h>], +- [pthread_getspecific(0,NULL);], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)]) +- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like) ++ AC_CACHE_CHECK([whether pthread_getspecific is posix like], ++ [glib_cv_sys_pthread_getspecific_posix], ++ AC_TRY_COMPILE([#include <pthread.h>], ++ [pthread_getspecific(0,NULL);], ++ [glib_cv_sys_pthread_getspecific_posix=no], ++ [glib_cv_sys_pthread_getspecific_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX) ++ fi + # DCE Threads return 1 as success, posix 0. what a mess. +- AC_TRY_RUN([#include <pthread.h> +- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +- int main () { +- return !pthread_mutex_trylock (&mutex); }], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)]) +- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like) ++ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like], ++ [glib_cv_sys_pthread_mutex_trylock_posix], ++ AC_TRY_RUN([#include <pthread.h> ++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ int main () { ++ return !pthread_mutex_trylock (&mutex); }], ++ [glib_cv_sys_pthread_mutex_trylock_posix=no], ++ [glib_cv_sys_pthread_mutex_trylock_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX) ++ fi + # DCE Threads return -1 as failure, posix ETIMEDOUT. +- AC_TRY_RUN([#include <pthread.h> +- #include <sys/time.h> +- int main () { +- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +- pthread_cond_t cond = PTHREAD_COND_INITIALIZER; +- struct timeval tval; +- struct timespec tspec; +- gettimeofday (&tval, NULL); +- tspec.tv_sec = tval.tv_sec; +- tspec.tv_nsec = 0; +- pthread_mutex_lock (&mutex); +- return pthread_cond_timedwait (&cond,&mutex,&tspec) +- != -1;}], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)]) ++ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like], ++ [glib_cv_sys_pthread_cond_timedwait_posix], ++ AC_TRY_RUN([#include <pthread.h> ++ int main () { ++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ pthread_cond_t cond = PTHREAD_COND_INITIALIZER; ++ struct timeval tval; ++ struct timespec tspec; ++ gettimeofday (&tval, NULL); ++ tspec.tv_sec = tval.tv_sec; ++ tspec.tv_nsec = 0; ++ return pthread_cond_timedwait (&cond,&mutex,&tspec) ++ != -1;}], ++ [glib_cv_sys_pthread_cond_timedwait_posix=no], ++ [glib_cv_sys_pthread_cond_timedwait_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX) ++ fi + fi + LIBS="$glib_save_LIBS" + CFLAGS="$glib_save_CFLAGS" +@@ -893,13 +948,14 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes, + dnl **************************************** + dnl *** GLib POLL* compatibility defines *** + dnl **************************************** ++if test x"$cross_compiling" != xyes; then + GLIB_SYSDEFS( + [#include <sys/types.h> + #include <sys/poll.h>], + POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, + glibconfig-sysdefs.h, + =) +- ++fi + + dnl ****************************** + dnl *** output the whole stuff *** +@@ -956,7 +1012,7 @@ _______EOF + echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile + fi + +- cat >> $outfile <<_______EOF ++ cat >> $outfile <<EOF + + #define G_MINFLOAT $glib_mf + #define G_MAXFLOAT $glib_Mf +@@ -969,60 +1025,60 @@ _______EOF + #define G_MINLONG $glib_ml + #define G_MAXLONG $glib_Ml + +-_______EOF ++EOF + + + ### this should always be true in a modern C/C++ compiler +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + typedef signed char gint8; + typedef unsigned char guint8; +-_______EOF ++EOF + + + if test -n "$gint16"; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + typedef signed $gint16 gint16; + typedef unsigned $gint16 guint16; +-_______EOF ++EOF + fi + + + if test -n "$gint32"; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + typedef signed $gint32 gint32; + typedef unsigned $gint32 guint32; +-_______EOF ++EOF + fi + + + if test -n "$gint64"; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + ${glib_warning_guard}#define G_HAVE_GINT64 1 + + ${glib_extension}typedef signed $gint64 gint64; + ${glib_extension}typedef unsigned $gint64 guint64; + + #define G_GINT64_CONSTANT(val) $gint64_constant +-_______EOF ++EOF + fi + + + if test -z "$glib_unknown_void_p"; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + + #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p)) + #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p)) + + #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i)) + #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u)) +-_______EOF ++EOF + else + echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile + fi + + + +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + $glib_atexit + $glib_memmove + $glib_defines +@@ -1034,11 +1090,11 @@ $glib_vacopy + #else /* !__cplusplus */ + $glib_inline + #endif /* !__cplusplus */ +-_______EOF ++EOF + + echo >>$outfile + if test x$g_mutex_has_default = xyes; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + $g_enable_threads_def G_THREADS_ENABLED + #define G_THREADS_IMPL_$g_threads_impl_def + typedef struct _GStaticMutex GStaticMutex; +@@ -1056,15 +1112,15 @@ struct _GStaticMutex + #define g_static_mutex_get_mutex(mutex) \ + (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \ + g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) +-_______EOF ++EOF + else +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + $g_enable_threads_def G_THREADS_ENABLED + #define G_THREADS_IMPL_$g_threads_impl_def + typedef struct _GMutex* GStaticMutex; + #define G_STATIC_MUTEX_INIT NULL + #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex)) +-_______EOF ++EOF + fi + + echo >>$outfile +@@ -1073,15 +1129,15 @@ _______EOF + g_bit_sizes="$g_bit_sizes 64" + fi + for bits in $g_bit_sizes; do +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val)) + #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val)) + #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val)) + #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val)) +-_______EOF ++EOF + done + +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val)) + #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val)) + #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val)) +@@ -1092,14 +1148,14 @@ _______EOF + #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val)) + #define G_BYTE_ORDER $g_byte_order + +-_______EOF ++EOF + + if test -r glibconfig-sysdefs.h; then + cat glibconfig-sysdefs.h >>$outfile + fi + + +- cat >>$outfile <<_______EOF ++ cat >>$outfile <<EOF + + $glib_wc + +@@ -1109,7 +1165,7 @@ $glib_wc + #endif /* __cplusplus */ + + #endif /* GLIBCONFIG_H */ +-_______EOF ++EOF + + + if cmp -s $outfile glibconfig.h; then diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb index 507a74b7d9..4481656d7a 100644 --- a/packages/pkgconfig/pkgconfig-native_0.22.bb +++ b/packages/pkgconfig/pkgconfig-native_0.22.bb @@ -1,7 +1,16 @@ SECTION = "console/utils" -require pkgconfig_${PV}.bb +require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +DEFAULT_PREFERENCE = "-1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit native DEPENDS = "" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc new file mode 100644 index 0000000000..47c077a8d3 --- /dev/null +++ b/packages/pkgconfig/pkgconfig.inc @@ -0,0 +1,24 @@ +SECTION = "console/utils" +DESCRIPTION = "pkg-config is a system for managing library \ +compile/link flags that works with automake and autoconf. \ +It replaces the ubiquitous *-config scripts you may have \ +seen with a single tool." +HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/pkg-config-${PV}/" + +inherit autotools + +acpaths = "-I ." +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/ +} + +do_stage_prepend() { + install -d -m 0755 ${STAGING_DATADIR}/pkgconfig +} diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb index 68d6a9917d..31fc7820fe 100644 --- a/packages/pkgconfig/pkgconfig_0.15.0.bb +++ b/packages/pkgconfig/pkgconfig_0.15.0.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV file://pkg.m4 \ file://glibconfig-sysdefs.h" -inherit autotools +inherit autotools acpaths = "-I ." do_configure_prepend () { diff --git a/packages/pkgconfig/pkgconfig_0.22.bb b/packages/pkgconfig/pkgconfig_0.22.bb index f634a87940..599e1c815e 100644 --- a/packages/pkgconfig/pkgconfig_0.22.bb +++ b/packages/pkgconfig/pkgconfig_0.22.bb @@ -1,30 +1,3 @@ -SECTION = "console/utils" -DESCRIPTION = "pkg-config is a system for managing library \ -compile/link flags that works with automake and autoconf. \ -It replaces the ubiquitous *-config scripts you may have \ -seen with a single tool." -HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" -LICENSE = "GPL" -PR = "r0" +require pkgconfig.inc -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/pkg-config-${PV}/" - -inherit autotools - -acpaths = "-I ." -do_configure () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/ - gnu-configize - libtoolize --force - oe_runconf -} - -do_stage_prepend() { - install -d -m 0755 ${STAGING_DATADIR}/pkgconfig - -} +SRC_URI += "file://autofoo.patch;patch=1" diff --git a/packages/psplash/files/fic-gta01/psplash-bar-img.h b/packages/psplash/files/fic-gta01/psplash-bar-img.h deleted file mode 100644 index ab47c99ef2..0000000000 --- a/packages/psplash/files/fic-gta01/psplash-bar-img.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ - -#define BAR_IMG_ROWSTRIDE (920) -#define BAR_IMG_WIDTH (230) -#define BAR_IMG_HEIGHT (28) -#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ -#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \ - "\203\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377\377h" \ - "lp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310\377\205" \ - "\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250\377" \ - "\203\0\0\0\377\1\260\260\250\377\377hlp\377\343hlp\377\4\260\260\250" \ - "\377\0\0\0\377\345\345\337\377ppp\377\377hlp\377\343hlp\377\3ppp\377" \ - "\220\220\212\377\240\244\240\377\203hlp\377\377\0\0\0\377\337\0\0\0\377" \ - "\203hlp\377\2\240\244\240\377\210\210\210\377\203hlp\377\377\0\0\0\377" \ - "\337\0\0\0\377\203hlp\377\2\210\210\210\377ppp\377\203hlp\377\377\0\0" \ - "\0\377\337\0\0\0\377\203hlp\377\1ppp\377\204hlp\377\377\0\0\0\377\337" \ - "\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0" \ - "\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377" \ - "\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210" \ - "hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0" \ - "\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \ - "\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377" \ - "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \ - "lp\377\377\0\0\0\377\337\0\0\0\377\204hlp\377\1ppp\377\203hlp\377\377" \ - "\0\0\0\377\337\0\0\0\377\203hlp\377\2ppp\377\210\210\210\377\203hlp\377" \ - "\377\0\0\0\377\337\0\0\0\377\203hlp\377\2\210\210\210\377\240\244\240" \ - "\377\203hlp\377\377\0\0\0\377\337\0\0\0\377\203hlp\377\3\240\244\240" \ - "\377\220\220\212\377ppp\377\377hlp\377\343hlp\377\4ppp\377\220\220\212" \ - "\377\0\0\0\377\260\260\250\377\377hlp\377\343hlp\377\1\260\260\250\377" \ - "\203\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250" \ - "\377\205\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377" \ - "\377hlp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310" \ - "\377\203\0\0\0\377") - - diff --git a/packages/psplash/files/openmoko/.mtn2git_empty b/packages/psplash/files/openmoko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/psplash/files/openmoko/.mtn2git_empty diff --git a/packages/psplash/files/openmoko/psplash-bar-img.h b/packages/psplash/files/openmoko/psplash-bar-img.h new file mode 100644 index 0000000000..de77daa13f --- /dev/null +++ b/packages/psplash/files/openmoko/psplash-bar-img.h @@ -0,0 +1,59 @@ +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ + +#define BAR_IMG_ROWSTRIDE (920) +#define BAR_IMG_WIDTH (230) +#define BAR_IMG_HEIGHT (28) +#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ +#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \ + "\7\17\20\17\377!#\40\377EGC\377z}x\377\200\204\201\377vz{\377knr\377\377" \ + "hlp\377\331hlp\377\16knr\377x|}\377\210\214\211\377\206\212\205\377=" \ + "\77<\377\27\27\26\377\7\7\7\377\"#!\377464\377bda\377mpn\377sww\377n" \ + "qt\377ilp\377\377hlp\377\331hlp\377\20ilp\377nqt\377swy\377ors\377nn" \ + "k\377+,*\377\24\24\24\377HIG\377ded\377egf\377ill\377fik\377beh\377_" \ + "cf\377aei\377fjn\377\377hlp\377\323hlp\377\2hlo\377dhl\377\203bfj\377" \ + "\22dgk\377gkn\377knp\377fij\377jkf\377342\377\201\203\201\377prr\377" \ + "jlm\377_bd\377TWY\377JNP\377ILO\377MQS\377WZ]\377_cf\377dhk\377gko\377" \ + "\377hlp\377\317hlp\377\30cgj\377\\_b\377QTW\377LNQ\377LOQ\377LOR\377" \ + "NRT\377VZ]\377`cf\377jmo\377lnn\377ttr\377\211\213\212\377wy{\377hjl" \ + "\377TWY\37779;\377&)*\377\36\40!\377\30\30\32\377\17\17\20\377\7\7\10" \ + "\377\6\6\7\377\1\1\1\377\377\0\0\0\377\317\0\0\0\377\24\4\4\4\377\12" \ + "\12\13\377\24\26\27\377\32\34\35\377\34\35\37\377\35\36\37\377\40\"#" \ + "\377/12\377VY]\377gjm\377rtv\377\210\212\210\377{}\177\377psv\377cfi" \ + "\377KNP\377&()\377\16\17\17\377\5\5\5\377\2\2\2\377\377\0\0\0\377\325" \ + "\0\0\0\377\2\1\1\1\377\4\5\5\377\202\6\6\6\377\14\13\14\14\377\40\"#" \ + "\377NRT\377dgj\377ort\377\200\201\202\377pqs\377jmq\377aeh\377KNQ\377" \ + "\33\34\35\377\5\5\5\377\377\0\0\0\377\332\0\0\0\377\7\1\1\1\377\6\6\6" \ + "\377\35\36\37\377MPR\377bfj\377jnq\377pqs\377\202hlp\377\4gko\377SWY" \ + "\377\23\23\25\377\1\1\1\377\377\0\0\0\377\333\0\0\0\377\4\4\4\4\377\31" \ + "\32\33\377PSV\377fjm\377\205hlp\377\2^be\377\11\11\12\377\377\0\0\0\377" \ + "\334\0\0\0\377\3\1\1\1\377\17\20\21\377Y\\_\377\206hlp\377\2cgj\377\6" \ + "\6\7\377\377\0\0\0\377\336\0\0\0\377\207hlp\377\2fjm\377\4\4\5\377\377" \ + "\0\0\0\377\336\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \ + "lp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0" \ + "\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \ + "\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377" \ + "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\336\0\0\0\377\2\2\2" \ + "\3\377eim\377\206hlp\377\2cgk\377\3\3\3\377\377\0\0\0\377\334\0\0\0\377" \ + "\4\3\3\3\377\26\27\31\377TWZ\377gko\377\204hlp\377\3gko\377Z]a\377\13" \ + "\14\14\377\377\0\0\0\377\334\0\0\0\377\4\7\7\7\377\36\37\40\377MPR\377" \ + "cgj\377\202hlp\377\6pqs\377jnp\377cfi\377MPS\377\26\26\30\377\2\2\2\377" \ + "\377\0\0\0\377\332\0\0\0\377\16\2\2\2\377\10\10\10\377\40\"#\377KNP\377" \ + "adh\377jmp\377pqs\377|~~\377ort\377cfi\377LOQ\377!\"$\377\11\12\12\377" \ + "\2\2\2\377\377\0\0\0\377\325\0\0\0\377\24\1\1\1\377\4\4\4\377\5\5\5\377" \ + "\10\10\10\377\10\10\11\377\17\20\20\377$&'\377LPR\377cfi\377ort\377~" \ + "\200\201\377\201\203\201\377qtu\377fik\377TW[\377347\377!\"#\377\30\31" \ + "\32\377\15\16\16\377\3\3\3\377\377\0\0\0\377\321\0\0\0\377\26\3\3\3\377" \ + "\7\7\10\377\21\22\23\377\31\32\33\377\35\36\40\377\37\40!\377\40!#\377" \ + "$&'\377367\377UX[\377fik\377rtv\377\204\206\205\377oon\377jll\377hkm" \ + "\377_ad\377TW[\377LOQ\377NQS\377UXZ\377bei\377\377hlp\377\321hlp\377" \ + "\25eim\377`dg\377VY\\\377MPS\377KNP\377ILO\377JMP\377LPR\377TX[\377_" \ + "bd\377ilm\377jll\377qro\377==<\377cda\377dgh\377iln\377gjl\377cfi\377" \ + "cgj\377fjn\377\377hlp\377\324hlp\377\3gkn\377cgk\377bfj\377\202`dh\377" \ + "\15cfi\377fjl\377imn\377dgh\377ddb\377675\377\35\36\35\377121\377ghe" \ + "\377nqq\377swy\377nqt\377ilp\377\377hlp\377\331hlp\377\16ilp\377nqt\377" \ + "swy\377nqp\377ghe\377./.\377\26\26\26\377\15\15\15\377\37\37\36\377C" \ + "EB\377~\202~\377\204\210\205\377w{|\377knr\377\377hlp\377\331hlp\377" \ + "\7knr\377w{|\377\204\210\205\377~\202~\377BDA\377\34\34\33\377\10\10" \ + "\10\377") + + diff --git a/packages/psplash/files/fic-gta01/psplash-hand-img.h b/packages/psplash/files/openmoko/psplash-hand-img.h index 96dc16c723..96dc16c723 100644 --- a/packages/psplash/files/fic-gta01/psplash-hand-img.h +++ b/packages/psplash/files/openmoko/psplash-hand-img.h diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index fe62f64e2c..6e117db941 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -2,22 +2,21 @@ DESCRIPTION = "Userspace framebuffer boot logo based on usplash." SECTION = "base" LICENSE = "GPL" PV = "0.0+svn${SRCDATE}" -PR = "r5" +PR = "r8" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND # and rename the resulting .h to pslash-hand-img.h (for the logo) -# respectively psplash-bar-img.h (for the bar). +# respectively psplash-bar-img.h (BAR) for the bar. # You might also want to patch the colors (see patch) SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-hand-img.h \ file://psplash-bar-img.h \ - file://psplash-init " + file://psplash-init" S = "${WORKDIR}/psplash" -# for now only GTA01, later use openmoko distro override -SRC_URI_append_fic-gta01 = "file://configurability.patch;patch=1 " +SRC_URI_append_openmoko = " file://configurability.patch;patch=1 " inherit autotools pkgconfig update-rc.d diff --git a/packages/roadmap/.mtn2git_empty b/packages/roadmap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/.mtn2git_empty diff --git a/packages/roadmap/files/.mtn2git_empty b/packages/roadmap/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/files/.mtn2git_empty diff --git a/packages/roadmap/files/cross.patch b/packages/roadmap/files/cross.patch new file mode 100644 index 0000000000..87c8d7894b --- /dev/null +++ b/packages/roadmap/files/cross.patch @@ -0,0 +1,17 @@ +--- /tmp/options.mk 2007-08-08 12:14:11.000000000 +0200 ++++ roadmap/src/options.mk 2007-08-08 12:14:35.688400000 +0200 +@@ -26,13 +26,7 @@ + + # if you want to cross-compile, define CROSS in config.mk. you + # may also have to add paths to libraries (with -L) in LDFLAGS. +-CC = $(CROSS)gcc +-CXX = $(CROSS)g++ +-AS = $(CROSS)as +-AR = $(CROSS)ar +-LD = $(CROSS)ld +-STRIP = $(CROSS)strip +-RANLIB = $(CROSS)ranlib ++STRIP = echo + + + # --- Build options ------------------------------------------------ diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb new file mode 100644 index 0000000000..cb81a44ae8 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection." +AUTHOR = "Pascal Martin <pascal.martin@iname.com>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +DEPENDS = "popt expat gtk+" +LICENSE = "GPL" +PV = "1.0.12+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ + file://cross.patch;patch=1;pnum=2 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + " + +S = "${WORKDIR}/roadmap/src" + +PARALLEL_MAKE = "" +CFLAGS += " -I${S} " + + +do_compile() { + oe_runmake + oe_runmake gtk2 +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/roadmap + + install -m 0755 gtk2/gtkroad* ${D}${bindir} + + install -m 0644 icons/*png ${D}${datadir}/pixmaps + + install -m 0644 sprites preferences ${D}${datadir}/roadmap + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 7360a13104..a4ce1252f8 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r34" +PR = "r35" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. @@ -19,14 +19,14 @@ USE_VT ?= "1" SYSVINIT_ENABLED_GETTYS ?= "1" SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \ - file://install.patch;patch=1 \ + file://install.patch;patch=1 \ file://need \ file://provide \ file://inittab \ file://rcS-default \ file://rc \ file://rcS \ - file://bootlogd.init" + file://bootlogd.init" S = "${WORKDIR}/sysvinit-${PV}" B = "${S}/src" @@ -56,9 +56,9 @@ EXTRA_OEMAKE += "'INSTALL=install' \ do_install () { oe_runmake 'ROOT=${D}' install - install -d ${D}${sysconfdir} \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab if [ ! -z "${SERIAL_CONSOLE}" ]; then echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 3d08f465ba..f1a90abf8e 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r37" +PR = "r38" PROVIDES = "${PACKAGES}" PACKAGES = 'task-boot' @@ -31,6 +31,9 @@ DISTRO_LOGIN_MANAGER ?= "tinylogin" MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +# Make sure we build the kernel +DEPENDS = "virtual/kernel" + # # minimal set of packages - needed to boot # diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb index b587578120..d4fbaecd37 100644 --- a/packages/tasks/task-gpe-base.bb +++ b/packages/tasks/task-gpe-base.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Base task package for GPE Palmtop Environment" -PR = "r6" +PR = "r7" LICENSE = "MIT" ALLOW_EMPTY = "1" RDEPENDS = "\ - virtual/libx11 \ gpe-bootsplash \ bluez-utils-dbus \ matchbox \ @@ -32,7 +31,5 @@ RDEPENDS = "\ gdk-pixbuf-loader-jpeg \ pango-module-basic-x \ pango-module-basic-fc \ - ttf-dejavu-sans \ - ttf-dejavu-sans-mono \ - ttf-dejavu-serif" + ttf-bitstream-vera" diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index 8bf39d8af9..f2a108b712 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r7" +PR = "r8" LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "\ - gpephone-base-depends \ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ @@ -12,9 +11,6 @@ PACKAGES = "\ gpephone-task-apps \ gpephone-task-development" -RDEPENDS_gpephone-base-depends = "\ - virtual/libx11" - RDEPENDS_gpephone-task-development = "\ rxvt-unicode \ gpe-terminal \ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 7ad13c7acc..56e26cdb32 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r54" +PR = "r56" ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" @@ -65,11 +65,13 @@ RDEPENDS_task-openmoko-ui = "\ xset \ xrandr \ settings-daemon \ + \ openmoko-session2 \ openmoko-theme-standard2 \ openmoko-icon-theme-standard2 \ openmoko-sound-system \ openmoko-sound-theme-standard \ + neod \ " # @@ -77,13 +79,13 @@ RDEPENDS_task-openmoko-ui = "\ # DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer" RDEPENDS_task-openmoko-base = "\ - openmoko-terminal \ matchbox-panel-2 \ matchbox-panel-2-applets \ matchbox-applet-inputmanager \ # openmoko-appmanager \ matchbox-keyboard \ matchbox-stroke \ + openmoko-terminal2 \ openmoko-keyboard \ # openmoko-panel-mainmenu \ openmoko-panel-battery \ @@ -114,8 +116,8 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-calculator2 \ openmoko-contacts2 \ openmoko-today2 \ + openmoko-feedreader2 \ # openmoko-messages \ -# openmoko-rssreader \ " # diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index d2281bca17..21f1b551f5 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r12" +PR = "r13" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -92,6 +92,9 @@ kernel-module-pata-artop \ # Add modules required for Network support SLUGOS_STANDARD_RRECOMMENDS += "\ +kernel-module-mii \ +kernel-module-ixp4xx-mac \ +kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ " diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index f6df462f11..51bd1f6a7b 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -4,12 +4,12 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PR = "r14" +PR = "r16" SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ file://tslib-input_raw-grab_events.patch;patch=1 \ file://fix_version.patch;patch=1 \ - file://ts.conf \ + file://ts.conf \ file://ts.conf-simpad-2.4 \ file://ts.conf-collie-2.4 \ file://tslib.sh" diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty b/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch index d7a2a872e5..d7a2a872e5 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch index 37b2807908..37b2807908 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch index fa0de39ab7..fa0de39ab7 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch index 53a3e05c67..53a3e05c67 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch index 352967ae06..352967ae06 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch b/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch index ee4c1984fc..ee4c1984fc 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch b/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch index 2ac5b75dee..2ac5b75dee 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/default-env.patch b/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch index b9ae4f29fe..b9ae4f29fe 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/default-env.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dontask.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch index 23d4b13626..23d4b13626 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/dontask.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch index cf12352553..cf12352553 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch b/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch index 7326c2daa6..7326c2daa6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch index dcb721c8d3..dcb721c8d3 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch index 5a2dd61461..5a2dd61461 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch b/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch index ff8e9cd6fc..ff8e9cd6fc 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch b/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch index 715c46ed81..715c46ed81 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch b/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch index fcf54b9fd1..fcf54b9fd1 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch index a5800e2499..a5800e2499 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch index 74b79da0a9..74b79da0a9 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch index ecce004ca6..ecce004ca6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch index b0e9bf4c4b..b0e9bf4c4b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch index 8360409e46..8360409e46 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch b/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch index 6f6af2c758..6f6af2c758 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch b/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch index f32cbde27b..f32cbde27b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch b/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch index a1c381a2cf..a1c381a2cf 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/series b/packages/uboot/u-boot-mkimage-openmoko-native/series index 4fc7d1342f..4fc7d1342f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/series +++ b/packages/uboot/u-boot-mkimage-openmoko-native/series diff --git a/packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch b/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch index 8ea48cf484..8ea48cf484 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch index 7c70244b38..7c70244b38 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch index 343598902f..343598902f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch index b39a268c84..b39a268c84 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch index b3d7bc1166..b3d7bc1166 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch index 9b1febe956..9b1febe956 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch index 993ef4f6f2..993ef4f6f2 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch index 349b83697e..349b83697e 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch index 1122f4894f..1122f4894f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch index ca54ebeff7..ca54ebeff7 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch index f85fdea836..f85fdea836 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch index 227a97e71a..227a97e71a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch index db3cee6e99..db3cee6e99 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch index a44434155e..a44434155e 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch index d630889e3c..d630889e3c 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch index 7e3aa4f480..7e3aa4f480 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch index 19d912620d..19d912620d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch index 6efe24651a..6efe24651a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch index b775beaa07..b775beaa07 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch index dc363bbbab..dc363bbbab 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch index 0d5a49771d..0d5a49771d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch index 8cc442a865..8cc442a865 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch index b50853554b..b50853554b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch index 16bee3e26a..16bee3e26a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch index da0fb8cf2d..da0fb8cf2d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch index 62ae5592ab..62ae5592ab 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch index 09392ad2cf..09392ad2cf 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch index 5757cc078b..5757cc078b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch index a88e94b006..a88e94b006 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch index 722a227aa6..722a227aa6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch b/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch index 680b301620..680b301620 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch b/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch index 339289699a..339289699a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch b/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch index 132a9f8da5..132a9f8da5 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb index 5946be9c3f..8d69a54c4c 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb +++ b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb @@ -1,4 +1,4 @@ -require uboot-gta01_svn.bb +require uboot-openmoko_svn.bb PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238" diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 98622fe408..d7a07a7d00 100644 --- a/packages/uboot/uboot-gta01_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -3,13 +3,14 @@ AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -PV = "1.2.0+svn${SRCDATE}" -PR = "r11" + +UBOOT_UPSTREAM_REV = "8993e54b6f397973794f3d6f47d3b3c0c98dd4f6" +PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${SRCDATE}" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" -SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git \ +SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ @@ -44,33 +45,38 @@ do_configure_prepend() { } do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin - fi - done + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin \ + lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin \ + -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done } do_deploy () { install -d ${DEPLOY_DIR_IMAGE} for mach in ${UBOOT_MACHINES} do - install -m 0644 ${S}/u-boot_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin fi done install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb deleted file mode 100644 index 5805a0fe04..0000000000 --- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "The appres program prints the resources seen by an application." - -DEPENDS += " virtual/libx11 libxt" - diff --git a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb deleted file mode 100644 index 7b6aa37311..0000000000 --- a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Native bdftopdf utility" -SECTION = "x11/fonts" -LICENSE = "MIT-X" - -S="${WORKDIR}/bdftopcf-${PV}" - -DEPENDS = "libxfont-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb deleted file mode 100644 index d9f37daf1a..0000000000 --- a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." - -DEPENDS += " libxfont" - diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb deleted file mode 100644 index 5a64332d48..0000000000 --- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" - diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb deleted file mode 100644 index c933d4f718..0000000000 --- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb deleted file mode 100644 index 4d9a7f53de..0000000000 --- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" - diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb deleted file mode 100644 index 281a33c4bd..0000000000 --- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxt libxmu libxaw" - diff --git a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb deleted file mode 100644 index fb84802ca6..0000000000 --- a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto freetype libfontenc" - diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb deleted file mode 100644 index 0257648e20..0000000000 --- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libfs" - diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb deleted file mode 100644 index 0257648e20..0000000000 --- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libfs" - diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb deleted file mode 100644 index 0257648e20..0000000000 --- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libfs" - diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb deleted file mode 100644 index 5f94b334be..0000000000 --- a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto libice" - diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb deleted file mode 100644 index b9aa49f4ab..0000000000 --- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \ -extension to X (LBX) must make their connections to an lbxproxy." - -DEPENDS += " xtrans libxext liblbxutil virtual/libx11 libice xproxymngproto bigreqsproto zlib" diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb deleted file mode 100644 index 61fb362e23..0000000000 --- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw virtual/libx11 libxt libxmu" - diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb deleted file mode 100644 index dd599b3ad7..0000000000 --- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " zlib zlib virtual/libx11 libfontenc" - diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb deleted file mode 100644 index d2974045c2..0000000000 --- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxfont libfs libfontenc" - diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb deleted file mode 100644 index 7bfea3e84c..0000000000 --- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X mkfontdir app" -SECTION = "x11/applications" -LICENSE = "MIT-X" -DEPENDS = "util-macros-native mkfontscale-native" -PR = "r1" - -S = "${WORKDIR}/mkfontdir-${PV}" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2" - -inherit native autotools pkgconfig diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb deleted file mode 100644 index ac6d19fd95..0000000000 --- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X mkfontdir app" -SECTION = "x11/applications" -LICENSE = "MIT-X" -DEPENDS = "util-macros-native mkfontscale-native" -PR = "r1" - -S = "${WORKDIR}/mkfontdir-${PV}" -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2" - -inherit native autotools pkgconfig diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb deleted file mode 100644 index d721fd07b7..0000000000 --- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-app-common.inc - -RDEPENDS += "mkfontscale" - diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb deleted file mode 100644 index d721fd07b7..0000000000 --- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-app-common.inc - -RDEPENDS += "mkfontscale" - diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb deleted file mode 100644 index 5bbab6a5fd..0000000000 --- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X mkfontscale app" -SECTION = "x11/applications" -LICENSE = "MIT-X" -S="${WORKDIR}/mkfontscale-${PV}" - -DEPENDS = "libx11-native libfontenc-native freetype-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2" - -inherit native autotools pkgconfig diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb deleted file mode 100644 index 2f5eab7d63..0000000000 --- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " zlib libfontenc freetype virtual/libx11" - diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb deleted file mode 100644 index f275cc94d4..0000000000 --- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu libxext libxt" - diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb deleted file mode 100644 index ea4a1ad78d..0000000000 --- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libice libxt virtual/libx11 xproxymngproto" - diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb deleted file mode 100644 index 1c46d69a0b..0000000000 --- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxt" - diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb deleted file mode 100644 index 59dd8abd27..0000000000 --- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-app-common.inc -PR = "r1" - -#DESCRIPTION = "" - -DEPENDS += " xproto util-macros" - -FILES_${PN} += "${datadir}/X11" - - diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb deleted file mode 100644 index 00bfde0620..0000000000 --- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - - diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb deleted file mode 100644 index 8001d661e7..0000000000 --- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb deleted file mode 100644 index 8001d661e7..0000000000 --- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb deleted file mode 100644 index 165202b2da..0000000000 --- a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libfs" - diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb deleted file mode 100644 index 843541dc77..0000000000 --- a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxt libxmu" - diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb deleted file mode 100644 index 843541dc77..0000000000 --- a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxt libxmu" - diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb deleted file mode 100644 index 3cbab36e9b..0000000000 --- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "tiny window manager" - -DEPENDS += " virtual/libx11 libxext libxt libxmu" - -ALTERNATIVE_PATH = "${bindir}/twm" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "1" diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb deleted file mode 100644 index 50c6a97949..0000000000 --- a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxt" - diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb deleted file mode 100644 index 905f3cdced..0000000000 --- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu" - diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb deleted file mode 100644 index 8581abd43c..0000000000 --- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext" diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb deleted file mode 100644 index b891ff90ef..0000000000 --- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxau libxext libxmu" - diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb deleted file mode 100644 index 5e21a9e590..0000000000 --- a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw xbitmaps libxext" - diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb deleted file mode 100644 index 7ad19bb1bb..0000000000 --- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" - diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb deleted file mode 100644 index 7ad19bb1bb..0000000000 --- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" - diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb deleted file mode 100644 index 50c6a97949..0000000000 --- a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxt" - diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb deleted file mode 100644 index 2dbb5b76ce..0000000000 --- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxcursor libpng" - diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb deleted file mode 100644 index 2dbb5b76ce..0000000000 --- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxcursor libpng" - diff --git a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb deleted file mode 100644 index 37d37250df..0000000000 --- a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxp libxprintutil libxp libxau libxext" - diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb deleted file mode 100644 index d2c87b6a57..0000000000 --- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X display manager" - -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" - -EXTRA_OECONF += " --with-random-device=/dev/urandom" - diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb deleted file mode 100644 index 955fd33732..0000000000 --- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X display manager" - -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" - -EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb deleted file mode 100644 index d212bc1422..0000000000 --- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X display information utility" -LICENSE = "MIT" - -DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" - -SRC_URI += "file://disable-xkb.patch;patch=1" - -EXTRA_OECONF = "--disable-xkb" diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb deleted file mode 100644 index 61e5837b9e..0000000000 --- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 glproto mesa" - diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb deleted file mode 100644 index 61e5837b9e..0000000000 --- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 glproto mesa" - diff --git a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb deleted file mode 100644 index c4008cc579..0000000000 --- a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxprintutil libxp libxt" - diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb deleted file mode 100644 index c4008cc579..0000000000 --- a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxprintutil libxp libxt" - diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb deleted file mode 100644 index 1969eb3c07..0000000000 --- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Event Viewer" -LICENSE = "MIT" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb deleted file mode 100644 index de9861c60e..0000000000 --- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb deleted file mode 100644 index 6a5f12d484..0000000000 --- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" - diff --git a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb deleted file mode 100644 index 1751f4bdf7..0000000000 --- a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw freetype fontconfig libxft libxt" - diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb deleted file mode 100644 index bf8ad7904b..0000000000 --- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libice libxt xproxymngproto" - diff --git a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb deleted file mode 100644 index 9567be7a12..0000000000 --- a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X fontserver" - -DEPENDS += " libfs libxfont xtrans" - diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb deleted file mode 100644 index 9567be7a12..0000000000 --- a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X fontserver" - -DEPENDS += " libfs libxfont xtrans" - diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb deleted file mode 100644 index 0257648e20..0000000000 --- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libfs" - diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb deleted file mode 100644 index b9dc35b367..0000000000 --- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libice xproxymngproto" - diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb deleted file mode 100644 index 7549d9902f..0000000000 --- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxxf86vm" - diff --git a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb deleted file mode 100644 index e997ffc6a6..0000000000 --- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "Server access control program for X" -LICENSE = "MIT" - -DEPENDS += " virtual/libx11 libxmu libxau" - diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb deleted file mode 100644 index e997ffc6a6..0000000000 --- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "Server access control program for X" -LICENSE = "MIT" - -DEPENDS += " virtual/libx11 libxmu libxau" - diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb deleted file mode 100644 index 00bfde0620..0000000000 --- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - - diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb deleted file mode 100644 index 025a578370..0000000000 --- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" -FILES_${PN} += " /usr/lib/X11/xinit" - diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb deleted file mode 100644 index f6b9503cd8..0000000000 --- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." - -DEPENDS += " virtual/libx11 libxkbfile" - diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb deleted file mode 100644 index f6b9503cd8..0000000000 --- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." - -DEPENDS += " virtual/libx11 libxkbfile" - diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb deleted file mode 100644 index 8001d661e7..0000000000 --- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb deleted file mode 100644 index 8001d661e7..0000000000 --- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb deleted file mode 100644 index 8001d661e7..0000000000 --- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb deleted file mode 100644 index 15ce7e6011..0000000000 --- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxkbfile virtual/libx11" - diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb deleted file mode 100644 index 905f3cdced..0000000000 --- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu" - diff --git a/packages/xorg-app/xload_X11R7.0-1.0.1.bb b/packages/xorg-app/xload_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xload_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb deleted file mode 100644 index b328683361..0000000000 --- a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt" - diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb deleted file mode 100644 index 905f3cdced..0000000000 --- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu" - diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb deleted file mode 100644 index 905f3cdced..0000000000 --- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxmu" - diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb deleted file mode 100644 index 7559ace10c..0000000000 --- a/packages/xorg-app/xman_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxprintutil libxp libxt" -RDEPENDS = " man" - -FILES_${PN} += " /usr/share/X11/xman.help" diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb deleted file mode 100644 index 7559ace10c..0000000000 --- a/packages/xorg-app/xman_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxprintutil libxp libxt" -RDEPENDS = " man" - -FILES_${PN} += " /usr/share/X11/xman.help" diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb deleted file mode 100644 index da0a1896b3..0000000000 --- a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "xmessage displays a message or query in a window." - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb deleted file mode 100644 index 9ef50b8ffd..0000000000 --- a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb deleted file mode 100644 index 856aae8e6c..0000000000 --- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X" -LICENSE = "MIT" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb deleted file mode 100644 index da12303b23..0000000000 --- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" -LICENSE = "MIT" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb deleted file mode 100644 index 88b90afb05..0000000000 --- a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxprintutil libxp libxt" - diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb deleted file mode 100644 index 2153dfd459..0000000000 --- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxprintapputil libxaw libxprintutil libxt libxp" - diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb deleted file mode 100644 index 79f4194c48..0000000000 --- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxp libxprintutil virtual/libx11" - diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb deleted file mode 100644 index 2dd7807ec5..0000000000 --- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu virtual/libx11" - diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb deleted file mode 100644 index 0718958efe..0000000000 --- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxp virtual/libx11" - diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb deleted file mode 100644 index 2dd7807ec5..0000000000 --- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu virtual/libx11" - diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb deleted file mode 100644 index 4b878cc32e..0000000000 --- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Resize and Rotate extension command." -LICENSE= "BSD-X" - -DEPENDS += " libxrandr libxrender virtual/libx11" - diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb deleted file mode 100644 index 4b878cc32e..0000000000 --- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Resize and Rotate extension command." -LICENSE= "BSD-X" - -DEPENDS += " libxrandr libxrender virtual/libx11" - diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb deleted file mode 100644 index 65f08f2bb6..0000000000 --- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X server resource database utility" -LICENSE = "xrdb" - -DEPENDS += " libxmu virtual/libx11 libxext" - diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb deleted file mode 100644 index 24a5ac9208..0000000000 --- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X server resource database utility" -LICENSE = "xrdb" - -DEPENDS += " libxmu virtual/libx11 libxext" diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb deleted file mode 100644 index d956f3aecd..0000000000 --- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau" - diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb deleted file mode 100644 index 72c315c6a1..0000000000 --- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "user preference utility for X" -LICENSE = "MIT" - -DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" - -SRC_URI += "file://disable-xkb.patch;patch=1" - -CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-xkb" - diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb deleted file mode 100644 index 72c315c6a1..0000000000 --- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "user preference utility for X" -LICENSE = "MIT" - -DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" - -SRC_URI += "file://disable-xkb.patch;patch=1" - -CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-xkb" - diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb deleted file mode 100644 index d473975d5e..0000000000 --- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxi virtual/libx11" - diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb deleted file mode 100644 index d473975d5e..0000000000 --- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxi virtual/libx11" - diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb deleted file mode 100644 index d5ddbadb49..0000000000 --- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu virtual/libx11 xbitmaps" - diff --git a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb deleted file mode 100644 index 6c22106e5a..0000000000 --- a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "X Session Manager" - -DEPENDS += " libxaw libxt" - diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb deleted file mode 100644 index 2dd7807ec5..0000000000 --- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu virtual/libx11" - diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb deleted file mode 100644 index 91933be884..0000000000 --- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxtrap" - diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb deleted file mode 100644 index 91933be884..0000000000 --- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxtrap" - diff --git a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb deleted file mode 100644 index 66fa7fff7f..0000000000 --- a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxaw libxxf86vm libxt" - diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb deleted file mode 100644 index e0fe5605bc..0000000000 --- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxv virtual/libx11" - diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb deleted file mode 100644 index 2dd7807ec5..0000000000 --- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu virtual/libx11" - diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb deleted file mode 100644 index 71fb6f0ca4..0000000000 --- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu libxext virtual/libx11" - diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb deleted file mode 100644 index 71fb6f0ca4..0000000000 --- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxmu libxext virtual/libx11" - diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb deleted file mode 100644 index d584483e44..0000000000 --- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-app-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb deleted file mode 100644 index 502b3c1419..0000000000 --- a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-data-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb deleted file mode 100644 index 8d765a1bb7..0000000000 --- a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-data-common.inc - -#DESCRIPTION = "" - -DEPENDS += " libxcursor" - diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb deleted file mode 100644 index dc02f163f6..0000000000 --- a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-data-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " -RDEPENDS = "xkbcomp" - -FILES_${PN} += " /usr/share/X11/xkb" - diff --git a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb deleted file mode 100644 index 069f25ad10..0000000000 --- a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-doc-common.inc - -DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \ -source tree." - -DEPENDS += " intltool" - -FILES_${PN} += " /usr/share/X11/doc" - diff --git a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb deleted file mode 100644 index 069f25ad10..0000000000 --- a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-doc-common.inc - -DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \ -source tree." - -DEPENDS += " intltool" - -FILES_${PN} += " /usr/share/X11/doc" - diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb deleted file mode 100644 index 45dd0d692d..0000000000 --- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-doc-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -FILES_${PN} += " /usr/share/X11/sgml" diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb deleted file mode 100644 index 45dd0d692d..0000000000 --- a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-doc-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -FILES_${PN} += " /usr/share/X11/sgml" diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb deleted file mode 100644 index 47acb760d2..0000000000 --- a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -DEPENDS += " kbproto" - diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb deleted file mode 100644 index 47acb760d2..0000000000 --- a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -DEPENDS += " kbproto" - diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb deleted file mode 100644 index 47acb760d2..0000000000 --- a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -DEPENDS += " kbproto" - diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb deleted file mode 100644 index a76eec5e1f..0000000000 --- a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -DESCRIPTION = "Mouse Support in X11" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb deleted file mode 100644 index a76eec5e1f..0000000000 --- a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -DESCRIPTION = "Mouse Support in X11" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb deleted file mode 100644 index 7942a3ab2e..0000000000 --- a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-driver-input.inc - -DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protocol \ -that is provided by VMware virtual machines to give absolute pointer \ -positioning. " - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb deleted file mode 100644 index ee92f6c162..0000000000 --- a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-input.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb deleted file mode 100644 index 63e473c720..0000000000 --- a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" - -DEPENDS += " xf86rushproto" - diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb deleted file mode 100644 index 63e473c720..0000000000 --- a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" - -DEPENDS += " xf86rushproto" - diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb deleted file mode 100644 index c811bf888a..0000000000 --- a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb deleted file mode 100644 index c811bf888a..0000000000 --- a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb deleted file mode 100644 index 4b57f17b9e..0000000000 --- a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb deleted file mode 100644 index 4b57f17b9e..0000000000 --- a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb deleted file mode 100644 index 3b867c9c56..0000000000 --- a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "Number Nine I128 for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb deleted file mode 100644 index 3b867c9c56..0000000000 --- a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "Number Nine I128 for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb deleted file mode 100644 index 4935a006cd..0000000000 --- a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "I740 for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb deleted file mode 100644 index 4935a006cd..0000000000 --- a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "I740 for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb deleted file mode 100644 index 8dc577aeaa..0000000000 --- a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "I810 for X11" - -DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb deleted file mode 100644 index 8dc577aeaa..0000000000 --- a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "I810 for X11" - -DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb deleted file mode 100644 index a66e410315..0000000000 --- a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb deleted file mode 100644 index a66e410315..0000000000 --- a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb deleted file mode 100644 index e5f997e0fa..0000000000 --- a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb deleted file mode 100644 index 4c2a45f05e..0000000000 --- a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" - -DEPENDS += " xf86dgaproto" - diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb deleted file mode 100644 index 956a2021c1..0000000000 --- a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb deleted file mode 100644 index 956a2021c1..0000000000 --- a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb deleted file mode 100644 index 1dad571e13..0000000000 --- a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" - diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb deleted file mode 100644 index 1dad571e13..0000000000 --- a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" - diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb deleted file mode 100644 index 84edd97fd3..0000000000 --- a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb deleted file mode 100644 index 84edd97fd3..0000000000 --- a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb deleted file mode 100644 index d05a26bddd..0000000000 --- a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb deleted file mode 100644 index f898676111..0000000000 --- a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb deleted file mode 100644 index 2cd161cec2..0000000000 --- a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb deleted file mode 100644 index 2cd161cec2..0000000000 --- a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb deleted file mode 100644 index 9e662ff6bb..0000000000 --- a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto" - diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb deleted file mode 100644 index 9e662ff6bb..0000000000 --- a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xineramaproto xf86miscproto" - diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb deleted file mode 100644 index f005c731ef..0000000000 --- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb deleted file mode 100644 index d05a26bddd..0000000000 --- a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" - diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb deleted file mode 100644 index f898676111..0000000000 --- a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb deleted file mode 100644 index f898676111..0000000000 --- a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb deleted file mode 100644 index f898676111..0000000000 --- a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb deleted file mode 100644 index 3ede51328b..0000000000 --- a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "DEC 21030 X11 driver" - -DEPENDS += " xf86dgaproto" - diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb deleted file mode 100644 index 3ede51328b..0000000000 --- a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "DEC 21030 X11 driver" - -DEPENDS += " xf86dgaproto" - diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb deleted file mode 100644 index 92216d1e4a..0000000000 --- a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb deleted file mode 100644 index ae5f660b08..0000000000 --- a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "Video 4 Linux adaptor driver for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb deleted file mode 100644 index ae5f660b08..0000000000 --- a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "Video 4 Linux adaptor driver for X11" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb deleted file mode 100644 index c04d4b4346..0000000000 --- a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-driver-video.inc - -SRC_URI += "file://fix-includepath.patch;patch=1" - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb deleted file mode 100644 index a87a5f7a56..0000000000 --- a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb deleted file mode 100644 index e202a0d54e..0000000000 --- a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto libxvmc" diff --git a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb deleted file mode 100644 index e202a0d54e..0000000000 --- a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -#DESCRIPTION = "" - -DEPENDS += " drm xf86driproto libxvmc" diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb deleted file mode 100644 index c8898e462b..0000000000 --- a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for VMware SVGA Device" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb deleted file mode 100644 index c8898e462b..0000000000 --- a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for VMware SVGA Device" - -#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb deleted file mode 100644 index db2545c9c3..0000000000 --- a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for Voodoo/Voodoo2" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb deleted file mode 100644 index db2545c9c3..0000000000 --- a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-driver-video.inc - -DESCRIPTION = "X11 driver for Voodoo/Voodoo2" - -DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb deleted file mode 100644 index f25d150d61..0000000000 --- a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -DEPENDS = "mkfontscale-native" -RDEPENDS = "" - diff --git a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index 94e4a48083..0000000000 --- a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb deleted file mode 100644 index 536a3f6e60..0000000000 --- a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "Adobe typeface software" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb deleted file mode 100644 index cd9773cc61..0000000000 --- a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "Adobe typeface software" - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb deleted file mode 100644 index cd9773cc61..0000000000 --- a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "Adobe typeface software" - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb deleted file mode 100644 index 12f8c63088..0000000000 --- a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "X font aliases." - -DEPENDS = "virtual/xserver font-util" -RDEPENDS = "encodings font-util" - diff --git a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index 8b8f914f4f..0000000000 --- a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \ -of the Arabic characters available in Unicode." - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index 82d6f5350e..0000000000 --- a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - --EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r" diff --git a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb deleted file mode 100644 index 5ab5967ab6..0000000000 --- a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "These fonts are designed for the display of Syriac text." - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index 216c123346..0000000000 --- a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \ -the glyphs needed for Unicode text." - -#DEPENDS += " " - diff --git a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb deleted file mode 100644 index e12d658230..0000000000 --- a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X font utils." -SECTION = "x11/fonts" -LICENSE = "MIT-X" - -S="${WORKDIR}/font-util-${PV}" - -DEPENDS = "bdftopcf-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz" - -inherit native autotools pkgconfig diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb deleted file mode 100644 index 86e7b62b63..0000000000 --- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X font utils." -SECTION = "x11/fonts" -LICENSE = "MIT-X" - -S="${WORKDIR}/font-util-${PV}" - -DEPENDS = "bdftopcf-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz" - -inherit native autotools pkgconfig diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb deleted file mode 100644 index fea5089e2d..0000000000 --- a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "X font utils." - -DEPENDS = "encodings" -RDEPENDS = "encodings" - diff --git a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb deleted file mode 100644 index 9074beb55a..0000000000 --- a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-font-common.inc - -DESCRIPTION = "X font utils." - -DEPENDS = "encodings" -RDEPENDS = "mkfontdir mkfontscale encodings" - -PR="r1" - diff --git a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb deleted file mode 100644 index e929e911ec..0000000000 --- a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-font-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb deleted file mode 100644 index b30098c850..0000000000 --- a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "x11/base" -require libx11_${PV}.bb - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" - -#do_stage_append () { -# rm -f ${STAGING_INCDIR}/X11/XKBlib.h -#} diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb deleted file mode 100644 index 52e01dde75..0000000000 --- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "x11/base" -require libx11_${PV}.bb - -EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -PR = "r4" - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1 \ - file://xim.patch;patch=1 \ - file://xchar2b.patch;patch=1" diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb deleted file mode 100644 index 28abffa735..0000000000 --- a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto applewmproto" - -XORG_PN = "libAppleWM" - diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb deleted file mode 100644 index a612982a95..0000000000 --- a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb deleted file mode 100644 index a612982a95..0000000000 --- a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb deleted file mode 100644 index f410b5d94e..0000000000 --- a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X fontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "zlib-native xproto-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2" -S = "${WORKDIR}/libfontenc-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb deleted file mode 100644 index 5a3febbca8..0000000000 --- a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X libfontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "zlib-native xproto-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2" -S = "${WORKDIR}/libfontenc-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb deleted file mode 100644 index a4badc38ce..0000000000 --- a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X fontenc library (used by libxfont)." -LICENSE = "BSD-X" -PRIORITY = "optional" - -DEPENDS += " zlib xproto" - diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb deleted file mode 100644 index a4badc38ce..0000000000 --- a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X fontenc library (used by libxfont)." -LICENSE = "BSD-X" -PRIORITY = "optional" - -DEPENDS += " zlib xproto" - diff --git a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb deleted file mode 100644 index 5c07ce682c..0000000000 --- a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = " " - -DEPENDS += " xproto fontsproto xtrans" - -XORG_PN = "libFS" - diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb deleted file mode 100644 index da40983162..0000000000 --- a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" -PROVIDES = "ice" - -XORG_PN = "libICE" - diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb deleted file mode 100644 index da40983162..0000000000 --- a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" -PROVIDES = "ice" - -XORG_PN = "libICE" - diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb deleted file mode 100644 index 57b2987968..0000000000 --- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -SRC_URI += "file://mkg3states-1.0.0.patch;patch=0" - -DESCRIPTION = "XFIXES Extension" - -DEPENDS += " xextproto xproto zlib" -PROVIDES = "lbxutil" diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb deleted file mode 100644 index 1b8660dda6..0000000000 --- a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -export CC_FOR_BUILD = "gcc" - -SRC_URI += "file://mkg3states.patch;patch=1" - -DESCRIPTION = "XFIXES Extension" - -DEPENDS += " xextproto xproto zlib" -PROVIDES = "lbxutil" diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb deleted file mode 100644 index 2a380a65f6..0000000000 --- a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - -XORG_PN = "liboldX" - diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb deleted file mode 100644 index 383e29e743..0000000000 --- a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Session management library" -PRIORITY = "optional" - -DEPENDS += " libice xproto xtrans" - -XORG_PN = "libSM" - diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb deleted file mode 100644 index 383e29e743..0000000000 --- a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Session management library" -PRIORITY = "optional" - -DEPENDS += " libice xproto xtrans" - -XORG_PN = "libSM" - diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb deleted file mode 100644 index 90b8aeca49..0000000000 --- a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" - -XORG_PN = "libWindowsWM" - diff --git a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb deleted file mode 100644 index f1dfd65c98..0000000000 --- a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" -PROVIDES = "x11-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2" -S = "${WORKDIR}/libX11-${PV}" - -inherit native autotools pkgconfig - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake -} diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb deleted file mode 100644 index 3c30890ac8..0000000000 --- a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" -PROVIDES = "x11-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2" -SRC_URI += "file://makekeys.diff;patch=1" -S = "${WORKDIR}/libX11-${PV}" - -inherit autotools pkgconfig native - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake -} - - diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 023f15cef3..7ac5b58345 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,13 +1,12 @@ require xorg-lib-common.inc PE = "1" -PR = "r2" +PR = "r4" DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" XORG_PN = "libX11" @@ -20,9 +19,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - ) || exit 1 - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } + diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb index bab2277fd0..e6b0ec5d8b 100644 --- a/packages/xorg-lib/libx11_1.1.2.bb +++ b/packages/xorg-lib/libx11_1.1.2.bb @@ -5,17 +5,19 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" +PR = "r1" XORG_PN = "libX11" EXTRA_OECONF += "--without-xcb" do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb deleted file mode 100644 index b1c26775e3..0000000000 --- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Base X libs." - -DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" - -XORG_PN = "libX11" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) || exit 1 - oe_runmake -} diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb deleted file mode 100644 index b7fb686a60..0000000000 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -require xorg-lib-common.inc - - -PR = "r4" - -DESCRIPTION = "Base X libs." -SRC_URI += "file://makekeys.diff;patch=1" -SRC_URI += " file://ruutf8.patch;patch=1" - -DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" - -XORG_PN = "libX11" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - ) || exit 1 - oe_runmake -} diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index f2929624e8..422afc92e0 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -5,8 +5,7 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" -PR = "r1" +PR = "r3" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" @@ -18,14 +17,17 @@ inherit autotools pkgconfig EXTRA_OECONF="--enable-malloc0returnsnull" + do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } + do_stage() { autotools_stage_all } diff --git a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb deleted file mode 100644 index 0e28057d82..0000000000 --- a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2" -S = "${WORKDIR}/libXau-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb deleted file mode 100644 index 617ee7e6b3..0000000000 --- a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2" -S = "${WORKDIR}/libXau-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb deleted file mode 100644 index 5ad793c9b8..0000000000 --- a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "A Sample Authorization Protocol for X" -PRIORITY = "optional" - -DEPENDS += " xproto" -PROVIDES = "xau" - -XORG_PN = "libXau" - diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb deleted file mode 100644 index 5ad793c9b8..0000000000 --- a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "A Sample Authorization Protocol for X" -PRIORITY = "optional" - -DEPENDS += " xproto" -PROVIDES = "xau" - -XORG_PN = "libXau" - diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb deleted file mode 100644 index 3961042a2d..0000000000 --- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xaw is the X Athena Widget Set." - -DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" -PROVIDES = "xaw" - -XORG_PN = "libXaw" - -do_stage () { - autotools_stage_all - ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so -} diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb deleted file mode 100644 index ff240607cb..0000000000 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" -PROVIDES = "xaw" -PR = "r1" - -XORG_PN = "libXaw" - -do_stage () { - autotools_stage_all - ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so -} - -PACKAGES =+ "libxaw6 libxaw7 libxaw8" - -FILES_libxaw6 = "${libdir}/libXaw6.so.6*" -FILES_libxaw7 = "${libdir}/libXaw7.so.7*" -FILES_libxaw8 = "${libdir}/libXaw8.so.8*" diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb deleted file mode 100644 index 4cab60a531..0000000000 --- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Composite extension library." -LICENSE= "BSD-X" - -DEPENDS += " compositeproto virtual/libx11 libxfixes" -PROVIDES = "xcomposite" - -XORG_PN = "libXcomposite" - -SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb deleted file mode 100644 index 70d0917887..0000000000 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Composite extension library." -LICENSE= "BSD-X" - -DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" -PROVIDES = "xcomposite" - -XORG_PN = "libXcomposite" - -SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb deleted file mode 100644 index 2b13c4213c..0000000000 --- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Cursor library" -LICENSE= "BSD-X" - -DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" - -XORG_PN = "libXcursor" - -FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb deleted file mode 100644 index 2b13c4213c..0000000000 --- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Cursor library" -LICENSE= "BSD-X" - -DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" - -XORG_PN = "libXcursor" - -FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb deleted file mode 100644 index 6bb9c39f60..0000000000 --- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Damage extension library." -LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" -PROVIDES = "xdamage" - -XORG_PN = "libXdamage" - diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb deleted file mode 100644 index 6bb9c39f60..0000000000 --- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Damage extension library." -LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" -PROVIDES = "xdamage" - -XORG_PN = "libXdamage" - diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb deleted file mode 100644 index d34088a255..0000000000 --- a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2" -S = "${WORKDIR}/libXdmcp-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb deleted file mode 100644 index 12b5bbe905..0000000000 --- a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2" -S = "${WORKDIR}/libXdmcp-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb deleted file mode 100644 index c0139498c5..0000000000 --- a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Display Manager Control Protocol library." -PRIORITY = "optional" - -DEPENDS += " xproto" -PROVIDES = "xdmcp" - -XORG_PN = "libXdmcp" - diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb deleted file mode 100644 index c0139498c5..0000000000 --- a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Display Manager Control Protocol library." -PRIORITY = "optional" - -DEPENDS += " xproto" -PROVIDES = "xdmcp" - -XORG_PN = "libXdmcp" - diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb deleted file mode 100644 index 4c3a134633..0000000000 --- a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" - -XORG_PN = "libXevie" - diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb deleted file mode 100644 index 4c3a134633..0000000000 --- a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" - -XORG_PN = "libXevie" - diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb deleted file mode 100644 index fc2061514a..0000000000 --- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Server Extension library" -PRIORITY = "optional" - -DEPENDS += " xproto virtual/libx11 xextproto libxau" -PROVIDES = "xext" - -XORG_PN = "libXext" - diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb deleted file mode 100644 index fc2061514a..0000000000 --- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Server Extension library" -PRIORITY = "optional" - -DEPENDS += " xproto virtual/libx11 xextproto libxau" -PROVIDES = "xext" - -XORG_PN = "libXext" - diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb deleted file mode 100644 index b63633dea2..0000000000 --- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Fixes extension library." -LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 xproto fixesproto xextproto" - -XORG_PN = "libXfixes" - diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb deleted file mode 100644 index b63633dea2..0000000000 --- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Fixes extension library." -LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 xproto fixesproto xextproto" - -XORG_PN = "libXfixes" - diff --git a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb deleted file mode 100644 index f49c207637..0000000000 --- a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2" -S = "${WORKDIR}/libXfont-${PV}" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb deleted file mode 100644 index e4d721dfe4..0000000000 --- a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2" -S = "${WORKDIR}/libXfont-${PV}" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb deleted file mode 100644 index 073b54f7cf..0000000000 --- a/packages/xorg-lib/libxfont-native_X11R7.1-1.2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" - -SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" -S = "${WORKDIR}/libXfont-1.2.0" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb deleted file mode 100644 index a3a28d6578..0000000000 --- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-lib-common.inc - -PR = "r1" -SRC_URI += "file://no-scalable-crash.patch;patch=1" - - -DESCRIPTION = "X font library (used by the X server)." -LICENSE= "BSD-X" -PRIORITY = "optional" - -DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" -PROVIDES = "xfont" - -XORG_PN = "libXfont" - diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb deleted file mode 100644 index 748a71f1ae..0000000000 --- a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X font library (used by the X server)." -LICENSE= "BSD-X" -PRIORITY = "optional" - -DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" -PROVIDES = "xfont" - -XORG_PN = "libXfont" - diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb deleted file mode 100644 index 8739822a07..0000000000 --- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-lib-common.inc - -PR = "r1" - -DESCRIPTION = "X font library (used by the X server)." -LICENSE= "BSD-X" -PRIORITY = "optional" - -SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" -SRC_URI += "file://no-scalable-crash.patch;patch=1" - -DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" -PROVIDES = "xfont" - -XORG_PN = "libXfont" - -S = "${WORKDIR}/libXfont-1.2.0" diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb deleted file mode 100644 index c75278ecb0..0000000000 --- a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" - -XORG_PN = "libXfontcache" - diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb deleted file mode 100644 index c75278ecb0..0000000000 --- a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" - -XORG_PN = "libXfontcache" - diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb deleted file mode 100644 index 5ae8247296..0000000000 --- a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb +++ /dev/null @@ -1,23 +0,0 @@ -require xorg-lib-common.inc - -SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-2.1.12" - - -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." - -DEPENDS += " libxrender freetype fontconfig" -PROVIDES = "xft" - -XORG_PN = "libXft" - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb deleted file mode 100644 index 092c25d3ab..0000000000 --- a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." - -DEPENDS += " libxrender freetype fontconfig" -PROVIDES = "xft" - -XORG_PN = "libXft" - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb deleted file mode 100644 index af5e4008eb..0000000000 --- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Input extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" - -XORG_PN = "libXi" - diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb deleted file mode 100644 index af5e4008eb..0000000000 --- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Input extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" - -XORG_PN = "libXi" - diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb deleted file mode 100644 index 8f72c20898..0000000000 --- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xinerama library" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" -PROVIDES = "xinerama" - -XORG_PN = "libXinerama" - diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb deleted file mode 100644 index 715dcd0554..0000000000 --- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 keyboard library" -LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 kbproto" - diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb deleted file mode 100644 index 715dcd0554..0000000000 --- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 keyboard library" -LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 kbproto" - diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb deleted file mode 100644 index e094728c2f..0000000000 --- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 lbxkbui library" -LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxt libxkbfile" -PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb deleted file mode 100644 index e094728c2f..0000000000 --- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 lbxkbui library" -LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxt libxkbfile" -PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb deleted file mode 100644 index 02df24cd9f..0000000000 --- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Window System miscellaneous utility library" -PRIORITY = "optional" - -DEPENDS += " libxt libxext xextproto virtual/libx11" -PROVIDES = "xmu" - -XORG_PN = "libXmu" - -PACKAGES =+ "libxmuu libxmuu-dev" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" -FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb deleted file mode 100644 index 02df24cd9f..0000000000 --- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Window System miscellaneous utility library" -PRIORITY = "optional" - -DEPENDS += " libxt libxext xextproto virtual/libx11" -PROVIDES = "xmu" - -XORG_PN = "libXmu" - -PACKAGES =+ "libxmuu libxmuu-dev" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" -FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb deleted file mode 100644 index fc7ecb5778..0000000000 --- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X print extension library." - -DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" - -XORG_PN = "libXp" - -CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb deleted file mode 100644 index 3ff582a8e3..0000000000 --- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Pixmap library." -PRIORITY = "optional" -LICENSE = "X-BSD" - -DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" - -XORG_PN = "libXpm" - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb deleted file mode 100644 index 3ff582a8e3..0000000000 --- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Pixmap library." -PRIORITY = "optional" -LICENSE = "X-BSD" - -DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" - -XORG_PN = "libXpm" - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb deleted file mode 100644 index 077ac40a0a..0000000000 --- a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" - -XORG_PN = "libXprintAppUtil" - diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb deleted file mode 100644 index f965b9a2bc..0000000000 --- a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxt printproto libxau" - -XORG_PN = "libXprintUtil" - diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb deleted file mode 100644 index 363550fade..0000000000 --- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Resize and Rotate extension library." -LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" - -XORG_PN = "libXrandr" - diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb deleted file mode 100644 index 363550fade..0000000000 --- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Resize and Rotate extension library." -LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" - -XORG_PN = "libXrandr" - diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb deleted file mode 100644 index 32ba95721d..0000000000 --- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Render extension library." -LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 renderproto" - -XORG_PN = "libXrender" - diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb deleted file mode 100644 index 32ba95721d..0000000000 --- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Render extension library." -LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 renderproto" - -XORG_PN = "libXrender" - diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb deleted file mode 100644 index 282947e7fe..0000000000 --- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Resource usage library." - -DEPENDS += " virtual/libx11 libxext xextproto resourceproto" - -XORG_PN = "libXres" - diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb deleted file mode 100644 index 282947e7fe..0000000000 --- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Resource usage library." - -DEPENDS += " virtual/libx11 libxext xextproto resourceproto" - -XORG_PN = "libXres" - diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb deleted file mode 100644 index 2f0168e2b5..0000000000 --- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X screen saver extension library." -LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" - -XORG_PN = "libXScrnSaver" - -PROVIDES = "libxss" -RREPLACES = "libxss" - -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb deleted file mode 100644 index 2f0168e2b5..0000000000 --- a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X screen saver extension library." -LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" - -XORG_PN = "libXScrnSaver" - -PROVIDES = "libxss" -RREPLACES = "libxss" - -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb deleted file mode 100644 index 520ab10c0e..0000000000 --- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Toolkit Intrinsics" -PRIORITY = "optional" - -DEPENDS += " libsm virtual/libx11 xproto kbproto" -PROVIDES = "xt" - -XORG_PN = "libXt" - -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs - ) || exit 1 - oe_runmake -} diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb deleted file mode 100644 index 520ab10c0e..0000000000 --- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Toolkit Intrinsics" -PRIORITY = "optional" - -DEPENDS += " libsm virtual/libx11 xproto kbproto" -PROVIDES = "xt" - -XORG_PN = "libXt" - -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs - ) || exit 1 - oe_runmake -} diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb deleted file mode 100644 index f9ebac47f9..0000000000 --- a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" - -XORG_PN = "libXTrap" - diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb deleted file mode 100644 index 802ea2836d..0000000000 --- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Test Extension: client side library" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" -PROVIDES = "xtst" - -XORG_PN = "libXtst" - diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb deleted file mode 100644 index 0d045940e3..0000000000 --- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Video extension library." -LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto videoproto" - -XORG_PN = "libXv" - diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb deleted file mode 100644 index a0f9f7be25..0000000000 --- a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Video Motion Compensation extension library." - -DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" - -XORG_PN = "libXvMC" - diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb deleted file mode 100644 index a0f9f7be25..0000000000 --- a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Video Motion Compensation extension library." - -DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" - -XORG_PN = "libXvMC" - diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb deleted file mode 100644 index e067190b84..0000000000 --- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86dga extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" - -XORG_PN = "libXxf86dga" - diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb deleted file mode 100644 index e067190b84..0000000000 --- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86dga extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" - -XORG_PN = "libXxf86dga" - diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb deleted file mode 100644 index 3af4acba96..0000000000 --- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" -PROVIDES = "xxf86misc" - -XORG_PN = "libXxf86misc" - diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb deleted file mode 100644 index 3af4acba96..0000000000 --- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" -PROVIDES = "xxf86misc" - -XORG_PN = "libXxf86misc" - diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb deleted file mode 100644 index b85e2d2477..0000000000 --- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86vm extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" - -XORG_PN = "libXxf86vm" - diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb deleted file mode 100644 index b85e2d2477..0000000000 --- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86vm extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" - -XORG_PN = "libXxf86vm" - diff --git a/packages/xorg-lib/pixman_0.9.4.bb b/packages/xorg-lib/pixman_0.9.4.bb new file mode 100644 index 0000000000..08b29fedef --- /dev/null +++ b/packages/xorg-lib/pixman_0.9.4.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Library for lowlevel pixel operations" +DEPENDS = "virtual/libx11" +PR = "r0" + diff --git a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb deleted file mode 100644 index 7d24f07432..0000000000 --- a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" - -DEPENDS = "util-macros-native" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2" -S = "${WORKDIR}/xtrans-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb deleted file mode 100644 index 2c38782a57..0000000000 --- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc -PR = "r1" - -SRC_URI += "file://fix-missing-includepath.patch;patch=1" - -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb deleted file mode 100644 index 1f4cf97e70..0000000000 --- a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb deleted file mode 100644 index f46c1da93e..0000000000 --- a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2" -S = "${WORKDIR}/bigreqsproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb deleted file mode 100644 index 1f4cf97e70..0000000000 --- a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb deleted file mode 100644 index 59eae3a0bb..0000000000 --- a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "compositeext" diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb deleted file mode 100644 index 59eae3a0bb..0000000000 --- a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "compositeext" diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb deleted file mode 100644 index a05558f979..0000000000 --- a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "damageext" diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb deleted file mode 100644 index 16ff0441b5..0000000000 --- a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "fixesext" diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb deleted file mode 100644 index 16ff0441b5..0000000000 --- a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "fixesext" diff --git a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb deleted file mode 100644 index a9ff843cb3..0000000000 --- a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2" -S = "${WORKDIR}/fontcacheproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb deleted file mode 100644 index 34a32f97be..0000000000 --- a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2" -S = "${WORKDIR}/fontsproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb deleted file mode 100644 index c47701289d..0000000000 --- a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2" -S = "${WORKDIR}/inputproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/inputproto_X11R7.1-1.4.bb b/packages/xorg-proto/inputproto_X11R7.1-1.4.bb deleted file mode 100644 index 26260c401e..0000000000 --- a/packages/xorg-proto/inputproto_X11R7.1-1.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -SRC_URI = "${XORG_MIRROR}/individual/proto/inputproto-1.4.tar.gz" -S = "${WORKDIR}/${XORG_PN}-1.4" diff --git a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb deleted file mode 100644 index e7d1f9c992..0000000000 --- a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2" -S = "${WORKDIR}/kbproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb deleted file mode 100644 index 813143995d..0000000000 --- a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-1.0.3" - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb deleted file mode 100644 index ffdbf51ebf..0000000000 --- a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "randrext" diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb deleted file mode 100644 index 255ab83609..0000000000 --- a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "recordext" diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb deleted file mode 100644 index 881eed5240..0000000000 --- a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "renderext" diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb deleted file mode 100644 index 231eb0b37f..0000000000 --- a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "resourceext" diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb deleted file mode 100644 index 1ccfc89032..0000000000 --- a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2" -S = "${WORKDIR}/xcmiscproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb deleted file mode 100644 index 50d6c5b2e9..0000000000 --- a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2" -S = "${WORKDIR}/xextproto-${PV}" - -inherit native autotools pkgconfig - -PROVIDES = "xextensions-native" diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb deleted file mode 100644 index 3b35a020e4..0000000000 --- a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -PROVIDES = "xextensions" - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb deleted file mode 100644 index e37d738633..0000000000 --- a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2" -S = "${WORKDIR}/xf86bigfontproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb deleted file mode 100644 index 18207c0307..0000000000 --- a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "xxf86dgaext" diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb deleted file mode 100644 index d3acf1f590..0000000000 --- a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -CONFLICTS = "xxf86vmext" diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb deleted file mode 100644 index 34a74b77e8..0000000000 --- a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2" -S = "${WORKDIR}/xproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb deleted file mode 100644 index 80ddcd7e6e..0000000000 --- a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2" -S = "${WORKDIR}/xproto-${PV}" - -inherit native autotools pkgconfig diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb deleted file mode 100644 index d7cd7c8c86..0000000000 --- a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb deleted file mode 100644 index a901c5b61b..0000000000 --- a/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-proto-common.inc - -XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/development/X11R7.2-RC3/proto/${XORG_PN}-7.0.9.tar.gz" -S = "${WORKDIR}/${XORG_PN}-7.0.9" - - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb deleted file mode 100644 index b265a53346..0000000000 --- a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PROVIDES="xproxymngproto" -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb deleted file mode 100644 index f9dc1f3d3e..0000000000 --- a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb deleted file mode 100644 index f9dc1f3d3e..0000000000 --- a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/packages/xorg-util/imake_X11R7.0-1.0.1.bb deleted file mode 100644 index b2b11cf038..0000000000 --- a/packages/xorg-util/imake_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "imake utility" - -DEPENDS += " perl xproto" - diff --git a/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/packages/xorg-util/imake_X11R7.1-1.0.2.bb deleted file mode 100644 index b2b11cf038..0000000000 --- a/packages/xorg-util/imake_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "imake utility" - -DEPENDS += " perl xproto" - diff --git a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb deleted file mode 100644 index 09a7787ee3..0000000000 --- a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto" - diff --git a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb deleted file mode 100644 index 1b8476be47..0000000000 --- a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-util-common.inc -inherit native - -#DESCRIPTION = "" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2" -S="${WORKDIR}/makedepend-${PV}" - -DEPENDS += " util-macros-native xproto-native" - diff --git a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb deleted file mode 100644 index 09a7787ee3..0000000000 --- a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto" - diff --git a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb deleted file mode 100644 index dcfc7ebaee..0000000000 --- a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2" -S = "${WORKDIR}/util-macros-${PV}" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb deleted file mode 100644 index 239750bb80..0000000000 --- a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2" -S = "${WORKDIR}/util-macros-${PV}" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb deleted file mode 100644 index 64e0550571..0000000000 --- a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ - file://unbreak_cross_compile.patch;patch=1 " - -S = "${WORKDIR}/util-macros-1.1.5" - -inherit native autotools pkgconfig - diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb deleted file mode 100644 index 4e2ddece48..0000000000 --- a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" - -#DEPENDS += " " - diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb deleted file mode 100644 index 4e2ddece48..0000000000 --- a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" - -#DEPENDS += " " - diff --git a/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb deleted file mode 100644 index 06dd0a5d73..0000000000 --- a/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" - -PR = "r1" - -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ - file://unbreak_cross_compile.patch;patch=1 " -S = "${WORKDIR}/${XORG_PN}-1.1.5" - diff --git a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb deleted file mode 100644 index f1b6b0d4f7..0000000000 --- a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -FILES_${PN} += " /usr/lib/X11/config" diff --git a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb deleted file mode 100644 index f1b6b0d4f7..0000000000 --- a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -FILES_${PN} += " /usr/lib/X11/config" diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb deleted file mode 100644 index 4783c6878a..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "X server for Imageon Cards from freedesktop.org" -DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" - -COMPATIBLE_MACHINE = "(c7x0|hx4700)" - -SECTION = "x11/base" -LICENSE = "MIT" - -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" - -PROVIDES = "virtual/xserver" - -PR = "r3" - -FILESPATH = "${FILE_DIRNAME}/xserver-kdrive" - -SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ - file://kdrive-vidmemarea.patch;patch=1 \ - file://kdrive-imageon.patch;patch=1" - -S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" - -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" -W100_OECONF_arm = "--enable-imageon" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" - -FILES_${PN} = "${libdir}/xserver/SecurityPolicy \ - ${bindir}/Ximageon" diff --git a/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch deleted file mode 100644 index 0c0b64bf14..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac~ 2005-06-03 17:23:36.000000000 +0200 -+++ configure.ac 2005-06-03 17:23:36.000000000 +0200 -@@ -447,10 +447,6 @@ - KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" - fi - --if test "$TSLIB" = yes; then -- KDRIVE_LIBS="${KDRIVE_LIBS} -lts" --fi -- - AC_SUBST([KDRIVE_PURE_LIBS]) - AC_SUBST([KDRIVE_PURE_INCS]) - AC_SUBST([KDRIVE_LIBS]) diff --git a/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch deleted file mode 100644 index f87e7cc2cd..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 -+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 -@@ -198,6 +198,11 @@ - return FALSE; - } - -+ /* Re-get the "fixed" parameters since they might have changed */ -+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); -+ if (k < 0) -+ perror ("FBIOGET_FSCREENINFO"); -+ - /* Now get the new screeninfo */ - ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); - depth = priv->var.bits_per_pixel; diff --git a/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch deleted file mode 100644 index 22ad51c5ad..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: hw/kdrive/src/kmode.c -=================================================================== -RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v -retrieving revision 1.13 -diff -u -r1.13 kmode.c ---- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13 -+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000 -@@ -41,6 +41,11 @@ - 1, 11, 14, KdSyncNegative, - }, - -+ { 240, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ - /* Other VESA modes */ - { 640, 350, 85, 31500, /* VESA */ - 32, 96, 192, KdSyncPositive, /* 26.413 */ diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb deleted file mode 100644 index d4a184b484..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" -PROVIDES = "virtual/xserver" -PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices" - -PR = "r2" - -FILES_${PN} = "${bindir}/Xomap" - -SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \ - file://kmode.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://configure-tslib.patch;patch=1;pnum=0" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ - --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr" diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb deleted file mode 100644 index 7837884a75..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb +++ /dev/null @@ -1,47 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "xcalibrateext tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto xpext xsp libxkbfile dbus" - -PROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-xomap" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800" - -PR = "r4" - -COMPATIBLE_MACHINE = "nokia800" - -FILES_${PN} = "${libdir}/xserver /etc/dbus-1/* ${bindir}/Xomap" - -SRC_URI = "http://repository.maemo.org/pool/maemo3.0/free/source/xorg-server_1.1.99.3-0osso31.tar.gz \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ - file://fixups.patch;patch=1 \ - file://button_only.patch;patch=1 \ - file://calibrateext.patch;patch=1" -# file://kdrive-evdev.patch;patch=1 \ -# file://kdrive-use-evdev.patch;patch=1 \ -# file://optional-xkb.patch;patch=1 \ -# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ -# file://enable-tslib.patch;patch=1 \ -# file://xfbdev-fb-opt.patch;patch=1" - -S = "${WORKDIR}/xorg-server-1.1.99.3" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-dmx --enable-xcalibrate \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --with-default-font-path=built-ins \ - --disable-xsdl \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no \ - --enable-xomap" diff --git a/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff deleted file mode 100644 index 596e498b80..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff +++ /dev/null @@ -1,464 +0,0 @@ ---- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100 -@@ -79,7 +79,7 @@ - # tslib touchscreen driver - AC_CHECK_HEADERS([tslib.h]) - --REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau" -+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau" - - DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi" - DEFAULT_VENDOR_STRING="freedesktop.org" ---- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100 -@@ -79,7 +79,6 @@ - #endif - - #include "windowstr.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "gcstruct.h" - #include "selection.h" ---- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100 -@@ -51,7 +51,6 @@ - #include <config.h> - #endif - #include "misc.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "scrnintstr.h" - #include "gcstruct.h" ---- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100 -@@ -89,7 +89,6 @@ - #include "colormap.h" - #include "colormapst.h" - #include "cursorstr.h" --#include "font.h" - #include "opaque.h" - #include "servermd.h" - #include "site.h" ---- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100 -@@ -57,7 +57,7 @@ - #include <X11/Xproto.h> - #include "misc.h" - #include "dixstruct.h" --#include "fontstruct.h" -+#include "dixfont.h" - #include "scrnintstr.h" - #include "swaprep.h" - #include "globals.h" ---- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100 -@@ -31,7 +31,7 @@ - #include <config.h> - #endif - #include "misc.h" --#include "font.h" -+#include "dixfont.h" - - Bool - XpClientIsBitmapClient(ClientPtr client) ---- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100 -@@ -26,7 +26,6 @@ - #include <config.h> - #endif - #include "fb.h" --#include "fontstruct.h" - #include "dixfontstr.h" - - Bool ---- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100 -@@ -38,7 +38,6 @@ - #include "pixmapstr.h" - #include "regionstr.h" - #include "mistruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "fb.h" - #include "migc.h" ---- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100 -@@ -51,7 +51,6 @@ - #include "pixmapstr.h" - #include "regionstr.h" - #include "mistruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "fb.h" - #include "migc.h" ---- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100 -@@ -29,7 +29,6 @@ - #endif - #include "kdrive.h" - #include "kaa.h" --#include "fontstruct.h" - #include "dixfontstr.h" - - #define DEBUG_MIGRATE 0 ---- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100 -@@ -27,10 +27,10 @@ - #define DIXFONT_H 1 - - #include "dix.h" --#include "font.h" --#include "fontconf.h" -+#include <X11/fonts/font.h> -+#include <X11/fonts/fontconf.h> - #include "closure.h" --#include "fontstruct.h" -+#include <X11/fonts/fontstruct.h> - - #define NullDIXFontProp ((DIXFontPropPtr)0) - ---- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100 -@@ -27,7 +27,6 @@ - - #include "servermd.h" - #include "dixfont.h" --#include "fontstruct.h" - #include "closure.h" - #define NEED_REPLIES - #include "X11/Xproto.h" /* for xQueryFontReply */ ---- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100 -@@ -57,7 +57,6 @@ - #include "gcstruct.h" - #include "windowstr.h" - #include "pixmapstr.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "dixstruct.h" /* For requestingClient */ - #include "mi.h" ---- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100 -@@ -55,7 +55,6 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - #include "misc.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "gcstruct.h" - #include "windowstr.h" ---- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100 -@@ -54,7 +54,7 @@ - #include "validate.h" - #include "window.h" - #include "gc.h" --#include "font.h" -+#include "dixfont.h" - #include "input.h" - #include "cursor.h" - ---- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100 -@@ -54,6 +54,8 @@ - #include "extension.h" - #include "micmap.h" - #include "xext.h" -+#include "pixmap.h" -+#include "gc.h" - - #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */ - #undef PEXEXT ---- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100 -@@ -63,7 +63,6 @@ - #include <X11/Xproto.h> - #include "misc.h" - #include "gcstruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "mi.h" - ---- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100 -@@ -42,7 +42,6 @@ - # include "input.h" - # include "mi.h" - # include "cursorstr.h" --# include "font.h" - # include "scrnintstr.h" - # include "colormapst.h" - # include "windowstr.h" -@@ -50,7 +49,6 @@ - # include "mipointer.h" - # include "mispritest.h" - # include "dixfontstr.h" --# include "fontstruct.h" - #ifdef RENDER - # include "mipict.h" - #endif ---- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100 -@@ -28,9 +28,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100 -@@ -29,9 +29,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100 -@@ -29,9 +29,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100 -@@ -28,9 +28,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100 -@@ -28,9 +28,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100 -@@ -28,9 +28,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100 -@@ -28,9 +28,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100 -@@ -30,9 +30,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100 -@@ -25,9 +25,7 @@ - #include <X11/X.h> - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100 -@@ -27,4 +27,4 @@ - - #include "config.h" - --#include <transport.c> -+#include <X11/Xtrans/transport.c> ---- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100 -@@ -25,4 +25,4 @@ - #define XSERV_t - #define TRANS_SERVER - --#include <Xtrans.h> -+#include <X11/Xtrans/Xtrans.h> ---- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100 -@@ -32,27 +32,6 @@ - #include "pixmap.h" - #include "gc.h" - --typedef struct _ShmFuncs { -- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, -- int width, -- int height, -- int depth, -- char *addr); -- void (* PutImage)(DrawablePtr dst, -- GCPtr pGC, -- int depth, -- unsigned int format, -- int w, -- int h, -- int sx, -- int sy, -- int sw, -- int sh, -- int dx, -- int dy, -- char *data); --} ShmFuncs, *ShmFuncsPtr; -- - void - ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); - ---- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100 -@@ -48,7 +48,7 @@ - PERFORMANCE OF THIS SOFTWARE. - - ******************************************************************/ --/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */ -+/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */ - - #ifndef _SYNCINT_H_ - #define _SYNCINT_H_ -@@ -57,26 +57,10 @@ - - #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */ - --typedef struct _SyncCounter { -- ClientPtr client; /* Owning client. 0 for system counters */ -- XSyncCounter id; /* resource ID */ -- CARD64 value; /* counter value */ -- struct _SyncTriggerList *pTriglist; /* list of triggers */ -- Bool beingDestroyed; /* in process of going away */ -- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */ --} SyncCounter; -- - /* - * The System Counter interface - */ - --typedef enum { -- XSyncCounterNeverChanges, -- XSyncCounterNeverIncreases, -- XSyncCounterNeverDecreases, -- XSyncCounterUnrestricted --} SyncCounterType; -- - typedef void - (*SyncQueryValueProcPtr) (pointer pCounter, - CARD64 *freshvalue); -@@ -86,16 +70,6 @@ - CARD64 *lessthan, - CARD64 *greaterthan); - --typedef struct _SysCounterInfo { -- char *name; -- CARD64 resolution; -- CARD64 bracket_greater; -- CARD64 bracket_less; -- SyncCounterType counterType; /* how can this counter change */ -- SyncQueryValueProcPtr QueryValue; -- SyncBracketValuesProcPtr BracketValues; --} SysCounterInfo; -- - struct _SyncTrigger; - - typedef Bool -@@ -108,55 +82,6 @@ - typedef void - (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger); - --typedef struct _SyncTrigger { -- SyncCounter *pCounter; -- CARD64 wait_value; /* wait value */ -- unsigned int value_type; /* Absolute or Relative */ -- unsigned int test_type; /* transition or Comparision type */ -- CARD64 test_value; /* trigger event threshold value */ -- SyncCheckTriggerProcPtr CheckTrigger; -- SyncTriggerFiredProcPtr TriggerFired; -- SyncCounterDestroyedProcPtr CounterDestroyed; --} SyncTrigger; -- --typedef struct _SyncTriggerList { -- SyncTrigger *pTrigger; -- struct _SyncTriggerList *next; --} SyncTriggerList; -- --typedef struct _SyncAlarmClientList { -- ClientPtr client; -- XID delete_id; -- struct _SyncAlarmClientList *next; --} SyncAlarmClientList; -- --typedef struct _SyncAlarm { -- SyncTrigger trigger; -- ClientPtr client; -- XSyncAlarm alarm_id; -- CARD64 delta; -- int events; -- int state; -- SyncAlarmClientList *pEventClients; --} SyncAlarm; -- --typedef struct { -- ClientPtr client; -- CARD32 delete_id; -- int num_waitconditions; --} SyncAwaitHeader; -- --typedef struct { -- SyncTrigger trigger; -- CARD64 event_threshold; -- SyncAwaitHeader *pHeader; --} SyncAwait; -- --typedef union { -- SyncAwaitHeader header; -- SyncAwait await; --} SyncAwaitUnion; -- - pointer - SyncCreateSystemCounter(char *name, - CARD64 inital_value, diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb deleted file mode 100644 index 3f97527553..0000000000 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xserver-kdrive-common.inc - -DEPENDS += "xcalibrateext" - -PR = "r10" - -PACKAGES =+ "xserver-kdrive-w100" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ - ${KDRIVE_COMMON_PATCHES} \ - file://xcalibrate.patch;patch=1 \ - file://w100.patch;patch=1 \ - " - -S = "${WORKDIR}/xorg-server-${PV}" - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb deleted file mode 100644 index e91a50a603..0000000000 --- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-xserver-common.inc - -PR = "r3" - -#DESCRIPTION = "" - -#DEPENDS += " " - -SRC_URI += " file://miext_layer_shadow_h.patch;patch=1 \ - file://xpconfig-parentdir.patch;patch=1" - diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb deleted file mode 100644 index 3c29684394..0000000000 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-xserver-common.inc - -SRC_URI += "file://drmfix.patch;patch=1" - -PR = "r3" - -EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " - -#DESCRIPTION = "" - -#DEPENDS += " " diff --git a/packages/xscrnsaverh/xscrnsaverh_1.0.bb b/packages/xscrnsaverh/xscrnsaverh_1.0.bb index 7fc7e6e15a..2989054f44 100644 --- a/packages/xscrnsaverh/xscrnsaverh_1.0.bb +++ b/packages/xscrnsaverh/xscrnsaverh_1.0.bb @@ -1,7 +1,7 @@ PR = "r0" -DEPENDS = "xextensions" +DEPENDS = "libxext" SECTION = "x11" LICENSE = "X-MIT" DESCRIPTION = "missing header" diff --git a/packages/zaurusd/files/tslib-1.diff b/packages/zaurusd/files/tslib-1.diff new file mode 100644 index 0000000000..8df1b83b3a --- /dev/null +++ b/packages/zaurusd/files/tslib-1.diff @@ -0,0 +1,11 @@ +--- /tmp/configure.ac 2007-08-04 10:09:46.000000000 +0200 ++++ zaurusd/configure.ac 2007-08-04 10:10:35.308400000 +0200 +@@ -45,7 +45,7 @@ + # + # Checks for tslib + # +- PKG_CHECK_MODULES(TSLIB, "tslib-0.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) ++ PKG_CHECK_MODULES(TSLIB, "tslib-1.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) + AC_SUBST(TSLIB_CFLAGS) + AC_SUBST(TSLIB_LIBS) + fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 0bc2424a69..2b918bbaa3 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -14,6 +14,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ file://zaurusd-mixer-callback.patch;patch=1 \ + file://tslib-1.diff;patch=1 \ file://zaurus-hinge.bl-on \ file://zaurus-hinge.bl-off" |
